Impoved mac.cgi page. Fixed table and added some comments.

[people/pmueller/ipfire-2.x.git] / html / cgi-bin / mac.cgi

diff --git a/html/cgi-bin/mac.cgi b/html/cgi-bin/mac.cgi
index 93767d00d1d18fc76c69dbf251a68066d81c347e..99eb6088caa141f8e7636c65f3ea00a44429e412 100755 (executable)
--- a/html/cgi-bin/mac.cgi
+++ b/html/cgi-bin/mac.cgi
@@ -46,25 +46,37 @@ if ($macsettings{'ACTION'} eq $Lang::tr{'save'}) {
        $macsettings{'MAC'} =~ s/\-/:/g;
        my @mac = split(/:/,$macsettings{"MAC"});
        if ($#mac == 5) { 
-               if (($mac[0] eq "00")||($mac[0] eq "0")){
+               foreach (@mac) {
+                       unless ($_ =~ /^[a-fA-F0-9]{1,2}$/) {
+                                       $errormessage = $Lang::tr{'mac address error not valid'};
+                                       last;                   
+                       }
+               }
+       } else {
+               $errormessage = $Lang::tr{'mac address error not valid'};
+       }
+       $macsettings{'MAC2'} =~ s/\-/:/g;
+       
+       if ( not ($macsettings{'MAC2'} eq "" )) {
+               my @mac = split(/:/,$macsettings{"MAC2"});
+               if ($#mac == 5) { 
                        foreach (@mac) {
                                unless ($_ =~ /^[a-fA-F0-9]{1,2}$/) {
                                                $errormessage = $Lang::tr{'mac address error not valid'};
                                                last;                   
-                               }                        
+                               }
                        }
-               } else {        
-                       $errormessage = $Lang::tr{'mac address error not 00'};
-               }
-               if ($errormessage eq "") {
-                       $macsettings{'MAC'} =~ s/\:/-/g;
-                       &General::writehash("${General::swroot}/mac/settings", \%macsettings);  
-                       &Header::openbox('100%', 'left', $Lang::tr{'mac address saved'});                                                               
-                       print "<font class='base'>$Lang::tr{'mac address saved txt'}</font>\n";
-                       &Header::closebox();            
+               } else {
+                       $errormessage = $Lang::tr{'mac address error not valid'};
                }
-       } else {
-               $errormessage = $Lang::tr{'mac address error not valid'};
+       }
+       if ($errormessage eq "") {
+               $macsettings{'MAC'} =~ s/\:/-/g;
+               $macsettings{'MAC2'} =~ s/\:/-/g;
+               &General::writehash("${General::swroot}/mac/settings", \%macsettings);  
+               &Header::openbox('100%', 'left', $Lang::tr{'mac address saved'});                                                               
+               print "<font class='base'>$Lang::tr{'mac address saved txt'}</font>\n";
+               &Header::closebox();
        }
 }
 if ($macsettings{'ACTION'} eq $Lang::tr{'reconnect'}) {
@@ -102,13 +114,13 @@ print <<END
 
 <table border="0"  width='100%'>
   <tr>
-    <td><font class='base'>$Lang::tr{'mac desc'}</font></td>
+    <td colspan="2"><font class='base'>$Lang::tr{'mac desc'}</font></td>
   </tr>
   <tr>
-    <td>&nbsp;</td>
+    <td colspan="2">&nbsp;</td>
   </tr>
   <tr>
-    <td><font class='base'>$Lang::tr{'mac new'}&nbsp;</font>
+    <td width="25%"><font class='base'>$Lang::tr{'mac new'}&nbsp;</font></td><td>
 END
 ;
 if ($macsettings{'ACTION'} eq $Lang::tr{'delete'} ) {
@@ -123,12 +135,32 @@ END
 ;  
 } 
 print <<END    
+  </tr>
+    <tr>
+    <td>&nbsp;</td>
   </tr>
   <tr>
-    <td><hr /></td>
+    <td><font class='base'>$Lang::tr{'mac2 new'}&nbsp;</font></td><td>
+END
+;
+if ($macsettings{'ACTION'} eq $Lang::tr{'delete'} ) {
+print <<END 
+      <input type="text" name="MAC2" maxlength="17" value=''/><img src='/blob.gif' alt='*' /></td>
+END
+;
+} else {   
+print <<END
+      <input type="text" name="MAC2" maxlength="17" value='$macsettings{"MAC2"}'/><img src='/blob.gif' alt='*' /></td>
+END
+;  
+} 
+print <<END    
+  </tr>
+    <tr>
+    <td colspan="2"><hr /></td>
   </tr>
   <tr>
-    <td><div align="center">
+    <td colspan="2"><div align="center">
 END
 ;
 if ($macsettings{'ACTION'} eq $Lang::tr{'delete'} ) {
@@ -165,8 +197,10 @@ END
 print <<END
     </div></td>
   </tr>
-  
-
+  <tr>
+    <td colspan="2"align='left'>
+        <img src='/blob.gif' alt='*' />&nbsp;$Lang::tr{'this field may be blank'}</td>
+  </tr>
 
 </table>