[prev in list] [next in list] [prev in thread] [next in thread] 

List:       ipcop-svn
Subject:    [Ipcop-svn] SF.net SVN: ipcop:[2025] ipcop/trunk
From:       dotzball () users ! sourceforge ! net
Date:       2008-10-27 19:59:59
Message-ID: E1KuYFr-0008ID-8m () 74yxhf1 ! ch3 ! sourceforge ! com
[Download RAW message or body]

Revision: 2025
          http://ipcop.svn.sourceforge.net/ipcop/?rev=2025&view=rev
Author:   dotzball
Date:     2008-10-27 19:59:59 +0000 (Mon, 27 Oct 2008)

Log Message:
-----------
Fix validation of USE_ADMIN_MAC.

Highlight policy line on policy edit .

Modified Paths:
--------------
    ipcop/trunk/config/cfgroot/firewall-lib.pl
    ipcop/trunk/html/cgi-bin/fwrulesadm.cgi

Modified: ipcop/trunk/config/cfgroot/firewall-lib.pl
===================================================================
--- ipcop/trunk/config/cfgroot/firewall-lib.pl	2008-10-27 19:56:12 UTC (rev 2024)
+++ ipcop/trunk/config/cfgroot/firewall-lib.pl	2008-10-27 19:59:59 UTC (rev 2025)
@@ -67,7 +67,7 @@
 		return 1;
 	}
 
-	if($FW::fwSettings{'USE_ADMIN_MAC'} && (! \
&General::validmac($FW::fwSettings{'ADMIN_MAC'}) ) ) { \
+	if($FW::fwSettings{'USE_ADMIN_MAC'} eq 'on' && (! \
&General::validmac($FW::fwSettings{'ADMIN_MAC'}) ) ) {  return 1;
 	}
 

Modified: ipcop/trunk/html/cgi-bin/fwrulesadm.cgi
===================================================================
--- ipcop/trunk/html/cgi-bin/fwrulesadm.cgi	2008-10-27 19:56:12 UTC (rev 2024)
+++ ipcop/trunk/html/cgi-bin/fwrulesadm.cgi	2008-10-27 19:59:59 UTC (rev 2025)
@@ -404,12 +404,20 @@
 
 my $id = 0;
 foreach my $iface (sort keys %ifacePolicies) {
-    if ($id % 2) {
-        print "<tr bgcolor='${Header::table1colour}'>\n";
+	my $rowColor;
+	if($iface eq $cgiparams{'IFACE_NAME'}
+	    && $cgiparams{'ACTION'} eq $Lang::tr{'edit'}
+		&& $cgiparams{'EDIT_FORM'} eq 'policy')
+	{
+		$rowColor = ${Header::colouryellow};
+	}
+    elsif ($id % 2) {
+        $rowColor = ${Header::table1colour};
     }
     else {
-        print "<tr bgcolor='${Header::table2colour}'>\n";
+       $rowColor = ${Header::table2colour};
     }
+
     my $ifaceColor = '';
     if ($FW::interfaces{$iface}{'COLOR'} eq 'GREEN_COLOR') {
         $ifaceColor = ${Header::colourgreen};
@@ -436,6 +444,7 @@
     }
 
     print <<END;
+	<tr bgcolor='$rowColor'>
 	<td>$iface</td>
 	<td align='center' bgcolor='$ifaceColor'></td>
 	<td align='center'>$ifacePolicies{$iface}{'POLICY'}</td>
@@ -473,7 +482,7 @@
     if ($cgiparams{'USE_ADMIN_MAC'} eq '') {
         $cgiparams{'USE_ADMIN_MAC'} = 'off';
     }
-    if ($cgiparams{'USE_ADMIN_MAC'} && \
(!&General::validmac($cgiparams{'ADMIN_MAC'}))) { +    if \
($cgiparams{'USE_ADMIN_MAC'} eq'on' && \
(!&General::validmac($cgiparams{'ADMIN_MAC'}))) {  $cgiparams{'ACTION'} = \
$Lang::tr{'edit'};  $errormessage .= "$Lang::tr{'mac bad'}<br/>";
     }


This was sent by the SourceForge.net collaborative development platform, the world's \
largest Open Source development site.

-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn


[prev in list] [next in list] [prev in thread] [next in thread]