call it "proxy" instead of "curlproxy"
Thanks Bart for the hint. This also switches "==" to "<>" and not the code actually works ;-)
This commit is contained in:
parent
f012135992
commit
a64a923d56
2 changed files with 6 additions and 6 deletions
|
@ -43,10 +43,10 @@ $CONFIG = array(
|
||||||
"enhancedauthtime" => 15 * 60,
|
"enhancedauthtime" => 15 * 60,
|
||||||
|
|
||||||
/* A proxy to use to connect to the internet. For example "myproxy.org:88" */
|
/* A proxy to use to connect to the internet. For example "myproxy.org:88" */
|
||||||
"curlproxy" => "",
|
"proxy" => "",
|
||||||
|
|
||||||
/* The optional authentication for the proxy to use to connect to the internet. The format is: [username]:[password] */
|
/* The optional authentication for the proxy to use to connect to the internet. The format is: [username]:[password] */
|
||||||
"curlproxyuserpwd" => "",
|
"proxyuserpwd" => "",
|
||||||
|
|
||||||
/* Theme to use for ownCloud */
|
/* Theme to use for ownCloud */
|
||||||
"theme" => "",
|
"theme" => "",
|
||||||
|
|
|
@ -678,11 +678,11 @@ class OC_Util {
|
||||||
curl_setopt($curl, CURLOPT_CONNECTTIMEOUT, 10);
|
curl_setopt($curl, CURLOPT_CONNECTTIMEOUT, 10);
|
||||||
curl_setopt($curl, CURLOPT_URL, $url);
|
curl_setopt($curl, CURLOPT_URL, $url);
|
||||||
curl_setopt($curl, CURLOPT_USERAGENT, "ownCloud Server Crawler");
|
curl_setopt($curl, CURLOPT_USERAGENT, "ownCloud Server Crawler");
|
||||||
if(OC_Config::getValue('curlproxy','')=='') {
|
if(OC_Config::getValue('proxy','')<>'') {
|
||||||
curl_setopt($curl, CURLOPT_PROXY, OC_Config::getValue('curlproxy'));
|
curl_setopt($curl, CURLOPT_PROXY, OC_Config::getValue('proxy'));
|
||||||
}
|
}
|
||||||
if(OC_Config::getValue('curlproxyuserpwd','')=='') {
|
if(OC_Config::getValue('proxyuserpwd','')<>'') {
|
||||||
curl_setopt($curl, CURLOPT_PROXYUSERPWD, OC_Config::getValue('curlproxyuserpwd'));
|
curl_setopt($curl, CURLOPT_PROXYUSERPWD, OC_Config::getValue('proxyuserpwd'));
|
||||||
}
|
}
|
||||||
$data = curl_exec($curl);
|
$data = curl_exec($curl);
|
||||||
curl_close($curl);
|
curl_close($curl);
|
||||||
|
|
Loading…
Reference in a new issue