Skip to content
Snippets Groups Projects
Commit f381d2e9 authored by root's avatar root
Browse files

call it "proxy" instead of "curlproxy"

Thanks Bart for the hint.
This also switches "==" to "<>" and not the code actually works ;-)
parent 2a55beab
Branches
No related tags found
No related merge requests found
......@@ -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" => "",
......
......@@ -696,11 +696,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);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment