define("PRIVACY_IMAGE_CACHE_DEFAULT_TIME", 86400); // 1 Day
require_once('include/security.php');
+require_once("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');
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("Expires: " . gmdate("D, d M Y H:i:s", time() + (31536000)) . " GMT");
header("Cache-Control: max-age=31536000");
+ $img = new Photo($img_str, $mime);
+ if($img->is_valid())
+ $img_str = $img->imageString();
+
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);
- //}
+ if (is_dir($_SERVER["DOCUMENT_ROOT"]."/privacy_image_cache"))
+ file_put_contents($_SERVER["DOCUMENT_ROOT"]."/privacy_image_cache/".privacy_image_cache_cachename($_REQUEST['url'], true), $img_str);
killme();
}
}
- require_once("Photo.php");
-
$valid = true;
$r = q("SELECT * FROM `photo` WHERE `resource-id` in ('%s', '%s') LIMIT 1", $urlhash, $urlhash2);
// It shouldn't happen but it does - spaces in URL
$_REQUEST['url'] = str_replace(" ", "+", $_REQUEST['url']);
- $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);
$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") {
$image = @imagecreatefromstring($img_str);
);
} 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)
$img->scaleImage(200); // Test
$img_str = $img->imageString();
}
- $mime = "image/jpeg";
+ //$mime = "image/jpeg";
}
}
+ $img = new Photo($img_str, $mime);
+ if($img->is_valid())
+ $img_str = $img->imageString();
// If there is a real existing directory then put the cache file there
// advantage: real file access is really fast
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();
}
// 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;
}
* @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];
logger("Purging old Cache of the Privacy Image Cache", LOGGER_DEBUG);
q('DELETE FROM `photo` WHERE `uid` = 0 AND `resource-id` LIKE "pic:%%" AND `created` < NOW() - INTERVAL %d SECOND', $cachetime);
- set_config('pi_cache', 'last_delete', $time);
clear_cache($a->get_basepath(), $a->get_basepath()."/privacy_image_cache");
-}
-
-
+ set_config('pi_cache', 'last_delete', $time);
+}
/**
* @param App $a
q('DELETE FROM `photo` WHERE `uid` = 0 AND `resource-id` LIKE "pic:%%"');
}
}
+
+function privacy_image_cache_parse_query($var) {
+ /**
+ * Use this function to parse out the query array element from
+ * the output of parse_url().
+ */
+ $var = parse_url($var, PHP_URL_QUERY);
+ $var = html_entity_decode($var);
+ $var = explode('&', $var);
+ $arr = array();
+
+ foreach($var as $val) {
+ $x = explode('=', $val);
+ $arr[$x[0]] = $x[1];
+ }
+
+ unset($val, $x, $var);
+ return $arr;
+}