aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjim-p <jimp@pfsense.org>2014-04-10 16:16:59 -0400
committerjim-p <jimp@pfsense.org>2014-04-10 16:16:59 -0400
commit8869c3d78abf2bf7e72fe079ed457c28f3f8edab (patch)
tree067036e6dc5992586f8b23d599fef5867874215f
parentc7d09f6ad822f1e93ea2d626ec0b33cda922e700 (diff)
downloadpfsense-packages-8869c3d78abf2bf7e72fe079ed457c28f3f8edab.tar.gz
pfsense-packages-8869c3d78abf2bf7e72fe079ed457c28f3f8edab.tar.bz2
pfsense-packages-8869c3d78abf2bf7e72fe079ed457c28f3f8edab.zip
Fix version test in ACB. Bump version of ACB.
-rw-r--r--config/autoconfigbackup/autoconfigbackup.inc4
-rw-r--r--config/autoconfigbackup/autoconfigbackup.php6
-rw-r--r--config/autoconfigbackup/autoconfigbackup.xml2
-rw-r--r--config/autoconfigbackup/autoconfigbackup_backup.php6
-rw-r--r--config/autoconfigbackup/autoconfigbackup_stats.php6
-rw-r--r--pkg_config.10.xml2
-rw-r--r--pkg_config.8.xml2
-rw-r--r--pkg_config.8.xml.amd642
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() {
<script src="/javascript/scriptaculous/prototype.js" type="text/javascript"></script>
<?php
include("fbegin.inc");
- if(strstr($pfSversion, "1.2"))
+ if ($pf_version < 2.0)
echo "<p class=\"pgtitle\">{$pgtitle}</p>";
if($savemsg) {
echo "<div id='savemsg'>";
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 @@
<description>Automatically backs up your pfSense configuration. All contents are encrypted on the server. Requires Gold or Support Subscription from https://portal.pfsense.org</description>
<requirements>pfSense Portal subscription</requirements>
<name>AutoConfigBackup</name>
- <version>1.21</version>
+ <version>1.22</version>
<title>Diagnostics: Auto Configuration Backup</title>
<savetext>Change</savetext>
<include_file>/usr/local/pkg/autoconfigbackup.inc</include_file>
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");
<div id='maincontent'>
<?php
include("fbegin.inc");
- if(strstr($pfSversion, "1.2"))
+ if ($pf_version < 2.0)
echo "<p class=\"pgtitle\">{$pgtitle}</p>";
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");
<div id='maincontent'>
<?php
include("fbegin.inc");
- if(strstr($pfSversion, "1.2"))
+ if ($pf_version < 2.0)
echo "<p class=\"pgtitle\">{$pgtitle}</p>";
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 @@
<descr>Automatically backs up your pfSense configuration. All contents are encrypted on the server. Requires pfSense Premium Support Portal Subscription from https://portal.pfsense.org</descr>
<website>https://portal.pfsense.org</website>
<category>Services</category>
- <version>1.21</version>
+ <version>1.22</version>
<status>Stable</status>
<required_version>2.2</required_version>
<pkginfolink>https://doc.pfsense.org/index.php/AutoConfigBackup</pkginfolink>
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 @@
<descr>Automatically backs up your pfSense configuration. All contents are encrypted on the server. Requires pfSense Premium Support Portal Subscription from https://portal.pfsense.org</descr>
<website>https://portal.pfsense.org</website>
<category>Services</category>
- <version>1.21</version>
+ <version>1.22</version>
<status>Stable</status>
<required_version>1.2</required_version>
<pkginfolink>https://doc.pfsense.org/index.php/AutoConfigBackup</pkginfolink>
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 @@
<descr>Automatically backs up your pfSense configuration. All contents are encrypted on the server. Requires pfSense Premium Support Portal Subscription from https://portal.pfsense.org</descr>
<website>https://portal.pfsense.org</website>
<category>Services</category>
- <version>1.21</version>
+ <version>1.22</version>
<status>Stable</status>
<required_version>1.2</required_version>
<pkginfolink>https://doc.pfsense.org/index.php/AutoConfigBackup</pkginfolink>