Merge pull request pkp#767 from bozana/1187fix-master

pkp/pkp-lib#1187 consider proxy settings for external feed plugin
Mansourzadeh · Feb 26, 2016 · 1b067b0 · 1b067b0
2 parents 7d31078 + eac92dc
commit 1b067b0
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/plugins/generic/externalFeed/simplepie/SimplePie.inc.php b/plugins/generic/externalFeed/simplepie/SimplePie.inc.php
@@ -7677,6 +7677,13 @@ function SimplePie_File($url, $timeout = 10, $redirects = 5, $headers = null, $u
 					curl_setopt($fp, CURLOPT_ENCODING, '');
 				}
 				curl_setopt($fp, CURLOPT_URL, $url);
+				if ($httpProxyHost = Config::getVar('proxy', 'http_host')) {
+					curl_setopt($fp, CURLOPT_PROXY, $httpProxyHost);
+					curl_setopt($fp, CURLOPT_PROXYPORT, Config::getVar('proxy', 'http_port', '80'));
+					if ($username = Config::getVar('proxy', 'username')) {
+						curl_setopt($fp, CURLOPT_PROXYUSERPWD, $username . ':' . Config::getVar('proxy', 'password'));
+					}
+				}
 				curl_setopt($fp, CURLOPT_HEADER, 1);
 				curl_setopt($fp, CURLOPT_RETURNTRANSFER, 1);
 				curl_setopt($fp, CURLOPT_TIMEOUT, $timeout);