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
old mode 100644 (file)
new mode 100755 (executable)
index 7c00cc3..99eb608
--- a/html/cgi-bin/mac.cgi
+++ b/html/cgi-bin/mac.cgi
@@ -22,8 +22,8 @@
 use strict;
 
 # enable only the following on debugging purpose
-use warnings;
-use CGI::Carp 'fatalsToBrowser';
+#use warnings;
+#use CGI::Carp 'fatalsToBrowser';
 
 require '/var/ipfire/general-functions.pl';
 require "${General::swroot}/lang.pl";
@@ -56,16 +56,19 @@ if ($macsettings{'ACTION'} eq $Lang::tr{'save'}) {
                $errormessage = $Lang::tr{'mac address error not valid'};
        }
        $macsettings{'MAC2'} =~ s/\-/:/g;
-       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;                   
+       
+       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 valid'};
                }
-       } else {
-               $errormessage = $Lang::tr{'mac address error not valid'};
        }
        if ($errormessage eq "") {
                $macsettings{'MAC'} =~ s/\:/-/g;
@@ -111,13 +114,13 @@ print <<END
 
 <table border="0"  width='100%'>
   <tr>
-    <td colspan=2><font class='base'>$Lang::tr{'mac desc'}</font></td>
+    <td colspan="2"><font class='base'>$Lang::tr{'mac desc'}</font></td>
   </tr>
   <tr>
-    <td colspan=2>&nbsp;</td><td>&nbsp;</td>
+    <td colspan="2">&nbsp;</td>
   </tr>
   <tr>
-    <td><font class='base'>$Lang::tr{'mac new'}&nbsp;</font></td><td>
+    <td width="25%"><font class='base'>$Lang::tr{'mac new'}&nbsp;</font></td><td>
 END
 ;
 if ($macsettings{'ACTION'} eq $Lang::tr{'delete'} ) {
@@ -133,8 +136,8 @@ END
 } 
 print <<END    
   </tr>
-  <tr>
-    <td colspan=2>&nbsp;</td><td>&nbsp;</td>
+    <tr>
+    <td>&nbsp;</td>
   </tr>
   <tr>
     <td><font class='base'>$Lang::tr{'mac2 new'}&nbsp;</font></td><td>
@@ -142,25 +145,22 @@ END
 ;
 if ($macsettings{'ACTION'} eq $Lang::tr{'delete'} ) {
 print <<END 
-      <input type="text" name="MAC2" maxlength="17" value=''/></td>
+      <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"}'/></td>
+      <input type="text" name="MAC2" maxlength="17" value='$macsettings{"MAC2"}'/><img src='/blob.gif' alt='*' /></td>
 END
 ;  
 } 
 print <<END    
   </tr>
-  <tr>
-    <td colspan=2>&nbsp;</td><td>&nbsp;</td>
-  </tr>
-  <tr>
-    <td colspan=2><hr /></td>
+    <tr>
+    <td colspan="2"><hr /></td>
   </tr>
   <tr>
-    <td colspan=2><div align="center">
+    <td colspan="2"><div align="center">
 END
 ;
 if ($macsettings{'ACTION'} eq $Lang::tr{'delete'} ) {
@@ -197,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>