From: Bernhard Bitsch <Bernhard.Bitsch@gmx.de>
To: development@lists.ipfire.org
Subject: Patch for bugzilla #12050
Date: Sat, 13 Apr 2019 23:13:32 +0200 [thread overview]
Message-ID: <trinity-3a0d9507-e6cd-4e8f-a505-bdfb79a26736-1555190012887@3c-app-gmx-bs47> (raw)
[-- Attachment #1: Type: text/plain, Size: 586 bytes --]
Please find appended the solution.
Short description of the problem:
After adding a new lease, you are in editing mode.
All fields are set right, but a second click ('update' ) is necessary.
With determining the exact mode 'add/edit' this second click can be avoided for new entries ( new MAC/IP combination).
The patch adds determination of add/edit mode. If the MAC/IP pair exists in the list of fixed leases edit mode is selected, add mode is selected else.
Sorry, did not produce the patch from git but by diffing changed file and the core 129 original.
-Bernhard
[-- Attachment #2: dhcp.cgi.patch --]
[-- Type: application/octet-stream, Size: 2256 bytes --]
--- /srv/web/ipfire/cgi-bin/dhcp.cgi.org 2019-04-13 13:32:01.000000000 +0200
+++ /srv/web/ipfire/cgi-bin/dhcp.cgi 2019-04-13 13:57:27.386228085 +0200
@@ -412,12 +412,16 @@
}
my $key = 0;
+ my $szc = scalar(@current2);
CHECK:foreach my $line (@current2) {
my @temp = split(/\,/,$line);
if($dhcpsettings{'KEY2'} ne $key) {
# same MAC is OK on different subnets. This test is not complete because
# if ip are not inside a known subnet, I don't warn.
# Also it may be needed to put duplicate fixed lease in their right subnet definition..
+ if ((lc($dhcpsettings{'FIX_MAC'}) eq lc($temp[0])) &&(lc($dhcpsettings{'FIX_ADDR'}) eq lc($temp[1]))) {
+ last CHECK;
+ }
foreach my $itf (@ITFs) {
my $scoped = &General::IpInSubnet($dhcpsettings{'FIX_ADDR'},
$netsettings{"${itf}_NETADDRESS"},
@@ -442,11 +446,19 @@
$dhcpsettings{'FIX_FILENAME'} = &Header::cleanhtml($dhcpsettings{'FIX_FILENAME'});
$dhcpsettings{'FIX_ROOTPATH'} = &Header::cleanhtml($dhcpsettings{'FIX_ROOTPATH'});
if ($dhcpsettings{'KEY2'} eq '') { #add or edit ?
+ if($key == $szc) { #add
+ @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";
+ # sort newly added/modified entry
+ &sortcurrent2;
+ $dhcpsettings{'KEY2'} = '';
+ &General::log($Lang::tr{'fixed ip lease added'});
+ } else { #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");
&General::log($Lang::tr{'fixed ip lease added'});
# Enter edit mode
$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
reply other threads:[~2019-04-13 21:13 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=trinity-3a0d9507-e6cd-4e8f-a505-bdfb79a26736-1555190012887@3c-app-gmx-bs47 \
--to=bernhard.bitsch@gmx.de \
--cc=development@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox