From e2b0054be49b513a63b3870fcc65f45f30b5b338 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Tue, 19 Mar 2013 01:10:02 +0400
Subject: experimental patch to enable compatibility with php safe_mode

---
 include/functions.php    | 54 ++++++++++++++++++++++++++++++++++++++++++++++--
 include/sanity_check.php |  4 ++--
 2 files changed, 54 insertions(+), 4 deletions(-)

(limited to 'include')

diff --git a/include/functions.php b/include/functions.php
index 2120a96b9..435ce24b4 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -286,11 +286,12 @@
 		global $fetch_last_error;
 
 		if (function_exists('curl_init') && !ini_get("open_basedir")) {
-			$ch = curl_init($url);
+			//$ch = curl_init($url);
+			$ch = curl_init(geturl($url));
 
 			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, true);
 			curl_setopt($ch, CURLOPT_MAXREDIRS, 20);
 			curl_setopt($ch, CURLOPT_BINARYTRANSFER, true);
 			curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
@@ -3906,6 +3907,55 @@
 	function implements_interface($class, $interface) {
 		return in_array($interface, class_implements($class));
 	}
+	
+	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');
+
+		$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_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);
+
+		$html = curl_exec($curl);
+
+		$status = curl_getinfo($curl);
+		curl_close($curl);
+
+		if($status['http_code']!=200){
+			if($status['http_code'] == 301 || $status['http_code'] == 302) {
+				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, $referer):'';
+			}
+			$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;
+		}
+		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 4925486a3..0373196b3 100644
--- a/include/sanity_check.php
+++ b/include/sanity_check.php
@@ -125,9 +125,9 @@
 				array_push($errors, "PHP support for iconv is required to handle multiple charsets.");
 			}
 
-			if (ini_get("safe_mode")) {
+			/* 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.");
-- 
cgit v1.2.3