Message ID | 20230214130847.3939253-1-adolf.belka@ipfire.org |
---|---|
State | Accepted |
Commit | 71604352ca9f2e8b2f960c4f685834328322b47c |
Headers |
Return-Path: <development-bounces@lists.ipfire.org> Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4PGM3g1vyQz3xHD for <patchwork@web04.haj.ipfire.org>; Tue, 14 Feb 2023 13:09:03 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4PGM3c6KScz1wf; Tue, 14 Feb 2023 13:09:00 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4PGM3c4fZnz2y66; Tue, 14 Feb 2023 13:09:00 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4PGM3b0XQwz2xFl for <development@lists.ipfire.org>; Tue, 14 Feb 2023 13:08:59 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4PGM3Z1cD4zRT; Tue, 14 Feb 2023 13:08:58 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1676380138; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=3SZdhNhYHWbRnsSB4Niv5UHr7FVLWdUHFC5pMMUsxTU=; b=SNTVIdECnczyAcVzegmuMtB3bZ8dkw5p2nRb/Y431K4k9L6CegwwKjuuwtNROzNfirBV7/ HENZDeD5uUc0B/BQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1676380138; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=3SZdhNhYHWbRnsSB4Niv5UHr7FVLWdUHFC5pMMUsxTU=; b=rivPnovFlNdQirkzEgG1CmgpkLQFBHPc6IOxK+Cf7E3wnqKzp0KTW8EACiSW8ymBKDzDLB jnpuO79f6zRrxDCrc9yI5Y1MU+XmePM6Nyd7X9qUCdwlGIgpGULQAUpA0qFAmf7hF+hULF n8HNeizuXkBEJPAQXkGMSZmi9WlvBk6SbHwhqee5P8x5/ZADZpjAGfLRvoM+p0Be0I8go4 0kcOrPPSYVYE+5hLU2Msy8EZkDBQgO4RYW2xHMUZNob5XPtsscVAW5kiZrt0KDxRk7cJLu TAk33YHH5h+Bco7Hyf/CM3y9kUY1OAHpKA/kBs4pp5gAsQVa7w7SyWSHoKpQOA== From: Adolf Belka <adolf.belka@ipfire.org> To: development@lists.ipfire.org Subject: [PATCH 1/2] procy.cgi: Fix bug#12701 - remove advproxy wpad notice line Date: Tue, 14 Feb 2023 14:08:46 +0100 Message-Id: <20230214130847.3939253-1-adolf.belka@ipfire.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk <development.lists.ipfire.org> List-Unsubscribe: <https://lists.ipfire.org/mailman/options/development>, <mailto:development-request@lists.ipfire.org?subject=unsubscribe> List-Archive: <http://lists.ipfire.org/pipermail/development/> List-Post: <mailto:development@lists.ipfire.org> List-Help: <mailto:development-request@lists.ipfire.org?subject=help> List-Subscribe: <https://lists.ipfire.org/mailman/listinfo/development>, <mailto:development-request@lists.ipfire.org?subject=subscribe> Errors-To: development-bounces@lists.ipfire.org Sender: "Development" <development-bounces@lists.ipfire.org> |
Series |
[1/2] procy.cgi: Fix bug#12701 - remove advproxy wpad notice line
|
|
Commit Message
Adolf Belka
Feb. 14, 2023, 1:08 p.m. UTC
- This line is no longer needed with the help button at the top of each WUI page that was implemented by @Leo - Sorry for long time for me to get around to finalising this patch but it is done now. Fixes: bug#12701 Tested-by: Adolf Belka <adolf.belka@ipfire.org> Signed-off-by: Adolf Belka <adolf.belka@ipfire.org> --- html/cgi-bin/proxy.cgi | 3 --- 1 file changed, 3 deletions(-)
Comments
Hello Adolf, thank you for this patchset, and no worries whatsoever regarding the timeline. :-) While the first part of this patchset looks good to me, the changes made to en.pl in the second part look odd: Instead of removing a single translation, it seems to bring back an older state of this file - perhaps thanks due to some orphaned version that was locally present during development. Could you please double-check the second patch? If necessary, feel free to just send that one in - I'll merge the first part in due course, so there is no need to resubmit the entire series. Thanks, and best regards, Peter Müller > - This line is no longer needed with the help button at the top of each WUI page that was > implemented by @Leo > - Sorry for long time for me to get around to finalising this patch but it is done now. > > Fixes: bug#12701 > Tested-by: Adolf Belka <adolf.belka@ipfire.org> > Signed-off-by: Adolf Belka <adolf.belka@ipfire.org> > --- > html/cgi-bin/proxy.cgi | 3 --- > 1 file changed, 3 deletions(-) > > diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi > index b4073343e..a718d5771 100644 > --- a/html/cgi-bin/proxy.cgi > +++ b/html/cgi-bin/proxy.cgi > @@ -1421,9 +1421,6 @@ print <<END > <tr> > <td colspan="4"> </td> > </tr> > -<tr> > - <td colspan="4">$Lang::tr{'advproxy wpad notice'}</td> > -</tr> > </table> > > <hr size='1'>
Hi Peter, On 11/03/2023 17:39, Peter Müller wrote: > Hello Adolf, > > thank you for this patchset, and no worries whatsoever regarding the timeline. :-) > > While the first part of this patchset looks good to me, the changes made to en.pl > in the second part look odd: Instead of removing a single translation, it seems to > bring back an older state of this file - perhaps thanks due to some orphaned version > that was locally present during development. > > Could you please double-check the second patch? If necessary, feel free to just send > that one in - I'll merge the first part in due course, so there is no need to resubmit > the entire series. Having looked closer at the language patch I see that there are several lines removed and others added, which I did not specify. Normally I run git pull origin next before doing any patch coding work so that I have the latest versions available. I suspect what happened here is that I used the language files I had previously adjusted and as some time had passed since then, additional changes had been implemented which were not in my language file versions. I must have just used the old versions without re-doing them. Basic error. Probably just used the old modified version also for the proxy.cgi file but that didn't have any other changes in the intervening period. I will re-do the language files again and check them this time to make sure they look correct. Regards, Adolf > > Thanks, and best regards, > Peter Müller > > >> - This line is no longer needed with the help button at the top of each WUI page that was >> implemented by @Leo >> - Sorry for long time for me to get around to finalising this patch but it is done now. >> >> Fixes: bug#12701 >> Tested-by: Adolf Belka <adolf.belka@ipfire.org> >> Signed-off-by: Adolf Belka <adolf.belka@ipfire.org> >> --- >> html/cgi-bin/proxy.cgi | 3 --- >> 1 file changed, 3 deletions(-) >> >> diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi >> index b4073343e..a718d5771 100644 >> --- a/html/cgi-bin/proxy.cgi >> +++ b/html/cgi-bin/proxy.cgi >> @@ -1421,9 +1421,6 @@ print <<END >> <tr> >> <td colspan="4"> </td> >> </tr> >> -<tr> >> - <td colspan="4">$Lang::tr{'advproxy wpad notice'}</td> >> -</tr> >> </table> >> >> <hr size='1'>
diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi index b4073343e..a718d5771 100644 --- a/html/cgi-bin/proxy.cgi +++ b/html/cgi-bin/proxy.cgi @@ -1421,9 +1421,6 @@ print <<END <tr> <td colspan="4"> </td> </tr> -<tr> - <td colspan="4">$Lang::tr{'advproxy wpad notice'}</td> -</tr> </table> <hr size='1'>