summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorroot <root@oc.(none)>2012-12-15 00:09:39 +0100
committerFrank Karlitschek <frank@owncloud.org>2012-12-19 18:50:19 +0100
commita64a923d5618de68ced9aaacbb3aa490e3d7594d (patch)
treea1e8ac2e82a9bbdffad0bfdff43dfdeac0f5f754 /lib
parentf012135992df29d48bb61f7c71315f2e54b1366b (diff)
downloadnextcloud-server-a64a923d5618de68ced9aaacbb3aa490e3d7594d.tar.gz
nextcloud-server-a64a923d5618de68ced9aaacbb3aa490e3d7594d.zip
call it "proxy" instead of "curlproxy"
Thanks Bart for the hint. This also switches "==" to "<>" and not the code actually works ;-)
Diffstat (limited to 'lib')
-rwxr-xr-xlib/util.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/util.php b/lib/util.php
index 65d66abc59d..4170de2125a 100755
--- a/lib/util.php
+++ b/lib/util.php
@@ -678,11 +678,11 @@ class OC_Util {
curl_setopt($curl, CURLOPT_CONNECTTIMEOUT, 10);
curl_setopt($curl, CURLOPT_URL, $url);
curl_setopt($curl, CURLOPT_USERAGENT, "ownCloud Server Crawler");
- if(OC_Config::getValue('curlproxy','')=='') {
- curl_setopt($curl, CURLOPT_PROXY, OC_Config::getValue('curlproxy'));
+ if(OC_Config::getValue('proxy','')<>'') {
+ curl_setopt($curl, CURLOPT_PROXY, OC_Config::getValue('proxy'));
}
- if(OC_Config::getValue('curlproxyuserpwd','')=='') {
- curl_setopt($curl, CURLOPT_PROXYUSERPWD, OC_Config::getValue('curlproxyuserpwd'));
+ if(OC_Config::getValue('proxyuserpwd','')<>'') {
+ curl_setopt($curl, CURLOPT_PROXYUSERPWD, OC_Config::getValue('proxyuserpwd'));
}
$data = curl_exec($curl);
curl_close($curl);