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/postfix | |
| 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/postfix')
| -rwxr-xr-x | config/postfix/postfix_about.php | 4 | ||||
| -rwxr-xr-x | config/postfix/postfix_queue.php | 4 | ||||
| -rwxr-xr-x | config/postfix/postfix_search.php | 4 | ||||
| -rw-r--r-- | config/postfix/postfix_view_config.php | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/config/postfix/postfix_about.php b/config/postfix/postfix_about.php index b7d04d16..87d0cf69 100755 --- a/config/postfix/postfix_about.php +++ b/config/postfix/postfix_about.php @@ -30,8 +30,8 @@ $shortcut_section = "postfix"; 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 = "Diagnostics: Search Mail"; diff --git a/config/postfix/postfix_queue.php b/config/postfix/postfix_queue.php index bf6e956c..7afd8fe7 100755 --- a/config/postfix/postfix_queue.php +++ b/config/postfix/postfix_queue.php @@ -104,8 +104,8 @@ if ($_REQUEST['cmd']!=""){ get_cmd(); } else{ - $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 = "Status: Postfix Mail Queue"; diff --git a/config/postfix/postfix_search.php b/config/postfix/postfix_search.php index 78d79869..c29d8cf2 100755 --- a/config/postfix/postfix_search.php +++ b/config/postfix/postfix_search.php @@ -34,8 +34,8 @@ $uname=posix_uname(); if ($uname['machine']=='amd64') ini_set('memory_limit', '250M'); -$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 = "Diagnostics: Search Mail"; diff --git a/config/postfix/postfix_view_config.php b/config/postfix/postfix_view_config.php index c3efda53..24bfd575 100644 --- a/config/postfix/postfix_view_config.php +++ b/config/postfix/postfix_view_config.php @@ -57,7 +57,7 @@ if ($_REQUEST['file']!=""){ } else{ $pfSversion = str_replace("\n", "", file_get_contents("/etc/version")); - if(strstr($pfSversion, "1.2")) + if ($pf_version < 2.0) $one_two = true; $pgtitle = "Services: Postfix View Configuration"; |