summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormomo-i <momo-i@ampache>2009-03-15 23:11:35 +0000
committermomo-i <momo-i@ampache>2009-03-15 23:11:35 +0000
commit62fa1b6da6139b3d8c77f10db75d8e6ead259310 (patch)
tree73f22839f3d2c17b12dc7647ee4728bd1b72cfcd
parent1a475806e052e5c7d7115887002f98a3c2be500f (diff)
downloadampache-62fa1b6da6139b3d8c77f10db75d8e6ead259310.tar.gz
ampache-62fa1b6da6139b3d8c77f10db75d8e6ead259310.tar.bz2
ampache-62fa1b6da6139b3d8c77f10db75d8e6ead259310.zip
Added: proxy use for xmlrpcclient.
-rwxr-xr-xdocs/CHANGELOG1
-rw-r--r--lib/class/xmlrpcclient.class.php8
2 files changed, 8 insertions, 1 deletions
diff --git a/docs/CHANGELOG b/docs/CHANGELOG
index 8f392194..de157c3b 100755
--- a/docs/CHANGELOG
+++ b/docs/CHANGELOG
@@ -4,6 +4,7 @@
--------------------------------------------------------------------------
v.3.5-Alpha3
+ - Added proxy use for xmlrpcclient
- Added Configuration 'Wizard' for democratic play
- Fixed interface feedback issues with democratic play actions
- Add extension to image urls for the API will add to others as
diff --git a/lib/class/xmlrpcclient.class.php b/lib/class/xmlrpcclient.class.php
index 568fb265..b35f2a27 100644
--- a/lib/class/xmlrpcclient.class.php
+++ b/lib/class/xmlrpcclient.class.php
@@ -118,10 +118,16 @@ class xmlRpcClient {
$server = $match['1'];
$port = $match['2'] ? intval($match['2']) : '80';
$path = $match['3'];
+ if(Config::get('proxy_host') AND Config::get('proxy_port')) {
+ $proxy_host = Config::get('proxy_host');
+ $proxy_port = Config::get('proxy_port');
+ $proxy_user = Config::get('proxy_user');
+ $proxy_pass = Config::get('proxy_pass');
+ }
$full_url = "/" . ltrim($path . "/server/xmlrpc.server.php",'/');
- $client = new XML_RPC_Client($full_url,$server,$port);
+ $client = new XML_RPC_Client($full_url,$server,$port,$proxy_host,$proxy_port,$proxy_user,$proxy_pass);
return $client;