suricata: Change midstream policy to "pass-flow"

[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 83207d66294fc77c1dfda6f906610d305488dcb4..6811fa89cbe256b749ee29c7856ef72354ceffa6 100644 (file)
--- a/html/cgi-bin/mac.cgi
+++ b/html/cgi-bin/mac.cgi
@@ -45,25 +45,38 @@ my $errormessage = '';
 if ($macsettings{'ACTION'} eq $Lang::tr{'save'}) {
        $macsettings{'MAC'} =~ s/\-/:/g;
        my @mac = split(/:/,$macsettings{"MAC"});
-       if ($#mac == 5) { 
+       if ($#mac == 5) {
                foreach (@mac) {
                        unless ($_ =~ /^[a-fA-F0-9]{1,2}$/) {
                                        $errormessage = $Lang::tr{'mac address error not valid'};
-                                       last;                   
+                                       last;
                        }
                }
        } 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;
-       
        if ( not ($macsettings{'MAC2'} eq "" )) {
                my @mac = split(/:/,$macsettings{"MAC2"});
-               if ($#mac == 5) { 
+               if ($#mac == 5) {
                        foreach (@mac) {
                                unless ($_ =~ /^[a-fA-F0-9]{1,2}$/) {
                                                $errormessage = $Lang::tr{'mac address error not valid'};
-                                               last;                   
+                                               last;
                                }
                        }
                } else {
@@ -72,28 +85,29 @@ if ($macsettings{'ACTION'} eq $Lang::tr{'save'}) {
        }
        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'});                                                               
+               &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'}) {
-       system("/usr/local/bin/redctrl restart >/dev/null 2>&1 &");
+       &General::system_background("/usr/local/bin/redctrl", "restart");
        &Header::openbox('100%', 'left', $Lang::tr{'mac address recon'} );
        print "<font class='base'>$Lang::tr{'mac address done'}</font>\n";
-       &Header::closebox();    
+       &Header::closebox();
 }
 if ($macsettings{'ACTION'} eq $Lang::tr{'delete'} ) {
        system("cat /dev/null > ${General::swroot}/mac/settings &");
        &Header::openbox('100%', 'left', $Lang::tr{'mac address deleted'} );
        print "<font class='base'>$Lang::tr{'mac address deleted txt'}</font>\n";
-       &Header::closebox();    
+       &Header::closebox();
 }
 if ($macsettings{'ACTION'} eq $Lang::tr{'reboot'}) {
        &General::log($Lang::tr{'rebooting ipfire'});
-       system("/usr/local/bin/ipfirereboot boot");
+       &General::system("/usr/local/bin/ipfirereboot", "boot");
        &Header::openbox('100%', 'left', $Lang::tr{'rebooting ipfire'} );
        print "&nbsp;&nbsp;<img src='/images/indicator.gif' /><br /><br />";
        print "<meta http-equiv='refresh' content='120;'>";
@@ -114,56 +128,75 @@ 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'} ) {
-print <<END 
+print <<END
       <input type="text" name="MAC" maxlength="17" value=''/></td>
 END
 ;
-} else {   
+} else {
 print <<END
       <input type="text" name="MAC" maxlength="17" value='$macsettings{"MAC"}'/></td>
 END
-;  
-} 
-print <<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>
 END
 ;
 if ($macsettings{'ACTION'} eq $Lang::tr{'delete'} ) {
-print <<END 
+print <<END
       <input type="text" name="MAC2" maxlength="17" value=''/></td>
 END
 ;
-} else {   
+} else {
 print <<END
       <input type="text" name="MAC2" maxlength="17" value='$macsettings{"MAC2"}'/></td>
 END
-;  
-} 
-print <<END    
-  </tr>
-  <tr>
-    <td colspan=2>&nbsp;</td><td>&nbsp;</td>
+;
+}
+
+print <<END
   </tr>
-  <tr>
-    <td colspan=2><hr /></td>
+    <tr>
+    <td colspan="2"><br><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'} ) {
@@ -175,7 +208,7 @@ print <<END
       <input type='submit' name='ACTION' value='$Lang::tr{'reboot'}' />
 END
 ;
-} elsif ($macsettings{'ACTION'} eq $Lang::tr{'save'} && $errormessage eq "") { 
+} elsif ($macsettings{'ACTION'} eq $Lang::tr{'save'} && $errormessage eq "") {
 print <<END
       <input type='submit' name='ACTION' value='$Lang::tr{'save'}' />
       &nbsp;&nbsp;&nbsp;&nbsp;
@@ -184,12 +217,12 @@ print <<END
       <input type='submit' name='ACTION' value='$Lang::tr{'reconnect'}' />
 END
 ;
-} elsif ($macsettings{'ACTION'} eq $Lang::tr{'save'}) {        
+} elsif ($macsettings{'ACTION'} eq $Lang::tr{'save'}) {
 print <<END
       <input type='submit' name='ACTION' value='$Lang::tr{'save'}' />
 END
 ;
-} else {       
+} else {
 print <<END
       <input type='submit' name='ACTION' value='$Lang::tr{'save'}' />
       &nbsp;&nbsp;&nbsp;&nbsp;
@@ -200,9 +233,6 @@ END
 print <<END
     </div></td>
   </tr>
-  
-
-
 </table>
 
 END