From mboxrd@z Thu Jan  1 00:00:00 1970
From: Bernhard Bitsch <Bernhard.Bitsch@gmx.de>
To: development@lists.ipfire.org
Subject: Aw: Re: [PATCH] dhcp.cgi: Fix for bug #12050
Date: Wed, 05 Jun 2019 13:13:32 +0200
Message-ID:
 <trinity-83a17be1-148f-4ac7-af80-c2ee8494087c-1559733212482@3c-app-gmx-bs32>
In-Reply-To: <51E3B9E9-4B18-4E67-8484-7BC5859B57D9@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3295895338892880080=="
List-Id: <development.lists.ipfire.org>

--===============3295895338892880080==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Hello,

Thanks for the merge.

> Gesendet: Mittwoch, 05. Juni 2019 um 11:05 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] dhcp.cgi: Fix for bug #12050
>
> Hello,
>=20
> I merged this patch.
>=20
> I had to spend a little time to figure out what you actually wanted to achi=
eve here. It would have helped to add to the commit message that the expected=
 behaviour just wasn=E2=80=99t programmed into the file and that this patch n=
ow changes that.
>=20

The commit message just describes what has changed. The new entry is just add=
ed to the file.
It is not the "one-click-solution" I would prefer, too.
I can submit a patch for this functionality, if we want to do it this way.

> I updated the commit message for your future reference. Please read through=
 that and take some inspiration from that with your next patch.
>
I've read your message. If the patch contained this functionality I would hav=
e stated that in this way.
=20
> I am happy that we can finally close this bug.
>
So am I.

Best,
Bernhard
=20
> Best,
> -Michael
>=20
> > On 4 Jun 2019, at 11:24, Bernhard Bitsch <Bernhard.Bitsch(a)gmx.de> wrote:
> >=20
> > Save fixed leases to file after addition of a new lease
> >=20
> > Signed-off-by: Bernhard Bitsch <bbitsch(a)ipfire.org>
> >=20
> > ---
> > html/cgi-bin/dhcp.cgi | 3 +++
> > 1 file changed, 3 insertions(+)
> >=20
> > 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'} =3D &Header::cleanhtml($dhcpsettings{'FIX_=
ROOTPATH'});
> > 	if ($dhcpsettings{'KEY2'} eq '') { #add or edit ?
> > 	    unshift (@current2, "$dhcpsettings{'FIX_MAC'},$dhcpsettings{'FIX_ADD=
R'},$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'});
> >=20
> > 	    # Enter edit mode
> > --
> > 2.21.0.windows.1
> >=20
>=20
>

--===============3295895338892880080==--