freeradius: Update to version 3.0.18

[ipfire-2.x.git] / html / cgi-bin / mail.cgi

diff --git a/html/cgi-bin/mail.cgi b/html/cgi-bin/mail.cgi
index a7c89defa6a89fe456397a6e670c20b296364c75..9cf14cac8b0d3d8b4b56d8f017daf3db86a84991 100755 (executable)
--- a/html/cgi-bin/mail.cgi
+++ b/html/cgi-bin/mail.cgi
@@ -110,9 +110,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 +132,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 +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';
@@ -204,35 +210,35 @@ END
        <div class="MAILSRV">
                <table style='width:100%;'>
                <tr>
-                       <td style='width:24em'>$Lang::tr{'email mailaddr'}</td>
+                       <td>$Lang::tr{'email mailsender'}<img src='/blob.gif' alt='*' /></td>
+                       <td><input type='text' name='txt_mailsender' value='$mail{'SENDER'}' style='width:22em;'></td>
+               </tr>
+               <tr>
+                       <td>$Lang::tr{'email mailrcpt'}<img src='/blob.gif' alt='*' /></td>
+                       <td><input type='text' name='txt_recipient' value='$mail{'RECIPIENT'}' style='width:22em;'></td>
+               </tr>
+               <tr>
+                       <td style='width:24em'>$Lang::tr{'email mailaddr'}<img src='/blob.gif' alt='*' /></td>
                        <td><input type='text' name='txt_mailserver' value='$dma{'SMARTHOST'}' style='width:22em;'></td>
                </tr>
                <tr>
-                       <td>$Lang::tr{'email mailport'}</td>
+                       <td>$Lang::tr{'email mailport'}<img src='/blob.gif' alt='*' /></td>
                        <td><input type='text' name='txt_mailport' value='$dma{'PORT'}' size='3'></td>
                </tr>
                <tr>
-                       <td>$Lang::tr{'email mailuser'}<img src='/blob.gif' alt='*' /></td>
+                       <td>$Lang::tr{'email mailuser'}</td>
                        <td><input type='text' name='txt_mailuser' value='$auth{'AUTHNAME'}' style='width:22em;'></td>
                </tr>
                <tr>
-                       <td>$Lang::tr{'email mailpass'}<img src='/blob.gif' alt='*' /></td>
+                       <td>$Lang::tr{'email mailpass'}</td>
                        <td><input type='password' name='txt_mailpass' value='$auth{'AUTHPASS'}' style='width:22em;' ></td>
                </tr>
                <tr>
                        <td>$Lang::tr{'email tls'}</td>
                        <td><input type='checkbox' name='mail_tls' $checked{'mail_tls'}{'on'}></td>
                </tr>
-               <tr>
-                       <td>$Lang::tr{'email mailsender'}</td>
-                       <td><input type='text' name='txt_mailsender' value='$mail{'SENDER'}' style='width:22em;'></td>
-               </tr>
-               <tr>
-                       <td>$Lang::tr{'email mailrcpt'}</td>
-                       <td><input type='text' name='txt_recipient' value='$mail{'RECIPIENT'}' style='width:22em;'></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>";
@@ -328,18 +334,3 @@ sub error {
                &Header::closebox();
        }
 }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-