From e0d68664c461f5649c760536c77532ef8c2e4818 Mon Sep 17 00:00:00 2001 From: Max Kostikov Date: Sun, 16 Dec 2018 20:48:36 +0100 Subject: Remove photo_cache_enable variable --- Zotlabs/Module/Photo.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Zotlabs/Module/Photo.php') diff --git a/Zotlabs/Module/Photo.php b/Zotlabs/Module/Photo.php index ddff3a68e..7365a5f64 100644 --- a/Zotlabs/Module/Photo.php +++ b/Zotlabs/Module/Photo.php @@ -32,7 +32,7 @@ class Photo extends \Zotlabs\Web\Controller { } $cache_mode = array( - 'on' => get_config('system','photo_cache_enable', 0), + 'on' => false, 'age' => 86400, 'exp' => true, 'leak' => false -- cgit v1.2.3 From 1b0a6fe9ebe8e5ae8a142745a53e228df2c6bbcf Mon Sep 17 00:00:00 2001 From: Max Kostikov Date: Mon, 17 Dec 2018 00:58:46 +0100 Subject: SSLify cached URL on redirect if needed --- Zotlabs/Module/Photo.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'Zotlabs/Module/Photo.php') diff --git a/Zotlabs/Module/Photo.php b/Zotlabs/Module/Photo.php index 7365a5f64..967a3b703 100644 --- a/Zotlabs/Module/Photo.php +++ b/Zotlabs/Module/Photo.php @@ -165,7 +165,9 @@ class Photo extends \Zotlabs\Web\Controller { if($cache_mode['on']) call_hooks('cache_url_hook', $cache); if(! $cache['status']) { - header("Location: " . htmlspecialchars_decode($r[0]['display_path'])); + $url = htmlspecialchars_decode($r[0]['display_path']); + call_hooks('cache_sslify_hook', $url); + header("Location: " . $url); killme(); } } -- cgit v1.2.3 From 05cb4fd8971f9c196d21ab21f08e840e471ab804 Mon Sep 17 00:00:00 2001 From: Max Kostikov Date: Mon, 17 Dec 2018 09:13:03 +0100 Subject: Move SSLify code from Photo cache addon --- Zotlabs/Module/Photo.php | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'Zotlabs/Module/Photo.php') diff --git a/Zotlabs/Module/Photo.php b/Zotlabs/Module/Photo.php index 967a3b703..e236cc5f4 100644 --- a/Zotlabs/Module/Photo.php +++ b/Zotlabs/Module/Photo.php @@ -159,15 +159,14 @@ class Photo extends \Zotlabs\Web\Controller { // Validate cache $cache = array( 'resid' => $photo, - 'uid' => $r[0]['uid'], - 'status' => false + 'url' => htmlspecialchars_decode($r[0]['display_path']) ); if($cache_mode['on']) call_hooks('cache_url_hook', $cache); - if(! $cache['status']) { - $url = htmlspecialchars_decode($r[0]['display_path']); - call_hooks('cache_sslify_hook', $url); - header("Location: " . $url); + if($cache['url'] != '') { + if(strpos(z_root(),'https:') !== false && strpos($cache['url'],'https:') === false) + $cache['url'] = z_root() . '/sslify/' . $filename . '?f=&url=' . urlencode($cache['url']); + header("Location: " . $cache['url']); killme(); } } -- cgit v1.2.3