Fixup URLs:

- Replace http by https
- *.pfsense.com -> *.pfsense.org
- www.pfsense.org/packages/config -> packages.pfsense.org/packages/config

8 files changed, 28 insertions, 28 deletions

diff --git a/config/ipblocklist/8/countryblock_IPBlocklist.widget.tmp b/config/ipblocklist/8/countryblock_IPBlocklist.widget.tmp
index a62fcede..546e27c4 100644
--- a/config/ipblocklist/8/countryblock_IPBlocklist.widget.tmp
+++ b/config/ipblocklist/8/countryblock_IPBlocklist.widget.tmp
@@ -1,7 +1,7 @@
 <?php
 /*
         Copyright 2011 Thomas Schaefer - Tomschaefer.org
-        Part of pfSense widgets (www.pfsense.com)
+        Part of pfSense widgets (www.pfsense.org)
 
         Redistribution and use in source and binary forms, with or without
         modification, are permitted provided that the following conditions are met:
diff --git a/config/ipblocklist/8/email.tmp b/config/ipblocklist/8/email.tmp
index 739b0000..abeb4932 100755
--- a/config/ipblocklist/8/email.tmp
+++ b/config/ipblocklist/8/email.tmp
@@ -155,7 +155,7 @@ tr.d0 td {
 	$tab_array[1] = array("Settings", false, "settings.php");
 	$tab_array[2] = array("Whitelist", false, "whitelist.php");
 	$tab_array[3] = array("Interfaces", false, "ipblocklist_if.php");
-	$tab_array[4] = array("Help", false, "http://doc.pfsense.org/index.php/IP_Blocklist");
+	$tab_array[4] = array("Help", false, "https://doc.pfsense.org/index.php/IP_Blocklist");
 	$tab_array[5] = array("Email", true, "email.php");
 	display_top_tabs($tab_array);
 ?>
diff --git a/config/ipblocklist/8/ipblocklist.tmp b/config/ipblocklist/8/ipblocklist.tmp
index 9291a468..ae654241 100755
--- a/config/ipblocklist/8/ipblocklist.tmp
+++ b/config/ipblocklist/8/ipblocklist.tmp
@@ -128,7 +128,7 @@ if(isset($_POST['formSubmit']))
 	$tab_array[1] = array("Settings", false, "settings.php");
 	$tab_array[2] = array("Whitelist", false, "whitelist.php");
 	$tab_array[3] = array("Interfaces", false, "ipblocklist_if.php");
-	$tab_array[4] = array("Help", false, "http://doc.pfsense.org/index.php/IP_Blocklist");
+	$tab_array[4] = array("Help", false, "https://doc.pfsense.org/index.php/IP_Blocklist");
 	//$tab_array[5] = array("Email", false, "email.php");
 	display_top_tabs($tab_array);
 ?> 
diff --git a/config/ipblocklist/8/ipblocklist.xml b/config/ipblocklist/8/ipblocklist.xml
index 262d1719..77c05bab 100755
--- a/config/ipblocklist/8/ipblocklist.xml
+++ b/config/ipblocklist/8/ipblocklist.xml
@@ -39,7 +39,7 @@
 		</copyright>
 	<description>IP Blocklist</description>
 	<requirements>perl</requirements>
-	<faq>http://forum.pfsense.org/index.php/topic,24769.0.html</faq>
+	<faq>https://forum.pfsense.org/index.php/topic,24769.0.html</faq>
 	<name>IP Blocklist Settings</name>
 	<version>0.3.5</version>
 	<title>Settings</title>
@@ -62,102 +62,102 @@
 	<additional_files_needed>
 		<prefix>/usr/local/pkg/</prefix>
 		<chmod>0755</chmod>
-		<item>http://www.pfsense.org/packages/config/ipblocklist/8/ipblocklist.xml</item>
+		<item>https://packages.pfsense.org/packages/config/ipblocklist/8/ipblocklist.xml</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/pkg/</prefix>
 		<chmod>0755</chmod>
-		<item>http://www.pfsense.org/packages/config/ipblocklist/8/ipblocklist.inc</item>
+		<item>https://packages.pfsense.org/packages/config/ipblocklist/8/ipblocklist.inc</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/tmp/</prefix>
 		<chmod>0755</chmod>
-		<item>http://www.pfsense.org/packages/config/ipblocklist/8/ipblocklist.tmp</item>
+		<item>https://packages.pfsense.org/packages/config/ipblocklist/8/ipblocklist.tmp</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/tmp/</prefix>
 		<chmod>0755</chmod>
-		<item>http://www.pfsense.org/packages/config/ipblocklist/8/interfaces.txt</item>
+		<item>https://packages.pfsense.org/packages/config/ipblocklist/8/interfaces.txt</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/tmp/</prefix>
 		<chmod>0755</chmod>
-		<item>http://www.pfsense.org/packages/config/ipblocklist/8/ipblocklist_list.tmp</item>
+		<item>https://packages.pfsense.org/packages/config/ipblocklist/8/ipblocklist_list.tmp</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/tmp/</prefix>
 		<chmod>0755</chmod>
-		<item>http://www.pfsense.org/packages/config/ipblocklist/8/ipblocklist_if.tmp</item>
+		<item>https://packages.pfsense.org/packages/config/ipblocklist/8/ipblocklist_if.tmp</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/tmp/</prefix>
 		<chmod>0755</chmod>
-		<item>http://www.pfsense.org/packages/config/ipblocklist/8/firewall_shaper.tmp</item>
+		<item>https://packages.pfsense.org/packages/config/ipblocklist/8/firewall_shaper.tmp</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/tmp/</prefix>
 		<chmod>0755</chmod>
-		<item>http://www.pfsense.org/packages/config/ipblocklist/8/convert.pl</item>
+		<item>https://packages.pfsense.org/packages/config/ipblocklist/8/convert.pl</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/tmp/</prefix>
 		<chmod>0755</chmod>
-		<item>http://www.pfsense.org/packages/config/ipblocklist/8/convert-execute.sh</item>
+		<item>https://packages.pfsense.org/packages/config/ipblocklist/8/convert-execute.sh</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/tmp/</prefix>
 		<chmod>0755</chmod>
-		<item>http://www.pfsense.org/packages/config/ipblocklist/8/purge.tmp</item>
+		<item>https://packages.pfsense.org/packages/config/ipblocklist/8/purge.tmp</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/tmp/</prefix>
 		<chmod>0755</chmod>
-		<item>http://www.pfsense.org/packages/config/ipblocklist/8/index.tmp</item>
+		<item>https://packages.pfsense.org/packages/config/ipblocklist/8/index.tmp</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/tmp/</prefix>
 		<chmod>0755</chmod>
-		<item>http://www.pfsense.org/packages/config/ipblocklist/8/whitelist.tmp</item>
+		<item>https://packages.pfsense.org/packages/config/ipblocklist/8/whitelist.tmp</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/tmp/</prefix>
 		<chmod>0755</chmod>
-		<item>http://www.pfsense.org/packages/config/ipblocklist/8/purgeip.tmp</item>
+		<item>https://packages.pfsense.org/packages/config/ipblocklist/8/purgeip.tmp</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/tmp/</prefix>
 		<chmod>0755</chmod>
-		<item>http://www.pfsense.org/packages/config/ipblocklist/8/IP-Blocklist.sh</item>
+		<item>https://packages.pfsense.org/packages/config/ipblocklist/8/IP-Blocklist.sh</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/tmp/</prefix>
 		<chmod>0755</chmod>
-		<item>http://www.pfsense.org/packages/config/ipblocklist/8/settings.tmp</item>
+		<item>https://packages.pfsense.org/packages/config/ipblocklist/8/settings.tmp</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/tmp/</prefix>
 		<chmod>0755</chmod>
-		<item>http://www.pfsense.org/packages/config/ipblocklist/8/class.phpmailer.tmp</item>
+		<item>https://packages.pfsense.org/packages/config/ipblocklist/8/class.phpmailer.tmp</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/tmp/</prefix>
 		<chmod>0755</chmod>
-		<item>http://www.pfsense.org/packages/config/ipblocklist/8/class.smtp.tmp</item>
+		<item>https://packages.pfsense.org/packages/config/ipblocklist/8/class.smtp.tmp</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/tmp/</prefix>
 		<chmod>0755</chmod>
-		<item>http://www.pfsense.org/packages/config/ipblocklist/8/email.tmp</item>
+		<item>https://packages.pfsense.org/packages/config/ipblocklist/8/email.tmp</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/tmp/</prefix>
 		<chmod>0755</chmod>
-		<item>http://www.pfsense.org/packages/config/ipblocklist/8/lists.txt</item>
+		<item>https://packages.pfsense.org/packages/config/ipblocklist/8/lists.txt</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/tmp/</prefix>
 		<chmod>0644</chmod>
-		<item>http://www.pfsense.org/packages/config/ipblocklist/8/countryblock_IPBlocklist.widget.tmp</item>
+		<item>https://packages.pfsense.org/packages/config/ipblocklist/8/countryblock_IPBlocklist.widget.tmp</item>
 	</additional_files_needed>
 	<fields>
 		<field>
diff --git a/config/ipblocklist/8/ipblocklist_if.tmp b/config/ipblocklist/8/ipblocklist_if.tmp
index 42ba2d07..582d856a 100755
--- a/config/ipblocklist/8/ipblocklist_if.tmp
+++ b/config/ipblocklist/8/ipblocklist_if.tmp
@@ -132,7 +132,7 @@ include("head.inc");
 	$tab_array[1] = array("Settings", false, "settings.php");
 	$tab_array[2] = array("Whitelist", false, "whitelist.php");
 	$tab_array[3] = array("Interfaces", true, "ipblocklist_if.php");
-	$tab_array[4] = array("Help", false, "http://doc.pfsense.org/index.php/IP_Blocklist");
+	$tab_array[4] = array("Help", false, "https://doc.pfsense.org/index.php/IP_Blocklist");
 	//$tab_array[5] = array("Email", false, "email.php");
 	display_top_tabs($tab_array);
 ?> 
diff --git a/config/ipblocklist/8/manual_add.tmp b/config/ipblocklist/8/manual_add.tmp
index 361b782b..a2218e61 100755
--- a/config/ipblocklist/8/manual_add.tmp
+++ b/config/ipblocklist/8/manual_add.tmp
@@ -6,7 +6,7 @@
 </head>
 <a href="ipblocklist_list.php"><img src="../../themes/nervecenter/images/icons/icon_alias_url_reload.gif" ALT="Manual" ALIGN=RIGHT></a>
 
-<span style="color:red">Experimental!</span> - This uses a different process to block IPs (uses IPFW) <a href="http://forum.pfsense.org/index.php/topic,24822.0.html" target="_blank"><img src="../../themes/nervecenter/images/icons/icon_log.gif"></a>
+<span style="color:red">Experimental!</span> - This uses a different process to block IPs (uses IPFW) <a href="https://forum.pfsense.org/index.php/topic,24822.0.html" target="_blank"><img src="../../themes/nervecenter/images/icons/icon_log.gif"></a>
   <br/>Enter in IP format (xx.xx.xx.xx) or CIDR format (xx.xx.xx.xx/xx)
 <br/><form method="post" action="">
 <input name="content" type="text" />
diff --git a/config/ipblocklist/8/settings.tmp b/config/ipblocklist/8/settings.tmp
index a13dd22b..0c1fd804 100755
--- a/config/ipblocklist/8/settings.tmp
+++ b/config/ipblocklist/8/settings.tmp
@@ -47,7 +47,7 @@ header("Expires: Sat, 26 Jul 1997 05:00:00 GMT"); // Date in the past
 	$tab_array[1] = array("Settings", true, "settings.php");
 	$tab_array[2] = array("Whitelist", false, "whitelist.php");
 	$tab_array[3] = array("Interfaces", false, "ipblocklist_if.php");
-	$tab_array[4] = array("Help", false, "http://doc.pfsense.org/index.php/IP_Blocklist");
+	$tab_array[4] = array("Help", false, "https://doc.pfsense.org/index.php/IP_Blocklist");
 	//$tab_array[5] = array("Email", false, "email.php");
 	display_top_tabs($tab_array);
 ?>
diff --git a/config/ipblocklist/8/whitelist.tmp b/config/ipblocklist/8/whitelist.tmp
index 51bd9f97..203cf798 100755
--- a/config/ipblocklist/8/whitelist.tmp
+++ b/config/ipblocklist/8/whitelist.tmp
@@ -45,7 +45,7 @@ header("Expires: Sat, 26 Jul 1997 05:00:00 GMT"); // Date in the past
 	$tab_array[1] = array("Settings", false, "settings.php");
 	$tab_array[2] = array("Whitelist", true, "whitelist.php");
 	$tab_array[3] = array("Interfaces", false, "ipblocklist_if.php");
-	$tab_array[4] = array("Help", false, "http://doc.pfsense.org/index.php/IP_Blocklist");
+	$tab_array[4] = array("Help", false, "https://doc.pfsense.org/index.php/IP_Blocklist");
 	//$tab_array[5] = array("Email", false, "email.php");
 	display_top_tabs($tab_array);
 ?>