From 8869c3d78abf2bf7e72fe079ed457c28f3f8edab Mon Sep 17 00:00:00 2001 From: jim-p Date: Thu, 10 Apr 2014 16:16:59 -0400 Subject: Fix version test in ACB. Bump version of ACB. --- config/autoconfigbackup/autoconfigbackup.inc | 4 ++-- config/autoconfigbackup/autoconfigbackup.php | 6 +++--- config/autoconfigbackup/autoconfigbackup.xml | 2 +- config/autoconfigbackup/autoconfigbackup_backup.php | 6 +++--- config/autoconfigbackup/autoconfigbackup_stats.php | 6 +++--- pkg_config.10.xml | 2 +- pkg_config.8.xml | 2 +- pkg_config.8.xml.amd64 | 2 +- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/config/autoconfigbackup/autoconfigbackup.inc b/config/autoconfigbackup/autoconfigbackup.inc index 9feace47..313cc1ac 100644 --- a/config/autoconfigbackup/autoconfigbackup.inc +++ b/config/autoconfigbackup/autoconfigbackup.inc @@ -29,8 +29,8 @@ require_once("filter.inc"); require_once("notices.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) require_once("crypt_acb.php"); // Plugin moved to save only diff --git a/config/autoconfigbackup/autoconfigbackup.php b/config/autoconfigbackup/autoconfigbackup.php index c0c15b95..69ac3e03 100644 --- a/config/autoconfigbackup/autoconfigbackup.php +++ b/config/autoconfigbackup/autoconfigbackup.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) require("crypt_acb.php"); // Seperator used during client / server communications @@ -115,7 +115,7 @@ function get_hostnames() { {$pgtitle}

"; if($savemsg) { echo "
"; diff --git a/config/autoconfigbackup/autoconfigbackup.xml b/config/autoconfigbackup/autoconfigbackup.xml index 1fdb88c1..0d324d8a 100644 --- a/config/autoconfigbackup/autoconfigbackup.xml +++ b/config/autoconfigbackup/autoconfigbackup.xml @@ -37,7 +37,7 @@ Automatically backs up your pfSense configuration. All contents are encrypted on the server. Requires Gold or Support Subscription from https://portal.pfsense.org pfSense Portal subscription AutoConfigBackup - 1.21 + 1.22 Diagnostics: Auto Configuration Backup Change /usr/local/pkg/autoconfigbackup.inc diff --git a/config/autoconfigbackup/autoconfigbackup_backup.php b/config/autoconfigbackup/autoconfigbackup_backup.php index 2676aabe..a65fba4d 100644 --- a/config/autoconfigbackup/autoconfigbackup_backup.php +++ b/config/autoconfigbackup/autoconfigbackup_backup.php @@ -31,8 +31,8 @@ require("globals.inc"); require("guiconfig.inc"); require("/usr/local/pkg/autoconfigbackup.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) require("crypt_acb.php"); if(!$config['installedpackages']['autoconfigbackup']['config'][0]['username']) { @@ -63,7 +63,7 @@ include("head.inc");
{$pgtitle}

"; if($savemsg) { print_info_box($savemsg); diff --git a/config/autoconfigbackup/autoconfigbackup_stats.php b/config/autoconfigbackup/autoconfigbackup_stats.php index b45d3993..b991e3d3 100644 --- a/config/autoconfigbackup/autoconfigbackup_stats.php +++ b/config/autoconfigbackup/autoconfigbackup_stats.php @@ -31,8 +31,8 @@ require("globals.inc"); require("guiconfig.inc"); require("/usr/local/pkg/autoconfigbackup.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) require("crypt_acb.php"); // Seperator used during client / server communications @@ -97,7 +97,7 @@ include("head.inc");
{$pgtitle}

"; if($savemsg) { print_info_box($savemsg); diff --git a/pkg_config.10.xml b/pkg_config.10.xml index c681c78c..3110c7fd 100644 --- a/pkg_config.10.xml +++ b/pkg_config.10.xml @@ -670,7 +670,7 @@ Automatically backs up your pfSense configuration. All contents are encrypted on the server. Requires pfSense Premium Support Portal Subscription from https://portal.pfsense.org https://portal.pfsense.org Services - 1.21 + 1.22 Stable 2.2 https://doc.pfsense.org/index.php/AutoConfigBackup diff --git a/pkg_config.8.xml b/pkg_config.8.xml index 19cb4e13..07bf3d55 100644 --- a/pkg_config.8.xml +++ b/pkg_config.8.xml @@ -921,7 +921,7 @@ Automatically backs up your pfSense configuration. All contents are encrypted on the server. Requires pfSense Premium Support Portal Subscription from https://portal.pfsense.org https://portal.pfsense.org Services - 1.21 + 1.22 Stable 1.2 https://doc.pfsense.org/index.php/AutoConfigBackup diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64 index c04e094f..b5cd9c55 100644 --- a/pkg_config.8.xml.amd64 +++ b/pkg_config.8.xml.amd64 @@ -908,7 +908,7 @@ Automatically backs up your pfSense configuration. All contents are encrypted on the server. Requires pfSense Premium Support Portal Subscription from https://portal.pfsense.org https://portal.pfsense.org Services - 1.21 + 1.22 Stable 1.2 https://doc.pfsense.org/index.php/AutoConfigBackup -- cgit v1.2.3