X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=html%2Fcgi-bin%2Fmac.cgi;h=f95c0d802623f7e549d084fd19db5e2e5bb0d89e;hb=62fc8511664c6646d706aa42927bac53ac6a5b5f;hp=7c00cc334289d328bc389b818827975093e06540;hpb=d4ca4a03eb3b6af070e3e952f70f4919899b2b9e;p=people%2Fteissler%2Fipfire-2.x.git

diff --git a/html/cgi-bin/mac.cgi b/html/cgi-bin/mac.cgi
index 7c00cc334..f95c0d802 100644
--- 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";
@@ -55,20 +55,37 @@ if ($macsettings{'ACTION'} eq $Lang::tr{'save'}) {
 	} else {
 		$errormessage = $Lang::tr{'mac address error not valid'};
 	}
+	$macsettings{'MAC1'} =~ s/\-/:/g;
+	if ( not ($macsettings{'MAC1'} eq "" )) {
+		my @mac = split(/:/,$macsettings{"MAC1"});
+		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'};
+		}
+	}
 	$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;
+		$macsettings{'MAC1'} =~ s/\:/-/g;
 		$macsettings{'MAC2'} =~ s/\:/-/g;
 		&General::writehash("${General::swroot}/mac/settings", \%macsettings);	
 		&Header::openbox('100%', 'left', $Lang::tr{'mac address saved'});								
@@ -111,13 +128,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,34 +150,52 @@ 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>
+    <td><font class='base'>$Lang::tr{'mac1 new'}&nbsp;</font></td><td>
 END
 ;
 if ($macsettings{'ACTION'} eq $Lang::tr{'delete'} ) {
 print <<END 
-      <input type="text" name="MAC2" maxlength="17" value=''/></td>
+      <input type="text" name="MAC1" 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="MAC1" maxlength="17" value='$macsettings{"MAC1"}'/><img src='/blob.gif' alt='*' /></td>
 END
 ;  
 } 
 print <<END    
   </tr>
-  <tr>
-    <td colspan=2>&nbsp;</td><td>&nbsp;</td>
+    <tr>
+    <td>&nbsp;</td>
   </tr>
   <tr>
-    <td colspan=2><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 colspan=2><div align="center">
+    <td colspan="2"><div align="center">
 END
 ;
 if ($macsettings{'ACTION'} eq $Lang::tr{'delete'} ) {
@@ -197,8 +232,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>