]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
DHCP: Fix error when editing a newly added fixed lease
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 26 Feb 2019 11:02:56 +0000 (11:02 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 26 Feb 2019 16:33:46 +0000 (16:33 +0000)
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>
html/cgi-bin/dhcp.cgi

index 900ea3a9c30d1895746799f24d038b6b62c99b27..675d8001200aa37eb8bfda4c2187f65b51b4cf49 100644 (file)
@@ -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 !
     }
 }