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/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 @@ urn:schemas-upnp-org:device:InternetGatewayDevice:1 IPFire UPnP Device IPFire Project - http://www.ipfire.org + https://www.ipfire.org IPFire 2.3 uuid:75802409-bccb-40e7-8e6c-fa095ecce13e @@ -34,7 +34,7 @@ urn:schemas-upnp-org:device:WANDevice:1 WANDevice IPFire Project - http://www.ipfire.org + https://www.ipfire.org WAN Device on Linux IGD IPFire 2.3 @@ -56,11 +56,11 @@ urn:schemas-upnp-org:device:WANConnectionDevice:1 Internet Connection IPFire Project - http://www.ipfire.org + https://www.ipfire.org Internet connection on Linux IPFire Firewall IPFire 2.3 - http://www.ipfire.org + https://www.ipfire.org 2.3 uuid:75802409-bccb-40e7-8e6c-fa095ecce13e Linux IGD 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 Wiki. +WARNING: untranslated string: advproxy wpad notice = Notice: For WPAD/PAC to work properly, furtcher changes need to be made. Please see the Wiki. 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 Wiki. +WARNING: untranslated string: advproxy wpad notice = Notice: For WPAD/PAC to work properly, furtcher changes need to be made. Please see the Wiki. 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 Wiki. +WARNING: untranslated string: advproxy wpad notice = Notice: For WPAD/PAC to work properly, furtcher changes need to be made. Please see the Wiki. 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 Wiki. +WARNING: untranslated string: advproxy wpad notice = Notice: For WPAD/PAC to work properly, furtcher changes need to be made. Please see the Wiki. 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 Wiki. +WARNING: untranslated string: advproxy wpad notice = Notice: For WPAD/PAC to work properly, furtcher changes need to be made. Please see the Wiki. 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 Wiki. +WARNING: untranslated string: advproxy wpad notice = Notice: For WPAD/PAC to work properly, furtcher changes need to be made. Please see the Wiki. 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 Wiki. +WARNING: untranslated string: advproxy wpad notice = Notice: For WPAD/PAC to work properly, furtcher changes need to be made. Please see the Wiki. 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 <
- $Lang::tr{'visit us at'}: https://www.ipfire.org/ + $Lang::tr{'visit us at'}: https://www.ipfire.org/


@@ -147,7 +147,7 @@ END print < This product includes GeoLite data created by MaxMind, available from - http://www.maxmind.com/. + http://www.maxmind.com/.

END ; diff --git a/html/cgi-bin/dns.cgi b/html/cgi-bin/dns.cgi index 314107df90..44d1e7102d 100644 --- a/html/cgi-bin/dns.cgi +++ b/html/cgi-bin/dns.cgi @@ -91,7 +91,7 @@ print < - $Lang::tr{'dns desc'}
$Lang::tr{'dns list'} + $Lang::tr{'dns desc'}
$Lang::tr{'dns list'}   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") {

$Lang::tr{'fireinfo why descr1'} - $Lang::tr{'fireinfo why descr2'}$Lang::tr{'fireinfo why read more'} + $Lang::tr{'fireinfo why descr2'}$Lang::tr{'fireinfo why read more'}

END @@ -122,7 +122,7 @@ print < $Lang::tr{'fireinfo your profile id'}: - $profile_id + $profile_id 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 <

- $Lang::tr{'gpl unofficial translation of the general public license v3'} + $Lang::tr{'gpl unofficial translation of the general public license v3'} END 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 < - $Lang::tr{'proxy reports today'} + $Lang::tr{'proxy reports today'} END } else { @@ -270,7 +270,7 @@ END if (-e "$sargdir/daily") { print < - $Lang::tr{'proxy reports daily'} + $Lang::tr{'proxy reports daily'} END } else { @@ -285,7 +285,7 @@ END if (-e "$sargdir/weekly") { print < - $Lang::tr{'proxy reports weekly'} + $Lang::tr{'proxy reports weekly'} END } else { @@ -300,7 +300,7 @@ END if (-e "$sargdir/monthly") { print < - $Lang::tr{'proxy reports monthly'} + $Lang::tr{'proxy reports monthly'} END } else { 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 "$sid\n"; + print "target='_blank' rel='noopener'>$sid\n"; } elsif ($sid >= 2000000 and $sid < 3000000) { # Link to emergingthreats if the rule sid is between 2000000 and 3000000. print "$sid\n"; + print "target='_blank' rel='noopener'>$sid\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 "$site\n"; - print "$site\n"; + print "$site\n"; } print "\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 <$stream[1] +$stream[1]
diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi index b639640817..f1a9b6d556 100644 --- a/html/cgi-bin/proxy.cgi +++ b/html/cgi-bin/proxy.cgi @@ -1021,7 +1021,7 @@ print <$Lang::tr{'advproxy cache management'} - $Lang::tr{'proxy cachemgr'}: + $Lang::tr{'proxy cachemgr'}: $Lang::tr{'advproxy admin mail'}: @@ -1363,7 +1363,7 @@ print <  - $Lang::tr{'advproxy wpad view pac'}: http://$ENV{SERVER_ADDR}:81/wpad.dat + $Lang::tr{'advproxy wpad view pac'}: http://$ENV{SERVER_ADDR}:81/wpad.dat   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 $Lang::tr{'tor relay fingerprint'}: - $fingerprint + $fingerprint END @@ -609,7 +609,7 @@ END print < - + $node->{'name'} diff --git a/html/cgi-bin/webaccess.cgi b/html/cgi-bin/webaccess.cgi index 0d50f01b1b..ff601eb9ef 100644 --- a/html/cgi-bin/webaccess.cgi +++ b/html/cgi-bin/webaccess.cgi @@ -232,8 +232,8 @@ print < - Advanced Proxy running on - IPFire + Advanced Proxy running on + IPFire diff --git a/html/html/clwarn.cgi b/html/html/clwarn.cgi index 44f7f98abc..4e2b8df254 100755 --- a/html/html/clwarn.cgi +++ b/html/html/clwarn.cgi @@ -110,7 +110,7 @@ print < Web Filtering by - + IPFire diff --git a/html/html/redirect-templates/legacy/template.html b/html/html/redirect-templates/legacy/template.html index 297561e3a7..7ee293fd2f 100644 --- a/html/html/redirect-templates/legacy/template.html +++ b/html/html/redirect-templates/legacy/template.html @@ -51,7 +51,7 @@ Web Filtering by - + IPFire diff --git a/html/html/themes/ipfire/include/functions.pl b/html/html/themes/ipfire/include/functions.pl index 9aec77497b..275daf07e7 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 "
    "; foreach my $item (sort keys %$submenus) { $link = getlink($submenus->{$item}); @@ -126,10 +126,13 @@ sub openpage { $headline - $title $extrahead + + + - + - + END ; } @@ -152,8 +155,8 @@ END