From e3effd8be2d76b161f648b5112798c56e60a21db Mon Sep 17 00:00:00 2001
From: Dominic Taylor <dominic@dominictaylor.dev>
Date: Mon, 19 Aug 2019 23:18:36 +0100
Subject: [PATCH 1/5] minor html fixes removing type from javascript or css
 files, adding meta info and viewport information

---
 html/html/themes/ipfire/include/functions.pl | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/html/html/themes/ipfire/include/functions.pl b/html/html/themes/ipfire/include/functions.pl
index 9aec77497b..ed88cc5fbc 100644
--- a/html/html/themes/ipfire/include/functions.pl
+++ b/html/html/themes/ipfire/include/functions.pl
@@ -39,7 +39,7 @@
 # @param submenu entries
 sub showsubmenu() {
 	my $submenus = shift;
-	
+
 	print "<ul>";
 	foreach my $item (sort keys %$submenus) {
 		$link = getlink($submenus->{$item});
@@ -126,10 +126,13 @@ sub openpage {
 	<title>$headline - $title</title>
 	$extrahead
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+	<meta name="viewport" content="width=device-width, initial-scale=1">
+	<meta name="theme-color" content="#E12917"/>
+	<meta name="Description" content="$settings{'HOSTNAME'}.$settings{'DOMAINNAME'}">
 	<link rel="shortcut icon" href="/favicon.ico" />
-	<script type="text/javascript" src="/include/jquery.js"></script>
+	<script src="/include/jquery.js"></script>
 
-	<script type="text/javascript">
+	<script>
 		function swapVisibility(id) {
 			\$('#' + id).toggle();
 		}
@@ -137,12 +140,12 @@ sub openpage {
 END
 
 	foreach my $stylesheet (@stylesheets) {
-		print "<link href=\"/themes/ipfire/include/css/$stylesheet\" rel=\"stylesheet\" type=\"text/css\" />\n";
+		print "<link href=\"/themes/ipfire/include/css/$stylesheet\" rel=\"stylesheet\" />\n";
 	}
 
 if ($settings{'SPEED'} ne 'off') {
 print <<END
-	<script type="text/javascript" src="/themes/ipfire/include/js/refreshInetInfo.js"></script>
+	<script src="/themes/ipfire/include/js/refreshInetInfo.js"></script>
 END
 ;
 }
@@ -152,8 +155,8 @@ END
 	<body>
 		<div id="header" class="fixed">
 			<div id="logo">
-				<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;"/>
+				<a href="https://www.ipfire.org" aria-label="ipfire logo" style="text-decoration: none;">
+					<img src="/themes/ipfire/images/tux2.png" alt="ipfire logo" style="float:left; margin-left: -3px; margin-top: -3px;"/>
 END
 ;
 	if ($settings{'WINDOWWITHHOSTNAME'} ne 'off') {

From 3396673ccd09bf291418950d3fb704762d6a7af0 Mon Sep 17 00:00:00 2001
From: Dominic Taylor <dominic@dominictaylor.dev>
Date: Mon, 19 Aug 2019 23:28:05 +0100
Subject: [PATCH 2/5] add rel=nopener to all links that contain target=blank
 https://developers.google.com/web/tools/lighthouse/audits/noopener

---
 doc/language_issues.en                            | 2 +-
 doc/language_issues.es                            | 2 +-
 doc/language_issues.it                            | 2 +-
 doc/language_issues.nl                            | 2 +-
 doc/language_issues.pl                            | 2 +-
 doc/language_issues.ru                            | 2 +-
 doc/language_issues.tr                            | 2 +-
 html/cgi-bin/credits.cgi                          | 4 ++--
 html/cgi-bin/dns.cgi                              | 2 +-
 html/cgi-bin/fireinfo.cgi                         | 4 ++--
 html/cgi-bin/logs.cgi/calamaris.dat               | 8 ++++----
 html/cgi-bin/proxy.cgi                            | 2 +-
 html/html/clwarn.cgi                              | 2 +-
 html/html/redirect-templates/legacy/template.html | 2 +-
 html/html/themes/ipfire/include/functions.pl      | 4 ++--
 langs/de/cgi-bin/de.pl                            | 6 +++---
 langs/en/cgi-bin/en.pl                            | 8 ++++----
 langs/fr/cgi-bin/fr.pl                            | 8 ++++----
 langs/it/cgi-bin/it.pl                            | 6 +++---
 langs/nl/cgi-bin/nl.pl                            | 6 +++---
 langs/pl/cgi-bin/pl.pl                            | 6 +++---
 langs/ru/cgi-bin/ru.pl                            | 6 +++---
 langs/tr/cgi-bin/tr.pl                            | 6 +++---
 23 files changed, 47 insertions(+), 47 deletions(-)

diff --git a/doc/language_issues.en b/doc/language_issues.en
index 9ca53b50a1..d165923ca5 100644
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -307,7 +307,7 @@ WARNING: untranslated string: advproxy wpad example dst_noproxy_ip = e.g. 192.16
 WARNING: untranslated string: advproxy wpad example dst_noproxy_url = e.g. *.ipfire.org*
 WARNING: untranslated string: advproxy wpad label dst_noproxy_ip = Excluded IP Subnets (one per line)
 WARNING: untranslated string: advproxy wpad label dst_noproxy_url = Excluded URL s (one per line)
-WARNING: untranslated string: advproxy wpad notice = Notice: For WPAD/PAC to work properly, furtcher changes need to be made. Please see the <a href="https://wiki.ipfire.org/configuration/network/proxy/extend/wpad" target="_blank">Wiki</a>.
+WARNING: untranslated string: advproxy wpad notice = Notice: For WPAD/PAC to work properly, furtcher changes need to be made. Please see the <a href="https://wiki.ipfire.org/configuration/network/proxy/extend/wpad" target="_blank" rel="noopener">Wiki</a>.
 WARNING: untranslated string: advproxy wpad title = Web Proxy Auto-Discovery Protocol (WPAD) / Proxy Auto-Config (PAC)
 WARNING: untranslated string: advproxy wpad view pac = Open PAC File
 WARNING: untranslated string: age second = second
diff --git a/doc/language_issues.es b/doc/language_issues.es
index 2af165d6b1..81ed5f6a49 100644
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -727,7 +727,7 @@ WARNING: untranslated string: advproxy wpad example dst_noproxy_ip = e.g. 192.16
 WARNING: untranslated string: advproxy wpad example dst_noproxy_url = e.g. *.ipfire.org*
 WARNING: untranslated string: advproxy wpad label dst_noproxy_ip = Excluded IP Subnets (one per line)
 WARNING: untranslated string: advproxy wpad label dst_noproxy_url = Excluded URL s (one per line)
-WARNING: untranslated string: advproxy wpad notice = Notice: For WPAD/PAC to work properly, furtcher changes need to be made. Please see the <a href="https://wiki.ipfire.org/configuration/network/proxy/extend/wpad" target="_blank">Wiki</a>.
+WARNING: untranslated string: advproxy wpad notice = Notice: For WPAD/PAC to work properly, furtcher changes need to be made. Please see the <a href="https://wiki.ipfire.org/configuration/network/proxy/extend/wpad" target="_blank" rel="noopener">Wiki</a>.
 WARNING: untranslated string: advproxy wpad title = Web Proxy Auto-Discovery Protocol (WPAD) / Proxy Auto-Config (PAC)
 WARNING: untranslated string: advproxy wpad view pac = Open PAC File
 WARNING: untranslated string: age second = second
diff --git a/doc/language_issues.it b/doc/language_issues.it
index 59c6499541..eed99f4682 100644
--- a/doc/language_issues.it
+++ b/doc/language_issues.it
@@ -804,7 +804,7 @@ WARNING: untranslated string: advproxy wpad example dst_noproxy_ip = e.g. 192.16
 WARNING: untranslated string: advproxy wpad example dst_noproxy_url = e.g. *.ipfire.org*
 WARNING: untranslated string: advproxy wpad label dst_noproxy_ip = Excluded IP Subnets (one per line)
 WARNING: untranslated string: advproxy wpad label dst_noproxy_url = Excluded URL s (one per line)
-WARNING: untranslated string: advproxy wpad notice = Notice: For WPAD/PAC to work properly, furtcher changes need to be made. Please see the <a href="https://wiki.ipfire.org/configuration/network/proxy/extend/wpad" target="_blank">Wiki</a>.
+WARNING: untranslated string: advproxy wpad notice = Notice: For WPAD/PAC to work properly, furtcher changes need to be made. Please see the <a href="https://wiki.ipfire.org/configuration/network/proxy/extend/wpad" target="_blank" rel="noopener">Wiki</a>.
 WARNING: untranslated string: advproxy wpad title = Web Proxy Auto-Discovery Protocol (WPAD) / Proxy Auto-Config (PAC)
 WARNING: untranslated string: advproxy wpad view pac = Open PAC File
 WARNING: untranslated string: application layer gateways = Application Layer Gateways
diff --git a/doc/language_issues.nl b/doc/language_issues.nl
index 836745e5af..f1076d1a7c 100644
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -798,7 +798,7 @@ WARNING: untranslated string: advproxy wpad example dst_noproxy_ip = e.g. 192.16
 WARNING: untranslated string: advproxy wpad example dst_noproxy_url = e.g. *.ipfire.org*
 WARNING: untranslated string: advproxy wpad label dst_noproxy_ip = Excluded IP Subnets (one per line)
 WARNING: untranslated string: advproxy wpad label dst_noproxy_url = Excluded URL s (one per line)
-WARNING: untranslated string: advproxy wpad notice = Notice: For WPAD/PAC to work properly, furtcher changes need to be made. Please see the <a href="https://wiki.ipfire.org/configuration/network/proxy/extend/wpad" target="_blank">Wiki</a>.
+WARNING: untranslated string: advproxy wpad notice = Notice: For WPAD/PAC to work properly, furtcher changes need to be made. Please see the <a href="https://wiki.ipfire.org/configuration/network/proxy/extend/wpad" target="_blank" rel="noopener">Wiki</a>.
 WARNING: untranslated string: advproxy wpad title = Web Proxy Auto-Discovery Protocol (WPAD) / Proxy Auto-Config (PAC)
 WARNING: untranslated string: advproxy wpad view pac = Open PAC File
 WARNING: untranslated string: application layer gateways = Application Layer Gateways
diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index 2af165d6b1..81ed5f6a49 100644
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -727,7 +727,7 @@
 WARNING: untranslated string: advproxy wpad example dst_noproxy_url = e.g. *.ipfire.org*
 WARNING: untranslated string: advproxy wpad label dst_noproxy_ip = Excluded IP Subnets (one per line)
 WARNING: untranslated string: advproxy wpad label dst_noproxy_url = Excluded URL s (one per line)
-WARNING: untranslated string: advproxy wpad notice = Notice: For WPAD/PAC to work properly, furtcher changes need to be made. Please see the <a href="https://wiki.ipfire.org/configuration/network/proxy/extend/wpad" target="_blank">Wiki</a>.
+WARNING: untranslated string: advproxy wpad notice = Notice: For WPAD/PAC to work properly, furtcher changes need to be made. Please see the <a href="https://wiki.ipfire.org/configuration/network/proxy/extend/wpad" target="_blank" rel="noopener">Wiki</a>.
 WARNING: untranslated string: advproxy wpad title = Web Proxy Auto-Discovery Protocol (WPAD) / Proxy Auto-Config (PAC)
 WARNING: untranslated string: advproxy wpad view pac = Open PAC File
 WARNING: untranslated string: age second = second
diff --git a/doc/language_issues.ru b/doc/language_issues.ru
index b904157b1b..85c76f0d90 100644
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -729,7 +729,7 @@ WARNING: untranslated string: advproxy wpad example dst_noproxy_ip = e.g. 192.16
 WARNING: untranslated string: advproxy wpad example dst_noproxy_url = e.g. *.ipfire.org*
 WARNING: untranslated string: advproxy wpad label dst_noproxy_ip = Excluded IP Subnets (one per line)
 WARNING: untranslated string: advproxy wpad label dst_noproxy_url = Excluded URL s (one per line)
-WARNING: untranslated string: advproxy wpad notice = Notice: For WPAD/PAC to work properly, furtcher changes need to be made. Please see the <a href="https://wiki.ipfire.org/configuration/network/proxy/extend/wpad" target="_blank">Wiki</a>.
+WARNING: untranslated string: advproxy wpad notice = Notice: For WPAD/PAC to work properly, furtcher changes need to be made. Please see the <a href="https://wiki.ipfire.org/configuration/network/proxy/extend/wpad" target="_blank" rel="noopener">Wiki</a>.
 WARNING: untranslated string: advproxy wpad title = Web Proxy Auto-Discovery Protocol (WPAD) / Proxy Auto-Config (PAC)
 WARNING: untranslated string: advproxy wpad view pac = Open PAC File
 WARNING: untranslated string: age second = second
diff --git a/doc/language_issues.tr b/doc/language_issues.tr
index cf773d8cbd..264188d314 100644
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -790,7 +790,7 @@ WARNING: untranslated string: advproxy wpad example dst_noproxy_ip = e.g. 192.16
 WARNING: untranslated string: advproxy wpad example dst_noproxy_url = e.g. *.ipfire.org*
 WARNING: untranslated string: advproxy wpad label dst_noproxy_ip = Excluded IP Subnets (one per line)
 WARNING: untranslated string: advproxy wpad label dst_noproxy_url = Excluded URL s (one per line)
-WARNING: untranslated string: advproxy wpad notice = Notice: For WPAD/PAC to work properly, furtcher changes need to be made. Please see the <a href="https://wiki.ipfire.org/configuration/network/proxy/extend/wpad" target="_blank">Wiki</a>.
+WARNING: untranslated string: advproxy wpad notice = Notice: For WPAD/PAC to work properly, furtcher changes need to be made. Please see the <a href="https://wiki.ipfire.org/configuration/network/proxy/extend/wpad" target="_blank" rel="noopener">Wiki</a>.
 WARNING: untranslated string: advproxy wpad title = Web Proxy Auto-Discovery Protocol (WPAD) / Proxy Auto-Config (PAC)
 WARNING: untranslated string: advproxy wpad view pac = Open PAC File
 WARNING: untranslated string: bytes = unknown string
diff --git a/html/cgi-bin/credits.cgi b/html/cgi-bin/credits.cgi
index 5031e40889..2fb7fdc47f 100644
--- a/html/cgi-bin/credits.cgi
+++ b/html/cgi-bin/credits.cgi
@@ -54,7 +54,7 @@ END
 print <<END
 <br>
 <center>
-	$Lang::tr{'visit us at'}: <b><a href='https://www.ipfire.org/' target="_blank">https://www.ipfire.org/</a></b>
+	$Lang::tr{'visit us at'}: <b><a href='https://www.ipfire.org/' target="_blank" rel="noopener">https://www.ipfire.org/</a></b>
 </center>
 <br><br>
 
@@ -147,7 +147,7 @@ END
 print <<END
 	<p>
 		This product includes GeoLite data created by MaxMind, available from
-		<a href='http://www.maxmind.com/' target="_blank">http://www.maxmind.com/</a>.
+		<a href='http://www.maxmind.com/' target="_blank" rel="noopener">http://www.maxmind.com/</a>.
 	</p>
 END
 ;
diff --git a/html/cgi-bin/dns.cgi b/html/cgi-bin/dns.cgi
index 314107df90..e5832a5608 100644
--- a/html/cgi-bin/dns.cgi
+++ b/html/cgi-bin/dns.cgi
@@ -91,7 +91,7 @@ print <<END
 
 <table border="0"  width='100%'>
   <tr>
-    <td colspan="2"><font class='base'>$Lang::tr{'dns desc'}<br /><img src="/images/dns_link.png" border="0" align="absmiddle"/><a href="http://wiki.ipfire.org/en/dns/public-servers" target="_blank">$Lang::tr{'dns list'}</a></font></td>
+    <td colspan="2"><font class='base'>$Lang::tr{'dns desc'}<br /><img src="/images/dns_link.png" border="0" align="absmiddle"/><a href="http://wiki.ipfire.org/en/dns/public-servers" target="_blank" rel="noopener">$Lang::tr{'dns list'}</a></font></td>
   </tr>
   <tr>
     <td colspan="2">&nbsp;</td>
diff --git a/html/cgi-bin/fireinfo.cgi b/html/cgi-bin/fireinfo.cgi
index 08fee3d8ac..45be5e45bd 100644
--- a/html/cgi-bin/fireinfo.cgi
+++ b/html/cgi-bin/fireinfo.cgi
@@ -67,7 +67,7 @@ if ($fireinfosettings{'ENABLE_FIREINFO'} ne "on") {
 <font color="$Header::colourred">
 	<p>
 		$Lang::tr{'fireinfo why descr1'}
-		$Lang::tr{'fireinfo why descr2'}<a href="https://fireinfo.ipfire.org" target="_blank">$Lang::tr{'fireinfo why read more'}</a>
+		$Lang::tr{'fireinfo why descr2'}<a href="https://fireinfo.ipfire.org" target="_blank" rel="noopener">$Lang::tr{'fireinfo why read more'}</a>
 	</p>
 </font>
 END
@@ -122,7 +122,7 @@ print <<END;
 	<tr>
 		<td>$Lang::tr{'fireinfo your profile id'}:</td>
 		<td>
-			<a href="https://fireinfo.ipfire.org/profile/$profile_id" target="_blank">$profile_id</a>
+			<a href="https://fireinfo.ipfire.org/profile/$profile_id" target="_blank" rel="noopener">$profile_id</a>
 		</td>
 	</tr>
 	<tr>
diff --git a/html/cgi-bin/logs.cgi/calamaris.dat b/html/cgi-bin/logs.cgi/calamaris.dat
index 07fdf8a880..01740781f8 100644
--- a/html/cgi-bin/logs.cgi/calamaris.dat
+++ b/html/cgi-bin/logs.cgi/calamaris.dat
@@ -255,7 +255,7 @@ END
 	if (-e "$sargdir/today") {
 		print <<END;
 			<td width="25%" align="center">
-				<a href="/proxy-reports/today" target="_blank">$Lang::tr{'proxy reports today'}</a>
+				<a href="/proxy-reports/today" target="_blank" rel="noopener">$Lang::tr{'proxy reports today'}</a>
 			</td>
 END
 	} else {
@@ -270,7 +270,7 @@ END
 	if (-e "$sargdir/daily") {
 		print <<END;
 			<td width="25%" align="center">
-				<a href="/proxy-reports/daily" target="_blank">$Lang::tr{'proxy reports daily'}</a>
+				<a href="/proxy-reports/daily" target="_blank" rel="noopener">$Lang::tr{'proxy reports daily'}</a>
 			</td>
 END
 	} else {
@@ -285,7 +285,7 @@ END
 	if (-e "$sargdir/weekly") {
 		print <<END;
 			<td width="25%" align="center">
-				<a href="/proxy-reports/weekly" target="_blank">$Lang::tr{'proxy reports weekly'}</a>
+				<a href="/proxy-reports/weekly" target="_blank" rel="noopener">$Lang::tr{'proxy reports weekly'}</a>
 			</td>
 END
 	} else {
@@ -300,7 +300,7 @@ END
 	if (-e "$sargdir/monthly") {
 		print <<END;
 			<td width="25%" align="center">
-				<a href="/proxy-reports/monthly" target="_blank">$Lang::tr{'proxy reports monthly'}</a>
+				<a href="/proxy-reports/monthly" target="_blank" rel="noopener">$Lang::tr{'proxy reports monthly'}</a>
 			</td>
 END
 	} else {
diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi
index b639640817..2e3efbbb70 100644
--- a/html/cgi-bin/proxy.cgi
+++ b/html/cgi-bin/proxy.cgi
@@ -1363,7 +1363,7 @@ print <<END
 	<td colspan="4">&nbsp;</td>
 </tr>
 <tr>
-	<td colspan="4">$Lang::tr{'advproxy wpad view pac'}: <a href="http://$ENV{SERVER_ADDR}:81/wpad.dat" target="_blank">http://$ENV{SERVER_ADDR}:81/wpad.dat</a></td>
+	<td colspan="4">$Lang::tr{'advproxy wpad view pac'}: <a href="http://$ENV{SERVER_ADDR}:81/wpad.dat" target="_blank" rel="noopener">http://$ENV{SERVER_ADDR}:81/wpad.dat</a></td>
 </tr>
 <tr>
 	<td colspan="4">&nbsp;</td>
diff --git a/html/html/clwarn.cgi b/html/html/clwarn.cgi
index 44f7f98abc..e7db81bb99 100755
--- a/html/html/clwarn.cgi
+++ b/html/html/clwarn.cgi
@@ -110,7 +110,7 @@ print <<END
 	<td colspan='3' height='60%' valign="bottom" align="right">
 		<font face="verdana,arial,sans serif" color="#656565" size="1">Web Filtering by
 		</font>
-		<a href="http://www.ipfire.org" target="_blank"><b>
+		<a href="http://www.ipfire.org" target="_blank" rel="noopener"><b>
 		<font face="verdana,arial,sans serif" color="#656565" size="1">IPFire</b></a>
 		</font>
 
diff --git a/html/html/redirect-templates/legacy/template.html b/html/html/redirect-templates/legacy/template.html
index 297561e3a7..734858bcd8 100644
--- a/html/html/redirect-templates/legacy/template.html
+++ b/html/html/redirect-templates/legacy/template.html
@@ -51,7 +51,7 @@
 					<font face="verdana,arial,sans serif" color="#656565" size="1">
 						Web Filtering by
 					</font>
-					<a href="http://www.ipfire.org" target="_blank">
+					<a href="http://www.ipfire.org" target="_blank" rel="noopener">
 						<font face="verdana,arial,sans serif" color="#656565" size="1"><b>IPFire</b></font>
 					</a>
 
diff --git a/html/html/themes/ipfire/include/functions.pl b/html/html/themes/ipfire/include/functions.pl
index ed88cc5fbc..275daf07e7 100644
--- a/html/html/themes/ipfire/include/functions.pl
+++ b/html/html/themes/ipfire/include/functions.pl
@@ -208,8 +208,8 @@ ()
 
 	<div id="footer" class='bigbox fixed'>
 		<span class="pull-right">
-			<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>
+			<a href="https://www.ipfire.org/" target="_blank" rel="noopener"><strong>IPFire.org</strong></a> &bull;
+			<a href="https://www.ipfire.org/donate" target="_blank" rel="noopener">$Lang::tr{'support donation'}</a>
 		</span>
 
 		<strong>$system_release</strong>
diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 2e67e495ff..6c408f166f 100644
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -402,7 +402,7 @@
 'advproxy wpad example dst_noproxy_url' => 'z.B. *.ipfire.org*',
 'advproxy wpad label dst_noproxy_ip' => 'Ausgenommene IP-Subnetze (eins pro Zeile)',
 'advproxy wpad label dst_noproxy_url' => 'Ausgenommene URLs (eine pro Zeile)',
-'advproxy wpad notice' => 'Hinweis: Damit WPAD / PAC korrekt funktioniert, sind weitere Anpassungen erforderlich. Bitte in das <a href="https://wiki.ipfire.org/configuration/network/proxy/extend/wpad" target="_blank">Wiki</a> schauen.',
+'advproxy wpad notice' => 'Hinweis: Damit WPAD / PAC korrekt funktioniert, sind weitere Anpassungen erforderlich. Bitte in das <a href="https://wiki.ipfire.org/configuration/network/proxy/extend/wpad" target="_blank" rel="noopener">Wiki</a> schauen.',
 'advproxy wpad title' => 'Web Proxy Auto-Discovery Protocol (WPAD) / Proxy Auto-Config (PAC)',
 'advproxy wpad view pac' => 'PAC-Datei aufrufen',
 'again' => 'Wiederholung:',
@@ -2500,7 +2500,7 @@
 'updxlrtr total files' => 'Gesamtanzahl Dateien im Cache',
 'updxlrtr unknown' => 'Unbekannt',
 'updxlrtr update accelerator' => 'Update-Accelerator',
-'updxlrtr update information' => 'Eine aktualisierte Version steht zum Download bereit. Besuchen Sie <a href="http://update-accelerator.advproxy.net" target="_blank">http://update-accelerator.advproxy.net</a> für weitere Informationen.',
+'updxlrtr update information' => 'Eine aktualisierte Version steht zum Download bereit. Besuchen Sie <a href="http://update-accelerator.advproxy.net" target="_blank" rel="noopener">http://update-accelerator.advproxy.net</a> für weitere Informationen.',
 'updxlrtr update notification' => 'Update-Benachrichtigung!',
 'updxlrtr web proxy service required' => 'Der Web-Proxy muss aktiviert sein, um den Update-Accelerator zu verwenden',
 'updxlrtr week' => 'einer Woche',
@@ -2700,7 +2700,7 @@
 'urlfilter tue' => 'D',
 'urlfilter tuesday' => 'Di',
 'urlfilter unfiltered clients' => 'Ungefilterte IP-Adressen',
-'urlfilter update information' => 'Eine aktualisierte Version steht zum Download bereit. Besuchen Sie <a href="http://www.urlfilter.net" target="_blank">http://www.urlfilter.net</a> für weitere Informationen.',
+'urlfilter update information' => 'Eine aktualisierte Version steht zum Download bereit. Besuchen Sie <a href="http://www.urlfilter.net" target="_blank" rel="noopener">http://www.urlfilter.net</a> für weitere Informationen.',
 'urlfilter update notification' => 'Update-Benachrichtigung!',
 'urlfilter update now' => 'Jetzt updaten',
 'urlfilter update results' => 'Blacklist-Aktualisierungsergebnisse',
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 8b7e63cb86..199a125866 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -386,7 +386,7 @@
 'advproxy unrestricted ip clients' => 'Unrestricted IP addresses (one per line)',
 'advproxy unrestricted mac clients' => 'Unrestricted MAC addresses (one per line)',
 'advproxy update accelerator' => 'Update accelerator',
-'advproxy update information' => 'There is an updated version available for download. Visit <a href="http://www.advproxy.net" target="_blank">http://www.advproxy.net</a> for more information.',
+'advproxy update information' => 'There is an updated version available for download. Visit <a href="http://www.advproxy.net" target="_blank" rel="noopener">http://www.advproxy.net</a> for more information.',
 'advproxy update notification' => 'Update notification!',
 'advproxy upstream password' => 'Upstream password',
 'advproxy upstream proxy' => 'Upstream proxy',
@@ -402,7 +402,7 @@
 'advproxy wpad example dst_noproxy_url' => 'e.g. *.ipfire.org*',
 'advproxy wpad label dst_noproxy_ip' => 'Excluded IP Subnets (one per line)',
 'advproxy wpad label dst_noproxy_url' => 'Excluded URL s (one per line)',
-'advproxy wpad notice' => 'Notice: For WPAD/PAC to work properly, furtcher changes need to be made. Please see the <a href="https://wiki.ipfire.org/configuration/network/proxy/extend/wpad" target="_blank">Wiki</a>.',
+'advproxy wpad notice' => 'Notice: For WPAD/PAC to work properly, furtcher changes need to be made. Please see the <a href="https://wiki.ipfire.org/configuration/network/proxy/extend/wpad" target="_blank" rel="noopener">Wiki</a>.',
 'advproxy wpad title' => 'Web Proxy Auto-Discovery Protocol (WPAD) / Proxy Auto-Config (PAC)',
 'advproxy wpad view pac' => 'Open PAC File',
 'again' => 'Again:',
@@ -2543,7 +2543,7 @@
 'updxlrtr total files' => 'Total files in cache',
 'updxlrtr unknown' => 'Unknown',
 'updxlrtr update accelerator' => 'Update Accelerator',
-'updxlrtr update information' => 'There is an updated version available for download. Visit <a href="http://update-accelerator.advproxy.net" target="_blank">http://update-accelerator.advproxy.net</a> for more information.',
+'updxlrtr update information' => 'There is an updated version available for download. Visit <a href="http://update-accelerator.advproxy.net" target="_blank" rel="noopener">http://update-accelerator.advproxy.net</a> for more information.',
 'updxlrtr update notification' => 'Update notification!',
 'updxlrtr used by' => 'Used by',
 'updxlrtr web proxy service required' => 'Web proxy service must be enabled to use Update Accelerator',
@@ -2745,7 +2745,7 @@
 'urlfilter tue' => 'T',
 'urlfilter tuesday' => 'Tue',
 'urlfilter unfiltered clients' => 'Unfiltered IP addresses',
-'urlfilter update information' => 'There is an updated version available for download. Visit <a href="http://www.urlfilter.net" target="_blank">http://www.urlfilter.net</a> for more information.',
+'urlfilter update information' => 'There is an updated version available for download. Visit <a href="http://www.urlfilter.net" target="_blank" rel="noopener">http://www.urlfilter.net</a> for more information.',
 'urlfilter update notification' => 'Update notification!',
 'urlfilter update now' => 'Update now',
 'urlfilter update results' => 'Blacklist update results',
diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl
index 28af41cfba..1573e9181d 100644
--- a/langs/fr/cgi-bin/fr.pl
+++ b/langs/fr/cgi-bin/fr.pl
@@ -386,7 +386,7 @@
 'advproxy unrestricted ip clients' => 'Adresses IP sans restriction (une par ligne) ',
 'advproxy unrestricted mac clients' => 'Adresses MAC sans restriction (une par ligne) ',
 'advproxy update accelerator' => 'Mise à jour accélérateur',
-'advproxy update information' => 'Une mise à jour est disponible pour le téléchargement. Visitez <a href="http://www.advproxy.net" target="_blank"> http://www.advproxy.net </ a> pour plus d\'informations.',
+'advproxy update information' => 'Une mise à jour est disponible pour le téléchargement. Visitez <a href="http://www.advproxy.net" target="_blank" rel="noopener"> http://www.advproxy.net </ a> pour plus d\'informations.',
 'advproxy update notification' => 'Alerte de mise à jour !',
 'advproxy upstream password' => 'Mot de passe montant ',
 'advproxy upstream proxy' => 'Proxy montant',
@@ -402,7 +402,7 @@
 'advproxy wpad example dst_noproxy_url' => 'Ex. : *.ipfire.org*',
 'advproxy wpad label dst_noproxy_ip' => 'Sous-réseaux IP exclus (un par ligne) ',
 'advproxy wpad label dst_noproxy_url' => 'URL exclus (une par ligne) ',
-'advproxy wpad notice' => 'Note : Pour le fonctionnement correct de WPAD/PAC, d\'autres modifications doivent être apportées. Veuillez consulter le <a href="https://wiki.ipfire.org/configuration/network/proxy/extend/wpad" target="_blank">Wiki</a>.',
+'advproxy wpad notice' => 'Note : Pour le fonctionnement correct de WPAD/PAC, d\'autres modifications doivent être apportées. Veuillez consulter le <a href="https://wiki.ipfire.org/configuration/network/proxy/extend/wpad" target="_blank" rel="noopener">Wiki</a>.',
 'advproxy wpad title' => 'Protocole de détection automatique du proxy web (WPAD) / config automatique du proxy (PAC)',
 'advproxy wpad view pac' => 'Ouvrir fichier PAC ',
 'again' => 'De nouveau :',
@@ -2544,7 +2544,7 @@
 'updxlrtr total files' => 'Total de fichiers dans le cache ',
 'updxlrtr unknown' => 'Inconnu',
 'updxlrtr update accelerator' => 'Configuration',
-'updxlrtr update information' => 'Une nouvelle version est disponible au téléchargement. Visitez <a href="http://update-accelerator.advproxy.net" target="_blank">http://update-accelerator.advproxy.net</a> pour plus d\'information.',
+'updxlrtr update information' => 'Une nouvelle version est disponible au téléchargement. Visitez <a href="http://update-accelerator.advproxy.net" target="_blank" rel="noopener">http://update-accelerator.advproxy.net</a> pour plus d\'information.',
 'updxlrtr update notification' => 'Notification de mise à jour !',
 'updxlrtr used by' => 'Utilisé par',
 'updxlrtr web proxy service required' => 'Le proxy web doit être activé pour utiliser la mise à jour Accélérateur',
@@ -2746,7 +2746,7 @@
 'urlfilter tue' => 'Mar',
 'urlfilter tuesday' => 'Mardi',
 'urlfilter unfiltered clients' => 'Adresses IP non filtrées',
-'urlfilter update information' => 'Une mise à jour est disponible en téléchargement. Visitez <a href="http://www.urlfilter.net" target="_blank">http://www.urlfilter.net</a> pour plus d\'informations.',
+'urlfilter update information' => 'Une mise à jour est disponible en téléchargement. Visitez <a href="http://www.urlfilter.net" target="_blank" rel="noopener">http://www.urlfilter.net</a> pour plus d\'informations.',
 'urlfilter update notification' => 'Mise à jour !',
 'urlfilter update now' => 'Mettre à jour',
 'urlfilter update results' => 'Résultats mise à jour de la liste noire',
diff --git a/langs/it/cgi-bin/it.pl b/langs/it/cgi-bin/it.pl
index 6c9137c28a..bb75a5bc83 100644
--- a/langs/it/cgi-bin/it.pl
+++ b/langs/it/cgi-bin/it.pl
@@ -319,7 +319,7 @@
 'advproxy unrestricted ip clients' => 'Gli indirizzi IP senza restrizioni (uno per riga)',
 'advproxy unrestricted mac clients' => 'Gli indirizzi MAC senza restrizioni (uno per riga)',
 'advproxy update accelerator' => 'Update accelerator',
-'advproxy update information' => 'There is an updated version available for download. Visit <a href="http://www.advproxy.net" target="_blank">http://www.advproxy.net</a> for more information.',
+'advproxy update information' => 'There is an updated version available for download. Visit <a href="http://www.advproxy.net" target="_blank" rel="noopener">http://www.advproxy.net</a> for more information.',
 'advproxy update notification' => 'Update notification!',
 'advproxy upstream password' => 'Upstream password',
 'advproxy upstream proxy' => 'Upstream proxy',
@@ -2300,7 +2300,7 @@
 'updxlrtr total files' => 'Total files in cache',
 'updxlrtr unknown' => 'Unknown',
 'updxlrtr update accelerator' => 'Update Accelerator',
-'updxlrtr update information' => 'There is an updated version available for download. Visit <a href="http://update-accelerator.advproxy.net" target="_blank">http://update-accelerator.advproxy.net</a> for more information.',
+'updxlrtr update information' => 'There is an updated version available for download. Visit <a href="http://update-accelerator.advproxy.net" target="_blank" rel="noopener">http://update-accelerator.advproxy.net</a> for more information.',
 'updxlrtr update notification' => 'Update notification!',
 'updxlrtr used by' => 'Used by',
 'updxlrtr web proxy service required' => 'Web proxy service must be enabled to use Update Accelerator',
@@ -2501,7 +2501,7 @@
 'urlfilter tue' => 'T',
 'urlfilter tuesday' => 'Mar',
 'urlfilter unfiltered clients' => 'Gli indirizzi IP non filtrati',
-'urlfilter update information' => 'There is an updated version available for download. Visit <a href="http://www.urlfilter.net" target="_blank">http://www.urlfilter.net</a> for more information.',
+'urlfilter update information' => 'There is an updated version available for download. Visit <a href="http://www.urlfilter.net" target="_blank" rel="noopener">http://www.urlfilter.net</a> for more information.',
 'urlfilter update notification' => 'Update notification!',
 'urlfilter update now' => 'Aggiorna ora',
 'urlfilter update results' => 'Blacklist update results',
diff --git a/langs/nl/cgi-bin/nl.pl b/langs/nl/cgi-bin/nl.pl
index 5fa89b1acd..92184c10c4 100644
--- a/langs/nl/cgi-bin/nl.pl
+++ b/langs/nl/cgi-bin/nl.pl
@@ -318,7 +318,7 @@
 'advproxy unrestricted ip clients' => 'Onbeperkte IP-adressen (een per regel)',
 'advproxy unrestricted mac clients' => 'Onbeperkte MAC-adressen (een per regel)',
 'advproxy update accelerator' => 'Update versneller',
-'advproxy update information' => 'Er is een geüpdatete versie beschikbaar. Bezoek <a href="http://www.advproxy.net" target="_blank">http://www.advproxy.net</a> voor meer informatie.',
+'advproxy update information' => 'Er is een geüpdatete versie beschikbaar. Bezoek <a href="http://www.advproxy.net" target="_blank" rel="noopener">http://www.advproxy.net</a> voor meer informatie.',
 'advproxy update notification' => 'Update notificatie!',
 'advproxy upstream password' => 'Upstream wachtwoord',
 'advproxy upstream proxy' => 'Upstream proxy',
@@ -2246,7 +2246,7 @@
 'updxlrtr total files' => 'Totaal aantal bestanden in cache',
 'updxlrtr unknown' => 'Onbekend',
 'updxlrtr update accelerator' => 'Updateversneller',
-'updxlrtr update information' => 'Er is een nieuwere versie beschikbaar voor download. Bezoek <a href="http://update-accelerator.advproxy.net" target="_blank">http://update-accelerator.advproxy.net</a> voor meer informatie.',
+'updxlrtr update information' => 'Er is een nieuwere versie beschikbaar voor download. Bezoek <a href="http://update-accelerator.advproxy.net" target="_blank" rel="noopener">http://update-accelerator.advproxy.net</a> voor meer informatie.',
 'updxlrtr update notification' => 'Update notificatie!',
 'updxlrtr used by' => 'Gebruikt door',
 'updxlrtr web proxy service required' => 'Web proxy service moet ingeschakeld zijn om de updateversneller te kunnen gebruiken.',
@@ -2446,7 +2446,7 @@
 'urlfilter tue' => 'D',
 'urlfilter tuesday' => 'Din',
 'urlfilter unfiltered clients' => 'Ongefilterde IP-adressen',
-'urlfilter update information' => 'Er is een nieuwere versie beschikbaar om te downloaden. Bezoek <a href="http://www.urlfilter.net" target="_blank">http://www.urlfilter.net</a> voor meer informatie.',
+'urlfilter update information' => 'Er is een nieuwere versie beschikbaar om te downloaden. Bezoek <a href="http://www.urlfilter.net" target="_blank" rel="noopener">http://www.urlfilter.net</a> voor meer informatie.',
 'urlfilter update notification' => 'Update notificatie!',
 'urlfilter update now' => 'Update nu',
 'urlfilter update results' => 'Zware lijst update-resultaten',
diff --git a/langs/pl/cgi-bin/pl.pl b/langs/pl/cgi-bin/pl.pl
index 521381af2d..cb95e19d7f 100644
--- a/langs/pl/cgi-bin/pl.pl
+++ b/langs/pl/cgi-bin/pl.pl
@@ -306,7 +306,7 @@
 'advproxy unrestricted ip clients' => 'Adresy IP bez ograniczeń (jeden w linii)',
 'advproxy unrestricted mac clients' => 'Adresy MAC bez ograniczeń (jeden w linii)',
 'advproxy update accelerator' => 'Update accelerator',
-'advproxy update information' => 'Dostępna jest nowsza wersja do pobrania. Odwiedź <a href="http://www.advproxy.net" target="_blank">http://www.advproxy.net</a> aby uzyskać dodatkowe informacje.',
+'advproxy update information' => 'Dostępna jest nowsza wersja do pobrania. Odwiedź <a href="http://www.advproxy.net" target="_blank" rel="noopener">http://www.advproxy.net</a> aby uzyskać dodatkowe informacje.',
 'advproxy update notification' => 'Aktualizacja dostępna!',
 'advproxy upstream password' => 'Upstream password',
 'advproxy upstream proxy' => 'Upstream proxy',
@@ -1844,7 +1844,7 @@
 'updxlrtr total files' => 'Liczba plików w cache',
 'updxlrtr unknown' => 'Nieznany',
 'updxlrtr update accelerator' => 'Update Accelerator',
-'updxlrtr update information' => 'Dostępna jest nowsza wersja do pobrania. Wejdź na stronę <a href="http://update-accelerator.advproxy.net" target="_blank">http://update-accelerator.advproxy.net</a> aby uzyskać więcej informacji.',
+'updxlrtr update information' => 'Dostępna jest nowsza wersja do pobrania. Wejdź na stronę <a href="http://update-accelerator.advproxy.net" target="_blank" rel="noopener">http://update-accelerator.advproxy.net</a> aby uzyskać więcej informacji.',
 'updxlrtr update notification' => 'Informacja o aktualizacji!',
 'updxlrtr web proxy service required' => 'Usługa Web proxy musi być włączona aby używać Update Accelerator',
 'updxlrtr week' => 'tygodnia',
@@ -2039,7 +2039,7 @@
 'urlfilter tue' => 'W',
 'urlfilter tuesday' => 'Wto',
 'urlfilter unfiltered clients' => 'Niefiltrowane adresy IP',
-'urlfilter update information' => 'Dostępna jest nowsza wersja do pobrania. Wejdź na stronę <a href="http://www.urlfilter.net" target="_blank">http://www.urlfilter.net</a> aby uzyskać więcej informacji.',
+'urlfilter update information' => 'Dostępna jest nowsza wersja do pobrania. Wejdź na stronę <a href="http://www.urlfilter.net" target="_blank" rel="noopener">http://www.urlfilter.net</a> aby uzyskać więcej informacji.',
 'urlfilter update notification' => 'Informacja o aktualizacji!',
 'urlfilter update now' => 'Aktualizuj teraz',
 'urlfilter update results' => 'Wyniki aktualizacja czarnej listy',
diff --git a/langs/ru/cgi-bin/ru.pl b/langs/ru/cgi-bin/ru.pl
index 9ac46d459c..3eaa2ac5d0 100644
--- a/langs/ru/cgi-bin/ru.pl
+++ b/langs/ru/cgi-bin/ru.pl
@@ -304,7 +304,7 @@
 'advproxy unrestricted ip clients' => 'Неограниченные IP адреса (один на строчку)',
 'advproxy unrestricted mac clients' => 'Неограниченные MAC адреса (один на строчку)',
 'advproxy update accelerator' => 'Ускоритель обновления',
-'advproxy update information' => 'Доступна новая версия для загрузки. Зайдите на <a href="http://www.advproxy.net" target="_blank">http://www.advproxy.net</a> для получения информации.',
+'advproxy update information' => 'Доступна новая версия для загрузки. Зайдите на <a href="http://www.advproxy.net" target="_blank" rel="noopener">http://www.advproxy.net</a> для получения информации.',
 'advproxy update notification' => 'Сообщение об обновлении!',
 'advproxy upstream password' => 'Пароль на выход',
 'advproxy upstream proxy' => 'Исходящий proxy',
@@ -1839,7 +1839,7 @@
 'updxlrtr total files' => 'Общее число файлов в кэше',
 'updxlrtr unknown' => 'Неизвестно',
 'updxlrtr update accelerator' => 'Ускоритель обновлений',
-'updxlrtr update information' => 'Имеется обновлённая версия. Зайдите на <a href="http://update-accelerator.advproxy.net" target="_blank">http://update-accelerator.advproxy.net</a> для получения полной информации.',
+'updxlrtr update information' => 'Имеется обновлённая версия. Зайдите на <a href="http://update-accelerator.advproxy.net" target="_blank" rel="noopener">http://update-accelerator.advproxy.net</a> для получения полной информации.',
 'updxlrtr update notification' => 'Уведомление об обновлении!',
 'updxlrtr web proxy service required' => 'Необходимо включить сервис Web proxy для работы ускорителя обновлений',
 'updxlrtr week' => 'одна неделя',
@@ -2034,7 +2034,7 @@
 'urlfilter tue' => 'T',
 'urlfilter tuesday' => 'Вт',
 'urlfilter unfiltered clients' => 'Нефильтруемые IP адреса',
-'urlfilter update information' => 'Доступна обновлённая версия. Зайдите на <a href="http://www.urlfilter.net" target="_blank">http://www.urlfilter.net</a> Для получения информации.',
+'urlfilter update information' => 'Доступна обновлённая версия. Зайдите на <a href="http://www.urlfilter.net" target="_blank" rel="noopener">http://www.urlfilter.net</a> Для получения информации.',
 'urlfilter update notification' => 'Update notification!',
 'urlfilter update now' => 'Обновить сейчас',
 'urlfilter update results' => 'Результаты обновления чёрного списка',
diff --git a/langs/tr/cgi-bin/tr.pl b/langs/tr/cgi-bin/tr.pl
index 1917b82416..1569fde6fa 100644
--- a/langs/tr/cgi-bin/tr.pl
+++ b/langs/tr/cgi-bin/tr.pl
@@ -382,7 +382,7 @@
 'advproxy unrestricted ip clients' => 'Yasaksız IP adresleri (her satırda bir tane)',
 'advproxy unrestricted mac clients' => 'Yasaksız MAC adresleri (her satırda bir tane)',
 'advproxy update accelerator' => 'Güncelleme hızlandırıcısı',
-'advproxy update information' => 'Yüklenebilir güncelleştirilmiş bir sürümü vardır. Daha fazla bilgi için <a href="http://www.advproxy.net" target="_blank">http://www.advproxy.net</a> adresini ziyaret edebilirsiniz.',
+'advproxy update information' => 'Yüklenebilir güncelleştirilmiş bir sürümü vardır. Daha fazla bilgi için <a href="http://www.advproxy.net" target="_blank" rel="noopener">http://www.advproxy.net</a> adresini ziyaret edebilirsiniz.',
 'advproxy update notification' => 'Güncelleme bildirimi!',
 'advproxy upstream password' => 'Gönderim parolası',
 'advproxy upstream proxy' => 'Gönderim vekili',
@@ -2463,7 +2463,7 @@
 'updxlrtr total files' => 'Önbellekteki toplam dosya',
 'updxlrtr unknown' => 'Bilinmeyen',
 'updxlrtr update accelerator' => 'Güncelleme hızlandırıcısı',
-'updxlrtr update information' => 'Yüklenebilir bir güncelleştirime sürümü var. Daha fazla bilgi için <a href="http://update-accelerator.advproxy.net" target="_blank">http://update-accelerator.advproxy.net</a> adresini ziyaret edin.',
+'updxlrtr update information' => 'Yüklenebilir bir güncelleştirime sürümü var. Daha fazla bilgi için <a href="http://update-accelerator.advproxy.net" target="_blank" rel="noopener">http://update-accelerator.advproxy.net</a> adresini ziyaret edin.',
 'updxlrtr update notification' => 'Güncelleme bildirimi!',
 'updxlrtr used by' => 'Kullanan',
 'updxlrtr web proxy service required' => 'Web vekil sunucu hizmeti güncelleme hızlandırıcı kullanmak için aktif olmalıdır',
@@ -2665,7 +2665,7 @@
 'urlfilter tue' => 'S',
 'urlfilter tuesday' => 'Sal',
 'urlfilter unfiltered clients' => 'Yasaksız IP adresleri',
-'urlfilter update information' => 'Yüklenebilir güncelleştirilmiş bir sürümü var. Daha fazla bilgi için <a href="http://www.urlfilter.net" target="_blank">http://www.urlfilter.net</a> adresini ziyaret edin.',
+'urlfilter update information' => 'Yüklenebilir güncelleştirilmiş bir sürümü var. Daha fazla bilgi için <a href="http://www.urlfilter.net" target="_blank" rel="noopener">http://www.urlfilter.net</a> adresini ziyaret edin.',
 'urlfilter update notification' => 'Güncelleme bildirimi!',
 'urlfilter update now' => 'Şimdi Güncelle',
 'urlfilter update results' => 'Kara liste güncelleştirme sonuçları',

From b12bffe560866bf799a99912d64e2dfd3d7be3ee Mon Sep 17 00:00:00 2001
From: Dominic Taylor <dominic@dominictaylor.dev>
Date: Mon, 19 Aug 2019 23:29:02 +0100
Subject: [PATCH 3/5] change all http links to https for wiki.ipfire.org

---
 config/cdrom/README.txt             | 2 +-
 config/cfgroot/general-functions.pl | 2 +-
 html/cgi-bin/dns.cgi                | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/config/cdrom/README.txt b/config/cdrom/README.txt
index e342bc401e..e031593649 100644
--- a/config/cdrom/README.txt
+++ b/config/cdrom/README.txt
@@ -5,7 +5,7 @@ Installation
 ------------
 
 Please read the IPFire Installation manual before installing the firewall.
-This document is located on our wiki (http://wiki.ipfire.org/en/installation/start)
+This document is located on our wiki (https://wiki.ipfire.org/en/installation/start)
 It will guide you through the installation process and will help 
 you make the necessary decisions during the installation process.
 
diff --git a/config/cfgroot/general-functions.pl b/config/cfgroot/general-functions.pl
index aefcfb6878..430ec4904d 100644
--- a/config/cfgroot/general-functions.pl
+++ b/config/cfgroot/general-functions.pl
@@ -25,7 +25,7 @@ package General;
 $General::version = 'VERSION';
 $General::swroot = 'CONFIG_ROOT';
 $General::noipprefix = 'noipg-';
-$General::adminmanualurl = 'http://wiki.ipfire.org';
+$General::adminmanualurl = 'https://wiki.ipfire.org';
 
 require "${General::swroot}/network-functions.pl";
 
diff --git a/html/cgi-bin/dns.cgi b/html/cgi-bin/dns.cgi
index e5832a5608..44d1e7102d 100644
--- a/html/cgi-bin/dns.cgi
+++ b/html/cgi-bin/dns.cgi
@@ -91,7 +91,7 @@ print <<END
 
 <table border="0"  width='100%'>
   <tr>
-    <td colspan="2"><font class='base'>$Lang::tr{'dns desc'}<br /><img src="/images/dns_link.png" border="0" align="absmiddle"/><a href="http://wiki.ipfire.org/en/dns/public-servers" target="_blank" rel="noopener">$Lang::tr{'dns list'}</a></font></td>
+    <td colspan="2"><font class='base'>$Lang::tr{'dns desc'}<br /><img src="/images/dns_link.png" border="0" align="absmiddle"/><a href="https://wiki.ipfire.org/en/dns/public-servers" target="_blank" rel="noopener">$Lang::tr{'dns list'}</a></font></td>
   </tr>
   <tr>
     <td colspan="2">&nbsp;</td>

From fd8b94e6f00ee166c203d910157c409e2c8371a1 Mon Sep 17 00:00:00 2001
From: Dominic Taylor <dominic@dominictaylor.dev>
Date: Mon, 19 Aug 2019 23:40:31 +0100
Subject: [PATCH 4/5] update all links to www.ipfire.org from http to https

---
 config/motion/motion.conf                             | 2 +-
 config/upnp/gatedesc.xml                              | 8 ++++----
 html/cgi-bin/webaccess.cgi                            | 2 +-
 html/html/clwarn.cgi                                  | 2 +-
 html/html/redirect-templates/legacy/template.html     | 2 +-
 html/html/themes/ipfire/include/js/refreshInetInfo.js | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/config/motion/motion.conf b/config/motion/motion.conf
index 0d2853ada2..b1150e3aec 100644
--- a/config/motion/motion.conf
+++ b/config/motion/motion.conf
@@ -321,7 +321,7 @@ text_right %Y-%m-%d\n%T-%q
 # Draw a user defined text on the images using same options as C function strftime(3)
 # Default: Not defined = no text
 # Text is placed in lower left corner
-text_left CAMERA %t\nhttp://www.ipfire.org
+text_left CAMERA %t\nhttps://www.ipfire.org
 
 # Draw the number of changed pixed on the images (default: off)
 # Will normally be set to off except when you setup and adjust the motion settings
diff --git a/config/upnp/gatedesc.xml b/config/upnp/gatedesc.xml
index a0608bb532..3a3bbb36ec 100755
--- a/config/upnp/gatedesc.xml
+++ b/config/upnp/gatedesc.xml
@@ -8,7 +8,7 @@
 		<deviceType>urn:schemas-upnp-org:device:InternetGatewayDevice:1</deviceType>
 		<friendlyName>IPFire UPnP Device</friendlyName>
 		<manufacturer>IPFire Project</manufacturer>
-		<manufacturerURL>http://www.ipfire.org</manufacturerURL>
+		<manufacturerURL>https://www.ipfire.org</manufacturerURL>
 		<modelName>IPFire 2.3</modelName>
 		<UDN>uuid:75802409-bccb-40e7-8e6c-fa095ecce13e</UDN>
 		<iconList>
@@ -34,7 +34,7 @@
 				<deviceType>urn:schemas-upnp-org:device:WANDevice:1</deviceType>
 				<friendlyName>WANDevice</friendlyName>
 				<manufacturer>IPFire Project</manufacturer>
-				<manufacturerURL>http://www.ipfire.org</manufacturerURL>
+				<manufacturerURL>https://www.ipfire.org</manufacturerURL>
 				<modelDescription>WAN Device on Linux IGD</modelDescription>
 				<modelName>IPFire</modelName>
 				<modelNumber>2.3</modelNumber>
@@ -56,11 +56,11 @@
 						<deviceType>urn:schemas-upnp-org:device:WANConnectionDevice:1</deviceType>
 						<friendlyName>Internet Connection</friendlyName>
 						<manufacturer>IPFire Project</manufacturer>
-						<manufacturerURL>http://www.ipfire.org</manufacturerURL>
+						<manufacturerURL>https://www.ipfire.org</manufacturerURL>
 						<modelDescription>Internet connection on Linux IPFire Firewall</modelDescription>
 						<modelName>IPFire</modelName>
 						<modelNumber>2.3</modelNumber>
-						<modelURL>http://www.ipfire.org</modelURL>
+						<modelURL>https://www.ipfire.org</modelURL>
 						<serialNumber>2.3</serialNumber>
 						<UDN>uuid:75802409-bccb-40e7-8e6c-fa095ecce13e</UDN>
 						<UPC>Linux IGD</UPC>
diff --git a/html/cgi-bin/webaccess.cgi b/html/cgi-bin/webaccess.cgi
index 0d50f01b1b..e687603f26 100644
--- a/html/cgi-bin/webaccess.cgi
+++ b/html/cgi-bin/webaccess.cgi
@@ -233,7 +233,7 @@ print <<END
    <td bgcolor='#C0C0C0' align='right'>
       <font face='verdana,arial,helvetica' color='#FFFFFF' size='1'>
       <a href='http://www.advproxy.net' target='_blank'>Advanced Proxy</a> running on
-      <a href='http://www.ipfire.org' target='_blank'>IPFire</a>
+      <a href='https://www.ipfire.org' target='_blank'>IPFire</a>
       </font>
    </td>
 </tr>
diff --git a/html/html/clwarn.cgi b/html/html/clwarn.cgi
index e7db81bb99..4e2b8df254 100755
--- a/html/html/clwarn.cgi
+++ b/html/html/clwarn.cgi
@@ -110,7 +110,7 @@ print <<END
 	<td colspan='3' height='60%' valign="bottom" align="right">
 		<font face="verdana,arial,sans serif" color="#656565" size="1">Web Filtering by
 		</font>
-		<a href="http://www.ipfire.org" target="_blank" rel="noopener"><b>
+		<a href="https://www.ipfire.org" target="_blank" rel="noopener"><b>
 		<font face="verdana,arial,sans serif" color="#656565" size="1">IPFire</b></a>
 		</font>
 
diff --git a/html/html/redirect-templates/legacy/template.html b/html/html/redirect-templates/legacy/template.html
index 734858bcd8..7ee293fd2f 100644
--- a/html/html/redirect-templates/legacy/template.html
+++ b/html/html/redirect-templates/legacy/template.html
@@ -51,7 +51,7 @@
 					<font face="verdana,arial,sans serif" color="#656565" size="1">
 						Web Filtering by
 					</font>
-					<a href="http://www.ipfire.org" target="_blank" rel="noopener">
+					<a href="https://www.ipfire.org" target="_blank" rel="noopener">
 						<font face="verdana,arial,sans serif" color="#656565" size="1"><b>IPFire</b></font>
 					</a>
 
diff --git a/html/html/themes/ipfire/include/js/refreshInetInfo.js b/html/html/themes/ipfire/include/js/refreshInetInfo.js
index 7d9cf8fc35..4e326aa524 100644
--- a/html/html/themes/ipfire/include/js/refreshInetInfo.js
+++ b/html/html/themes/ipfire/include/js/refreshInetInfo.js
@@ -3,7 +3,7 @@
 * Modified: March 6th, 2013 by michael@koehler.tk
 * Authors: 	IPFire Team (info@ipfire.org)
 			Kay-Michael Köhler (michael@koehler.tk)
-* Visit http://www.ipfire.org/
+* Visit https://www.ipfire.org/
 */
 
 var t_current;

From 979307b9aabbcdc3240be58c50b5ee39575cc9e9 Mon Sep 17 00:00:00 2001
From: Dominic Taylor <dominic@dominictaylor.dev>
Date: Mon, 19 Aug 2019 23:45:11 +0100
Subject: [PATCH 5/5] add rel=nopener to all links that contain target=blank 02
 https://developers.google.com/web/tools/lighthouse/audits/noopener

---
 html/cgi-bin/gpl.cgi                | 2 +-
 html/cgi-bin/logs.cgi/ids.dat       | 4 ++--
 html/cgi-bin/logs.cgi/urlfilter.dat | 2 +-
 html/cgi-bin/mpfire.cgi             | 2 +-
 html/cgi-bin/proxy.cgi              | 2 +-
 html/cgi-bin/tor.cgi                | 4 ++--
 html/cgi-bin/webaccess.cgi          | 4 ++--
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/html/cgi-bin/gpl.cgi b/html/cgi-bin/gpl.cgi
index 94187ce7a3..2f6c2eca7f 100644
--- a/html/cgi-bin/gpl.cgi
+++ b/html/cgi-bin/gpl.cgi
@@ -74,7 +74,7 @@ print <<END;
 			<input type='submit' name='ACTION' value=$Lang::tr{'yes'} />
 		</form>
 	</p>
-	<a href='http://www.gnu.org/licenses/translations.html' target='_blank'>$Lang::tr{'gpl unofficial translation of the general public license v3'}</a>
+	<a href='http://www.gnu.org/licenses/translations.html' target='_blank' rel='noopener'>$Lang::tr{'gpl unofficial translation of the general public license v3'}</a>
 
 END
 
diff --git a/html/cgi-bin/logs.cgi/ids.dat b/html/cgi-bin/logs.cgi/ids.dat
index 8918bc6da6..6a6c7718c9 100644
--- a/html/cgi-bin/logs.cgi/ids.dat
+++ b/html/cgi-bin/logs.cgi/ids.dat
@@ -348,11 +348,11 @@ END
 	} elsif ($sid < 1000000) {
 		# Link to sourcefire if the the rule sid is less than 1000000.
 		print "<a href='https://www.snort.org/rule_docs/1-$sid' ";
-		print "target='_blank'>$sid</a></td>\n";
+		print "target='_blank' rel='noopener'>$sid</a></td>\n";
 	} elsif ($sid >= 2000000 and $sid < 3000000) {
 		# Link to emergingthreats if the rule sid is between 2000000 and 3000000.
 		print "<a href='http://doc.emergingthreats.net/$sid' ";
-		print "target='_blank'>$sid</a></td>\n";
+		print "target='_blank' rel='noopener'>$sid</a></td>\n";
 	} else {
 		# No external link for user defined rules
 		print $sid;
diff --git a/html/cgi-bin/logs.cgi/urlfilter.dat b/html/cgi-bin/logs.cgi/urlfilter.dat
index 221ed74ac6..52d7ba2861 100644
--- a/html/cgi-bin/logs.cgi/urlfilter.dat
+++ b/html/cgi-bin/logs.cgi/urlfilter.dat
@@ -365,7 +365,7 @@ if ($lines)
 				if (length($dsturl) > 69) { $site .= "..."; }
 			}
 			#print "<td>$site</td>\n";
-			print "<td $col><a href='$dsturl' title='$dsturl' target='_blank'>$site</a></td>\n";
+			print "<td $col><a href='$dsturl' title='$dsturl' target='_blank' rel='noopener'>$site</a></td>\n";
 		}
 		print "</tr>\n";
 	}
diff --git a/html/cgi-bin/mpfire.cgi b/html/cgi-bin/mpfire.cgi
index 6cec8ff338..14fadae72b 100644
--- a/html/cgi-bin/mpfire.cgi
+++ b/html/cgi-bin/mpfire.cgi
@@ -605,7 +605,7 @@ foreach (@webradio){
 	}
 	chomp $stream[1];chomp $stream[2];
 	print <<END
-<td align='left'><a href='$stream[2]' target='_blank'>$stream[1]</a></td>
+<td align='left'><a href='$stream[2]' target='_blank' rel='noopener'>$stream[1]</a></td>
 <td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}'><input type='hidden' name='FILE' value='$stream[0]' /><input type='hidden' name='ACTION' value='playweb' /><input type='image' alt='$Lang::tr{'play'}' title='$Lang::tr{'play'}' src='/images/media-playback-start.png' align='middle' />
 <input type='hidden' name='FRAME' value='$mpfiresettings{'FRAME'}' />
 </form></td>
diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi
index 2e3efbbb70..f1a9b6d556 100644
--- a/html/cgi-bin/proxy.cgi
+++ b/html/cgi-bin/proxy.cgi
@@ -1021,7 +1021,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'}:</td>
+	<td class='base'><a href='/cgi-bin/cachemgr.cgi' target='_blank' rel='noopener'>$Lang::tr{'proxy cachemgr'}:</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>
diff --git a/html/cgi-bin/tor.cgi b/html/cgi-bin/tor.cgi
index d31eb10862..7e50a40991 100644
--- a/html/cgi-bin/tor.cgi
+++ b/html/cgi-bin/tor.cgi
@@ -516,7 +516,7 @@ END
 					<tr>
 						<td width='40%' class='base'>$Lang::tr{'tor relay fingerprint'}:</td>
 						<td width='60%'>
-							<a href='https://metrics.torproject.org/rs.html#details/$fingerprint' target='_blank'>$fingerprint</a>
+							<a href='https://metrics.torproject.org/rs.html#details/$fingerprint' target='_blank' rel='noopener'>$fingerprint</a>
 						</td>
 					</tr>
 END
@@ -609,7 +609,7 @@ END
 				print <<END;
 					<tr>
 						<td width='40%'>
-							<a href='https://metrics.torproject.org/rs.html#details/$node->{'fingerprint'}' target='_blank'>
+							<a href='https://metrics.torproject.org/rs.html#details/$node->{'fingerprint'}' target='_blank' rel='noopener'>
 								$node->{'name'}
 							</a>
 						</td>
diff --git a/html/cgi-bin/webaccess.cgi b/html/cgi-bin/webaccess.cgi
index e687603f26..ff601eb9ef 100644
--- a/html/cgi-bin/webaccess.cgi
+++ b/html/cgi-bin/webaccess.cgi
@@ -232,8 +232,8 @@ print <<END
 <tr>
    <td bgcolor='#C0C0C0' align='right'>
       <font face='verdana,arial,helvetica' color='#FFFFFF' size='1'>
-      <a href='http://www.advproxy.net' target='_blank'>Advanced Proxy</a> running on
-      <a href='https://www.ipfire.org' target='_blank'>IPFire</a>
+      <a href='http://www.advproxy.net' target='_blank' rel='noopener'>Advanced Proxy</a> running on
+      <a href='https://www.ipfire.org' target='_blank' rel='noopener'>IPFire</a>
       </font>
    </td>
 </tr>
