[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.8,1.14.2.9
From:       Eric Oberlander <eoberlander () users ! sourceforge ! net>
Date:       2004-04-28 17:43:43
Message-ID: E1BIt6H-0000Wx-9B () 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-serv2014

Modified Files:
      Tag: IPCOP_v1_4_0
	dhcp.cgi 
Log Message:
Swap code around. Fix for error messages that appear when editing fixed leases.

Index: dhcp.cgi
===================================================================
RCS file: /cvsroot/ipcop/ipcop/html/cgi-bin/dhcp.cgi,v
retrieving revision 1.14.2.8
retrieving revision 1.14.2.9
diff -C2 -d -r1.14.2.8 -r1.14.2.9
*** dhcp.cgi	24 Apr 2004 14:47:56 -0000	1.14.2.8
--- dhcp.cgi	28 Apr 2004 17:43:39 -0000	1.14.2.9
***************
*** 70,74 ****
  close(FILE);
  
! if ($dhcpsettings{'ACTION'} eq $tr{'add'})
  {
  	$dhcpsettings{'FIX_MAC'} =~ tr/-/:/;
--- 70,74 ----
  close(FILE);
  
! if ($dhcpsettings{'ACTION'} eq $tr{'add'} || $dhcpsettings{'ACTION'} eq \
$tr{'update'})  {
  	$dhcpsettings{'FIX_MAC'} =~ tr/-/:/;
***************
*** 138,162 ****
  }
  
- if ($dhcpsettings{'ACTION'} eq $tr{'edit'})
- {
- 	my $id = 0;
- 	foreach my $line (@current)
- 	{
- 		$id++;
- 		chomp($line);
- 		my @temp = split(/\,/,$line);
- 
- 		if ($dhcpsettings{'ID'} eq $id) {
- 			$dhcpsettings{'FIX_MAC'} = $temp[0];
- 			$dhcpsettings{'FIX_ADDR'} = $temp[1];
- 			$dhcpsettings{'FIX_ENABLED'} = $temp[2];
- 			$dhcpsettings{'FIX_NEXTADDR'} = $temp[3];
- 			$dhcpsettings{'FIX_FILENAME'} = $temp[4];
- 			$dhcpsettings{'FIX_ROOTPATH'} = $temp[5];
- 		}
- 	}
- 	close(FILE);
- }
- 
  if ($dhcpsettings{'ACTION'} eq $tr{'remove'} || $dhcpsettings{'ACTION'} eq \
$tr{'toggle enable disable'})  {
--- 138,141 ----
***************
*** 605,613 ****
  &closebox();
  
- print "</form>\n";
- print "<form method='post' action='$ENV{'SCRIPT_NAME'}'>\n";
- 
  my $buttontext = $tr{'add'};
  if ($dhcpsettings{'ACTION'} eq $tr{'edit'}) {
  	$buttontext = $tr{'update'};
  	&openbox('100%', 'left', $tr{'edit an existing lease'});
--- 584,608 ----
  &closebox();
  
  my $buttontext = $tr{'add'};
  if ($dhcpsettings{'ACTION'} eq $tr{'edit'}) {
+ 
+ 	my $id = 0;
+ 	foreach my $line (@current)
+ 	{
+ 		$id++;
+ 		chomp($line);
+ 		my @temp = split(/\,/,$line);
+ 
+ 		if ($dhcpsettings{'ID'} eq $id) {
+ 			$dhcpsettings{'FIX_MAC'} = $temp[0];
+ 			$dhcpsettings{'FIX_ADDR'} = $temp[1];
+ 			$dhcpsettings{'FIX_ENABLED'} = $temp[2];
+ 			$dhcpsettings{'FIX_NEXTADDR'} = $temp[3];
+ 			$dhcpsettings{'FIX_FILENAME'} = $temp[4];
+ 			$dhcpsettings{'FIX_ROOTPATH'} = $temp[5];
+ 		}
+ 	}
+ 	close(FILE);
+ 
  	$buttontext = $tr{'update'};
  	&openbox('100%', 'left', $tr{'edit an existing lease'});
***************
*** 635,639 ****
  <tr>
  	<td class='base' width='50%' align='center'>$tr{'enabled'}<input type='checkbox' \
                name='FIX_ENABLED' $fixchecked{'FIX_ENABLED'}{'on'} /></td>
! 	<td width='50%' align='center'><input type='hidden' name='ACTION' \
value='$tr{'add'}' /><input type='submit' name='SUBMIT' value='$buttontext' /></td>  \
</tr>  </table>
--- 630,634 ----
  <tr>
  	<td class='base' width='50%' align='center'>$tr{'enabled'}<input type='checkbox' \
                name='FIX_ENABLED' $fixchecked{'FIX_ENABLED'}{'on'} /></td>
! 	<td width='50%' align='center'><input type='submit' name='ACTION' \
value='$buttontext' /></td>  </tr>
  </table>



-------------------------------------------------------
This SF.Net email is sponsored by: Oracle 10g
Get certified on the hottest thing ever to hit the market... Oracle 10g. 
Take an Oracle 10g class now, and we'll give you the exam FREE.
http://ads.osdn.com/?ad_id=3149&alloc_id=8166&op=click
_______________________________________________
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]