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 --- 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{

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