5 files changed, 22 insertions, 22 deletions
diff --git a/config/zebedee/zebedee.xml b/config/zebedee/zebedee.xml
index b56fa1a6..db7bfddf 100644
--- a/config/zebedee/zebedee.xml
+++ b/config/zebedee/zebedee.xml
@@ -62,52 +62,52 @@
 		<description>Tunneling Service</description>
 	</service>
 	<additional_files_needed>
-		<item>http://www.pfsense.org/packages/config/zebedee/zebedee.inc</item>
+		<item>https://packages.pfsense.org/packages/config/zebedee/zebedee.inc</item>
 		<prefix>/usr/local/pkg/</prefix>
 		<chmod>0755</chmod>
 	</additional_files_needed>
 	<additional_files_needed>
-		<item>http://www.pfsense.org/packages/config/zebedee/zebedee_tunnels.xml</item>
+		<item>https://packages.pfsense.org/packages/config/zebedee/zebedee_tunnels.xml</item>
 		<prefix>/usr/local/pkg/</prefix>
 		<chmod>0755</chmod>
 	</additional_files_needed>
 	<additional_files_needed>
-		<item>http://www.pfsense.org/packages/config/zebedee/zebedee_key_details.xml</item>
+		<item>https://packages.pfsense.org/packages/config/zebedee/zebedee_key_details.xml</item>
 		<prefix>/usr/local/pkg/</prefix>
 		<chmod>0755</chmod>
 	</additional_files_needed>
 	<additional_files_needed>
-		<item>http://www.pfsense.org/packages/config/zebedee/zebedee_sync.xml</item>
+		<item>https://packages.pfsense.org/packages/config/zebedee/zebedee_sync.xml</item>
 		<prefix>/usr/local/pkg/</prefix>
 		<chmod>0755</chmod>
 	</additional_files_needed>
 	<additional_files_needed>
-		<item>http://www.pfsense.org/packages/config/zebedee/zebedee_del_key.php</item>
+		<item>https://packages.pfsense.org/packages/config/zebedee/zebedee_del_key.php</item>
 		<prefix>/usr/local/www/</prefix>
 		<chmod>0755</chmod>
 	</additional_files_needed>
 	<additional_files_needed>
-		<item>http://www.pfsense.org/packages/config/zebedee/zebedee_get_key.php</item>
+		<item>https://packages.pfsense.org/packages/config/zebedee/zebedee_get_key.php</item>
 		<prefix>/usr/local/www/</prefix>
 		<chmod>0755</chmod>
 	</additional_files_needed>
 	<additional_files_needed>
-		<item>http://www.pfsense.org/packages/config/zebedee/zebedee_keys.php</item>
+		<item>https://packages.pfsense.org/packages/config/zebedee/zebedee_keys.php</item>
 		<prefix>/usr/local/www/</prefix>
 		<chmod>0755</chmod>
 	</additional_files_needed>
 	<additional_files_needed>
-		<item>http://www.pfsense.org/packages/config/zebedee/zebedee_log.php</item>
+		<item>https://packages.pfsense.org/packages/config/zebedee/zebedee_log.php</item>
 		<prefix>/usr/local/www/</prefix>
 		<chmod>0755</chmod>
 	</additional_files_needed> 
 	<additional_files_needed>
-		<item>http://www.pfsense.org/packages/config/zebedee/zebedee_view_config.php</item>
+		<item>https://packages.pfsense.org/packages/config/zebedee/zebedee_view_config.php</item>
 		<prefix>/usr/local/www/</prefix>
 		<chmod>0755</chmod>
 	</additional_files_needed>
 	<additional_files_needed>
-		<item>http://www.pfsense.org/packages/config/zebedee/zebedee.sh</item>
+		<item>https://packages.pfsense.org/packages/config/zebedee/zebedee.sh</item>
 		<prefix>/usr/local/etc/rc.d/</prefix>
 		<chmod>0755</chmod>
 	</additional_files_needed>
diff --git a/config/zebedee/zebedee_del_key.php b/config/zebedee/zebedee_del_key.php
index e6cfa955..9b52bbd9 100644
--- a/config/zebedee/zebedee_del_key.php
+++ b/config/zebedee/zebedee_del_key.php
@@ -1,7 +1,7 @@
 <?php
 /*
 	zebedee_del_key.php
-	part of pfSense (http://www.pfsense.com/)
+	part of pfSense (https://www.pfsense.org/)
 	Copyright (C) 2010 Scott Ullrich <sullrich@gmail.com>
 	Copyright (C) 2010 Marcello Coutinho
 	Copyright (C) 2010 Jorge Lustosa
@@ -32,8 +32,8 @@
 
 require("guiconfig.inc");
 
-$pfSversion = str_replace("\n", "", file_get_contents("/etc/version"));
-if(strstr($pfSversion, "1.2"))
+$pf_version=substr(trim(file_get_contents("/etc/version")),0,3);
+if ($pf_version < 2.0)
 	$one_two = true;
 
 $zebede_keys = $config['installedpackages']['zebedeekeys']['config'] ; 
diff --git a/config/zebedee/zebedee_keys.php b/config/zebedee/zebedee_keys.php
index 14b39078..58adc79d 100644
--- a/config/zebedee/zebedee_keys.php
+++ b/config/zebedee/zebedee_keys.php
@@ -1,7 +1,7 @@
 <?php
 /*
 	zebedee_keys.php
-	part of pfSense (http://www.pfsense.com/)
+	part of pfSense (https://www.pfsense.org/)
 	Copyright (C) 2010 Scott Ullrich <sullrich@gmail.com>
 	Copyright (C) 2010 Marcello Coutinho
 	Copyright (C) 2010 Jorge Lustosa
@@ -34,8 +34,8 @@
 
 require("guiconfig.inc");
 
-$pfSversion = str_replace("\n", "", file_get_contents("/etc/version"));
-if(strstr($pfSversion, "1.2"))
+$pf_version=substr(trim(file_get_contents("/etc/version")),0,3);
+if ($pf_version < 2.0)
 	$one_two = true;
 
 $pgtitle = "Zebedee Tunneling";
diff --git a/config/zebedee/zebedee_log.php b/config/zebedee/zebedee_log.php
index e397ca08..4e7911c6 100644
--- a/config/zebedee/zebedee_log.php
+++ b/config/zebedee/zebedee_log.php
@@ -1,7 +1,7 @@
 <?php
 /*
 	varnishstat_view_logs.php
-	part of pfSense (http://www.pfsense.com/)
+	part of pfSense (https://www.pfsense.org/)
 	Copyright (C) 2006 Scott Ullrich <sullrich@gmail.com>
 	All rights reserved.
 
@@ -36,8 +36,8 @@ if($_REQUEST['getactivity']) {
 	exit;
 }
 
-$pfSversion = str_replace("\n", "", file_get_contents("/etc/version"));
-if(strstr($pfSversion, "1.2"))
+$pf_version=substr(trim(file_get_contents("/etc/version")),0,3);
+if ($pf_version < 2.0)
 	$one_two = true;
 
 $pgtitle = "Zebedee: Logs";
diff --git a/config/zebedee/zebedee_view_config.php b/config/zebedee/zebedee_view_config.php
index 78a0bca9..26e0f1ff 100644
--- a/config/zebedee/zebedee_view_config.php
+++ b/config/zebedee/zebedee_view_config.php
@@ -1,7 +1,7 @@
 <?php
 /*
 	varnish_view_config.php
-	part of pfSense (http://www.pfsense.com/)
+	part of pfSense (https://www.pfsense.org/)
 	Copyright (C) 2010 Scott Ullrich <sullrich@gmail.com>
 	All rights reserved.
 
@@ -29,8 +29,8 @@
 
 require("guiconfig.inc");
 
-$pfSversion = str_replace("\n", "", file_get_contents("/etc/version"));
-if(strstr($pfSversion, "1.2"))
+$pf_version=substr(trim(file_get_contents("/etc/version")),0,3);
+if ($pf_version < 2.0)
 	$one_two = true;
 
 $pgtitle = "Zebedee: View Configuration";