From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: [PATCH] proxy.cgi: Even more cosmetics (V4)
Date: Wed, 11 Oct 2017 20:14:28 +0100
Message-ID: <1507749268.2995.8.camel@ipfire.org>
In-Reply-To: <20171011160146.3476-1-matthias.fischer@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3576975193818144374=="
List-Id: <development.lists.ipfire.org>

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

Hi,

this patch doesn't want to apply.

-Michael

On Wed, 2017-10-11 at 18:01 +0200, Matthias Fischer wrote:
> Another clickable link, this time for the 'Cache Manager Interface' - this =
one opens in a new window.
>=20
> And: This time - hopefully - with correct '_blank'-attribute (deleted the b=
ackslashes).
>=20
> Plus: Deleted some "blind" tabs - found by chance.
>=20
> Best,
> Matthias
>=20
> Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
> ---
>  html/cgi-bin/proxy.cgi | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
>=20
> diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi
> index ab490c3d3..179671a99 100644
> --- a/html/cgi-bin/proxy.cgi
> +++ b/html/cgi-bin/proxy.cgi
> @@ -359,7 +359,7 @@ if (($proxysettings{'ACTION'} eq $Lang::tr{'save'}) || =
($proxysettings{'ACTION'}
>  		$errormessage =3D $Lang::tr{'advproxy errmsg cache'}." ".$proxysettings{=
'CACHE_MEM'}." > ".$proxysettings{'CACHE_SIZE'};
>  		goto ERROR;
>  	}
> -=09
> +
>  	if (!(&General::validport($proxysettings{'PROXY_PORT'})))
>  	{
>  		$errormessage =3D $Lang::tr{'advproxy errmsg invalid proxy port'};
> @@ -695,7 +695,7 @@ ERROR:
>  			system ('/usr/bin/touch', "${General::swroot}/proxy/transparent_blue");=
 }
> =20
>  		if ($proxysettings{'ACTION'} eq $Lang::tr{'advproxy save and restart'}) =
{ system('/usr/local/bin/squidctrl restart >/dev/null 2>&1'); }
> -		if ($proxysettings{'ACTION'} eq $Lang::tr{'proxy reconfigure'}) { system=
('/usr/local/bin/squidctrl reconfigure >/dev/null 2>&1'); }=09
> +		if ($proxysettings{'ACTION'} eq $Lang::tr{'proxy reconfigure'}) { system=
('/usr/local/bin/squidctrl reconfigure >/dev/null 2>&1'); }
>    }
>  }
> =20
> @@ -1118,7 +1118,7 @@ print <<END
>  	<td colspan=3D'4'><b>$Lang::tr{'advproxy cache management'}</b></td>
>  </tr>
>  <tr>
> -	<td class=3D'base'><a href=3D'/cgi-bin/cachemgr.cgi\' target=3D\'_blank\'=
>$Lang::tr{'proxy cachemgr'}</a>:</td>
> +	<td class=3D'base'><a href=3D'/cgi-bin/cachemgr.cgi' target=3D'_blank'>$L=
ang::tr{'proxy cachemgr'}</a>:</td>
>  	<td><input type=3D'checkbox' name=3D'CACHEMGR' $checked{'CACHEMGR'}{'on'}=
 /></td>
>  	<td class=3D'base'>$Lang::tr{'advproxy admin mail'}:</td>
>  	<td><input type=3D'text' name=3D'ADMIN_MAIL_ADDRESS' value=3D'$proxysetti=
ngs{'ADMIN_MAIL_ADDRESS'}' /></td>
> @@ -3206,7 +3206,7 @@ END
> =20
>  	if ($proxysettings{'OFFLINE_MODE'} eq 'on') {  print FILE "offline_mode o=
n\n\n"; }
>  	if ($proxysettings{'CACHE_DIGESTS'} eq 'on') {  print FILE "digest_genera=
tion on\n\n"; } else {  print FILE "digest_generation off\n\n"; }
> -=09
> +
>  	if ((!($proxysettings{'MEM_POLICY'} eq 'LRU')) || (!($proxysettings{'CACH=
E_POLICY'} eq 'LRU')))
>  	{
>  		if (!($proxysettings{'MEM_POLICY'} eq 'LRU'))

--===============3576975193818144374==
Content-Type: application/pgp-signature
Content-Transfer-Encoding: base64
Content-Disposition: attachment; filename="signature.asc"
MIME-Version: 1.0

LS0tLS1CRUdJTiBQR1AgU0lHTkFUVVJFLS0tLS0KCmlRSXpCQUFCQ2dBZEZpRUU1L3JXNWwzR0dl
Mnlwa3R4Z0hudy8yK1FDUWNGQWxuZWJaUUFDZ2tRZ0hudy8yK1EKQ1FkK2J3LytLdWNIQlZ2Tk80
TW1iWnBGQ2MwaW1HcndMUGRoUWcrNUVpbnhLT1RsOURwVlJJNk41V3ZveUF1Zgp1b1lFRlpSTWs4
VDZ1cU84elN1NHBTblRtNGg3Q3doQjdYdWJwNllxZTBqZjlCejdTK1Y1RXh6eHY2WE5OdXF3CmpB
em42YUhES1RIK3RzZUdETU1Xa0EzRWxDWUozMXhOTjNsR2xNTkNWbXdNOVlBSzNHWlJaVVZjaVVG
ZWE2MHcKWWZhblorbDF5WVYyM1RLUU04dm9BdTB6c01vUVhQT1ZCR1pFaG9Ha2h6VjlHZFVRb0Qw
MGR6SE8yalBIb1kvTgpEWGFNU0NqTUF6S1lRYlBPVVJBYy80UXlPT01tenUxZDdXRldYeTI1UmdU
MGI3Vi95S1BLdnRMQTVxZnVVTU1HCndqdWdqUWI5NjcrV2lpZjhuYUo1d05UdEVBbmZ6S2R6dU9S
UnhBVmErWU5CL2RuVEpCTUc4R1B2TWxQMjJXOSsKbmFyQUUzd1RTZndFbEFTWlhla1Z4enBENVc5
SWg1OGpjaVhBZFZiMkZORUlVb1dWcytKWGV1cVczZi9udE9GQQp1eVFFTC9JVXFyckhnaEJsbEg4
aWVOUXZvanJiS0hQNWtOcGFIUEhneFhXcWVlUE9xcDA3bjg3QzZ0Yk53WUE1Cml6S0hKem1jaGlU
cVk5VlRZeVdhZWYxeFFBVEdKTUtzZGpiUlNFbFJmSjRWbG1YSTRndTY3NmJhc010RzBNeDIKZlNP
NGxNYVBURG9LNXMrT1hLSjh1VUxqcDJnL1pERUZsUWVIbVRZeHkyb0RpTmFjWlB5bDFhUUVvcGFi
ckwrWQp6VkVyUzZMVlYwZTJ4djgrTVZLV2JxZXo2dHJlMlNuYzJvdVdnNklhVGlodVRaNURJMDQ9
Cj1pSjE1Ci0tLS0tRU5EIFBHUCBTSUdOQVRVUkUtLS0tLQo=

--===============3576975193818144374==--