diff options
| author | momo-i <momo-i@ampache> | 2009-03-12 07:54:39 +0000 |
|---|---|---|
| committer | momo-i <momo-i@ampache> | 2009-03-12 07:54:39 +0000 |
| commit | df124af57b5a1e34f2929b9c3042bf9b5e686b50 (patch) | |
| tree | 00091f1a5f5c74c933d402fbca6b806ac33f9da4 /lib/class/album.class.php | |
| parent | 6080bceee5f843e18270189fec10671b7ea4944b (diff) | |
| download | ampache-df124af57b5a1e34f2929b9c3042bf9b5e686b50.tar.gz ampache-df124af57b5a1e34f2929b9c3042bf9b5e686b50.tar.bz2 ampache-df124af57b5a1e34f2929b9c3042bf9b5e686b50.zip | |
Added: get url using proxy #313(Thx faber) + proxyuser, proxypassword
Diffstat (limited to 'lib/class/album.class.php')
| -rw-r--r-- | lib/class/album.class.php | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/lib/class/album.class.php b/lib/class/album.class.php index c68fa587..438a9033 100644 --- a/lib/class/album.class.php +++ b/lib/class/album.class.php @@ -376,6 +376,14 @@ class Album extends database_object { $album = $this->full_name; } + if(Config::get('proxy_host') AND Config::get('proxy_port')) { + $proxyhost = Config::get('proxy_host'); + $proxyport = Config::get('proxy_port'); + $proxyuser = Config::get('proxy_user'); + $proxypass = Config::get('proxy_pass'); + debug_event("lastfm", "set Proxy", "5"); + $lastfm->setProxy($proxyhost, $proxyport, $proxyuser, $proxypass); + } $raw_data = $lastfm->search($artist,$album); if (!count($raw_data)) { return array(); } @@ -609,6 +617,15 @@ class Album extends database_object { // Create the Search Object $amazon = new AmazonSearch(Config::get('amazon_developer_key'), $amazon_base); + if(Config::get('proxy_host') AND Config::get('proxy_port')) { + $proxyhost = Config::get('proxy_host'); + $proxyport = Config::get('proxy_port'); + $proxyuser = Config::get('proxy_user'); + $proxypass = Config::get('proxy_pass'); + debug_print("amazon", "setProxy", "5"); + $amazon->setProxy($proxyhost, $proxyport, $proxyuser, $proxypass); + } + $search_results = array(); /* Setup the needed variables */ @@ -903,6 +920,12 @@ class Album extends database_object { // Check to see if it's a URL if (isset($data['url'])) { $snoopy = new Snoopy(); + if(Config::get('proxy_host') AND Config::get('proxy_port')) { + $snoopy->proxy_user = Config::get('proxy_host'); + $snoopy->proxy_port = Config::get('proxy_port'); + $snoopy->proxy_user = Config::get('proxy_user'); + $snoopy->proxy_pass = Config::get('proxy_pass'); + } $snoopy->fetch($data['url']); return $snoopy->results; } |