From 94aa568b4f2fac31e8b8585d0530c5a15b0e5041 Mon Sep 17 00:00:00 2001
From: Manuel Silvoso <msilvoso@gmail.com>
Date: Fri, 9 May 2014 18:11:22 +0200
Subject: added proxy configuration to autoconfigbackup

---
 config/autoconfigbackup/autoconfigbackup.inc       | 22 ++++++++++++++++++++-
 config/autoconfigbackup/autoconfigbackup.php       | 23 ++++++++++++++++++++--
 config/autoconfigbackup/autoconfigbackup_stats.php |  8 ++++++++
 3 files changed, 50 insertions(+), 3 deletions(-)

(limited to 'config')

diff --git a/config/autoconfigbackup/autoconfigbackup.inc b/config/autoconfigbackup/autoconfigbackup.inc
index b49b81fd..06a5c206 100644
--- a/config/autoconfigbackup/autoconfigbackup.inc
+++ b/config/autoconfigbackup/autoconfigbackup.inc
@@ -68,6 +68,20 @@ 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 test_connection($post) {
 	global $savemsg, $config, $g;
 
@@ -102,6 +116,9 @@ function test_connection($post) {
 	curl_setopt($curl_session, CURLOPT_RETURNTRANSFER, 1);
 	curl_setopt($curl_session, CURLOPT_CONNECTTIMEOUT, 55);
 	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($curl_session, CURLOPT_POSTFIELDS, "action=showbackups&hostname={$hostname}");
 	$data = curl_exec($curl_session);
@@ -209,7 +226,10 @@ function upload_config($reasonm = "") {
 				curl_setopt($curl_session, CURLOPT_SSL_VERIFYPEER, 0);
 				curl_setopt($curl_session, CURLOPT_CONNECTTIMEOUT, 55);
 				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));
+				
 				$data = curl_exec($curl_session);
 				if (curl_errno($curl_session)) {
 					$fd = fopen("/tmp/backupdebug.txt", "w");
diff --git a/config/autoconfigbackup/autoconfigbackup.php b/config/autoconfigbackup/autoconfigbackup.php
index 20f5f741..94f835c0 100644
--- a/config/autoconfigbackup/autoconfigbackup.php
+++ b/config/autoconfigbackup/autoconfigbackup.php
@@ -28,6 +28,7 @@
 */
 
 require("guiconfig.inc");
+require("/usr/local/pkg/autoconfigbackup.inc");
 
 $pf_version=substr(trim(file_get_contents("/etc/version")),0,3);
 if ($pf_version < 2.0)
@@ -79,7 +80,7 @@ else
 include("head.inc");
 
 function get_hostnames() {
-	global $stats_url, $username, $password, $oper_sep;
+	global $stats_url, $username, $password, $oper_sep, $config, $g;
 	// Populate available backups
 	$curl_session = curl_init();
 	curl_setopt($curl_session, CURLOPT_URL, $stats_url);  
@@ -88,6 +89,10 @@ function get_hostnames() {
 	curl_setopt($curl_session, CURLOPT_POST, 1);
 	curl_setopt($curl_session, CURLOPT_RETURNTRANSFER, 1);
 	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));
+	
 	$data = curl_exec($curl_session);
 	if (curl_errno($curl_session)) {
 		$fd = fopen("/tmp/acb_statsdebug.txt", "w");
@@ -165,6 +170,10 @@ function get_hostnames() {
 					curl_setopt($curl_session, CURLOPT_POSTFIELDS, "action=delete" . 
 						"&hostname=" . urlencode($hostname) . 
 						"&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));
+					
 					$data = curl_exec($curl_session);
 					if (curl_errno($curl_session)) {
 						$fd = fopen("/tmp/acb_deletedebug.txt", "w");
@@ -192,6 +201,9 @@ function get_hostnames() {
 					curl_setopt($curl_session, CURLOPT_POSTFIELDS, "action=restore" . 
 						"&hostname=" . urlencode($hostname) . 	
 						"&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));
 					$data = curl_exec($curl_session);
 					$data_split = split("\+\+\+\+", $data);
 					$sha256 = trim($data_split[0]);	// sha256
@@ -256,6 +268,9 @@ EOF;
 					curl_setopt($curl_session, CURLOPT_POSTFIELDS, "action=restore" . 
 						"&hostname=" . urlencode($hostname) . 
 						"&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));
 					$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.";
@@ -306,6 +321,10 @@ EOF;
 				curl_setopt($curl_session, CURLOPT_POST, 1);
 				curl_setopt($curl_session, CURLOPT_RETURNTRANSFER, 1);
 				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));
+
 				$data = curl_exec($curl_session);
 				if (curl_errno($curl_session)) {
 					$fd = fopen("/tmp/acb_backupdebug.txt", "w");
@@ -401,4 +420,4 @@ EOF;
 </form>
 <?php include("fend.inc"); ?>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/config/autoconfigbackup/autoconfigbackup_stats.php b/config/autoconfigbackup/autoconfigbackup_stats.php
index b991e3d3..e3b115f9 100644
--- a/config/autoconfigbackup/autoconfigbackup_stats.php
+++ b/config/autoconfigbackup/autoconfigbackup_stats.php
@@ -72,6 +72,10 @@ if($_REQUEST['delhostname']) {
 	curl_setopt($curl_session, CURLOPT_SSL_VERIFYPEER, 0);	
 	curl_setopt($curl_session, CURLOPT_RETURNTRANSFER, 1);	
 	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));
+	
 	$data = curl_exec($curl_session);
 	if (curl_errno($curl_session)) {
 		$fd = fopen("/tmp/acb_deletedebug.txt", "w");
@@ -144,6 +148,10 @@ include("head.inc");
 	curl_setopt($curl_session, CURLOPT_POST, 1);
 	curl_setopt($curl_session, CURLOPT_RETURNTRANSFER, 1);
 	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));
+
 	$data = curl_exec($curl_session);
 	if (curl_errno($curl_session)) {
 		$fd = fopen("/tmp/acb_statsdebug.txt", "w");
-- 
cgit v1.2.3


From 653a43f2e113f28cc8226392bf9a5c0562a486ad Mon Sep 17 00:00:00 2001
From: Manuel Silvoso <msilvoso@gmail.com>
Date: Fri, 9 May 2014 22:08:41 +0200
Subject: removed: closing php tags

---
 config/autoconfigbackup/autoconfigbackup.inc     | 1 -
 config/autoconfigbackup/crypt_acb.php            | 1 -
 config/autoconfigbackup/parse_config_upload.inc  | 1 -
 config/autoconfigbackup/parse_config_upload.php  | 1 -
 config/autoconfigbackup/upload_config_filter.php | 1 -
 5 files changed, 5 deletions(-)

(limited to 'config')

diff --git a/config/autoconfigbackup/autoconfigbackup.inc b/config/autoconfigbackup/autoconfigbackup.inc
index 06a5c206..30e4bed4 100644
--- a/config/autoconfigbackup/autoconfigbackup.inc
+++ b/config/autoconfigbackup/autoconfigbackup.inc
@@ -268,4 +268,3 @@ function upload_config($reasonm = "") {
 	}	
 }
 
-?>
diff --git a/config/autoconfigbackup/crypt_acb.php b/config/autoconfigbackup/crypt_acb.php
index 49a2147a..b0d8bebd 100644
--- a/config/autoconfigbackup/crypt_acb.php
+++ b/config/autoconfigbackup/crypt_acb.php
@@ -130,4 +130,3 @@
 		return strpos(strtolower($str), strtolower($needle));
 	}
 
-?>
\ No newline at end of file
diff --git a/config/autoconfigbackup/parse_config_upload.inc b/config/autoconfigbackup/parse_config_upload.inc
index ce592966..ba0b48ce 100644
--- a/config/autoconfigbackup/parse_config_upload.inc
+++ b/config/autoconfigbackup/parse_config_upload.inc
@@ -5,4 +5,3 @@ if(file_exists("/usr/local/pkg/autoconfigbackup.inc")) {
 	upload_config();
 }
 
-?>
diff --git a/config/autoconfigbackup/parse_config_upload.php b/config/autoconfigbackup/parse_config_upload.php
index ce592966..ba0b48ce 100644
--- a/config/autoconfigbackup/parse_config_upload.php
+++ b/config/autoconfigbackup/parse_config_upload.php
@@ -5,4 +5,3 @@ if(file_exists("/usr/local/pkg/autoconfigbackup.inc")) {
 	upload_config();
 }
 
-?>
diff --git a/config/autoconfigbackup/upload_config_filter.php b/config/autoconfigbackup/upload_config_filter.php
index ce592966..ba0b48ce 100644
--- a/config/autoconfigbackup/upload_config_filter.php
+++ b/config/autoconfigbackup/upload_config_filter.php
@@ -5,4 +5,3 @@ if(file_exists("/usr/local/pkg/autoconfigbackup.inc")) {
 	upload_config();
 }
 
-?>
-- 
cgit v1.2.3


From c4f7014bba0bb82b21025afe02f2ec04039e0cf2 Mon Sep 17 00:00:00 2001
From: Manuel Silvoso <msilvoso@gmail.com>
Date: Wed, 25 Jun 2014 22:32:36 +0200
Subject: Tabs to spaces and merged changes from crypt.php into crypt_acb.php

---
 config/autoconfigbackup/autoconfigbackup.php |  8 ++++----
 config/autoconfigbackup/crypt_acb.php        | 19 +++++++++++--------
 2 files changed, 15 insertions(+), 12 deletions(-)

(limited to 'config')

diff --git a/config/autoconfigbackup/autoconfigbackup.php b/config/autoconfigbackup/autoconfigbackup.php
index 94f835c0..9826154c 100644
--- a/config/autoconfigbackup/autoconfigbackup.php
+++ b/config/autoconfigbackup/autoconfigbackup.php
@@ -269,8 +269,8 @@ EOF;
 						"&hostname=" . urlencode($hostname) . 
 						"&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));
+					// Proxy
+					curl_setopt_array($curl_session, configure_proxy($config));
 					$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.";
@@ -322,8 +322,8 @@ EOF;
 				curl_setopt($curl_session, CURLOPT_RETURNTRANSFER, 1);
 				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));
+				// Proxy
+				curl_setopt_array($curl_session, configure_proxy($config));
 
 				$data = curl_exec($curl_session);
 				if (curl_errno($curl_session)) {
diff --git a/config/autoconfigbackup/crypt_acb.php b/config/autoconfigbackup/crypt_acb.php
index b0d8bebd..9f897cb5 100644
--- a/config/autoconfigbackup/crypt_acb.php
+++ b/config/autoconfigbackup/crypt_acb.php
@@ -31,14 +31,17 @@
 
 	function crypt_data($val, $pass, $opt) {
 		$file = tempnam("/tmp", "php-encrypt");
-		$fd = fopen("$file.dec", "w");
-		fwrite($fd, $val);
-		fclose($fd);
-		exec("/usr/bin/openssl enc {$opt} -aes-256-cbc -in $file.dec -out $file.enc -k {$pass}");
-		$result = file_get_contents("$file.enc");
-		exec("rm $file");
-		exec("rm $file.dec");
-		exec("rm $file.enc");
+		file_put_contents("{$file}.dec", $val);
+		exec("/usr/bin/openssl enc {$opt} -aes-256-cbc -in {$file}.dec -out {$file}.enc -k " . escapeshellarg($pass));
+		if (file_exists("{$file}.enc"))
+			$result = file_get_contents("{$file}.enc");
+		else {
+			$result = "";
+			log_error("Failed to encrypt/decrypt data!");
+		}
+		@unlink($file);
+		@unlink("{$file}.dec");
+		@unlink("{$file}.enc");
 		return $result;
 	}
 
-- 
cgit v1.2.3


From 2fb2c17eef49225706b2fb1d4bd522dea58ce982 Mon Sep 17 00:00:00 2001
From: Manuel Silvoso <msilvoso@gmail.com>
Date: Fri, 25 Jul 2014 23:06:43 +0200
Subject: Requested changes

---
 config/autoconfigbackup/autoconfigbackup.inc       | 29 +++++++++++-----------
 config/autoconfigbackup/autoconfigbackup.php       | 12 ++++-----
 .../autoconfigbackup/autoconfigbackup_backup.php   |  2 +-
 config/autoconfigbackup/autoconfigbackup_stats.php |  6 ++---
 4 files changed, 25 insertions(+), 24 deletions(-)

(limited to 'config')

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)) {
-- 
cgit v1.2.3