[git.ipfire.org] IPFire 2.x development tree branch, next, updated. c899be2fd02e24f86f801191652d6083eb5524b9

[Michael Tremer <git@ipfire.org>]

[-- Attachment #1: Type: text/plain, Size: 3241 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  c899be2fd02e24f86f801191652d6083eb5524b9 (commit)
       via  e4f9ea3c1650d369f8a764605203778bfea0d390 (commit)
      from  0bb25a4f61e494a8118bfb764625cd98fe209438 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit c899be2fd02e24f86f801191652d6083eb5524b9
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Wed Jun 5 00:33:36 2019 +0100

    core133: Ship updated dhcp.cgi
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit e4f9ea3c1650d369f8a764605203778bfea0d390
Author: Bernhard Bitsch <Bernhard.Bitsch(a)gmx.de>
Date:   Tue Jun 4 12:24:00 2019 +0200

    dhcp.cgi: Save fixed leases immediately after addition of a new lease
    
    This changes the behaviour of the script to immediately save the added
    lease to file but still remain in edit mode to make changes.
    
    If the user does not make any changes, the lease is immediately saved
    and there is no second click required to write it to file.
    
    This a more natural flow that is expected by almost all users of this
    feature.
    
    Fixes: #12050
    Signed-off-by: Bernhard Bitsch <bbitsch(a)ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 config/rootfiles/core/133/filelists/files | 1 +
 html/cgi-bin/dhcp.cgi                     | 3 +++
 2 files changed, 4 insertions(+)

Difference in files:
diff --git a/config/rootfiles/core/133/filelists/files b/config/rootfiles/core/133/filelists/files
index f78013c4e..e822e7501 100644
--- a/config/rootfiles/core/133/filelists/files
+++ b/config/rootfiles/core/133/filelists/files
@@ -2,5 +2,6 @@ etc/system-release
 etc/issue
 etc/rc.d/init.d/smt
 srv/web/ipfire/cgi-bin/credits.cgi
+srv/web/ipfire/cgi-bin/dhcp.cgi
 srv/web/ipfire/cgi-bin/ovpnmain.cgi
 srv/web/ipfire/cgi-bin/vulnerabilities.cgi
diff --git a/html/cgi-bin/dhcp.cgi b/html/cgi-bin/dhcp.cgi
index 675d80012..19c55eb6d 100644
--- a/html/cgi-bin/dhcp.cgi
+++ b/html/cgi-bin/dhcp.cgi
@@ -443,6 +443,9 @@ if ($dhcpsettings{'ACTION'} eq $Lang::tr{'add'}.'2') {
 	$dhcpsettings{'FIX_ROOTPATH'} = &Header::cleanhtml($dhcpsettings{'FIX_ROOTPATH'});
 	if ($dhcpsettings{'KEY2'} eq '') { #add or edit ?
 	    unshift (@current2, "$dhcpsettings{'FIX_MAC'},$dhcpsettings{'FIX_ADDR'},$dhcpsettings{'FIX_ENABLED'},$dhcpsettings{'FIX_NEXTADDR'},$dhcpsettings{'FIX_FILENAME'},$dhcpsettings{'FIX_ROOTPATH'},$dhcpsettings{'FIX_REMARK'}\n");
+	    open(FILE, ">$filename2") or die 'Unable to open fixed lease file.';
+	    print FILE @current2;
+	    close(FILE);
 	    &General::log($Lang::tr{'fixed ip lease added'});
 
 	    # Enter edit mode


hooks/post-receive
--
IPFire 2.x development tree