harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'patch-1' into 'dev'

Browse Source 
Disable image caching if personal or group permissions enabled

See merge request hubzilla/core!1377
This commit is contained in:
Mario 2018-11-08 10:25:11 +01:00
commit 61deb4fcfd
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Zotlabs/Module/Photo.php
View File

@ -128,9 +128,7 @@ class Photo extends \Zotlabs\Web\Controller {
$photo = substr($photo,0,-2); $photo = substr($photo,0,-2);
// If viewing on a high-res screen, attempt to serve a higher resolution image: // If viewing on a high-res screen, attempt to serve a higher resolution image:
if ($resolution == 2 && ($cookie_value > 1)) if ($resolution == 2 && ($cookie_value > 1))
{
$resolution = 1; $resolution = 1;
}
} }
$r = q("SELECT uid, photo_usage FROM photo WHERE resource_id = '%s' AND imgscale = %d LIMIT 1", $r = q("SELECT uid, photo_usage FROM photo WHERE resource_id = '%s' AND imgscale = %d LIMIT 1",
@ -171,6 +169,8 @@ class Photo extends \Zotlabs\Web\Controller {
$modified = strtotime($e[0]['edited']); $modified = strtotime($e[0]['edited']);
if(intval($e[0]['os_storage'])) if(intval($e[0]['os_storage']))
$streaming = $data; $streaming = $data;
if($e[0]['allow_cid'] != '' || $e[0]['allow_gid'] != '' || $e[0]['deny_gid'] != '' || $e[0]['deny_gid'] != '')
$prvcachecontrol = true;
} }
else { else {
if(! $allowed) { if(! $allowed) {
@ -188,13 +188,13 @@ class Photo extends \Zotlabs\Web\Controller {
header_remove('Pragma'); header_remove('Pragma');
if($ismodified === gmdate("D, d M Y H:i:s", $modified) . " GMT") { if($ismodified === gmdate("D, d M Y H:i:s", $modified) . " GMT") {
header_remove('Expires'); header_remove('Expires');
header_remove('Cache-Control'); header_remove('Cache-Control');
header_remove('Set-Cookie'); header_remove('Set-Cookie');
http_status_exit(304,'not modified'); http_status_exit(304,'not modified');
} }
if(! isset($data)) { if(! isset($data)) {
if(isset($resolution)) { if(isset($resolution)) {
switch($resolution) { switch($resolution) {