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

List:       ipcop-cvs
Subject:    [IPCop-cvs] ipcop/html/cgi-bin dhcp.cgi,1.14.2.26,1.14.2.27
From:       Eric Oberlander <eoberlander () users ! sourceforge ! net>
Date:       2004-12-29 7:22:01
Message-ID: E1CjY9i-00032b-Jy () sc8-pr-cvs1 ! sourceforge ! net
[Download RAW message or body]

Update of /cvsroot/ipcop/ipcop/html/cgi-bin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11645/ipcop/html/cgi-bin

Modified Files:
      Tag: IPCOP_v1_4_0
	dhcp.cgi 
Log Message:
Fix a bug that caused a fixed lease to always be Enabled after being edited. Proper \
fix, provided by Franck Bourdonnec.

Index: dhcp.cgi
===================================================================
RCS file: /cvsroot/ipcop/ipcop/html/cgi-bin/dhcp.cgi,v
retrieving revision 1.14.2.26
retrieving revision 1.14.2.27
diff -C2 -d -r1.14.2.26 -r1.14.2.27
*** dhcp.cgi	28 Dec 2004 18:35:43 -0000	1.14.2.26
--- dhcp.cgi	29 Dec 2004 07:21:59 -0000	1.14.2.27
***************
*** 16,20 ****
  #		-add NTP option
  #		-add display sorting of actives leases
! #		
  # to do : choose a correct format for displaying dates
  #
--- 16,21 ----
  #		-add NTP option
  #		-add display sorting of actives leases
! #  dec/2004	- add comment field to fixed leases
! # 
  # to do : choose a correct format for displaying dates
  #
***************
*** 48,52 ****
  $dhcpsettings{'FIX_MAC'} = '';
  $dhcpsettings{'FIX_ADDR'} = '';
! $dhcpsettings{'FIX_ENABLED'} = 'on';
  $dhcpsettings{'FIX_NEXTADDR'} = '';
  $dhcpsettings{'FIX_FILENAME'} = '';
--- 49,53 ----
  $dhcpsettings{'FIX_MAC'} = '';
  $dhcpsettings{'FIX_ADDR'} = '';
! $dhcpsettings{'FIX_ENABLED'} = '';
  $dhcpsettings{'FIX_NEXTADDR'} = '';
  $dhcpsettings{'FIX_FILENAME'} = '';
***************
*** 128,142 ****
  	    } else {
  		@current[$dhcpsettings{'KEY1'}] = \
"$dhcpsettings{'FIX_MAC'},$dhcpsettings{'FIX_ADDR'},$dhcpsettings{'FIX_ENABLED'},$dhcp \
settings{'FIX_NEXTADDR'},$dhcpsettings{'FIX_FILENAME'},$dhcpsettings{'FIX_ROOTPATH'},$dhcpsettings{'FIX_REMARK'}\n";
                
- 		$dhcpsettings{'FIX_MAC'}='';
- 		$dhcpsettings{'FIX_ADDR'}='';
- 		$dhcpsettings{'FIX_REMARK'}='';
- 		$dhcpsettings{'FIX_NEXTADDR'}='';
- 		$dhcpsettings{'FIX_FILENAME'}='';
- 		$dhcpsettings{'FIX_ROOTPATH'}='';
- 		$dhcpsettings{'FIX_ENABLED'}='on';
  		$dhcpsettings{'KEY1'} = '';       # End edit mode
  		&log($tr{'fixed ip lease modified'});
  	    }
-         
  
  	    #Write changes to dhcpd.conf.
--- 129,135 ----
***************
*** 144,149 ****
  	    &sortcurrent;     # sort newly added/modified entry
  	    &buildconf;       # before calling buildconf which use fixed lease file !
! 	} else {
  	    &readhash("${swroot}/dhcp/settings", \%dhcpsettings); #getcgihash did not get \
all info in the <form>  }
  }
--- 137,158 ----
  	    &sortcurrent;     # sort newly added/modified entry
  	    &buildconf;       # before calling buildconf which use fixed lease file !
! 	} else { #Error
! 	    # We don't want to erase new/edited faulty fixed lease
! 	    my $a = $dhcpsettings{'FIX_MAC'};
! 	    my $b = $dhcpsettings{'FIX_ADDR'};
! 	    my $c = $dhcpsettings{'FIX_ENABLED'};
! 	    my $d = $dhcpsettings{'FIX_NEXTADDR'};
! 	    my $e = $dhcpsettings{'FIX_FILENAME'};
! 	    my $f = $dhcpsettings{'FIX_ROOTPATH'};
! 	    my $g = $dhcpsettings{'FIX_REMARK'};
  	    &readhash("${swroot}/dhcp/settings", \%dhcpsettings); #getcgihash did not get \
all info in the <form> + 	    # Restore
+ 	    $dhcpsettings{'FIX_MAC'} = $a;
+ 	    $dhcpsettings{'FIX_ADDR'} = $b;
+ 	    $dhcpsettings{'FIX_ENABLED'} = $c;
+ 	    $dhcpsettings{'FIX_NEXTADDR'} = $d;
+ 	    $dhcpsettings{'FIX_FILENAME'} = $e;
+ 	    $dhcpsettings{'FIX_ROOTPATH'} = $f;
+ 	    $dhcpsettings{'FIX_REMARK'} = $g;
  	}
  }
***************
*** 367,370 ****
--- 376,380 ----
  	}
      }
+     $dhcpsettings{'FIX_ENABLED'} = 'on';
  }
  



-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now. 
http://productguide.itmanagersjournal.com/
_______________________________________________
IPCop-cvs mailing list
IPCop-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-cvs


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