diff options
| author | jim-p <jimp@pfsense.org> | 2014-04-10 16:31:57 -0400 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2014-04-10 16:31:57 -0400 |
| commit | 0fea430100e63268f0dc313061a713fe114c7c59 (patch) | |
| tree | 195c25cd40e51f4256865af3917f84f2a1a7c9bf /config/zebedee | |
| parent | 8869c3d78abf2bf7e72fe079ed457c28f3f8edab (diff) | |
| download | pfsense-packages-0fea430100e63268f0dc313061a713fe114c7c59.tar.gz pfsense-packages-0fea430100e63268f0dc313061a713fe114c7c59.tar.bz2 pfsense-packages-0fea430100e63268f0dc313061a713fe114c7c59.zip | |
Fix a whole bunch of invalid version tests.
Diffstat (limited to 'config/zebedee')
| -rw-r--r-- | config/zebedee/zebedee_del_key.php | 4 | ||||
| -rw-r--r-- | config/zebedee/zebedee_keys.php | 4 | ||||
| -rw-r--r-- | config/zebedee/zebedee_log.php | 4 | ||||
| -rw-r--r-- | config/zebedee/zebedee_view_config.php | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/config/zebedee/zebedee_del_key.php b/config/zebedee/zebedee_del_key.php index 49688fd3..9b52bbd9 100644 --- a/config/zebedee/zebedee_del_key.php +++ b/config/zebedee/zebedee_del_key.php @@ -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 1ff7d06e..58adc79d 100644 --- a/config/zebedee/zebedee_keys.php +++ b/config/zebedee/zebedee_keys.php @@ -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 784ad93e..4e7911c6 100644 --- a/config/zebedee/zebedee_log.php +++ b/config/zebedee/zebedee_log.php @@ -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 1d57d8eb..26e0f1ff 100644 --- a/config/zebedee/zebedee_view_config.php +++ b/config/zebedee/zebedee_view_config.php @@ -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"; |