From 0fea430100e63268f0dc313061a713fe114c7c59 Mon Sep 17 00:00:00 2001 From: jim-p Date: Thu, 10 Apr 2014 16:31:57 -0400 Subject: Fix a whole bunch of invalid version tests. --- config/varnish3/varnish_view_config.php | 4 ++-- config/varnish3/varnishstat.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'config/varnish3') diff --git a/config/varnish3/varnish_view_config.php b/config/varnish3/varnish_view_config.php index 15c68447..69a9fabb 100644 --- a/config/varnish3/varnish_view_config.php +++ b/config/varnish3/varnish_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 = "Varnish: View Configuration"; diff --git a/config/varnish3/varnishstat.php b/config/varnish3/varnishstat.php index 9fe3d77d..10d9ceb9 100644 --- a/config/varnish3/varnishstat.php +++ b/config/varnish3/varnishstat.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 = "Varnish: VarnishSTAT"; -- cgit v1.2.3