Requested changes

4 files changed, 25 insertions, 24 deletions

diff --git a/config/autoconfigbackup/autoconfigbackup.inc b/config/autoconfigbackup/autoconfigbackup.inc
index 30e4bed4..2c9d18f9 100644
--- a/config/autoconfigbackup/autoconfigbackup.inc
+++ b/config/autoconfigbackup/autoconfigbackup.inc
@@ -68,18 +68,19 @@ function custom_php_validation_command($post, &$input_errors) {
 	unset($_POST['testconnection']);
 }
 
-function configure_proxy($config) {
-        $ret = array();
-        if (!empty($config['system']['proxyurl'])) {
-                $ret[CURLOPT_PROXY] = $config['system']['proxyurl'];
-                if (!empty($config['system']['proxyport']))
-                        $ret[CURLOPT_PROXYPORT] = $config['system']['proxyport'];
-                if (!empty($config['system']['proxyuser']) && !empty($config['system']['proxypass'])) {
-                        $ret[CURLOPT_PROXYAUTH] = CURLAUTH_ANY | CURLAUTH_ANYSAFE;
-                        $ret[CURLOPT_PROXYUSERPWD] = "{$config['system']['proxyuser']}:{$config['system']['proxypass']}";
-                }
-        }
-        return $ret;
+function configure_proxy() {
+	global $config;
+	$ret = array();
+	if (!empty($config['system']['proxyurl'])) {
+		$ret[CURLOPT_PROXY] = $config['system']['proxyurl'];
+		if (!empty($config['system']['proxyport']))
+			$ret[CURLOPT_PROXYPORT] = $config['system']['proxyport'];
+		if (!empty($config['system']['proxyuser']) && !empty($config['system']['proxypass'])) {
+			$ret[CURLOPT_PROXYAUTH] = CURLAUTH_ANY | CURLAUTH_ANYSAFE;
+			$ret[CURLOPT_PROXYUSERPWD] = "{$config['system']['proxyuser']}:{$config['system']['proxypass']}";
+		}
+	}
+	return $ret;
 }
 
 function test_connection($post) {
@@ -118,7 +119,7 @@ function test_connection($post) {
 	curl_setopt($curl_session, CURLOPT_TIMEOUT, 30);
 	curl_setopt($curl_session, CURLOPT_USERAGENT, $g['product_name'] . '/' . rtrim(file_get_contents("/etc/version")));
 	// Proxy
-	curl_setopt_array($curl_session, configure_proxy($config));
+	curl_setopt_array($curl_session, configure_proxy());
 
 	curl_setopt($curl_session, CURLOPT_POSTFIELDS, "action=showbackups&hostname={$hostname}");
 	$data = curl_exec($curl_session);
@@ -228,7 +229,7 @@ function upload_config($reasonm = "") {
 				curl_setopt($curl_session, CURLOPT_TIMEOUT, 30);
 				curl_setopt($curl_session, CURLOPT_USERAGENT, $g['product_name'] . '/' . rtrim(file_get_contents("/etc/version")));
 				// Proxy
-				curl_setopt_array($curl_session, configure_proxy($config));
+				curl_setopt_array($curl_session, configure_proxy());
 				
 				$data = curl_exec($curl_session);
 				if (curl_errno($curl_session)) {
diff --git a/config/autoconfigbackup/autoconfigbackup.php b/config/autoconfigbackup/autoconfigbackup.php
index 9826154c..755c47aa 100644
--- a/config/autoconfigbackup/autoconfigbackup.php
+++ b/config/autoconfigbackup/autoconfigbackup.php
@@ -28,7 +28,7 @@
 */
 
 require("guiconfig.inc");
-require("/usr/local/pkg/autoconfigbackup.inc");
+require("autoconfigbackup.inc");
 
 $pf_version=substr(trim(file_get_contents("/etc/version")),0,3);
 if ($pf_version < 2.0)
@@ -91,7 +91,7 @@ function get_hostnames() {
 	curl_setopt($curl_session, CURLOPT_POSTFIELDS, "action=showstats");
 	curl_setopt($curl_session, CURLOPT_USERAGENT, $g['product_name'] . '/' . rtrim(file_get_contents("/etc/version")));
 	// Proxy
-	curl_setopt_array($curl_session, configure_proxy($config));
+	curl_setopt_array($curl_session, configure_proxy());
 	
 	$data = curl_exec($curl_session);
 	if (curl_errno($curl_session)) {
@@ -172,7 +172,7 @@ function get_hostnames() {
 						"&revision=" . urlencode($_REQUEST['rmver']));
 					curl_setopt($curl_session, CURLOPT_USERAGENT, $g['product_name'] . '/' . rtrim(file_get_contents("/etc/version")));
 					// Proxy
-					curl_setopt_array($curl_session, configure_proxy($config));
+					curl_setopt_array($curl_session, configure_proxy());
 					
 					$data = curl_exec($curl_session);
 					if (curl_errno($curl_session)) {
@@ -203,7 +203,7 @@ function get_hostnames() {
 						"&revision=" . urlencode($_REQUEST['newver']));
 					curl_setopt($curl_session, CURLOPT_USERAGENT, $g['product_name'] . '/' . rtrim(file_get_contents("/etc/version")));
 					// Proxy
-					curl_setopt_array($curl_session, configure_proxy($config));
+					curl_setopt_array($curl_session, configure_proxy());
 					$data = curl_exec($curl_session);
 					$data_split = split("\+\+\+\+", $data);
 					$sha256 = trim($data_split[0]);	// sha256
@@ -270,7 +270,7 @@ EOF;
 						"&revision=" . urlencode($_REQUEST['download']));
 					curl_setopt($curl_session, CURLOPT_USERAGENT, $g['product_name'] . '/' . rtrim(file_get_contents("/etc/version")));
 					// Proxy
-					curl_setopt_array($curl_session, configure_proxy($config));
+					curl_setopt_array($curl_session, configure_proxy());
 					$data = curl_exec($curl_session);
 					if (!tagfile_deformat($data, $data1, "config.xml")) 
 						$input_errors[] = "The downloaded file does not appear to contain an encrypted pfSense configuration.";
@@ -323,7 +323,7 @@ EOF;
 				curl_setopt($curl_session, CURLOPT_POSTFIELDS, "action=showbackups&hostname={$hostname}");
 				curl_setopt($curl_session, CURLOPT_USERAGENT, $g['product_name'] . '/' . rtrim(file_get_contents("/etc/version")));
 				// Proxy
-				curl_setopt_array($curl_session, configure_proxy($config));
+				curl_setopt_array($curl_session, configure_proxy());
 
 				$data = curl_exec($curl_session);
 				if (curl_errno($curl_session)) {
diff --git a/config/autoconfigbackup/autoconfigbackup_backup.php b/config/autoconfigbackup/autoconfigbackup_backup.php
index 7a6b045f..f14b8aed 100644
--- a/config/autoconfigbackup/autoconfigbackup_backup.php
+++ b/config/autoconfigbackup/autoconfigbackup_backup.php
@@ -29,7 +29,7 @@
 
 require("globals.inc");
 require("guiconfig.inc");
-require("/usr/local/pkg/autoconfigbackup.inc");
+require("autoconfigbackup.inc");
 
 $pf_version=substr(trim(file_get_contents("/etc/version")),0,3);
 if ($pf_version < 2.0)
diff --git a/config/autoconfigbackup/autoconfigbackup_stats.php b/config/autoconfigbackup/autoconfigbackup_stats.php
index e3b115f9..34d96eda 100644
--- a/config/autoconfigbackup/autoconfigbackup_stats.php
+++ b/config/autoconfigbackup/autoconfigbackup_stats.php
@@ -29,7 +29,7 @@
 
 require("globals.inc");
 require("guiconfig.inc");
-require("/usr/local/pkg/autoconfigbackup.inc");
+require("autoconfigbackup.inc");
 
 $pf_version=substr(trim(file_get_contents("/etc/version")),0,3);
 if ($pf_version < 2.0)
@@ -74,7 +74,7 @@ if($_REQUEST['delhostname']) {
 	curl_setopt($curl_session, CURLOPT_POSTFIELDS, "action=deletehostname&delhostname=" . urlencode($_REQUEST['delhostname']));
 	curl_setopt($curl_session, CURLOPT_USERAGENT, $g['product_name'] . '/' . rtrim(file_get_contents("/etc/version")));
 	// Proxy
-	curl_setopt_array($curl_session, configure_proxy($config));
+	curl_setopt_array($curl_session, configure_proxy());
 	
 	$data = curl_exec($curl_session);
 	if (curl_errno($curl_session)) {
@@ -150,7 +150,7 @@ include("head.inc");
 	curl_setopt($curl_session, CURLOPT_POSTFIELDS, "action=showstats");
 	curl_setopt($curl_session, CURLOPT_USERAGENT, $g['product_name'] . '/' . rtrim(file_get_contents("/etc/version")));
         // Proxy
-        curl_setopt_array($curl_session, configure_proxy($config));
+        curl_setopt_array($curl_session, configure_proxy());
 
 	$data = curl_exec($curl_session);
 	if (curl_errno($curl_session)) {