[PATCH] proxy.cgi: Even more cosmetics (V4)

[PATCH] proxy.cgi: Even more cosmetics (V4)

[Matthias Fischer]

[-- Attachment #1: Type: text/plain, Size: 2524 bytes --]

Another clickable link, this time for the 'Cache Manager Interface' - this one opens in a new window.

And: This time - hopefully - with correct '_blank'-attribute (deleted the backslashes).

Plus: Deleted some "blind" tabs - found by chance.

Best,
Matthias

Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
---
 html/cgi-bin/proxy.cgi | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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 = $Lang::tr{'advproxy errmsg cache'}." ".$proxysettings{'CACHE_MEM'}." > ".$proxysettings{'CACHE_SIZE'};
 		goto ERROR;
 	}
-	
+
 	if (!(&General::validport($proxysettings{'PROXY_PORT'})))
 	{
 		$errormessage = $Lang::tr{'advproxy errmsg invalid proxy port'};
@@ -695,7 +695,7 @@ ERROR:
 			system ('/usr/bin/touch', "${General::swroot}/proxy/transparent_blue"); }
 
 		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'); }	
+		if ($proxysettings{'ACTION'} eq $Lang::tr{'proxy reconfigure'}) { system('/usr/local/bin/squidctrl reconfigure >/dev/null 2>&1'); }
   }
 }
 
@@ -1118,7 +1118,7 @@ print <<END
 	<td colspan='4'><b>$Lang::tr{'advproxy cache management'}</b></td>
 </tr>
 <tr>
-	<td class='base'><a href='/cgi-bin/cachemgr.cgi\' target=\'_blank\'>$Lang::tr{'proxy cachemgr'}</a>:</td>
+	<td class='base'><a href='/cgi-bin/cachemgr.cgi' target='_blank'>$Lang::tr{'proxy cachemgr'}</a>:</td>
 	<td><input type='checkbox' name='CACHEMGR' $checked{'CACHEMGR'}{'on'} /></td>
 	<td class='base'>$Lang::tr{'advproxy admin mail'}:</td>
 	<td><input type='text' name='ADMIN_MAIL_ADDRESS' value='$proxysettings{'ADMIN_MAIL_ADDRESS'}' /></td>
@@ -3206,7 +3206,7 @@ END
 
 	if ($proxysettings{'OFFLINE_MODE'} eq 'on') {  print FILE "offline_mode on\n\n"; }
 	if ($proxysettings{'CACHE_DIGESTS'} eq 'on') {  print FILE "digest_generation on\n\n"; } else {  print FILE "digest_generation off\n\n"; }
-	
+
 	if ((!($proxysettings{'MEM_POLICY'} eq 'LRU')) || (!($proxysettings{'CACHE_POLICY'} eq 'LRU')))
 	{
 		if (!($proxysettings{'MEM_POLICY'} eq 'LRU'))
-- 
2.14.2

Re: [PATCH] proxy.cgi: Even more cosmetics (V4)

[Michael Tremer]

[-- Attachment #1: Type: text/plain, Size: 2733 bytes --]

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.
> 
> And: This time - hopefully - with correct '_blank'-attribute (deleted the backslashes).
> 
> Plus: Deleted some "blind" tabs - found by chance.
> 
> Best,
> Matthias
> 
> Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
> ---
>  html/cgi-bin/proxy.cgi | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> 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 = $Lang::tr{'advproxy errmsg cache'}." ".$proxysettings{'CACHE_MEM'}." > ".$proxysettings{'CACHE_SIZE'};
>  		goto ERROR;
>  	}
> -	
> +
>  	if (!(&General::validport($proxysettings{'PROXY_PORT'})))
>  	{
>  		$errormessage = $Lang::tr{'advproxy errmsg invalid proxy port'};
> @@ -695,7 +695,7 @@ ERROR:
>  			system ('/usr/bin/touch', "${General::swroot}/proxy/transparent_blue"); }
>  
>  		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'); }	
> +		if ($proxysettings{'ACTION'} eq $Lang::tr{'proxy reconfigure'}) { system('/usr/local/bin/squidctrl reconfigure >/dev/null 2>&1'); }
>    }
>  }
>  
> @@ -1118,7 +1118,7 @@ print <<END
>  	<td colspan='4'><b>$Lang::tr{'advproxy cache management'}</b></td>
>  </tr>
>  <tr>
> -	<td class='base'><a href='/cgi-bin/cachemgr.cgi\' target=\'_blank\'>$Lang::tr{'proxy cachemgr'}</a>:</td>
> +	<td class='base'><a href='/cgi-bin/cachemgr.cgi' target='_blank'>$Lang::tr{'proxy cachemgr'}</a>:</td>
>  	<td><input type='checkbox' name='CACHEMGR' $checked{'CACHEMGR'}{'on'} /></td>
>  	<td class='base'>$Lang::tr{'advproxy admin mail'}:</td>
>  	<td><input type='text' name='ADMIN_MAIL_ADDRESS' value='$proxysettings{'ADMIN_MAIL_ADDRESS'}' /></td>
> @@ -3206,7 +3206,7 @@ END
>  
>  	if ($proxysettings{'OFFLINE_MODE'} eq 'on') {  print FILE "offline_mode on\n\n"; }
>  	if ($proxysettings{'CACHE_DIGESTS'} eq 'on') {  print FILE "digest_generation on\n\n"; } else {  print FILE "digest_generation off\n\n"; }
> -	
> +
>  	if ((!($proxysettings{'MEM_POLICY'} eq 'LRU')) || (!($proxysettings{'CACHE_POLICY'} eq 'LRU')))
>  	{
>  		if (!($proxysettings{'MEM_POLICY'} eq 'LRU'))

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]