From mboxrd@z Thu Jan  1 00:00:00 1970
From: Bernhard Bitsch <Bernhard.Bitsch@gmx.de>
To: development@lists.ipfire.org
Subject: Aw: [PATCH] Syntax fixes in several CGIs
Date: Tue, 29 Dec 2020 14:50:49 +0100
Message-ID:
 <trinity-80ba86de-fa32-4b4e-9361-d1c6e34eb590-1609249849345@3c-app-gmx-bs69>
In-Reply-To: <20201229125011.23920-1-matthias.fischer@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5930667461874130457=="
List-Id: <development.lists.ipfire.org>

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

Hi,

to avoid possible mis-interpretation by Perl we do not need to set the hash t=
ags in '.
For example
  value=3D'$Lang::tr{'update'}'
can read
  value=3D'$Lang::tr{update}'

In most locations we use the stringifying, it is just cosmetic. Thus an overa=
ll editing is not needed.

Greets,
Bernhard

> Gesendet: Dienstag, 29. Dezember 2020 um 13:50 Uhr
> Von: "Matthias Fischer" <matthias.fischer(a)ipfire.org>
> An: development(a)lists.ipfire.org
> Betreff: [PATCH] Syntax fixes in several CGIs
>
> Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
> ---
>  html/cgi-bin/asterisk/calls.cgi | 2 +-
>  html/cgi-bin/asterisk/conf.cgi  | 2 +-
>  html/cgi-bin/extrahd.cgi        | 4 ++--
>  html/cgi-bin/gpl.cgi            | 2 +-
>  html/cgi-bin/hardwaregraphs.cgi | 2 +-
>  html/cgi-bin/optionsfw.cgi      | 4 ++--
>  html/cgi-bin/upnp.cgi           | 2 +-
>  7 files changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/html/cgi-bin/asterisk/calls.cgi b/html/cgi-bin/asterisk/calls.=
cgi
> index c5877b2ea..a7635f2ec 100644
> --- a/html/cgi-bin/asterisk/calls.cgi
> +++ b/html/cgi-bin/asterisk/calls.cgi
> @@ -73,7 +73,7 @@ print <<END
>
>  <tr><td colspan=3D2>Von oder zum Anrufer mit der ID/Nummer:<td colspan=3D2=
><input type=3Dtext name=3Dnumber size=3D20 maxlength=3D100 value=3D"$cgipara=
ms{'number'}">
>
> -<tr><td align=3Dcenter colspan=3D4><input type=3Dsubmit name=3D'ACTION' va=
lue=3D$Lang::tr{'update'}>
> +<tr><td align=3Dcenter colspan=3D4><input type=3Dsubmit name=3D'ACTION' va=
lue=3D'$Lang::tr{'update'}'>
>  </table>
>  END
>  ;
> diff --git a/html/cgi-bin/asterisk/conf.cgi b/html/cgi-bin/asterisk/conf.cgi
> index 2dd8cf0a8..ab5011f21 100644
> --- a/html/cgi-bin/asterisk/conf.cgi
> +++ b/html/cgi-bin/asterisk/conf.cgi
> @@ -77,7 +77,7 @@ print <<END
>
>  	<tr><td align=3Dcenter>
>  	<p><input type=3Dtext name=3Dsave_path value=3D$conf_file size=3D25>
> -	<p><input type=3Dsubmit name=3DACTION value=3D$Lang::tr{'save'}>
> +	<p><input type=3Dsubmit name=3DACTION value=3D'$Lang::tr{'save'}'>
>  	</table>
>
>  END
> diff --git a/html/cgi-bin/extrahd.cgi b/html/cgi-bin/extrahd.cgi
> index da1efb2dd..aaf42baff 100644
> --- a/html/cgi-bin/extrahd.cgi
> +++ b/html/cgi-bin/extrahd.cgi
> @@ -156,7 +156,7 @@ END
>  						<input type=3D'hidden' name=3D'DEVICE' value=3D'$deviceline[0]' />
>  						<input type=3D'hidden' name=3D'FS' value=3D'$deviceline[1]' />
>  						<input type=3D'hidden' name=3D'PATH' value=3D'$deviceline[2]' />
> -						<input type=3D'hidden' name=3D'ACTION' value=3D$Lang::tr{'delete'} />
> +						<input type=3D'hidden' name=3D'ACTION' value=3D'$Lang::tr{'delete'}'=
 />
>  						<input type=3D'image' alt=3D'$Lang::tr{'delete'}' title=3D'$Lang::tr=
{'delete'}' src=3D'/images/delete.gif' />
>  					</form></td></tr>
>  END
> @@ -228,7 +228,7 @@ END
>  				<td align=3D"center">
>  					<input type=3D'hidden' name=3D'DEVICE' value=3D'$partitionline[0]' />
>  					<input type=3D'hidden' name=3D'UUID' value=3D'$partitionline[2]' />
> -					<input type=3D'hidden' name=3D'ACTION' value=3D$Lang::tr{'add'} />
> +					<input type=3D'hidden' name=3D'ACTION' value=3D'$Lang::tr{'add'}' />
>  					<input type=3D'image' alt=3D'$Lang::tr{'add'}' title=3D'$Lang::tr{'ad=
d'}' src=3D'/images/add.gif' />
>  				</form></td></tr>
>  END
> diff --git a/html/cgi-bin/gpl.cgi b/html/cgi-bin/gpl.cgi
> index 94187ce7a..be1ea2639 100644
> --- a/html/cgi-bin/gpl.cgi
> +++ b/html/cgi-bin/gpl.cgi
> @@ -71,7 +71,7 @@ print <<END;
>  		<form method=3D'post' action=3D'$ENV{'SCRIPT_NAME'}'>
>  			<input type=3D'checkbox' name=3D'gpl_accepted' value=3D'1'/> $Lang::tr{=
'gpl i accept these terms and conditions'}.
>  			<br/ >
> -			<input type=3D'submit' name=3D'ACTION' value=3D$Lang::tr{'yes'} />
> +			<input type=3D'submit' name=3D'ACTION' value=3D'$Lang::tr{'yes'}' />
>  		</form>
>  	</p>
>  	<a href=3D'http://www.gnu.org/licenses/translations.html' target=3D'_blan=
k'>$Lang::tr{'gpl unofficial translation of the general public license v3'}</=
a>
> diff --git a/html/cgi-bin/hardwaregraphs.cgi b/html/cgi-bin/hardwaregraphs.=
cgi
> index e582acfb9..5c677d815 100644
> --- a/html/cgi-bin/hardwaregraphs.cgi
> +++ b/html/cgi-bin/hardwaregraphs.cgi
> @@ -167,7 +167,7 @@ END
>
>  	print <<END
>  <tr>
> -	<td align=3D'center' colspan=3D'2' ><input type=3D'submit' name=3D'ACTION=
' value=3D$Lang::tr{'save'} /></td>
> +	<td align=3D'center' colspan=3D'2' ><input type=3D'submit' name=3D'ACTION=
' value=3D'$Lang::tr{'save'}' /></td>
>  </tr>
>  </table>
>  </form>
> diff --git a/html/cgi-bin/optionsfw.cgi b/html/cgi-bin/optionsfw.cgi
> index 47aba59cb..8c996802c 100644
> --- a/html/cgi-bin/optionsfw.cgi
> +++ b/html/cgi-bin/optionsfw.cgi
> @@ -323,7 +323,7 @@ END
>  <br />
>  <table width=3D'100%' cellspacing=3D'0'>
>  <tr><td align=3D'right'><form method=3D'post' action=3D'$ENV{'SCRIPT_NAME'=
}'>
> -<input type=3D'submit' name=3D'ACTION' value=3D$Lang::tr{'save'} />
> +<input type=3D'submit' name=3D'ACTION' value=3D'$Lang::tr{'save'}' />
>  </form></td></tr>
>  </table>
>  </form>
> @@ -345,7 +345,7 @@ print <<END;
>  		<tr><td width=3D'15%' align=3D'left'>	<select name=3D'POLICY' style=3D"w=
idth: 100px">
>  		<option value=3D'MODE1' $selected{'POLICY'}{'MODE1'}>$Lang::tr{'fwdfw po=
l block'}</option>
>  		<option value=3D'MODE2' $selected{'POLICY'}{'MODE2'}>$Lang::tr{'fwdfw po=
l allow'}</option></select>
> -	    <input type=3D'submit' name=3D'ACTION' value=3D$Lang::tr{'save'} /><i=
nput type=3D'hidden' name=3D'defpol' value=3D'1'></td>
> +	    <input type=3D'submit' name=3D'ACTION' value=3D'$Lang::tr{'save'}' />=
<input type=3D'hidden' name=3D'defpol' value=3D'1'></td>
>  END
>  	print "</tr></table></form>";
>  	print"<br><br>";
> diff --git a/html/cgi-bin/upnp.cgi b/html/cgi-bin/upnp.cgi
> index 07dfa2677..5d99d0ed7 100644
> --- a/html/cgi-bin/upnp.cgi
> +++ b/html/cgi-bin/upnp.cgi
> @@ -163,7 +163,7 @@ print <<END
>  <tr><td align=3D'left'>Downstream in KB:</td><td><input type=3D'text' name=
=3D'DOWNSTREAM' value=3D'$upnpsettings{'DOWNSTREAM'}' size=3D"30" /></td></tr>
>  <tr><td align=3D'left'>Upstream in KB:</td><td><input type=3D'text' name=
=3D'UPSTREAM' value=3D'$upnpsettings{'UPSTREAM'}' size=3D"30" /></td></tr>
>  <tr><td align=3D'left' colspan=3D'2'><br /></td></tr>
> -<tr><td colspan=3D'2' align=3D'center'>	<input type=3D'hidden' name=3D'ACT=
ION' value=3D$Lang::tr{'save'} />
> +<tr><td colspan=3D'2' align=3D'center'>	<input type=3D'hidden' name=3D'ACT=
ION' value=3D'$Lang::tr{'save'}' />
>  <input type=3D'image' alt=3D'$Lang::tr{'save'}' title=3D'$Lang::tr{'save'}=
' src=3D'/images/floppy.gif' /></td></tr>
>  </table></form>
>  END
> --
> 2.18.0
>
>

--===============5930667461874130457==--