wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

call it "proxy" instead of "curlproxy"

Browse source 
Thanks Bart for the hint.
This also switches "==" to "<>" and not the code actually works ;-)
This commit is contained in:
root 2012-12-15 00:09:39 +01:00 committed by Frank Karlitschek
parent f012135992
commit a64a923d56
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
config/config.sample.php
View file

@ -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" => "",

8
lib/util.php
View file

@ -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);