[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 70defeb036de5e8043a867f08effdc741d95fe99

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 70defeb036de5e8043a867f08effdc741d95fe99

[git]

[-- Attachment #1: Type: text/plain, Size: 2721 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  70defeb036de5e8043a867f08effdc741d95fe99 (commit)
      from  35a21a254d2d45488eea77eb6a6e947f38c4e388 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 70defeb036de5e8043a867f08effdc741d95fe99
Author: Alexander Marx <alexander.marx(a)ipfire.org>
Date:   Tue Nov 10 10:59:12 2015 +0100

    BUG10964: When entering wrong data in dma setup, the fields are blanked
    
    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>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 html/cgi-bin/mail.cgi | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

Difference in files:
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{
 
 	#If update set fieldvalues new
 	if($cgiparams{'update'} eq 'on'){
-		$dma{'USEMAIL'}= 'on';
+		$mail{'USEMAIL'}	= 'on';
+		$mail{'SENDER'} 	=  $cgiparams{'txt_mailsender'};
+		$mail{'RECIPIENT'}	=  $cgiparams{'txt_recipient'};
 		$dma{'SMARTHOST'} 	= $cgiparams{'txt_mailserver'};
 		$dma{'PORT'} 		= $cgiparams{'txt_mailport'};
-		$auth{'AUTHUSER'} 	= $cgiparams{'txt_mailuser'};
+		$auth{'AUTHNAME'} 	= $cgiparams{'txt_mailuser'};
 		$auth{'AUTHHOST'}	= $cgiparams{'txt_mailserver'};
 		$auth{'AUTHPASS'} 	= $cgiparams{'txt_mailpass'};
+		$dma{'STARTTLS'}	= $cgiparams{'mail_tls'};
 	}
 	#find preselections
 	$checked{'usemail'}{$mail{'USEMAIL'}}	= 'CHECKED';
@@ -235,7 +238,7 @@ END
 			<td><input type='checkbox' name='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='submit' name='ACTION' value='$Lang::tr{'email testmail'}'></td>";


hooks/post-receive
--
IPFire 2.x development tree