Merge pull request #99 from annando/master
rendertime and privacy_image_cache
This commit is contained in:
commit
b3710c96ea
|
|
@ -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');
|
||||
|
|
@ -47,9 +48,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');
|
||||
|
|
@ -83,7 +81,6 @@ function privacy_image_cache_init() {
|
|||
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");
|
||||
|
|
@ -92,21 +89,22 @@ function privacy_image_cache_init() {
|
|||
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;
|
||||
|
||||
//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);
|
||||
|
|
@ -119,15 +117,6 @@ function privacy_image_cache_init() {
|
|||
// 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";
|
||||
|
||||
$redirects = 0;
|
||||
$img_str = fetch_url($_REQUEST['url'],true, $redirects, 10);
|
||||
|
||||
|
|
@ -147,7 +136,6 @@ function privacy_image_cache_init() {
|
|||
$img->scaleImage(10);
|
||||
$img_str = $img->imageString();
|
||||
}
|
||||
//} else if (substr($img_str, 0, 6) == "GIF89a") {
|
||||
} else if ($mime != "image/jpeg") {
|
||||
$image = @imagecreatefromstring($img_str);
|
||||
|
||||
|
|
@ -171,17 +159,22 @@ 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)
|
||||
$img->scaleImage(200); // Test
|
||||
$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_str = $img->imageString();
|
||||
}
|
||||
|
||||
// If there is a real existing directory then put the cache file there
|
||||
// advantage: real file access is really fast
|
||||
|
|
@ -203,19 +196,14 @@ 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;
|
||||
|
||||
// echo $url;
|
||||
// $mime = image_type_to_mime_type(exif_imagetype($url));
|
||||
// echo $mime;
|
||||
$basepath = $_SERVER["DOCUMENT_ROOT"]."/privacy_image_cache";
|
||||
|
||||
$path = substr(hash("md5", $url), 0, 2);
|
||||
|
|
@ -243,7 +231,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;
|
||||
}
|
||||
|
||||
|
|
@ -258,6 +246,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];
|
||||
|
|
|
|||
43
rendertime/rendertime.php
Executable file
43
rendertime/rendertime.php
Executable file
|
|
@ -0,0 +1,43 @@
|
|||
<?php
|
||||
|
||||
|
||||
/**
|
||||
* Name: rendertime
|
||||
* Description: Shows the time that was needed to render the current page
|
||||
* Version: 0.1
|
||||
* Author: Michael Vvogel <http://pirati.ca/profile/heluecht>
|
||||
*
|
||||
*/
|
||||
|
||||
function rendertime_install() {
|
||||
register_hook('page_end', 'addon/rendertime/rendertime.php', 'rendertime_page_end');
|
||||
}
|
||||
|
||||
|
||||
function rendertime_uninstall() {
|
||||
unregister_hook('init_1', 'addon/rendertime/rendertime.php', 'rendertime_init_1');
|
||||
unregister_hook('page_end', 'addon/rendertime/rendertime.php', 'rendertime_page_end');
|
||||
}
|
||||
|
||||
function rendertime_init_1(&$a) {
|
||||
}
|
||||
|
||||
function rendertime_page_end(&$a, &$o) {
|
||||
|
||||
$duration = microtime(true)-$a->performance["start"];
|
||||
|
||||
$o = $o.'<div class="renderinfo">'.sprintf(t("Performance: Database: %s, Network: %s, Rendering: %s, Parser: %s, I/O: %s, Other: %s, Total: %s"),
|
||||
round($a->performance["database"], 3),
|
||||
round($a->performance["network"], 3),
|
||||
round($a->performance["rendering"], 3),
|
||||
round($a->performance["parser"], 3),
|
||||
round($a->performance["file"], 3),
|
||||
round($duration - $a->performance["database"] - $a->performance["network"]
|
||||
- $a->performance["rendering"] - $a->performance["parser"]
|
||||
- $a->performance["file"], 3),
|
||||
round($duration, 3)
|
||||
//round($a->performance["markstart"], 3)
|
||||
//round($a->performance["plugin"], 3)
|
||||
)."</div>";
|
||||
|
||||
}
|
||||
Loading…
Reference in a new issue