From ce7fc0a63ba36e3d6865e5819e7e13a6545089d7 Mon Sep 17 00:00:00 2001 From: Chris Buechler Date: Mon, 30 Jun 2014 21:34:28 -0500 Subject: add input validation to force filling in all of the fields on the Settings tab of AutoConfigBackup. While here, touch up some of the text (point to Gold sub) --- config/autoconfigbackup/autoconfigbackup.inc | 11 ++++++++++- config/autoconfigbackup/autoconfigbackup.xml | 2 +- pkg_config.10.xml | 6 +++--- pkg_config.7.xml | 4 ++-- pkg_config.8.xml | 4 ++-- pkg_config.8.xml.amd64 | 4 ++-- 6 files changed, 20 insertions(+), 11 deletions(-) diff --git a/config/autoconfigbackup/autoconfigbackup.inc b/config/autoconfigbackup/autoconfigbackup.inc index 0ca3ebe9..b49b81fd 100644 --- a/config/autoconfigbackup/autoconfigbackup.inc +++ b/config/autoconfigbackup/autoconfigbackup.inc @@ -43,8 +43,17 @@ if(file_exists("/usr/local/pkg/parse_config/parse_config_upload.php")) function custom_php_validation_command($post, &$input_errors) { global $_POST, $savemsg, $config; + if(!$post['username']) + $input_errors[] = "Username is required."; + + if(!$post['password'] or !$post['passwordagain']) + $input_errors[] = "The subscription password is required."; + + if(!$post['crypto_password'] or !$post['crypto_password2']) + $input_errors[] = "The encryption password is required."; + if($post['password'] <> $post['passwordagain']) - $input_errors[] = "Sorry, the entered passwords do not match."; + $input_errors[] = "Sorry, the entered portal.pfsense.org passwords do not match."; if($post['crypto_password'] <> $post['crypto_password2']) $input_errors[] = "Sorry, the entered encryption passwords do not match."; diff --git a/config/autoconfigbackup/autoconfigbackup.xml b/config/autoconfigbackup/autoconfigbackup.xml index b0514e6a..ee125efc 100644 --- a/config/autoconfigbackup/autoconfigbackup.xml +++ b/config/autoconfigbackup/autoconfigbackup.xml @@ -34,7 +34,7 @@ */ ]]> - Automatically backs up your pfSense configuration. All contents are encrypted on the server. Requires Gold or Support Subscription from https://portal.pfsense.org + Automatically backs up your pfSense configuration. All contents are encrypted before being sent to the server. Requires Gold Subscription from https://portal.pfsense.org pfSense Portal subscription AutoConfigBackup 1.25 diff --git a/pkg_config.10.xml b/pkg_config.10.xml index dda00863..7f796c1c 100644 --- a/pkg_config.10.xml +++ b/pkg_config.10.xml @@ -666,11 +666,11 @@ AutoConfigBackup - portal@bsdperimeter.com - Automatically backs up your pfSense configuration. All contents are encrypted on the server. Requires pfSense Premium Support Portal Subscription from https://portal.pfsense.org + coreteam@pfsense.org + Automatically backs up your pfSense configuration. All contents are encrypted before being sent to the server. Requires Gold Subscription from https://portal.pfsense.org https://portal.pfsense.org Services - 1.25 + 1.26 Stable 2.2 https://doc.pfsense.org/index.php/AutoConfigBackup diff --git a/pkg_config.7.xml b/pkg_config.7.xml index f3fce773..2fed901c 100644 --- a/pkg_config.7.xml +++ b/pkg_config.7.xml @@ -529,10 +529,10 @@ AutoConfigBackup portal@pfsense.org - Automatically backs up your pfSense configuration. All contents are encrypted on the server. Requires pfSense Premium Support Portal Subscription from https://portal.pfsense.org + Automatically backs up your pfSense configuration. All contents are encrypted on the server. Requires Gold Subscription from https://portal.pfsense.org https://portal.pfsense.org Services - 1.20 + 1.26 Stable 1.2 https://doc.pfsense.org/index.php/AutoConfigBackup diff --git a/pkg_config.8.xml b/pkg_config.8.xml index 2d5928a8..e90144a8 100644 --- a/pkg_config.8.xml +++ b/pkg_config.8.xml @@ -923,10 +923,10 @@ AutoConfigBackup portal@pfsense.org - Automatically backs up your pfSense configuration. All contents are encrypted on the server. Requires pfSense Premium Support Portal Subscription from https://portal.pfsense.org + Automatically backs up your pfSense configuration. All contents are encrypted before being sent to the server. Requires Gold Subscription from https://portal.pfsense.org https://portal.pfsense.org Services - 1.25 + 1.26 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 6ce6dccb..3662d465 100644 --- a/pkg_config.8.xml.amd64 +++ b/pkg_config.8.xml.amd64 @@ -910,10 +910,10 @@ AutoConfigBackup portal@pfsense.org - Automatically backs up your pfSense configuration. All contents are encrypted on the server. Requires pfSense Premium Support Portal Subscription from https://portal.pfsense.org + Automatically backs up your pfSense configuration. All contents are encrypted before being sent to the server. Requires Gold Subscription from https://portal.pfsense.org https://portal.pfsense.org Services - 1.25 + 1.26 Stable 1.2 https://doc.pfsense.org/index.php/AutoConfigBackup -- cgit v1.2.3