call it "proxy" instead of "curlproxy"

Thanks Bart for the hint.
This also switches "==" to "<>" and not the code actually works ;-)

diff --git a/config/config.sample.php b/config/config.sample.php
index c915a8772912009577e089a3a631f482648f0965..78dfe17ea790333c722987ac8b8e7980195c52ec 100644 (file)
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -43,10 +43,10 @@ $CONFIG = array(
 "enhancedauthtime" => 15 * 60,
 
 /* 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] */
-"curlproxyuserpwd" => "",
+"proxyuserpwd" => "",
 
 /* Theme to use for ownCloud */
 "theme" => "",

diff --git a/lib/util.php b/lib/util.php
index 65d66abc59dbbc96c527e6f2395f69cb0e7ade8c..4170de2125a172da68a85238f37379501f0ad9db 100755 (executable)
--- 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);