Merge remote branch 'friendica/master'

privacy_image_cache/privacy_image_cache.php

@@ -34,6 +34,9 @@ function privacy_image_cache_module() {}
 function privacy_image_cache_init() {
 	global $a;
 
+	if ($a->config["system"]["db_log"] != "")
+		$stamp1 = microtime(true);
+
 	if(function_exists('header_remove')) {
 		header_remove('Pragma');
 		header_remove('pragma');
@@ -45,7 +48,7 @@ function privacy_image_cache_init() {
 
 	$cache = get_config('system','itemcache');
 	if (($cache != '') and is_dir($cache)) {
-		$cachefile = $cache."/".hash("md5", $urlhash);
+		$cachefile = $cache."/".hash("md5", $_REQUEST['url']);
 		if (file_exists($cachefile)) {
 			$img_str = file_get_contents($cachefile);
 
@@ -57,18 +60,34 @@ function privacy_image_cache_init() {
 
 			echo $img_str;
 
+			if ($a->config["system"]["db_log"] != "") {
+				$stamp2 = microtime(true);
+				$duration = round($stamp2-$stamp1, 3);
+				if ($duration > $a->config["system"]["db_loglimit"])
+					@file_put_contents($a->config["system"]["db_log"], $duration."\t".strlen($img_str)."\t".$_REQUEST['url']."\n", FILE_APPEND);
+			}
+
 			killme();
 		}
 	}
 
+	require_once("Photo.php");
+
 	$r = q("SELECT * FROM `photo` WHERE `resource-id` in ('%s', '%s') LIMIT 1", $urlhash, $urlhash2);
 	if (count($r)) {
         	$img_str = $r[0]['data'];
 		$mime = $r[0]["desc"];
 		if ($mime == "") $mime = "image/jpeg";
-	} else {
-		require_once("Photo.php");
 
+		// Test
+		//if ($mime == "image/jpeg") {
+		//	$img = new Photo($img_str);
+		//	if($img->is_valid()) {
+		//		$img->scaleImage(1000);
+		//		$img_str = $img->imageString();
+		//	}
+		//}
+	} else {
 		// It shouldn't happen but it does - spaces in URL
 		$_REQUEST['url'] = str_replace(" ", "+", $_REQUEST['url']);
 
@@ -110,6 +129,7 @@ function privacy_image_cache_init() {
 			$img = new Photo($img_str);
 			if($img->is_valid()) {
 				$img->store(0, 0, $urlhash, $_REQUEST['url'], '', 100);
+				//$img->scaleImage(1000); // Test
 				$img_str = $img->imageString();
 			}
 			$mime = "image/jpeg";
@@ -117,7 +137,7 @@ function privacy_image_cache_init() {
 	}
 
 	// Writing in cachefile
-	if (isset($cachefile) && $cachefile != '')
+	if (isset($cachefile) && ($cachefile != '') and (exif_imagetype($cachefile) > 0))
 		file_put_contents($cachefile, $img_str);
 
 	header("Content-type: $mime");
@@ -126,6 +146,13 @@ function privacy_image_cache_init() {
 
 	echo $img_str;
 
+	if ($a->config["system"]["db_log"] != "") {
+		$stamp2 = microtime(true);
+		$duration = round($stamp2-$stamp1, 3);
+		if ($duration > $a->config["system"]["db_loglimit"])
+			@file_put_contents($a->config["system"]["db_log"], $duration."\t".strlen($img_str)."\t".$_REQUEST['url']."\n", FILE_APPEND);
+	}
+
 	killme();
 }
 

statusnet/statusnet.php

@@ -460,9 +460,9 @@ function statusnet_post_hook(&$a,&$b) {
 			// recycle 1
 			$recycle = html_entity_decode("♲ ", ENT_QUOTES, 'UTF-8');
 			$tmp = preg_replace( '/'.$recycle.'\[url\=(\w+.*?)\](\w+.*?)\[\/url\]/i', $recycle.'$2', $tmp);
-			// recycle 2
+			// recycle 2 (test)
-			//$recycle = html_entity_decode("♻ ", ENT_QUOTES, 'UTF-8');
+			$recycle = html_entity_decode("◌ ", ENT_QUOTES, 'UTF-8');
-			//$tmp = preg_replace( '/'.$recycle.'\[url\=(\w+.*?)\](\w+.*?)\[\/url\]/i', 'RT @$2:', $tmp);
+			$tmp = preg_replace( '/'.$recycle.'\[url\=(\w+.*?)\](\w+.*?)\[\/url\]/i', $recycle.'$2', $tmp);
                 }
                 // preserve links to webpages
                 $tmp = preg_replace( '/\[url\=(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,]+)\](\w+.*?)\[\/url\]/i', '$2 $1', $tmp);

twitter/twitter.php

@@ -326,9 +326,9 @@ function twitter_post_hook(&$a,&$b) {
 			// recycle 1
 			$recycle = html_entity_decode("♲ ", ENT_QUOTES, 'UTF-8');
 			$tmp = preg_replace( '/'.$recycle.'\[url\=(\w+.*?)\](\w+.*?)\[\/url\]/i', $recycle.'$2', $tmp);
-			// recycle 2
+			// recycle 2 (Test)
-			//$recycle = html_entity_decode("♻ ", ENT_QUOTES, 'UTF-8');
+			$recycle = html_entity_decode("◌ ", ENT_QUOTES, 'UTF-8');
-			//$tmp = preg_replace( '/'.$recycle.'\[url\=(\w+.*?)\](\w+.*?)\[\/url\]/i', 'RT @$2:', $tmp);
+			$tmp = preg_replace( '/'.$recycle.'\[url\=(\w+.*?)\](\w+.*?)\[\/url\]/i', $recycle.'$2', $tmp);
                 }
                 $tmp = preg_replace( '/\[url\=(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,]+)\](\w+.*?)\[\/url\]/i', '$2 $1', $tmp);
                 $tmp = preg_replace( '/\[bookmark\=(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,]+)\](\w+.*?)\[\/bookmark\]/i', '$2 $1', $tmp);