diff options
author | Andrew Dolgov <[email protected]> | 2013-03-20 12:15:06 +0400 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2013-03-20 12:15:06 +0400 |
commit | 81153e6b8bdf3761ebe805ae9622a305d001a786 (patch) | |
tree | 1c53f46cd3ece30c8c95a2c794df6330abb3b9dc | |
parent | 54bc5594ab26ae961bb92c113a1d2815044e450f (diff) |
fix broken redirects
-rw-r--r-- | include/functions.php | 2 | ||||
-rw-r--r-- | plugins/af_unburn/init.php | 11 |
2 files changed, 9 insertions, 4 deletions
diff --git a/include/functions.php b/include/functions.php index 62699e175..a055d1edf 100644 --- a/include/functions.php +++ b/include/functions.php @@ -295,7 +295,7 @@ curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $timeout ? $timeout : 15); curl_setopt($ch, CURLOPT_TIMEOUT, $timeout ? $timeout : 45); - //curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true); + curl_setopt($ch, CURLOPT_FOLLOWLOCATION, !ini_get("safe_mode")); curl_setopt($ch, CURLOPT_MAXREDIRS, 20); curl_setopt($ch, CURLOPT_BINARYTRANSFER, true); curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); diff --git a/plugins/af_unburn/init.php b/plugins/af_unburn/init.php index a0c51c97e..9f0b6cb0d 100644 --- a/plugins/af_unburn/init.php +++ b/plugins/af_unburn/init.php @@ -29,11 +29,16 @@ class Af_Unburn extends Plugin { if (strpos($article["plugin_data"], "unburn,$owner_uid:") === FALSE) { - $ch = curl_init(geturl($article["link"])); + if (ini_get("safe_mode")) { + $ch = curl_init(geturl($article["link"])); + } else { + $ch = curl_init($article["link"]); + } + curl_setopt($ch, CURLOPT_TIMEOUT, 5); curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); curl_setopt($ch, CURLOPT_HEADER, true); - //curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true); + curl_setopt($ch, CURLOPT_FOLLOWLOCATION, !ini_get("safe_mode")); curl_setopt($ch, CURLOPT_USERAGENT, SELF_USER_AGENT); $contents = @curl_exec($ch); @@ -74,7 +79,7 @@ class Af_Unburn extends Plugin { return $article; } - + function geturl($url){ (function_exists('curl_init')) ? '' : die('cURL Must be installed for geturl function to work. Ask your host to enable it or uncomment extension=php_curl.dll in php.ini'); |