From 40d9915647000e7337539fccaf455d17064adbfb Mon Sep 17 00:00:00 2001
From: Scott Ullrich <sullrich@sullrich-MacBookPro.local>
Date: Sun, 1 Mar 2009 15:48:29 -0500
Subject: Do not file notice when package is not configured

---
 config/autoconfigbackup/autoconfigbackup.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'config/autoconfigbackup')

diff --git a/config/autoconfigbackup/autoconfigbackup.inc b/config/autoconfigbackup/autoconfigbackup.inc
index fd0d3169..c95bbbb3 100644
--- a/config/autoconfigbackup/autoconfigbackup.inc
+++ b/config/autoconfigbackup/autoconfigbackup.inc
@@ -134,7 +134,7 @@ function upload_config($reasonm = "") {
 			$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, "");
+			//file_notice("AutoConfigBackup", $notice_text, $notice_text, "");
 			conf_mount_rw();
 			touch("/cf/conf/autoconfigback.notice");
 			conf_mount_ro();
-- 
cgit v1.2.3


From 8f8121f28405be1acbc5aafa907dcdaf8c3d4e18 Mon Sep 17 00:00:00 2001
From: Scott Ullrich <sullrich@sullrich-MacBookPro.local>
Date: Sun, 1 Mar 2009 15:49:58 -0500
Subject: * Axe upload routine during filter run (we use parse config hook now)
 * Do not file error either

---
 config/autoconfigbackup/autoconfigbackup.inc | 2 +-
 config/autoconfigbackup/autoconfigbackup.xml | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

(limited to 'config/autoconfigbackup')

diff --git a/config/autoconfigbackup/autoconfigbackup.inc b/config/autoconfigbackup/autoconfigbackup.inc
index c95bbbb3..ac8038d2 100644
--- a/config/autoconfigbackup/autoconfigbackup.inc
+++ b/config/autoconfigbackup/autoconfigbackup.inc
@@ -133,7 +133,7 @@ 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);
+			//log_error($notice_text);
 			//file_notice("AutoConfigBackup", $notice_text, $notice_text, "");
 			conf_mount_rw();
 			touch("/cf/conf/autoconfigback.notice");
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
@@ -48,11 +48,6 @@
 		<section>Diagnostics</section>
 		<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>
-- 
cgit v1.2.3


From 493432ce315f85f43c47ea47dc92d052cd1d9483 Mon Sep 17 00:00:00 2001
From: Scott Ullrich <sullrich@sullrich-MacBookPro.local>
Date: Wed, 11 Mar 2009 18:47:34 -0400
Subject: Show loading indicator correctly.

---
 config/autoconfigbackup/autoconfigbackup.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'config/autoconfigbackup')

diff --git a/config/autoconfigbackup/autoconfigbackup.php b/config/autoconfigbackup/autoconfigbackup.php
index 80db5543..9ac35b14 100644
--- a/config/autoconfigbackup/autoconfigbackup.php
+++ b/config/autoconfigbackup/autoconfigbackup.php
@@ -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/>&nbsp;
+</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();
-- 
cgit v1.2.3


From 63083e5c5877147283ea3e22f082425b7013df9a Mon Sep 17 00:00:00 2001
From: Scott Ullrich <sullrich@sullrich-MacBookPro.local>
Date: Fri, 13 Mar 2009 00:25:51 -0400
Subject: Show please setup auto config backup as a message after redirecting
 page

---
 config/autoconfigbackup/autoconfigbackup.php        | 2 +-
 config/autoconfigbackup/autoconfigbackup_backup.php | 2 +-
 config/autoconfigbackup/autoconfigbackup_stats.php  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'config/autoconfigbackup')

diff --git a/config/autoconfigbackup/autoconfigbackup.php b/config/autoconfigbackup/autoconfigbackup.php
index 9ac35b14..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;
 }
 
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;
 }
 
-- 
cgit v1.2.3