dma: change field order of mail.cgi and fix required fields

[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..be663a62e02dadac56cace7c5d3a1d5d672b5e05 100755 (executable)
--- a/html/cgi-bin/mail.cgi
+++ b/html/cgi-bin/mail.cgi
@@ -204,33 +204,33 @@ END
        <div class="MAILSRV">
                <table style='width:100%;'>
                <tr>
        <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><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><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><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>
                        <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'){
                        print "<tr>";
 END
                if (! -z $dmafile && $mail{'USEMAIL'} eq 'on'){
                        print "<tr>";