X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=html%2Fcgi-bin%2Fmail.cgi;h=25589046e6abcf5d2f1111237c177212a723bc8b;hb=70187da6a665120f1af623899a10b0b1eff670e3;hp=be663a62e02dadac56cace7c5d3a1d5d672b5e05;hpb=dfe630f77c780c17238ae23392e52e68a41ab892;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/html/cgi-bin/mail.cgi b/html/cgi-bin/mail.cgi
index be663a62e0..25589046e6 100755
--- a/html/cgi-bin/mail.cgi
+++ b/html/cgi-bin/mail.cgi
@@ -81,19 +81,10 @@ if ( -f $mailfile){
 
 #ACTIONS
 if ($cgiparams{'ACTION'} eq "$Lang::tr{'save'}"){ #SaveButton on configsite
-	#Check fields
-	if ($cgiparams{'USEMAIL'} eq 'on'){
-		$errormessage=&checkmailsettings;
-	}else{
-		$cgiparams{'txt_mailserver'}='';
-		$cgiparams{'txt_mailport'}='';
-		$cgiparams{'txt_mailuser'}='';
-		$cgiparams{'txt_mailpass'}='';
-		$cgiparams{'mail_tls'}='';
-		$cgiparams{'txt_mailsender'}='';
-		$cgiparams{'txt_recipient'}='';
-	}
-	if(!$errormessage){
+	# Check fields
+	$errormessage = &checkmailsettings();
+
+	if (!$errormessage) {
 		#clear hashes
 		%auth=();
 		%dma=();
@@ -110,9 +101,12 @@ if ($cgiparams{'ACTION'} eq "$Lang::tr{'save'}"){ #SaveButton on configsite
 		$mail{'SENDER'} 		= $cgiparams{'txt_mailsender'};
 		$mail{'RECIPIENT'}		= $cgiparams{'txt_recipient'};
 
-		$auth{'AUTHNAME'}		= $cgiparams{'txt_mailuser'};
-		$auth{'AUTHPASS'}		= $cgiparams{'txt_mailpass'};
-		$auth{'AUTHHOST'}		= $cgiparams{'txt_mailserver'};
+		if ($cgiparams{'txt_mailuser'} && $cgiparams{'txt_mailpass'}) {
+			$auth{'AUTHNAME'}		= $cgiparams{'txt_mailuser'};
+			$auth{'AUTHPASS'}		= $cgiparams{'txt_mailpass'};
+			$auth{'AUTHHOST'}		= $cgiparams{'txt_mailserver'};
+			print TXT1 "$auth{'AUTHNAME'}|$auth{'AUTHHOST'}:$auth{'AUTHPASS'}\n";
+		}
 
 		$dma{'SMARTHOST'}		= $cgiparams{'txt_mailserver'};
 		$dma{'PORT'}			= $cgiparams{'txt_mailport'};
@@ -129,7 +123,7 @@ if ($cgiparams{'ACTION'} eq "$Lang::tr{'save'}"){ #SaveButton on configsite
 			print TXT "$k $v\n";
 		}
 		close TXT;
-		print TXT1 "$auth{'AUTHNAME'}|$auth{'AUTHHOST'}:$auth{'AUTHPASS'}\n";
+		close TXT1;
 		close TXT2;
 
 	}else{
@@ -150,12 +144,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';
@@ -232,7 +229,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>";
@@ -263,21 +260,21 @@ sub checkmailsettings {
 	#Check if mailserver is an ip address or a domain
 	if ($cgiparams{'txt_mailserver'} =~ /^(\d+)\.(\d+)\.(\d+)\.(\d+)$/){
 		if (! &General::validip($cgiparams{'txt_mailserver'})){
-			$errormessage.="$Lang::tr{'email invalid mailip'} $cgiparams{'txt_mailserver'}<br>";
+			$errormessage .= $Lang::tr{'email invalid mailip'} . "<br>";
 		}
 	}elsif(! &General::validfqdn($cgiparams{'txt_mailserver'})){
-			$errormessage.="$Lang::tr{'email invalid mailfqdn'} $cgiparams{'txt_mailserver'}<br>";
+			$errormessage .= $Lang::tr{'email invalid mailfqdn'} . "<br>";
 	}
 	#Check valid mailserverport
 	if($cgiparams{'txt_mailport'} < 1 || $cgiparams{'txt_mailport'} > 65535){
-		$errormessage.="$Lang::tr{'email invalid mailport'} $cgiparams{'txt_mailport'}<br>";
+		$errormessage .= $Lang::tr{'email invalid mailport'} . "<br>";
 	}
 	#Check valid sender
 	if(! $cgiparams{'txt_mailsender'}){
-		$errormessage.="$Lang::tr{'email empty field'} $Lang::tr{'email mailsender'}<br>";
+		$errormessage .= $Lang::tr{'email empty field'} . "<br>";
 	}else{
 		if (! &General::validemail($cgiparams{'txt_mailsender'})){
-			$errormessage.="<br>$Lang::tr{'email invalid'} $Lang::tr{'email mailsender'}<br>";
+			$errormessage .= "$Lang::tr{'email invalid'} $Lang::tr{'email mailsender'}<br>";
 		}
 	}
 	return $errormessage;
@@ -328,18 +325,3 @@ sub error {
 		&Header::closebox();
 	}
 }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-