From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Wed, 20 Mar 2013 08:15:06 +0000 (+0400)
Subject: fix broken redirects
X-Git-Tag: 1.7.5~79
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=81153e6b8bdf3761ebe805ae9622a305d001a786;p=tt-rss.git

fix broken redirects
---

diff --git a/include/functions.php b/include/functions.php
index 62699e17..a055d1ed 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 a0c51c97..9f0b6cb0 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');