Patch for bugzilla #12050, try #2

Patch for bugzilla #12050, try #2

[Bernhard Bitsch]

[-- Attachment #1: Type: text/plain, Size: 668 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

EDIT: produced an error by blind copy & paste, should correct with this patch.

[-- Attachment #2: dhcp.cgi.patch --]
[-- Type: application/octet-stream, Size: 2239 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-14 00:45:43.433156979 +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[$key] = "$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;
+	        &General::log($Lang::tr{'fixed ip lease added'});
+	        $dhcpsettings{'KEY2'} = '';
+        } 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

Re: Patch for bugzilla #12050, try #2

[Michael Tremer]

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

Hi Bernhard,

I am happy that you are taking a look at this bug, but this is not how the process works.

We have a guide on how to submit patches to the mailing list:

  https://wiki.ipfire.org/devel/submit-patches

There are a thousand reasons why we are doing this as we are doing it. Please follow it.

-Michael

> On 14 Apr 2019, at 00:04, Bernhard Bitsch <Bernhard.Bitsch(a)gmx.de> wrote:
> 
> 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
> 
> EDIT: produced an error by blind copy & paste, should correct with this patch.<dhcp.cgi.patch>

Aw: Re: Patch for bugzilla #12050, try #2

[Bernhard Bitsch]

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

Hi Michael,

I know the "normal way" to send patches.
But I do not have a up-to-date git repo at the moment, reasons exist but aren't of interest for this special case.
I have posted the entire modified dhcpi.cgi in the forum for usage. Wanted just to supply the DevList and Bugzilla with a short and fast solution, hoping not to be to late for the announced emergency update.

If you want, I can post the entire modified dhcp.cgi to the DevList and someone of the devs can merge it to the git repository.

- Bernhard

BTW: I'll setup my local repo again. Further patches for this and other problems and/or developments will obey the guidance from wiki.

> Gesendet: Montag, 15. April 2019 um 13:12 Uhr
> Von: "Michael Tremer" <michael.tremer(a)ipfire.org>
> An: "Bernhard Bitsch" <Bernhard.Bitsch(a)gmx.de>
> Cc: "IPFire Development" <development(a)lists.ipfire.org>
> Betreff: Re: Patch for bugzilla #12050, try #2
>
> Hi Bernhard,
>
> I am happy that you are taking a look at this bug, but this is not how the process works.
>
> We have a guide on how to submit patches to the mailing list:
>
>   https://wiki.ipfire.org/devel/submit-patches
>
> There are a thousand reasons why we are doing this as we are doing it. Please follow it.
>
> -Michael
>
> > On 14 Apr 2019, at 00:04, Bernhard Bitsch <Bernhard.Bitsch(a)gmx.de> wrote:
> >
> > 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
> >
> > EDIT: produced an error by blind copy & paste, should correct with this patch.<dhcp.cgi.patch>
>
>

Re: Aw: Re: Patch for bugzilla #12050, try #2

[Matthias Fischer]

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

Hi,

@Bernhard:
Right now I've got a Core 130 branch up and running - I could do this
patch for you... Would it be ok if i do?

Best,
Matthias

On 15.04.2019 20:49, Bernhard Bitsch wrote:
> Hi Michael,
> 
> I know the "normal way" to send patches.
> But I do not have a up-to-date git repo at the moment, reasons exist but aren't of interest for this special case.
> I have posted the entire modified dhcpi.cgi in the forum for usage. Wanted just to supply the DevList and Bugzilla with a short and fast solution, hoping not to be to late for the announced emergency update.
> 
> If you want, I can post the entire modified dhcp.cgi to the DevList and someone of the devs can merge it to the git repository.
> 
> - Bernhard
> 
> BTW: I'll setup my local repo again. Further patches for this and other problems and/or developments will obey the guidance from wiki.
> 
>> Gesendet: Montag, 15. April 2019 um 13:12 Uhr
>> Von: "Michael Tremer" <michael.tremer(a)ipfire.org>
>> An: "Bernhard Bitsch" <Bernhard.Bitsch(a)gmx.de>
>> Cc: "IPFire Development" <development(a)lists.ipfire.org>
>> Betreff: Re: Patch for bugzilla #12050, try #2
>>
>> Hi Bernhard,
>>
>> I am happy that you are taking a look at this bug, but this is not how the process works.
>>
>> We have a guide on how to submit patches to the mailing list:
>>
>>   https://wiki.ipfire.org/devel/submit-patches
>>
>> There are a thousand reasons why we are doing this as we are doing it. Please follow it.
>>
>> -Michael
>>
>> > On 14 Apr 2019, at 00:04, Bernhard Bitsch <Bernhard.Bitsch(a)gmx.de> wrote:
>> >
>> > 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
>> >
>> > EDIT: produced an error by blind copy & paste, should correct with this patch.<dhcp.cgi.patch>
>>
>>
> 

Re: Aw: Re: Patch for bugzilla #12050, try #2

[Matthias Fischer]

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

Hi,

Suggestion:

...
 Fix for Bug #12050: Adding fixed leases with one 'add' click

    Signed-off-by: BeBiMa <bbitsch(a)ipfire.org>
    Reviewed-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
...

Take your pick. ;-))

Best,
Matthias

On 16.04.2019 18:24, Matthias Fischer wrote:
> Hi,
> 
> @Bernhard:
> Right now I've got a Core 130 branch up and running - I could do this
> patch for you... Would it be ok if i do?
> 
> Best,
> Matthias
> 
> On 15.04.2019 20:49, Bernhard Bitsch wrote:
>> Hi Michael,
>> 
>> I know the "normal way" to send patches.
>> But I do not have a up-to-date git repo at the moment, reasons exist but aren't of interest for this special case.
>> I have posted the entire modified dhcpi.cgi in the forum for usage. Wanted just to supply the DevList and Bugzilla with a short and fast solution, hoping not to be to late for the announced emergency update.
>> 
>> If you want, I can post the entire modified dhcp.cgi to the DevList and someone of the devs can merge it to the git repository.
>> 
>> - Bernhard
>> 
>> BTW: I'll setup my local repo again. Further patches for this and other problems and/or developments will obey the guidance from wiki.
>> 
>>> Gesendet: Montag, 15. April 2019 um 13:12 Uhr
>>> Von: "Michael Tremer" <michael.tremer(a)ipfire.org>
>>> An: "Bernhard Bitsch" <Bernhard.Bitsch(a)gmx.de>
>>> Cc: "IPFire Development" <development(a)lists.ipfire.org>
>>> Betreff: Re: Patch for bugzilla #12050, try #2
>>>
>>> Hi Bernhard,
>>>
>>> I am happy that you are taking a look at this bug, but this is not how the process works.
>>>
>>> We have a guide on how to submit patches to the mailing list:
>>>
>>>   https://wiki.ipfire.org/devel/submit-patches
>>>
>>> There are a thousand reasons why we are doing this as we are doing it. Please follow it.
>>>
>>> -Michael
>>>
>>> > On 14 Apr 2019, at 00:04, Bernhard Bitsch <Bernhard.Bitsch(a)gmx.de> wrote:
>>> >
>>> > 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
>>> >
>>> > EDIT: produced an error by blind copy & paste, should correct with this patch.<dhcp.cgi.patch>
>>>
>>>
>> 
> 
>