From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 26 Feb 2019 11:02:56 +0000 (+0000)
Subject: DHCP: Fix error when editing a newly added fixed lease
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=31672dc8bdb223ebf425ff96be64318f2d68e0d7

DHCP: Fix error when editing a newly added fixed lease

They key was remembered but then the array was sorted which resulted
the key showing a wrong line.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/html/cgi-bin/dhcp.cgi b/html/cgi-bin/dhcp.cgi
index 900ea3a9c3..675d800120 100644
--- a/html/cgi-bin/dhcp.cgi
+++ b/html/cgi-bin/dhcp.cgi
@@ -446,15 +446,17 @@ if ($dhcpsettings{'ACTION'} eq $Lang::tr{'add'}.'2') {
 	    &General::log($Lang::tr{'fixed ip lease added'});
 
 	    # Enter edit mode
-	    $dhcpsettings{'KEY2'} = $key;
+	    $dhcpsettings{'KEY2'} = 0;
 	} else {
 	    @current2[$dhcpsettings{'KEY2'}] = "$dhcpsettings{'FIX_MAC'},$dhcpsettings{'FIX_ADDR'},$dhcpsettings{'FIX_ENABLED'},$dhcpsettings{'FIX_NEXTADDR'},$dhcpsettings{'FIX_FILENAME'},$dhcpsettings{'FIX_ROOTPATH'},$dhcpsettings{'FIX_REMARK'}\n";
 	    $dhcpsettings{'KEY2'} = '';       # End edit mode
 	    &General::log($Lang::tr{'fixed ip lease modified'});
+
+	    # sort newly added/modified entry
+	    &sortcurrent2;
 	}
 
         #Write changes to dhcpd.conf.
-        &sortcurrent2;    # sort newly added/modified entry
         &buildconf;       # before calling buildconf which use fixed lease file !
     }
 }