diff options
Diffstat (limited to 'config/autoconfigbackup')
| -rw-r--r-- | config/autoconfigbackup/autoconfigbackup.inc | 4 | ||||
| -rw-r--r-- | config/autoconfigbackup/autoconfigbackup.php | 9 | ||||
| -rw-r--r-- | config/autoconfigbackup/autoconfigbackup.xml | 5 | ||||
| -rw-r--r-- | config/autoconfigbackup/autoconfigbackup_backup.php | 2 | ||||
| -rw-r--r-- | config/autoconfigbackup/autoconfigbackup_stats.php | 2 |
5 files changed, 9 insertions, 13 deletions
diff --git a/config/autoconfigbackup/autoconfigbackup.inc b/config/autoconfigbackup/autoconfigbackup.inc index fd0d3169..ac8038d2 100644 --- a/config/autoconfigbackup/autoconfigbackup.inc +++ b/config/autoconfigbackup/autoconfigbackup.inc @@ -133,8 +133,8 @@ function upload_config($reasonm = "") { if(!file_exists("/cf/conf/autoconfigback.notice")) { $notice_text = "Either the username, password or encryption password is not set for Automatic Configuration Backup. "; $notice_text .= "Please correct this in Diagnostics -> AutoConfigBackup -> Settings."; - log_error($notice_text); - file_notice("AutoConfigBackup", $notice_text, $notice_text, ""); + //log_error($notice_text); + //file_notice("AutoConfigBackup", $notice_text, $notice_text, ""); conf_mount_rw(); touch("/cf/conf/autoconfigback.notice"); conf_mount_ro(); diff --git a/config/autoconfigbackup/autoconfigbackup.php b/config/autoconfigbackup/autoconfigbackup.php index 80db5543..4f143adb 100644 --- a/config/autoconfigbackup/autoconfigbackup.php +++ b/config/autoconfigbackup/autoconfigbackup.php @@ -64,7 +64,7 @@ else $myhostname = $config['system']['hostname'] . "." . $config['system']['domain']; if(!$username) { - Header("Location: /pkg_edit.php?xml=autoconfigbackup.xml&id=0"); + Header("Location: /pkg_edit.php?xml=autoconfigbackup.xml&id=0&savemsg=Please+setup+Auto+Config+Backup"); exit; } @@ -127,6 +127,10 @@ function get_hostnames() { print_info_box("Warning! You are currently viewing an alternate hosts backup history ($hostname)"); ?> <table width="100%" border="0" cellpadding="0" cellspacing="0"> <tr><td> +<div id="loading"> + <img src="/themes/metallic/images/misc/loader.gif"> Loading, please wait... + <p/> +</div> <div id='feedbackdiv'></div> <?php $tab_array = array(); @@ -149,9 +153,6 @@ function get_hostnames() { <table id="backuptable" class="tabcont" align="center" width="100%" border="0" cellpadding="6" cellspacing="0"> <tr> <td colspan="2" align="left"> - <div id="loading"> - <img src="themes/metallic/images/misc/loader.gif"> Loading, please wait... - </div> <?php if($_REQUEST['rmver'] != "") { $curl_session = curl_init(); diff --git a/config/autoconfigbackup/autoconfigbackup.xml b/config/autoconfigbackup/autoconfigbackup.xml index 5e5eaf73..869cd747 100644 --- a/config/autoconfigbackup/autoconfigbackup.xml +++ b/config/autoconfigbackup/autoconfigbackup.xml @@ -49,11 +49,6 @@ <url>/autoconfigbackup.php</url> </menu> <additional_files_needed> - <prefix>/usr/local/pkg/pf/</prefix> - <chmod>0755</chmod> - <item>http://www.pfsense.com/packages/config/autoconfigbackup/upload_config_filter.php</item> - </additional_files_needed> - <additional_files_needed> <prefix>/usr/local/pkg/parse_config/</prefix> <chmod>0755</chmod> <item>http://www.pfsense.com/packages/config/autoconfigbackup/parse_config_upload.php</item> diff --git a/config/autoconfigbackup/autoconfigbackup_backup.php b/config/autoconfigbackup/autoconfigbackup_backup.php index cebd7a56..47336c27 100644 --- a/config/autoconfigbackup/autoconfigbackup_backup.php +++ b/config/autoconfigbackup/autoconfigbackup_backup.php @@ -57,7 +57,7 @@ $del_url = "https://{$username}:{$password}@portal.pfsense.org/pfSconfigbackup $hostname = $config['system']['hostname'] . "." . $config['system']['domain']; if(!$username) { - Header("Location: /pkg_edit.php?xml=autoconfigbackup.xml&id=0"); + Header("Location: /pkg_edit.php?xml=autoconfigbackup.xml&id=0&savemsg=Please+setup+Auto+Config+Backup"); exit; } diff --git a/config/autoconfigbackup/autoconfigbackup_stats.php b/config/autoconfigbackup/autoconfigbackup_stats.php index 65f02b2d..c024d689 100644 --- a/config/autoconfigbackup/autoconfigbackup_stats.php +++ b/config/autoconfigbackup/autoconfigbackup_stats.php @@ -60,7 +60,7 @@ $stats_url = "https://{$username}:{$password}@portal.pfsense.org/pfSconfigback $hostname = $config['system']['hostname'] . "." . $config['system']['domain']; if(!$username) { - Header("Location: /pkg_edit.php?xml=autoconfigbackup.xml&id=0"); + Header("Location: /pkg_edit.php?xml=autoconfigbackup.xml&id=0&savemsg=Please+setup+Auto+Config+Backup"); exit; } |