freeradius: Update to version 3.0.18

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

diff --git a/html/cgi-bin/mac.cgi b/html/cgi-bin/mac.cgi
index 7c00cc334289d328bc389b818827975093e06540..161be3421e0689ee8e3ab6be48389d70a374e888 100644 (file)
--- 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;<img src='/blob.gif' alt='*' /></font></td><td>
 END
 ;
 if ($macsettings{'ACTION'} eq $Lang::tr{'delete'} ) {
@@ -132,9 +149,29 @@ END
 ;  
 } 
 print <<END    
+  </tr>
+    <tr>
+    <td>&nbsp;</td>
   </tr>
   <tr>
-    <td colspan=2>&nbsp;</td><td>&nbsp;</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="MAC1" maxlength="17" value=''/></td>
+END
+;
+} else {   
+print <<END
+      <input type="text" name="MAC1" maxlength="17" value='$macsettings{"MAC1"}'/></td>
+END
+;  
+} 
+print <<END    
+  </tr>
+    <tr>
+    <td>&nbsp;</td>
   </tr>
   <tr>
     <td><font class='base'>$Lang::tr{'mac2 new'}&nbsp;</font></td><td>
@@ -151,16 +188,15 @@ print <<END
 END
 ;  
 } 
+
 print <<END    
   </tr>
-  <tr>
-    <td colspan=2>&nbsp;</td><td>&nbsp;</td>
+    <tr>
+    <td colspan="2"><br><hr /></td>
   </tr>
   <tr>
-    <td colspan=2><hr /></td>
-  </tr>
-  <tr>
-    <td colspan=2><div align="center">
+    <td align='left'><img src='/blob.gif' alt='*' />&nbsp;$Lang::tr{'required field'}</td><div align="right"></td>
+    <td align='right'>
 END
 ;
 if ($macsettings{'ACTION'} eq $Lang::tr{'delete'} ) {
@@ -197,9 +233,6 @@ END
 print <<END
     </div></td>
   </tr>
-  
-
-
 </table>
 
 END