aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2018-12-04 11:38:58 +0100
committerMario <mario@mariovavti.com>2018-12-04 11:38:58 +0100
commiteaa52c19a87ef90a16978b22c9757287cb6fba6f (patch)
tree21430dc27c7d0fc88ef4b14e14d94f0b008ee1a5
parent5e14da67e1329947a14cc4f009cebcfe4a5ece2f (diff)
parent1c44912aff2c7f026fe1e5e74eb1d70920d17747 (diff)
downloadvolse-hubzilla-eaa52c19a87ef90a16978b22c9757287cb6fba6f.tar.gz
volse-hubzilla-eaa52c19a87ef90a16978b22c9757287cb6fba6f.tar.bz2
volse-hubzilla-eaa52c19a87ef90a16978b22c9757287cb6fba6f.zip
Merge branch 'photocache' into 'dev'
Less dependence on cache logic See merge request hubzilla/core!1417
-rw-r--r--Zotlabs/Module/Photo.php27
1 files changed, 12 insertions, 15 deletions
diff --git a/Zotlabs/Module/Photo.php b/Zotlabs/Module/Photo.php
index d85db7307..ddff3a68e 100644
--- a/Zotlabs/Module/Photo.php
+++ b/Zotlabs/Module/Photo.php
@@ -139,7 +139,7 @@ class Photo extends \Zotlabs\Web\Controller {
$resolution = 1;
}
- $r = q("SELECT uid, photo_usage, expires, display_path FROM photo WHERE resource_id = '%s' AND imgscale = %d LIMIT 1",
+ $r = q("SELECT uid, photo_usage, display_path FROM photo WHERE resource_id = '%s' AND imgscale = %d LIMIT 1",
dbesc($photo),
intval($resolution)
);
@@ -156,20 +156,17 @@ class Photo extends \Zotlabs\Web\Controller {
if(! in_array($resolution,[4,5,6]))
$allowed = (-1);
if($u === PHOTO_CACHE) {
- // Cached image leak protection
- if(! (local_channel() || $cache_mode['leak'])) {
- header("Location: " . $r[0]['display_path']);
- killme();
- }
- // Revalidate cache
- if($cache_mode['on'] && strtotime($r[0]['expires']) - 60 < time()) {
- $cache = array(
- 'url' => $r[0]['display_path'],
- 'uid' => $r[0]['uid']
- );
+ // Validate cache
+ $cache = array(
+ 'resid' => $photo,
+ 'uid' => $r[0]['uid'],
+ 'status' => false
+ );
+ if($cache_mode['on'])
call_hooks('cache_url_hook', $cache);
- if(! $cache['status'])
- http_status_exit(404,'not found');
+ if(! $cache['status']) {
+ header("Location: " . htmlspecialchars_decode($r[0]['display_path']));
+ killme();
}
}
}
@@ -184,7 +181,7 @@ class Photo extends \Zotlabs\Web\Controller {
dbesc($photo),
intval($resolution)
);
-
+
$exists = (($e) ? true : false);
if($exists && $allowed) {