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] link to HTTPS version of www.ipfire.org in WebUI Date: Mon, 06 Nov 2017 18:12:58 +0000 Message-ID: <1509991978.4838.283.camel@ipfire.org> In-Reply-To: <20171106181248.5574bfe0.peter.mueller@link38.eu> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============3594859358388740939==" List-Id: <development.lists.ipfire.org> --===============3594859358388740939== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=C3=BCller wrote: > Change links to www.ipfire.org in WebUI themes since the website > now uses HTTPS. >=20 > Signed-off-by: Peter M=C3=BCller <peter.mueller(a)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(-) >=20 > 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 />"= ;=20 > } else { > - print "<h1><span><a href=3D'http://www.ipfire.o > rg' style=3D'text-decoration: none;'>-=3D IPFire =3D-</a></span></h1><br />= "; > + print "<h1><span><a href=3D'https://www.ipfire. > org' style=3D'text-decoration: none;'>-=3D IPFire =3D-</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 />"= ;=20 > } else { > - print "<h1><span><a href=3D'http://www.ipf= ire.o > rg' style=3D'text-decoration: none;'>IPFire</a></span></h1><br />"; > + print "<h1><span><a href=3D'https://www.ip= fire. > org' style=3D'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=3D"header" class=3D"fixed"> > <div id=3D"logo"> > - <a href=3D"http://www.ipfire.org" style=3D"text- > decoration: none;"> > + <a href=3D"https://www.ipfire.org" style=3D"text- > decoration: none;"> > <img > src=3D"/themes/ipfire/images/tux2.png" style=3D"float:left; margin-left: -3= px; > margin-top: -3px;"/> > END > ; > @@ -205,8 +205,8 @@ print <<END; > =20 > <div id=3D"footer" class=3D'bigbox fixed'> > <span class=3D"pull-right"> > - <a href=3D"http://www.ipfire.org/" > target=3D"_blank"><strong>IPFire.org</strong></a> • > - <a href=3D"http://www.ipfire.org/donate" > target=3D"_blank">$Lang::tr{'support donation'}</a> > + <a href=3D"https://www.ipfire.org/" > target=3D"_blank"><strong>IPFire.org</strong></a> • > + <a href=3D"https://www.ipfire.org/donate" > target=3D"_blank">$Lang::tr{'support donation'}</a> > </span> > =20 > <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 />"= ;=20 > } else { > - print "<h1><span><a href=3D'http://www.ipfire.o > rg' style=3D'text-decoration: none;'>-=3D IPFire =3D-</a></span></h1><br />= "; > + print "<h1><span><a href=3D'https://www.ipfire. > org' style=3D'text-decoration: none;'>-=3D IPFire =3D-</a></span></h1><br /= >"; > } > print <<END > <h2>+ $h2 +</h2> --===============3594859358388740939== Content-Type: application/pgp-signature Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="signature.asc" MIME-Version: 1.0 LS0tLS1CRUdJTiBQR1AgU0lHTkFUVVJFLS0tLS0KCmlRSXpCQUFCQ2dBZEZpRUU1L3JXNWwzR0dl Mnlwa3R4Z0hudy8yK1FDUWNGQWxvQXBpb0FDZ2tRZ0hudy8yK1EKQ1FjNEtRLy9UUklibkwxTGZU RkdOU3Q1WTRQdWFrUWVKaWFsdEpVZnVmTzJ4VlhpNVFWNXM4SEFuWVhFbGNXMQpGV3QvNDNkalJ6 eEVZTm9pT0lEQnN5UXhkb1FhMHJLcVA3TUVSV0M0OHR1dTIrTUxJZ0hSL01TVXRZTHNqQnh5CjFO ZFFOVHpSeXYybTBEVkhjcTBhb3ZTeGxDZWViODBKZndVdGdvdHVlZHU1aWdnTTRWbzVKTTNRTGJI YXRtL2wKZndqZ1l6bTZHZ1hHRytEdUQySlFRUkdpVkZ0SnBRa0J0R213UmVjbzZQMzdtakhvVDQy S2tUaVd2TkRyN3NDNApLVzB2YlJISkg0dkd0b0RxUkprNnJlbG1kNUY4NjFRUWZHWVFJYlZrK2x4 QXRxenJwbXhJOUhpZFNtTDNNdmY1CmY1WktPM2VvMVE0UHV3Vkt4VzE1SFNSZ25HL3JmR21wTHdh dFlHZ3hiVVUvdng0cm9vWFlZQUpuRHhrc29lT3MKZUFqNkRWSjlwQ1ZPMlpBOHBCZG91TmxlMmc5 V2ptZmhuNlNiKzF5UUtpWTF3QXRxdW5sT202NkpDeVFnTnc3Qgp3R3dEMFF2aG1BTXdJTHV3WjBR YmVJaEZ6MUR2YVMzRWVjVWtGQlVzYzUwQkduUDg2UjEvOWpBRzJERkpIV2NyCm9aZ3FnNytCWWkz bU92L3ZsYmRLWXRxQjZOaEw4NTVydDhIcEY3aUg0RnJGQ2J5U0lES3J6QUthUzRqVldaaHEKMllW Z21EQnFFMUx0UGF6anpwSmRzRmltaUptQ2hqKzdTSnhHVXZESEhhVk45RWt2YVhZRDdTRm5JdHVB MXNFQwp6TllNQ2dQVVJ6M1dnME1sejljdjB6NGlkVXoyNytFakV5djA0dDRGRys3UVIzSFYrT0E9 Cj10YUJNCi0tLS0tRU5EIFBHUCBTSUdOQVRVUkUtLS0tLQo= --===============3594859358388740939==--