IPCop Firewall

Revision: 2551
          http://ipcop.svn.sourceforge.net/ipcop/?rev=2551&view=rev
Author:   owes
Date:     2009-03-07 16:12:19 +0000 (Sat, 07 Mar 2009)

Log Message:
-----------
Fix duplication of dynamic leases box if green&blue enabled (thx proenz).

Modified Paths:
--------------
    ipcop/trunk/html/cgi-bin/dhcp.cgi

Modified: ipcop/trunk/html/cgi-bin/dhcp.cgi
===================================================================
--- ipcop/trunk/html/cgi-bin/dhcp.cgi	2009-03-07 15:57:32 UTC (rev 2550)
+++ ipcop/trunk/html/cgi-bin/dhcp.cgi	2009-03-07 16:12:19 UTC (rev 2551)
@@ -50,7 +50,9 @@
 
 # owes: TODO add Blue only when defined
 my @INTERFACEs = ('GREEN', 'BLUE');
+my $interface;
 my $counter;
+my $enabled_count = 0;
 my $key;
 my $line;
 my %checked = ();
@@ -65,7 +67,7 @@
 &General::readhash('/var/ipcop/time/settings',     \%timesettings);
 
 # main settings
-foreach my $interface (@INTERFACEs) {
+foreach $interface (@INTERFACEs) {
     for ($counter = 1; $counter <= 1; $counter++) {
         $dhcpsettings{"ENABLED_${interface}_${counter}"}            = 'off';
         $dhcpsettings{"ENABLED_BOOTP_${interface}_${counter}"}      = 'off';
@@ -123,7 +125,7 @@
 if ($dhcpsettings{'ACTION'} eq 'SAVE_MAIN') {
 
     # Verify the options before writing anything
-    foreach my $interface (@INTERFACEs) {
+    foreach $interface (@INTERFACEs) {
 
         # Limit to 1 interface for now
         for ($counter = 1; $counter <= 1; $counter++) {
@@ -393,7 +395,7 @@
 #
 &Header::openbox('100%', 'left', 'DHCP', $error_save_main);
 print "<form method='post' name='frm_main' action='$ENV{'SCRIPT_NAME'}'>";
-foreach my $interface (@INTERFACEs) {
+foreach $interface (@INTERFACEs) {
     for ($counter = 1; $counter <= $netsettings{"${interface}_COUNT"}; $counter++) {
         my $lc_interface = lc($interface);
         $checked{'ENABLED'}{'on'} =
@@ -668,16 +670,19 @@
 &Header::closebox();
 
 #
-# display box with dynamic leases if we have
+# display box with dynamic leases if we have one or more enabled interface(s)
 #
-foreach my $interface (@INTERFACEs) {
+$enabled_count = 0;
+foreach $interface (@INTERFACEs) {
     for ($counter = 1; $counter <= $netsettings{"${interface}_COUNT"}; $counter++) {
         if ($dhcpsettings{"ENABLED_${interface}_${counter}"} eq 'on') {
-            &General::PrintActualLeases($Lang::tr{'dhcp create fixed leases'});
-            last;
+            $enabled_count++;
         }
     }
 }
+if ($enabled_count > 0) {
+    &General::PrintActualLeases($Lang::tr{'dhcp create fixed leases'});
+}
 
 &Header::closebigbox();
 &Header::closepage();
@@ -689,7 +694,7 @@
     my %savesettings = ();
 
     # copy the relevant settings into a duplicate hash, otherwise we'd need to undef loads of stuff
-    foreach my $interface (@INTERFACEs) {
+    foreach $interface (@INTERFACEs) {
         for ($counter = 1; $counter <= 1; $counter++) {
             $savesettings{"ENABLED_${interface}_${counter}"} = $dhcpsettings{"ENABLED_${interface}_${counter}"};
             $savesettings{"ENABLED_BOOTP_${interface}_${counter}"} =
@@ -736,7 +741,7 @@
         ;
 
     # Interface definitions
-    foreach my $interface (@INTERFACEs) {
+    foreach $interface (@INTERFACEs) {
         for ($counter = 1; $counter <= $netsettings{"${interface}_COUNT"}; $counter++) {
             if ($savesettings{"ENABLED_${interface}_${counter}"} eq 'on') {
                 my $lease = $savesettings{"DEFAULT_LEASE_TIME_${interface}_${counter}"} * 60;


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

Revision: 2550
          http://ipcop.svn.sourceforge.net/ipcop/?rev=2550&view=rev
Author:   owes
Date:     2009-03-07 15:57:32 +0000 (Sat, 07 Mar 2009)

Log Message:
-----------
Because of testing, shutdown and reboot were disabled. Fix that.

Modified Paths:
--------------
    ipcop/trunk/html/cgi-bin/shutdown.cgi

Modified: ipcop/trunk/html/cgi-bin/shutdown.cgi
===================================================================
--- ipcop/trunk/html/cgi-bin/shutdown.cgi	2009-03-06 23:24:41 UTC (rev 2549)
+++ ipcop/trunk/html/cgi-bin/shutdown.cgi	2009-03-07 15:57:32 UTC (rev 2550)
@@ -22,7 +22,6 @@
 my %cgiparams    = ();
 my $death        = 0;
 my $rebirth      = 0;
-my $default_time = '03:15';
 
 &Header::showhttpheaders();
 
@@ -34,12 +33,12 @@
     &General::log($Lang::tr{'shutting down ipcop'});
 
     # not separated to be executed in background
-#    system('/usr/local/bin/ipcopreboot down &');
+    system('/usr/local/bin/ipcopreboot down &');
 }
 elsif ($cgiparams{'ACTION'} eq $Lang::tr{'reboot'}) {
     $rebirth = 1;
     &General::log($Lang::tr{'rebooting ipcop'});
-#    system('/usr/local/bin/ipcopreboot boot &');
+    system('/usr/local/bin/ipcopreboot boot &');
 }
 
 if ($death == 0 && $rebirth == 0) {


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