diff options
author | cbhp <cbhp@users.noreply.github.com> | 2014-09-03 18:00:05 +0200 |
---|---|---|
committer | cbhp <cbhp@users.noreply.github.com> | 2014-09-03 18:00:05 +0200 |
commit | c00450b2c715d5928af4ff3f1b8489cd69128c99 (patch) | |
tree | 3cf5d8aa8d31d390aefd8d1da054e269b5d80885 /lib | |
parent | 969b41c1c95239796c5eb98a8dac71b5ea367043 (diff) | |
download | nextcloud-server-c00450b2c715d5928af4ff3f1b8489cd69128c99.tar.gz nextcloud-server-c00450b2c715d5928af4ff3f1b8489cd69128c99.zip |
always use a user-agent constant
Some providers block connections with missing user-agents. Also
user-agents are useful for analyzing requests. I've added a USER_AGENT
constant that is used in cURL and in file_get_contents.
Diffstat (limited to 'lib')
-rwxr-xr-x | lib/private/util.php | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/lib/private/util.php b/lib/private/util.php index 1711dd7cf01..7c427f20a23 100755 --- a/lib/private/util.php +++ b/lib/private/util.php @@ -5,6 +5,8 @@ * */ class OC_Util { + const USER_AGENT = 'ownCloud Server Crawler'; + public static $scripts = array(); public static $styles = array(); public static $headers = array(); @@ -1281,7 +1283,7 @@ class OC_Util { curl_setopt($curl, CURLOPT_URL, $url); - curl_setopt($curl, CURLOPT_USERAGENT, "ownCloud Server Crawler"); + curl_setopt($curl, CURLOPT_USERAGENT, self::USER_AGENT); if (OC_Config::getValue('proxy', '') != '') { curl_setopt($curl, CURLOPT_PROXY, OC_Config::getValue('proxy')); } @@ -1303,7 +1305,7 @@ class OC_Util { curl_setopt($rcurl, CURLOPT_NOBODY, true); curl_setopt($rcurl, CURLOPT_FORBID_REUSE, false); curl_setopt($rcurl, CURLOPT_RETURNTRANSFER, true); - curl_setopt($rcurl, CURLOPT_USERAGENT, "ownCloud Server Crawler"); + curl_setopt($rcurl, CURLOPT_USERAGENT, self::USER_AGENT); do { curl_setopt($rcurl, CURLOPT_URL, $newURL); $header = curl_exec($rcurl); @@ -1338,7 +1340,7 @@ class OC_Util { if (OC_Config::getValue('proxy', '') != '') { $contextArray = array( 'http' => array( - 'header' => "User-Agent: ownCloud Server Crawler\r\n", + 'header' => 'User-Agent: ' . self::USER_AGENT . "\r\n", 'timeout' => 10, 'proxy' => OC_Config::getValue('proxy') ) @@ -1346,7 +1348,7 @@ class OC_Util { } else { $contextArray = array( 'http' => array( - 'header' => "User-Agent: ownCloud Server Crawler\r\n", + 'header' => 'User-Agent: ' . self::USER_AGENT . "\r\n", 'timeout' => 10 ) ); |