From patchwork Mon Apr 27 15:56:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Peter_M=C3=BCller?= X-Patchwork-Id: 3017 Return-Path: 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 "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 499qBw1280z3xQy for ; Mon, 27 Apr 2020 15:56:24 +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 "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 499qBt4r6Pz23J; Mon, 27 Apr 2020 15:56:22 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 499qBt2sYkz2yxh; Mon, 27 Apr 2020 15:56:22 +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) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 499qBs048wz2xqJ for ; Mon, 27 Apr 2020 15:56:21 +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)) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 499qBq5Z1Qzhp for ; Mon, 27 Apr 2020 15:56:19 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1588002980; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VbiKpxjc7vU5YqfS6NYKeJXcfL2wC2hzxQFy8aRLbmY=; b=w04HlrLTlRvSk8YXFfus2hAoh0sf3zR7gmXRzFZMjrHUZWjlTkH35rGrcNe6AEc/Ms7APD 44HOLBHQyfVW4bCg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1588002980; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VbiKpxjc7vU5YqfS6NYKeJXcfL2wC2hzxQFy8aRLbmY=; b=nkKuZm3Cn8ZtdQHzno479G+8lGP2Ny82GZAgRxxgSOPlMuQfeY9fEUwn9sIFukceOOh5K7 ObgzpiJ1aPMh5ePmPaRz3pndbpOaequUEtQHfAcfHtGfAvaYbIg7Kl9A3eCMLKSmNMI0Mz tHSeTcghZSw3lR4+ti4XGtHWcsy7nQqbPRZ/SysTm7UHUtIq9R5MuwF/iSi0r/FIkDjSnb q+YPkoouRiooLdGoJY7EU7mTr4SqelwvGq7VObQDR8p8qoqyEnWcx4ploSIqFeeb1Nfb31 OnpA6YcdRGbXsNuDBpc5jKf5yixrmmd1bYZbueoRWCxtBXvbmdEIDjWqJQwRsg== To: "IPFire: Development-List" From: =?utf-8?q?Peter_M=C3=BCller?= Subject: [PATCH] optionsfw.cgi: properly translate on/off radio buttons Message-ID: Date: Mon, 27 Apr 2020 17:56:16 +0200 MIME-Version: 1.0 Content-Language: en-US Authentication-Results: mail01.ipfire.org; auth=pass smtp.mailfrom=peter.mueller@ipfire.org X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" This patch also scrubs a forgotten Smoothwall comment and replaces it by our IPFire template. :-) Signed-off-by: Peter Müller --- html/cgi-bin/optionsfw.cgi | 84 +++++++++++++++++++++++++--------------------- 1 file changed, 46 insertions(+), 38 deletions(-) diff --git a/html/cgi-bin/optionsfw.cgi b/html/cgi-bin/optionsfw.cgi index 1ab3c7d79..47aba59cb 100644 --- a/html/cgi-bin/optionsfw.cgi +++ b/html/cgi-bin/optionsfw.cgi @@ -1,16 +1,24 @@ #!/usr/bin/perl -# -# SmoothWall CGIs -# -# This code is distributed under the terms of the GPL -# -# (c) The SmoothWall Team -# -# Copyright (C) 01-02-2002 Graham Smith -# -# $Id: optionsfw.cgi,v 1.1.2.10 2005/10/03 00:34:10 gespinasse Exp $ -# -# +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2014-2020 IPFire Team # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see . # +# # +############################################################################### + # enable only the following on debugging purpose #use warnings; #use CGI::Carp 'fatalsToBrowser'; @@ -206,41 +214,41 @@ END - - - - - - - + + + + + + +
$Lang::tr{'fw logging'}
$Lang::tr{'drop newnotsyn'}on / - off
$Lang::tr{'drop input'}on / - off
$Lang::tr{'drop forward'}on / - off
$Lang::tr{'drop outgoing'}on / - off
$Lang::tr{'drop portscan'}on / - off
$Lang::tr{'drop wirelessinput'}on / - off
$Lang::tr{'drop wirelessforward'}on / - off
$Lang::tr{'drop newnotsyn'}$Lang::tr{'on'} / + $Lang::tr{'off'}
$Lang::tr{'drop input'}$Lang::tr{'on'} / + $Lang::tr{'off'}
$Lang::tr{'drop forward'}$Lang::tr{'on'} / + $Lang::tr{'off'}
$Lang::tr{'drop outgoing'}$Lang::tr{'on'} / + $Lang::tr{'off'}
$Lang::tr{'drop portscan'}$Lang::tr{'on'} / + $Lang::tr{'off'}
$Lang::tr{'drop wirelessinput'}$Lang::tr{'on'} / + $Lang::tr{'off'}
$Lang::tr{'drop wirelessforward'}$Lang::tr{'on'} / + $Lang::tr{'off'}

- - + +
$Lang::tr{'fw blue'}
$Lang::tr{'drop proxy'}on / - off
$Lang::tr{'drop samba'}on / - off
$Lang::tr{'drop proxy'}$Lang::tr{'on'} / + $Lang::tr{'off'}
$Lang::tr{'drop samba'}$Lang::tr{'on'} / + $Lang::tr{'off'}

- - - - + + + +
$Lang::tr{'fw settings'}
$Lang::tr{'fw settings color'}on / - off
$Lang::tr{'fw settings remark'}on / - off
$Lang::tr{'fw settings ruletable'}on / - off
$Lang::tr{'fw settings dropdown'}on / - off
$Lang::tr{'fw settings color'}$Lang::tr{'on'} / + $Lang::tr{'off'}
$Lang::tr{'fw settings remark'}$Lang::tr{'on'} / + $Lang::tr{'off'}
$Lang::tr{'fw settings ruletable'}$Lang::tr{'on'} / + $Lang::tr{'off'}
$Lang::tr{'fw settings dropdown'}$Lang::tr{'on'} / + $Lang::tr{'off'}