webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-09 18:45:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

BUG10964: When entering wrong data in dma setup, the fields are blanked

Browse Source 
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@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
This commit is contained in:
Alexander Marx
2015-11-10 10:59:12 +01:00
committed by Michael Tremer
parent 35a21a254d
commit 70defeb036
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
html/cgi-bin/mail.cgi
View File

@@ -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>";