link to HTTPS version of www.ipfire.org in WebUI

Message ID 20171106181248.5574bfe0.peter.mueller@link38.eu
State Accepted
Commit 725396af2c8d180a687044ff9896d4eab3357998
Headers
Series link to HTTPS version of www.ipfire.org in WebUI |

Commit Message

Peter Müller Nov. 7, 2017, 4:12 a.m. UTC
  Change links to www.ipfire.org in WebUI themes since the website
now uses HTTPS.

Signed-off-by: Peter Müller <peter.mueller@link38.eu>
---
 html/html/themes/darkdos/include/functions.pl       | 2 +-
 html/html/themes/ipfire-legacy/include/functions.pl | 2 +-
 html/html/themes/ipfire/include/functions.pl        | 6 +++---
 html/html/themes/maniac/include/functions.pl        | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)
  

Comments

Michael Tremer Nov. 7, 2017, 5:12 a.m. UTC | #1
Thank you very much for submitting this patch. I suppose there is loads of
places where URLs are still pointing at our website over HTTP.

If you spot any more (also on the webapp), please send more patches.

Best,
-Michael

On Mon, 2017-11-06 at 18:12 +0100, Peter Müller wrote:
> Change links to www.ipfire.org in WebUI themes since the website
> now uses HTTPS.
> 
> Signed-off-by: Peter Müller <peter.mueller@link38.eu>
> ---
>  html/html/themes/darkdos/include/functions.pl       | 2 +-
>  html/html/themes/ipfire-legacy/include/functions.pl | 2 +-
>  html/html/themes/ipfire/include/functions.pl        | 6 +++---
>  html/html/themes/maniac/include/functions.pl        | 2 +-
>  4 files changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/html/html/themes/darkdos/include/functions.pl
> b/html/html/themes/darkdos/include/functions.pl
> index 7d803b6ad..ed3f546b0 100644
> --- a/html/html/themes/darkdos/include/functions.pl
> +++ b/html/html/themes/darkdos/include/functions.pl
> @@ -227,7 +227,7 @@ END
>      if ($settings{'WINDOWWITHHOSTNAME'} eq 'on') {
>          print
> "<h1><span>$settings{'HOSTNAME'}.$settings{'DOMAINNAME'}</span></h1><br />"; 
>      } else {
> -				print "<h1><span><a href='http://www.ipfire.o
> rg' style='text-decoration: none;'>-= IPFire =-</a></span></h1><br />";
> +				print "<h1><span><a href='https://www.ipfire.
> org' style='text-decoration: none;'>-= IPFire =-</a></span></h1><br />";
>  		}
>  		print <<END
>  			<h2>+ $h2 +</h2>
> diff --git a/html/html/themes/ipfire-legacy/include/functions.pl
> b/html/html/themes/ipfire-legacy/include/functions.pl
> index 528825329..26a8763c1 100644
> --- a/html/html/themes/ipfire-legacy/include/functions.pl
> +++ b/html/html/themes/ipfire-legacy/include/functions.pl
> @@ -227,7 +227,7 @@ END
>      if ($settings{'WINDOWWITHHOSTNAME'} eq 'on') {
>          print
> "<h1><span>$settings{'HOSTNAME'}.$settings{'DOMAINNAME'}</span></h1><br />"; 
>      } else {
> -                                print "<h1><span><a href='http://www.ipfire.o
> rg' style='text-decoration: none;'>IPFire</a></span></h1><br />";
> +                                print "<h1><span><a href='https://www.ipfire.
> org' style='text-decoration: none;'>IPFire</a></span></h1><br />";
>                  }
>                  print <<END
>                          <h2>$h2</h2>
> diff --git a/html/html/themes/ipfire/include/functions.pl
> b/html/html/themes/ipfire/include/functions.pl
> index 7f6000a46..9aec77497 100644
> --- a/html/html/themes/ipfire/include/functions.pl
> +++ b/html/html/themes/ipfire/include/functions.pl
> @@ -152,7 +152,7 @@ print <<END
>  	<body>
>  		<div id="header" class="fixed">
>  			<div id="logo">
> -				<a href="http://www.ipfire.org" style="text-
> decoration: none;">
> +				<a href="https://www.ipfire.org" style="text-
> decoration: none;">
>  					<img
> src="/themes/ipfire/images/tux2.png" style="float:left; margin-left: -3px;
> margin-top: -3px;"/>
>  END
>  ;
> @@ -205,8 +205,8 @@ print <<END;
>  
>  	<div id="footer" class='bigbox fixed'>
>  		<span class="pull-right">
> -			<a href="http://www.ipfire.org/"
> target="_blank"><strong>IPFire.org</strong></a> &bull;
> -			<a href="http://www.ipfire.org/donate"
> target="_blank">$Lang::tr{'support donation'}</a>
> +			<a href="https://www.ipfire.org/"
> target="_blank"><strong>IPFire.org</strong></a> &bull;
> +			<a href="https://www.ipfire.org/donate"
> target="_blank">$Lang::tr{'support donation'}</a>
>  		</span>
>  
>  		<strong>$system_release</strong>
> diff --git a/html/html/themes/maniac/include/functions.pl
> b/html/html/themes/maniac/include/functions.pl
> index 4866fcd0c..1c0aea1c4 100644
> --- a/html/html/themes/maniac/include/functions.pl
> +++ b/html/html/themes/maniac/include/functions.pl
> @@ -227,7 +227,7 @@ END
>      if ($settings{'WINDOWWITHHOSTNAME'} eq 'on') {
>          print
> "<h1><span>$settings{'HOSTNAME'}.$settings{'DOMAINNAME'}</span></h1><br />"; 
>      } else {
> -				print "<h1><span><a href='http://www.ipfire.o
> rg' style='text-decoration: none;'>-= IPFire =-</a></span></h1><br />";
> +				print "<h1><span><a href='https://www.ipfire.
> org' style='text-decoration: none;'>-= IPFire =-</a></span></h1><br />";
>  		}
>  		print <<END
>  			<h2>+ $h2 +</h2>
  

Patch

diff --git a/html/html/themes/darkdos/include/functions.pl b/html/html/themes/darkdos/include/functions.pl
index 7d803b6ad..ed3f546b0 100644
--- a/html/html/themes/darkdos/include/functions.pl
+++ b/html/html/themes/darkdos/include/functions.pl
@@ -227,7 +227,7 @@  END
     if ($settings{'WINDOWWITHHOSTNAME'} eq 'on') {
         print "<h1><span>$settings{'HOSTNAME'}.$settings{'DOMAINNAME'}</span></h1><br />"; 
     } else {
-				print "<h1><span><a href='http://www.ipfire.org' style='text-decoration: none;'>-= IPFire =-</a></span></h1><br />";
+				print "<h1><span><a href='https://www.ipfire.org' style='text-decoration: none;'>-= IPFire =-</a></span></h1><br />";
 		}
 		print <<END
 			<h2>+ $h2 +</h2>
diff --git a/html/html/themes/ipfire-legacy/include/functions.pl b/html/html/themes/ipfire-legacy/include/functions.pl
index 528825329..26a8763c1 100644
--- a/html/html/themes/ipfire-legacy/include/functions.pl
+++ b/html/html/themes/ipfire-legacy/include/functions.pl
@@ -227,7 +227,7 @@  END
     if ($settings{'WINDOWWITHHOSTNAME'} eq 'on') {
         print "<h1><span>$settings{'HOSTNAME'}.$settings{'DOMAINNAME'}</span></h1><br />"; 
     } else {
-                                print "<h1><span><a href='http://www.ipfire.org' style='text-decoration: none;'>IPFire</a></span></h1><br />";
+                                print "<h1><span><a href='https://www.ipfire.org' style='text-decoration: none;'>IPFire</a></span></h1><br />";
                 }
                 print <<END
                         <h2>$h2</h2>
diff --git a/html/html/themes/ipfire/include/functions.pl b/html/html/themes/ipfire/include/functions.pl
index 7f6000a46..9aec77497 100644
--- a/html/html/themes/ipfire/include/functions.pl
+++ b/html/html/themes/ipfire/include/functions.pl
@@ -152,7 +152,7 @@  print <<END
 	<body>
 		<div id="header" class="fixed">
 			<div id="logo">
-				<a href="http://www.ipfire.org" style="text-decoration: none;">
+				<a href="https://www.ipfire.org" style="text-decoration: none;">
 					<img src="/themes/ipfire/images/tux2.png" style="float:left; margin-left: -3px; margin-top: -3px;"/>
 END
 ;
@@ -205,8 +205,8 @@  print <<END;
 
 	<div id="footer" class='bigbox fixed'>
 		<span class="pull-right">
-			<a href="http://www.ipfire.org/" target="_blank"><strong>IPFire.org</strong></a> &bull;
-			<a href="http://www.ipfire.org/donate" target="_blank">$Lang::tr{'support donation'}</a>
+			<a href="https://www.ipfire.org/" target="_blank"><strong>IPFire.org</strong></a> &bull;
+			<a href="https://www.ipfire.org/donate" target="_blank">$Lang::tr{'support donation'}</a>
 		</span>
 
 		<strong>$system_release</strong>
diff --git a/html/html/themes/maniac/include/functions.pl b/html/html/themes/maniac/include/functions.pl
index 4866fcd0c..1c0aea1c4 100644
--- a/html/html/themes/maniac/include/functions.pl
+++ b/html/html/themes/maniac/include/functions.pl
@@ -227,7 +227,7 @@  END
     if ($settings{'WINDOWWITHHOSTNAME'} eq 'on') {
         print "<h1><span>$settings{'HOSTNAME'}.$settings{'DOMAINNAME'}</span></h1><br />"; 
     } else {
-				print "<h1><span><a href='http://www.ipfire.org' style='text-decoration: none;'>-= IPFire =-</a></span></h1><br />";
+				print "<h1><span><a href='https://www.ipfire.org' style='text-decoration: none;'>-= IPFire =-</a></span></h1><br />";
 		}
 		print <<END
 			<h2>+ $h2 +</h2>