From mboxrd@z Thu Jan  1 00:00:00 1970
From: Alexander Marx <alexander.marx@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH] BUG10964: When entering wrong data in dma setup, the fields
 are blanked
Date: Tue, 10 Nov 2015 10:59:12 +0100
Message-ID: <1447149552-5501-1-git-send-email-alexander.marx@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4247916308937019427=="
List-Id: <development.lists.ipfire.org>

--===============4247916308937019427==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

When entring wrong values in the fields and saving the site, there comes
an errormessage and all fields except mailserver and port are blanked.
Now the fileds are preserved and all data is displayed even after an
errormessage

Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org>
---
 html/cgi-bin/mail.cgi | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/html/cgi-bin/mail.cgi b/html/cgi-bin/mail.cgi
index 072888c..9cf14ca 100755
--- a/html/cgi-bin/mail.cgi
+++ b/html/cgi-bin/mail.cgi
@@ -153,12 +153,15 @@ sub configsite{
=20
 	#If update set fieldvalues new
 	if($cgiparams{'update'} eq 'on'){
-		$dma{'USEMAIL'}=3D 'on';
+		$mail{'USEMAIL'}	=3D 'on';
+		$mail{'SENDER'} 	=3D  $cgiparams{'txt_mailsender'};
+		$mail{'RECIPIENT'}	=3D  $cgiparams{'txt_recipient'};
 		$dma{'SMARTHOST'} 	=3D $cgiparams{'txt_mailserver'};
 		$dma{'PORT'} 		=3D $cgiparams{'txt_mailport'};
-		$auth{'AUTHUSER'} 	=3D $cgiparams{'txt_mailuser'};
+		$auth{'AUTHNAME'} 	=3D $cgiparams{'txt_mailuser'};
 		$auth{'AUTHHOST'}	=3D $cgiparams{'txt_mailserver'};
 		$auth{'AUTHPASS'} 	=3D $cgiparams{'txt_mailpass'};
+		$dma{'STARTTLS'}	=3D $cgiparams{'mail_tls'};
 	}
 	#find preselections
 	$checked{'usemail'}{$mail{'USEMAIL'}}	=3D 'CHECKED';
@@ -235,7 +238,7 @@ END
 			<td><input type=3D'checkbox' name=3D'mail_tls' $checked{'mail_tls'}{'on'}=
></td>
 		</tr>
 END
-		if (! -z $dmafile && $mail{'USEMAIL'} eq 'on'){
+		if (! -z $dmafile && $mail{'USEMAIL'} eq 'on' && !$errormessage){
 			print "<tr>";
 			print "<td></td>";
 			print "<td><input type=3D'submit' name=3D'ACTION' value=3D'$Lang::tr{'ema=
il testmail'}'></td>";
--=20
1.9.1


--===============4247916308937019427==--