X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=privacy_image_cache%2Fprivacy_image_cache.php;h=1fa6c5e6557762045b5cb262bdd57822ea83d8dc;hb=0568a5d8bbbc81baa237ae262f9025b232279396;hp=d98c6b6d92aebb0522b8c66194438661606d5c73;hpb=52a2a800cf77382f9ed1a8c843b77ababf614545;p=friendica-addons.git

diff --git a/privacy_image_cache/privacy_image_cache.php b/privacy_image_cache/privacy_image_cache.php
index d98c6b6d..1fa6c5e6 100644
--- a/privacy_image_cache/privacy_image_cache.php
+++ b/privacy_image_cache/privacy_image_cache.php
@@ -9,6 +9,7 @@
 define("PRIVACY_IMAGE_CACHE_DEFAULT_TIME", 86400); // 1 Day
 
 require_once('include/security.php');
+require_once("include/Photo.php");
 
 function privacy_image_cache_install() {
     register_hook('prepare_body', 'addon/privacy_image_cache/privacy_image_cache.php', 'privacy_image_cache_prepare_body_hook');
@@ -33,6 +34,13 @@ function privacy_image_cache_module() {}
 function privacy_image_cache_init() {
 	global $a, $_SERVER;
 
+	// The code needs to be reworked, it is too complicated
+	//
+	// it is doing the following:
+	// 1. If a folder "privacy_image_cache" exists and is writeable, then use this for caching
+	// 2. If a cache path is defined, use this
+	// 3. If everything else failed, cache into the database
+
 	if (isset($_SERVER['HTTP_IF_MODIFIED_SINCE'])) {
 		header('HTTP/1.1 304 Not Modified');
 		header("Last-Modified: " . gmdate("D, d M Y H:i:s", time()) . " GMT");
@@ -47,9 +55,6 @@ function privacy_image_cache_init() {
 		exit;
 	}
 
-	//if ($a->config["system"]["db_log"] != "")
-	//	$stamp1 = microtime(true);
-
 	if(function_exists('header_remove')) {
 		header_remove('Pragma');
 		header_remove('pragma');
@@ -57,78 +62,85 @@ function privacy_image_cache_init() {
 
 	$thumb = false;
 
+	// If the cache path isn't there, try to create it
+	if (!is_dir($_SERVER["DOCUMENT_ROOT"]."/privacy_image_cache"))
+		if (is_writable($_SERVER["DOCUMENT_ROOT"]))
+			mkdir($_SERVER["DOCUMENT_ROOT"]."/privacy_image_cache");
+
+	// Checking if caching into a folder in the webroot is activated and working
+	$direct_cache = (is_dir($_SERVER["DOCUMENT_ROOT"]."/privacy_image_cache") AND is_writable($_SERVER["DOCUMENT_ROOT"]."/privacy_image_cache"));
+
 	// Look for filename in the arguments
-	if (isset($a->argv[1]) OR isset($a->argv[2])) {
-		if (isset($a->argv[2]))
+	if (isset($a->argv[1]) OR isset($a->argv[2]) OR isset($a->argv[3])) {
+		if (isset($a->argv[3]))
+			$url = $a->argv[3];
+		elseif (isset($a->argv[2]))
 			$url = $a->argv[2];
 		else
 			$url = $a->argv[1];
 
-		$pos = strrpos($url, "==.");
+		$pos = strrpos($url, "=.");
 		if ($pos)
-			$url = substr($url, 0, $pos+2);
+			$url = substr($url, 0, $pos+1);
+
+		$url = str_replace(array(".jpg", ".jpeg", ".gif", ".png"), array("","","",""), $url);
 
 		$url = base64_decode(strtr($url, '-_', '+/'), true);
+
 		if ($url)
 			$_REQUEST['url'] = $url;
-
 		$thumb = (isset($a->argv[3]) and ($a->argv[3] == "thumb"));
 	}
 
-	$urlhash = 'pic:' . sha1($_REQUEST['url']);
-	// Double encoded url - happens with Diaspora
-	$urlhash2 = 'pic:' . sha1(urldecode($_REQUEST['url']));
-
-	$cachefile = get_cachefile(hash("md5", $_REQUEST['url']));
-	if ($cachefile != '') {
-		if (file_exists($cachefile)) {
-			$img_str = file_get_contents($cachefile);
-
-			$mime = image_type_to_mime_type(exif_imagetype($cachefile));
-
-			header("Content-type: $mime");
-			header("Last-Modified: " . gmdate("D, d M Y H:i:s", time()) . " GMT");
-			header('Etag: "'.md5($img_str).'"');
-			header("Expires: " . gmdate("D, d M Y H:i:s", time() + (31536000)) . " GMT");
-			header("Cache-Control: max-age=31536000");
-
-			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();
+	if (!$direct_cache) {
+		$urlhash = 'pic:' . sha1($_REQUEST['url']);
+		// Double encoded url - happens with Diaspora
+		$urlhash2 = 'pic:' . sha1(urldecode($_REQUEST['url']));
+
+		$cachefile = get_cachefile(hash("md5", $_REQUEST['url']));
+		if ($cachefile != '') {
+			if (file_exists($cachefile)) {
+				$img_str = file_get_contents($cachefile);
+				$mime = image_type_to_mime_type(exif_imagetype($cachefile));
+
+				header("Content-type: $mime");
+				header("Last-Modified: " . gmdate("D, d M Y H:i:s", time()) . " GMT");
+				header('Etag: "'.md5($img_str).'"');
+				header("Expires: " . gmdate("D, d M Y H:i:s", time() + (31536000)) . " GMT");
+				header("Cache-Control: max-age=31536000");
+
+				// reduce quality - if it isn't a GIF
+				if ($mime != "image/gif") {
+					$img = new Photo($img_str, $mime);
+					if($img->is_valid()) {
+						$img_str = $img->imageString();
+					}
+				}
+
+				echo $img_str;
+				killme();
+			}
 		}
-	}
-
-	require_once("Photo.php");
+	} else
+		$cachefile = "";
 
 	$valid = true;
 
-	$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";
+	if (!$direct_cache AND ($cachefile == "")) {
+		$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
+		$r = array();
 
-	} else {
+	if (!count($r)) {
 		// It shouldn't happen but it does - spaces in URL
 		$_REQUEST['url'] = str_replace(" ", "+", $_REQUEST['url']);
-
-		// if the picture seems to be from another picture cache then take the original source
-		$queryvar = privacy_image_cache_parse_query($_REQUEST['url']);
-		if ($queryvar['url'] != "")
-			$_REQUEST['url'] = urldecode($queryvar['url']);
-
-		// if fetching facebook pictures don't fetch the thumbnail but the big one
-		if (strpos($_REQUEST['url'], ".fbcdn.net/") and (substr($_REQUEST['url'], -6) == "_s.jpg"))
-			$_REQUEST['url'] = substr($_REQUEST['url'], 0, -6)."_n.jpg";
-
-		$img_str = fetch_url($_REQUEST['url'],true);
+		$redirects = 0;
+		$img_str = fetch_url($_REQUEST['url'],true, $redirects, 10);
 
 		$tempfile = tempnam(get_config("system","temppath"), "cache");
 		file_put_contents($tempfile, $img_str);
@@ -141,13 +153,12 @@ function privacy_image_cache_init() {
 			$mime = "image/png";
 			$cachefile = ""; // Clear the cachefile so that the dummy isn't stored
 			$valid = false;
-			$img = new Photo($img_str);
+			$img = new Photo($img_str, "image/png");
 			if($img->is_valid()) {
-				$img->scaleImage(1);
+				$img->scaleImage(10);
 				$img_str = $img->imageString();
 			}
-		//} else if (substr($img_str, 0, 6) == "GIF89a") {
-		} else if ($mime != "image/jpeg") {
+		} else if (($mime != "image/jpeg") AND !$direct_cache AND ($cachefile == "")) {
 			$image = @imagecreatefromstring($img_str);
 
 			if($image === FALSE) die();
@@ -170,22 +181,33 @@ function privacy_image_cache_init() {
 			);
 
 		} else {
-			$img = new Photo($img_str);
+			$img = new Photo($img_str, $mime);
 			if($img->is_valid()) {
-				$img->store(0, 0, $urlhash, $_REQUEST['url'], '', 100);
-				if ($thumb)
+				if (!$direct_cache AND ($cachefile == ""))
+					$img->store(0, 0, $urlhash, $_REQUEST['url'], '', 100);
+
+				if ($thumb) {
 					$img->scaleImage(200); // Test
-				$img_str = $img->imageString();
+					$img_str = $img->imageString();
+				}
 			}
-			$mime = "image/jpeg";
+			//$mime = "image/jpeg";
 		}
 	}
 
+	// reduce quality - if it isn't a GIF
+	if ($mime != "image/gif") {
+		$img = new Photo($img_str, $mime);
+		if($img->is_valid()) {
+			$img->scaleImage(1024); // Test
+			$img_str = $img->imageString();
+		}
+	}
 
 	// If there is a real existing directory then put the cache file there
 	// advantage: real file access is really fast
 	// Otherwise write in cachefile
-	if ($valid AND is_dir($_SERVER["DOCUMENT_ROOT"]."/privacy_image_cache"))
+	if ($valid AND $direct_cache)
 		file_put_contents($_SERVER["DOCUMENT_ROOT"]."/privacy_image_cache/".privacy_image_cache_cachename($_REQUEST['url'], true), $img_str);
 	elseif ($cachefile != '')
 		file_put_contents($cachefile, $img_str);
@@ -202,19 +224,20 @@ 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();
 }
 
 function privacy_image_cache_cachename($url, $writemode = false) {
 	global $_SERVER;
 
+	$pos = strrpos($url, ".");
+	if ($pos) {
+		$extension = strtolower(substr($url, $pos+1));
+		$pos = strpos($extension, "?");
+		if ($pos)
+			$extension = substr($extension, 0, $pos);
+	}
+
 	$basepath = $_SERVER["DOCUMENT_ROOT"]."/privacy_image_cache";
 
 	$path = substr(hash("md5", $url), 0, 2);
@@ -227,6 +250,11 @@ function privacy_image_cache_cachename($url, $writemode = false) {
 
 	$path .= "/".strtr(base64_encode($url), '+/', '-_');
 
+	$extensions = array("jpg", "jpeg", "gif", "png");
+
+	if (in_array($extension, $extensions))
+		$path .= ".".$extension;
+
 	return($path);
 }
 
@@ -242,7 +270,7 @@ function privacy_image_cache_is_local_image($url) {
 	// Check if the cached path would be longer than 255 characters - apache doesn't like it
 	if (is_dir($_SERVER["DOCUMENT_ROOT"]."/privacy_image_cache")) {
 		$cachedurl = get_app()->get_baseurl()."/privacy_image_cache/". privacy_image_cache_cachename($url);
-		if (strlen($url) > 255)
+		if (strlen($url) > 150)
 			return true;
 	}
 
@@ -257,6 +285,16 @@ function privacy_image_cache_is_local_image($url) {
  * @return string
  */
 function privacy_image_cache_img_cb($matches) {
+
+	// if the picture seems to be from another picture cache then take the original source
+	$queryvar = privacy_image_cache_parse_query($matches[2]);
+	if ($queryvar['url'] != "")
+		$matches[2] = urldecode($queryvar['url']);
+
+	// if fetching facebook pictures don't fetch the thumbnail but the big one
+	if (strpos($matches[2], ".fbcdn.net/") and (substr($matches[2], -6) == "_s.jpg"))
+		$matches[2] = substr($matches[2], 0, -6)."_n.jpg";
+
 	// following line changed per bug #431
 	if (privacy_image_cache_is_local_image($matches[2]))
 		return $matches[1] . $matches[2] . $matches[3];
@@ -292,13 +330,12 @@ function privacy_image_cache_display_item_hook(&$a, &$o) {
     if (isset($o["output"])) {
         if (isset($o["output"]["thumb"]) && !privacy_image_cache_is_local_image($o["output"]["thumb"]))
             $o["output"]["thumb"] = $a->get_baseurl() . "/privacy_image_cache/".privacy_image_cache_cachename($o["output"]["thumb"]);
-            //$o["output"]["thumb"] = $a->get_baseurl() . "/privacy_image_cache/?url=" . escape_tags(addslashes(rawurlencode($o["output"]["thumb"])));
         if (isset($o["output"]["author-avatar"]) && !privacy_image_cache_is_local_image($o["output"]["author-avatar"]))
             $o["output"]["author-avatar"] = $a->get_baseurl() . "/privacy_image_cache/".privacy_image_cache_cachename($o["output"]["author-avatar"]);
-            //$o["output"]["author-avatar"] = $a->get_baseurl() . "/privacy_image_cache/?url=" . escape_tags(addslashes(rawurlencode($o["output"]["author-avatar"])));
         if (isset($o["output"]["owner-avatar"]) && !privacy_image_cache_is_local_image($o["output"]["owner-avatar"]))
             $o["output"]["owner-avatar"] = $a->get_baseurl() . "/privacy_image_cache/".privacy_image_cache_cachename($o["output"]["owner-avatar"]);
-            //$o["output"]["owner-avatar"] = $a->get_baseurl() . "/privacy_image_cache/?url=" . escape_tags(addslashes(rawurlencode($o["output"]["owner-avatar"])));
+        if (isset($o["output"]["owner_photo"]) && !privacy_image_cache_is_local_image($o["output"]["owner_photo"]))
+            $o["output"]["owner_photo"] = $a->get_baseurl() . "/privacy_image_cache/".privacy_image_cache_cachename($o["output"]["owner_photo"]);
     }
 }
 
@@ -308,8 +345,8 @@ function privacy_image_cache_display_item_hook(&$a, &$o) {
  * @param string $o
  */
 function privacy_image_cache_ping_xmlize_hook(&$a, &$o) {
-    if ($o["photo"] != "" && !privacy_image_cache_is_local_image($o["photo"]))
-        $o["photo"] = $a->get_baseurl() . "/privacy_image_cache/".privacy_image_cache_cachename($o["photo"]);
+	if ($o["photo"] != "" && !privacy_image_cache_is_local_image($o["photo"]))
+		$o["photo"] = $a->get_baseurl() . "/privacy_image_cache/".privacy_image_cache_cachename($o["photo"]);
         //$o["photo"] = $a->get_baseurl() . "/privacy_image_cache/?url=" . escape_tags(addslashes(rawurlencode($o["photo"])));
 }