From a64a923d5618de68ced9aaacbb3aa490e3d7594d Mon Sep 17 00:00:00 2001
From: root <root@oc.(none)>
Date: Sat, 15 Dec 2012 00:09:39 +0100
Subject: [PATCH] call it "proxy" instead of "curlproxy" Thanks Bart for the
hint. This also switches "==" to "<>" and not the code actually works ;-)
---
config/config.sample.php | 4 ++--
lib/util.php | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/config/config.sample.php b/config/config.sample.php
index c915a87729..78dfe17ea7 100644
--- 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 65d66abc59..4170de2125 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);
--
GitLab