X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=privacy_image_cache%2Fprivacy_image_cache.php;h=4729900711d7aeed1ba161574d9bcdd2c4c722b7;hb=57232bcaa4f01053a1c31c44fdb30b9b31710537;hp=45aeb0800f179bff01f8c85174e90719c6879f78;hpb=e1b25a1556352fd1c8564c5060a3fce09736ee38;p=friendica-addons.git

diff --git a/privacy_image_cache/privacy_image_cache.php b/privacy_image_cache/privacy_image_cache.php
index 45aeb080..47299007 100644
--- a/privacy_image_cache/privacy_image_cache.php
+++ b/privacy_image_cache/privacy_image_cache.php
@@ -11,7 +11,8 @@ define("PRIVACY_IMAGE_CACHE_DEFAULT_TIME", 86400); // 1 Day
 require_once('include/security.php');
 
 function privacy_image_cache_install() {
-    register_hook('bbcode',       'addon/privacy_image_cache/privacy_image_cache.php', 'privacy_image_cache_bbcode_hook');
+    register_hook('prepare_body', 'addon/privacy_image_cache/privacy_image_cache.php', 'privacy_image_cache_prepare_body_hook');
+ //   register_hook('bbcode',       'addon/privacy_image_cache/privacy_image_cache.php', 'privacy_image_cache_bbcode_hook');
     register_hook('display_item', 'addon/privacy_image_cache/privacy_image_cache.php', 'privacy_image_cache_display_item_hook');
     register_hook('ping_xmlize',  'addon/privacy_image_cache/privacy_image_cache.php', 'privacy_image_cache_ping_xmlize_hook');
     register_hook('cron',         'addon/privacy_image_cache/privacy_image_cache.php', 'privacy_image_cache_cron');
@@ -19,6 +20,7 @@ function privacy_image_cache_install() {
 
 
 function privacy_image_cache_uninstall() {
+    unregister_hook('prepare_body', 'addon/privacy_image_cache/privacy_image_cache.php', 'privacy_image_cache_prepare_body_hook');
     unregister_hook('bbcode',       'addon/privacy_image_cache/privacy_image_cache.php', 'privacy_image_cache_bbcode_hook');
     unregister_hook('display_item', 'addon/privacy_image_cache/privacy_image_cache.php', 'privacy_image_cache_display_item_hook');
     unregister_hook('ping_xmlize',  'addon/privacy_image_cache/privacy_image_cache.php', 'privacy_image_cache_ping_xmlize_hook');
@@ -30,30 +32,144 @@ function privacy_image_cache_module() {}
 
 
 function privacy_image_cache_init() {
-    $urlhash = 'pic:' . sha1($_REQUEST['url']);
-    $r = q("SELECT * FROM `photo` WHERE `resource-id` = '%s' LIMIT 1", $urlhash );
-    if (count($r)) {
-        $img_str = $r[0]['data'];
-    }
-    else {
-        require_once("Photo.php");
-
-        $img_str = fetch_url($_REQUEST['url'],true);
-        $img = new Photo($img_str);
-        if($img->is_valid()) {
-            $img->store(0, 0, $urlhash, $_REQUEST['url'], '', 100);
-            $img_str = $img->imageString();
-        }
-    }
-
-
-    header("Content-type: image/jpeg");
-    header("Expires: " . gmdate("D, d M Y H:i:s", time() + (3600*24)) . " GMT");
-    header("Cache-Control: max-age=" . (3600*24));
-
-    echo $img_str;
-
-    killme();
+	global $a, $_SERVER;
+
+	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");
+		header('Etag: '.$_SERVER['HTTP_IF_NONE_MATCH']);
+		header("Expires: " . gmdate("D, d M Y H:i:s", time() + (31536000)) . " GMT");
+		header("Cache-Control: max-age=31536000");
+		if(function_exists('header_remove')) {
+			header_remove('Last-Modified');
+			header_remove('Expires');
+			header_remove('Cache-Control');
+		}
+		exit;
+	}
+
+	if ($a->config["system"]["db_log"] != "")
+		$stamp1 = microtime(true);
+
+	if(function_exists('header_remove')) {
+		header_remove('Pragma');
+		header_remove('pragma');
+	}
+
+	$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();
+		}
+	}
+
+	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 {
+		// It shouldn't happen but it does - spaces in URL
+		$_REQUEST['url'] = str_replace(" ", "+", $_REQUEST['url']);
+
+		$img_str = fetch_url($_REQUEST['url'],true);
+
+		$tempfile = tempnam(get_config("system","temppath"), "cache");
+		file_put_contents($tempfile, $img_str);
+		$mime = image_type_to_mime_type(exif_imagetype($tempfile));
+		unlink($tempfile);
+
+		// If there is an error then return a blank image
+		if ((substr($a->get_curl_code(), 0, 1) == "4") or (!$img_str)) {
+			$img_str = file_get_contents("images/blank.png");
+			$mime = "image/png";
+			$cachefile = ""; // Clear the cachefile so that the dummy isn't stored
+			$img = new Photo($img_str);
+			if($img->is_valid()) {
+				$img->scaleImage(1);
+				$img_str = $img->imageString();
+			}
+		//} else if (substr($img_str, 0, 6) == "GIF89a") {
+		} else if ($mime != "image/jpeg") {
+			$image = @imagecreatefromstring($img_str);
+
+			if($image === FALSE) die();
+
+			q("INSERT INTO `photo`
+			( `uid`, `contact-id`, `guid`, `resource-id`, `created`, `edited`, `filename`, `album`, `height`, `width`, `desc`, `data`, `scale`, `profile`, `allow_cid`, `allow_gid`, `deny_cid`, `deny_gid` )
+			VALUES ( %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', '%s', %d, %d, '%s', '%s', '%s', '%s' )",
+				0, 0, get_guid(), dbesc($urlhash),
+				dbesc(datetime_convert()),
+				dbesc(datetime_convert()),
+				dbesc(basename(dbesc($_REQUEST["url"]))),
+				dbesc(''),
+				intval(imagesy($image)),
+				intval(imagesx($image)),
+				$mime,
+				dbesc($img_str),
+				100,
+				intval(0),
+				dbesc(''), dbesc(''), dbesc(''), dbesc('')
+			);
+
+		} else {
+			$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";
+		}
+	}
+
+	// Writing in cachefile
+	// and (file_exists($cachefile)) and (exif_imagetype($cachefile) > 0))
+	if ($cachefile != '')
+		file_put_contents($cachefile, $img_str);
+
+	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();
 }
 
 /**
@@ -62,7 +178,11 @@ function privacy_image_cache_init() {
  */
 function privacy_image_cache_is_local_image($url) {
     if ($url[0] == '/') return true;
-    $baseurl = get_app()->get_baseurl();
+	if (strtolower(substr($url, 0, 5)) == "data:") return true;
+
+	// links normalised - bug #431
+    $baseurl = normalise_link(get_app()->get_baseurl());
+	$url = normalise_link($url);
     return (substr($url, 0, strlen($baseurl)) == $baseurl);
 }
 
@@ -71,16 +191,28 @@ function privacy_image_cache_is_local_image($url) {
  * @return string
  */
 function privacy_image_cache_img_cb($matches) {
-    if (privacy_image_cache_is_local_image($matches[2])) return $matches[2];
-    return $matches[1] . "/privacy_image_cache/?url=" . escape_tags(addslashes($matches[2])) . $matches[3];
+	// following line changed per bug #431
+	if (privacy_image_cache_is_local_image($matches[2]))
+		return $matches[1] . $matches[2] . $matches[3];
+
+	return $matches[1] . get_app()->get_baseurl() . "/privacy_image_cache/?url=" . addslashes(rawurlencode(htmlspecialchars_decode($matches[2]))) . $matches[3];
 }
 
 /**
  * @param App $a
  * @param string $o
  */
+function privacy_image_cache_prepare_body_hook(&$a, &$o) {
+	$o["html"] = preg_replace_callback("/(<img [^>]*src *= *[\"'])([^\"']+)([\"'][^>]*>)/siU", "privacy_image_cache_img_cb", $o["html"]);
+}
+
+/**
+ * @param App $a
+ * @param string $o
+ * Function disabled because the plugin moved
+ */
 function privacy_image_cache_bbcode_hook(&$a, &$o) {
-    $o = preg_replace_callback("/(<img [^>]*src *= *[\"'])([^\"']+)([\"'][^>]*>)/siU", "privacy_image_cache_img_cb", $o);
+	//$o = preg_replace_callback("/(<img [^>]*src *= *[\"'])([^\"']+)([\"'][^>]*>)/siU", "privacy_image_cache_img_cb", $o);
 }
 
 
@@ -91,9 +223,11 @@ function privacy_image_cache_bbcode_hook(&$a, &$o) {
 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"] = "/privacy_image_cache/?url=" . escape_tags(addslashes($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"] = "/privacy_image_cache/?url=" . escape_tags(addslashes($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/?url=" . escape_tags(addslashes(rawurlencode($o["output"]["owner-avatar"])));
     }
 }
 
@@ -104,7 +238,7 @@ function privacy_image_cache_display_item_hook(&$a, &$o) {
  */
 function privacy_image_cache_ping_xmlize_hook(&$a, &$o) {
     if ($o["photo"] != "" && !privacy_image_cache_is_local_image($o["photo"]))
-        $o["photo"] = "/privacy_image_cache/?url=" . escape_tags(addslashes($o["photo"]));
+        $o["photo"] = $a->get_baseurl() . "/privacy_image_cache/?url=" . escape_tags(addslashes(rawurlencode($o["photo"])));
 }
 
 
@@ -112,7 +246,7 @@ function privacy_image_cache_ping_xmlize_hook(&$a, &$o) {
  * @param App $a
  * @param null|object $b
  */
-function privacy_image_cache_cron(&$a, &$b) {
+function privacy_image_cache_cron(&$a = null, &$b = null) {
     $cachetime = get_config('privacy_image_cache','cache_time');
     if (!$cachetime) $cachetime = PRIVACY_IMAGE_CACHE_DEFAULT_TIME;
 
@@ -161,7 +295,7 @@ function privacy_image_cache_plugin_admin(&$a, &$o){
  * @param App $a
  * @param null|object $o
  */
-function privacy_image_cache_plugin_admin_post(&$a, &$o){
+function privacy_image_cache_plugin_admin_post(&$a = null, &$o = null){
     check_form_security_token_redirectOnErr('/admin/plugins/privacy_image_cache', 'picsave');
 
     if (isset($_REQUEST['save'])) {
@@ -172,4 +306,4 @@ function privacy_image_cache_plugin_admin_post(&$a, &$o){
     if (isset($_REQUEST['delete_all'])) {
         q('DELETE FROM `photo` WHERE `uid` = 0 AND `resource-id` LIKE "pic:%%"');
     }
-}
\ No newline at end of file
+}