drop support for (obsolete, removed from recent php versions) php safe_mode setting

remove ugly hacks for curl + open_basedir combination breaking support for http redirects

3 files changed, 5 insertions, 89 deletions

diff --git a/include/functions.php b/include/functions.php
index 92d6e9790..8d1c2a625 100644..100755
--- a/include/functions.php
+++ b/include/functions.php
@@ -351,16 +351,7 @@
 
 			$fetch_curl_used = true;
 
-			if (ini_get("safe_mode") || ini_get("open_basedir") || defined("FORCE_GETURL")) {
-				$new_url = geturl($url);
-				if (!$new_url) {
-				    // geturl has already populated $fetch_last_error
-				    return false;
-				}
-				$ch = curl_init($new_url);
-			} else {
-				$ch = curl_init($url);
-			}
+			$ch = curl_init($url);
 
 			if ($timestamp && !$post_query) {
 				curl_setopt($ch, CURLOPT_HTTPHEADER,
@@ -369,7 +360,7 @@
 
 			curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $timeout ? $timeout : FILE_FETCH_CONNECT_TIMEOUT);
 			curl_setopt($ch, CURLOPT_TIMEOUT, $timeout ? $timeout : FILE_FETCH_TIMEOUT);
-			curl_setopt($ch, CURLOPT_FOLLOWLOCATION, !ini_get("safe_mode") && !ini_get("open_basedir"));
+			curl_setopt($ch, CURLOPT_FOLLOWLOCATION, !ini_get("open_basedir"));
 			curl_setopt($ch, CURLOPT_MAXREDIRS, 20);
 			curl_setopt($ch, CURLOPT_BINARYTRANSFER, true);
 			curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
@@ -379,7 +370,7 @@
 			curl_setopt($ch, CURLOPT_ENCODING, "");
 			//curl_setopt($ch, CURLOPT_REFERER, $url);
 
-			if (!ini_get("safe_mode") && !ini_get("open_basedir")) {
+			if (!ini_get("open_basedir")) {
 				curl_setopt($ch, CURLOPT_COOKIEJAR, "/dev/null");
 			}
 
diff --git a/include/functions2.php b/include/functions2.php
index 51759aea9..779688716 100755
--- a/include/functions2.php
+++ b/include/functions2.php
@@ -2249,77 +2249,6 @@
 		return in_array($interface, class_implements($class));
 	}
 
-	function geturl($url, $depth = 0, $nobody = true){
-
-		if ($depth == 20) return $url;
-
-		if (!function_exists('curl_init'))
-			return user_error('CURL Must be installed for geturl function to work. Ask your host to enable it or uncomment extension=php_curl.dll in php.ini', E_USER_ERROR);
-
-		$curl = curl_init();
-		$header[0] = "Accept: text/xml,application/xml,application/xhtml+xml,";
-		$header[0] .= "text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5";
-		$header[] = "Cache-Control: max-age=0";
-		$header[] = "Connection: keep-alive";
-		$header[] = "Keep-Alive: 300";
-		$header[] = "Accept-Charset: ISO-8859-1,utf-8;q=0.7,*;q=0.7";
-		$header[] = "Accept-Language: en-us,en;q=0.5";
-		$header[] = "Pragma: ";
-
-		curl_setopt($curl, CURLOPT_URL, $url);
-		curl_setopt($curl, CURLOPT_USERAGENT, 'Mozilla/5.0 (Windows NT 5.1; rv:5.0) Gecko/20100101 Firefox/5.0 Firefox/5.0');
-		curl_setopt($curl, CURLOPT_HTTPHEADER, $header);
-		curl_setopt($curl, CURLOPT_HEADER, true);
-		curl_setopt($curl, CURLOPT_NOBODY, $nobody);
-		curl_setopt($curl, CURLOPT_REFERER, $url);
-		curl_setopt($curl, CURLOPT_ENCODING, 'gzip,deflate');
-		curl_setopt($curl, CURLOPT_AUTOREFERER, true);
-		curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
-		//curl_setopt($curl, CURLOPT_FOLLOWLOCATION, true); //CURLOPT_FOLLOWLOCATION Disabled...
-		curl_setopt($curl, CURLOPT_TIMEOUT, 60);
-
-		if (defined('_CURL_HTTP_PROXY')) {
-			curl_setopt($curl, CURLOPT_PROXY, _CURL_HTTP_PROXY);
-		}
-
-		$html = curl_exec($curl);
-
-		$status = curl_getinfo($curl);
-
-		if($status['http_code']!=200){
-
-			// idiot site not allowing http head
-			if($status['http_code'] == 405) {
-				curl_close($curl);
-				return geturl($url, $depth +1, false);
-			}
-
-			if($status['http_code'] == 301 || $status['http_code'] == 302) {
-				curl_close($curl);
-				list($header) = explode("\r\n\r\n", $html, 2);
-				$matches = array();
-				preg_match("/(Location:|URI:)[^(\n)]*/", $header, $matches);
-				$url = trim(str_replace($matches[1],"",$matches[0]));
-				$url_parsed = parse_url($url);
-				return (isset($url_parsed))? geturl($url, $depth + 1):'';
-			}
-
-			global $fetch_last_error;
-
-			$fetch_last_error = curl_errno($curl) . " " . curl_error($curl);
-			curl_close($curl);
-
-#			$oline='';
-#			foreach($status as $key=>$eline){$oline.='['.$key.']'.$eline.' ';}
-#			$line =$oline." \r\n ".$url."\r\n-----------------\r\n";
-#			$handle = @fopen('./curl.error.log', 'a');
-#			fwrite($handle, $line);
-			return FALSE;
-		}
-		curl_close($curl);
-		return $url;
-	}
-
 	function get_minified_js($files) {
 		require_once 'lib/jshrink/Minifier.php';
 
diff --git a/include/sanity_check.php b/include/sanity_check.php
index 6bec43051..be314f4e2 100644..100755
--- a/include/sanity_check.php
+++ b/include/sanity_check.php
@@ -134,14 +134,10 @@
 				array_push($errors, "PHP support for hash() function is required but was not found.");
 			}
 
-			if (!function_exists("ctype_lower")) {
-				array_push($errors, "PHP support for ctype functions are required by HTMLPurifier.");
+			if (ini_get("safe_mode")) {
+				array_push($errors, "PHP safe mode setting is obsolete and not supported by tt-rss.");
 			}
 
-			/* if (ini_get("safe_mode")) {
-				array_push($errors, "PHP safe mode setting is not supported.");
-			} */
-
 			if ((PUBSUBHUBBUB_HUB || PUBSUBHUBBUB_ENABLED) && !function_exists("curl_init")) {
 				array_push($errors, "PHP support for CURL is required for PubSubHubbub.");
 			}