From 2dd124d09e05dad1f640f25dc8c3cd8abdfd1aad Mon Sep 17 00:00:00 2001 From: Max Kostikov Date: Mon, 5 Nov 2018 21:25:08 +0100 Subject: Use modern get_config() syntax --- Zotlabs/Module/Photo.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'Zotlabs/Module/Photo.php') diff --git a/Zotlabs/Module/Photo.php b/Zotlabs/Module/Photo.php index 8efc00707..41a145ae1 100644 --- a/Zotlabs/Module/Photo.php +++ b/Zotlabs/Module/Photo.php @@ -240,10 +240,8 @@ class Photo extends \Zotlabs\Web\Controller { // This has performance considerations but we highly recommend you // leave it alone. - $cache = get_config('system','photo_cache_time'); - if(! $cache) - $cache = (3600 * 24); // 1 day - + $cache = get_config('system','photo_cache_time', 3600); + header("Expires: " . gmdate("D, d M Y H:i:s", time() + $cache) . " GMT"); header("Cache-Control: max-age=" . $cache); -- cgit v1.2.3 From f7ce374a28c2d5ad1ff8d8c81a544855d2bf5127 Mon Sep 17 00:00:00 2001 From: Max Kostikov Date: Mon, 5 Nov 2018 21:26:10 +0100 Subject: Update Photo.php --- 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 41a145ae1..f01909ff5 100644 --- a/Zotlabs/Module/Photo.php +++ b/Zotlabs/Module/Photo.php @@ -240,7 +240,7 @@ class Photo extends \Zotlabs\Web\Controller { // This has performance considerations but we highly recommend you // leave it alone. - $cache = get_config('system','photo_cache_time', 3600); + $cache = get_config('system','photo_cache_time', 86400); // 1 day by default header("Expires: " . gmdate("D, d M Y H:i:s", time() + $cache) . " GMT"); header("Cache-Control: max-age=" . $cache); -- cgit v1.2.3 From e116b90116b3d61548ce2bcf8949deee5feb6b98 Mon Sep 17 00:00:00 2001 From: Max Kostikov Date: Tue, 6 Nov 2018 13:37:50 +0100 Subject: 'Last-Modified' and 'Content-Length' HTTP headers added for better image caching --- Zotlabs/Module/Photo.php | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) (limited to 'Zotlabs/Module/Photo.php') diff --git a/Zotlabs/Module/Photo.php b/Zotlabs/Module/Photo.php index f01909ff5..14def3a62 100644 --- a/Zotlabs/Module/Photo.php +++ b/Zotlabs/Module/Photo.php @@ -33,8 +33,6 @@ class Photo extends \Zotlabs\Web\Controller { $observer_xchan = get_observer_hash(); - $default = z_root() . '/' . get_default_profile_photo(); - if(isset($type)) { /** @@ -44,22 +42,24 @@ class Photo extends \Zotlabs\Web\Controller { if($type === 'profile') { switch($res) { - case 'm': $resolution = 5; - $default = z_root() . '/' . get_default_profile_photo(80); + $default = get_default_profile_photo(80); break; case 's': $resolution = 6; - $default = z_root() . '/' . get_default_profile_photo(48); + $default = get_default_profile_photo(48); break; case 'l': default: $resolution = 4; + $default = get_default_profile_photo(); break; } } + $modified = filemtime($default); + $default = z_root() . '/' . $default; $uid = $person; $d = [ 'imgscale' => $resolution, 'channel_id' => $uid, 'default' => $default, 'data' => '', 'mimetype' => '' ]; @@ -78,11 +78,13 @@ class Photo extends \Zotlabs\Web\Controller { intval(PHOTO_PROFILE) ); if($r) { + $modified = strtotime($r[0]['edited']); $data = dbunescbin($r[0]['content']); $mimetype = $r[0]['mimetype']; } - if(intval($r[0]['os_storage'])) + if(intval($r[0]['os_storage'])) { $data = file_get_contents($data); + } } if(! $data) { $data = fetch_image_from_url($default,$mimetype); @@ -164,6 +166,7 @@ class Photo extends \Zotlabs\Web\Controller { if($exists && $allowed) { $data = dbunescbin($e[0]['content']); $mimetype = $e[0]['mimetype']; + $modified = strtotime($e[0]['edited']); if(intval($e[0]['os_storage'])) { $streaming = $data; } @@ -183,7 +186,6 @@ class Photo extends \Zotlabs\Web\Controller { if(! isset($data)) { if(isset($resolution)) { switch($resolution) { - case 4: $data = fetch_image_from_url(z_root() . '/' . get_default_profile_photo(),$mimetype); break; @@ -210,10 +212,14 @@ class Photo extends \Zotlabs\Web\Controller { } } + // @FIXME Seems never invoked // Writing in cachefile - if (isset($cachefile) && $cachefile != '') + if (isset($cachefile) && $cachefile != '') { file_put_contents($cachefile, $data); - + $modified = filemtime($cachefile); + } + + if(function_exists('header_remove')) { header_remove('Pragma'); header_remove('pragma'); @@ -247,6 +253,7 @@ class Photo extends \Zotlabs\Web\Controller { } + // If it's a file resource, stream it. if($streaming && $channel) { @@ -262,6 +269,8 @@ class Photo extends \Zotlabs\Web\Controller { } } else { + header("Last-Modified: " . gmdate("D, d M Y H:i:s", $modified) . " GMT"); + header("Content-Length: " . strlen($data)); echo $data; } -- cgit v1.2.3 From c26f45b7c20c870fcc77258a0c282440ec3e0b5a Mon Sep 17 00:00:00 2001 From: Max Kostikov Date: Tue, 6 Nov 2018 13:39:36 +0100 Subject: Update Photo.php --- Zotlabs/Module/Photo.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'Zotlabs/Module/Photo.php') diff --git a/Zotlabs/Module/Photo.php b/Zotlabs/Module/Photo.php index 14def3a62..8f85bdd69 100644 --- a/Zotlabs/Module/Photo.php +++ b/Zotlabs/Module/Photo.php @@ -39,7 +39,9 @@ class Photo extends \Zotlabs\Web\Controller { * Profile photos - Access controls on default profile photos are not honoured since they need to be exchanged with remote sites. * */ - + + $default = get_default_profile_photo(); + if($type === 'profile') { switch($res) { case 'm': @@ -53,7 +55,6 @@ class Photo extends \Zotlabs\Web\Controller { case 'l': default: $resolution = 4; - $default = get_default_profile_photo(); break; } } -- cgit v1.2.3 From 1828b6daab88041dbc85f11cc4e04efede6c993b Mon Sep 17 00:00:00 2001 From: Max Kostikov Date: Tue, 6 Nov 2018 13:41:41 +0100 Subject: Update Photo.php --- Zotlabs/Module/Photo.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'Zotlabs/Module/Photo.php') diff --git a/Zotlabs/Module/Photo.php b/Zotlabs/Module/Photo.php index 8f85bdd69..07443bb83 100644 --- a/Zotlabs/Module/Photo.php +++ b/Zotlabs/Module/Photo.php @@ -83,9 +83,8 @@ class Photo extends \Zotlabs\Web\Controller { $data = dbunescbin($r[0]['content']); $mimetype = $r[0]['mimetype']; } - if(intval($r[0]['os_storage'])) { + if(intval($r[0]['os_storage'])) $data = file_get_contents($data); - } } if(! $data) { $data = fetch_image_from_url($default,$mimetype); @@ -168,9 +167,8 @@ class Photo extends \Zotlabs\Web\Controller { $data = dbunescbin($e[0]['content']); $mimetype = $e[0]['mimetype']; $modified = strtotime($e[0]['edited']); - if(intval($e[0]['os_storage'])) { + if(intval($e[0]['os_storage'])) $streaming = $data; - } } else { if(! $allowed) { -- cgit v1.2.3 From 3491c488d340b7d5b4e0610398427cb52c05bf8e Mon Sep 17 00:00:00 2001 From: Max Kostikov Date: Tue, 6 Nov 2018 13:51:01 +0100 Subject: Update Photo.php --- Zotlabs/Module/Photo.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Zotlabs/Module/Photo.php') diff --git a/Zotlabs/Module/Photo.php b/Zotlabs/Module/Photo.php index 07443bb83..d76fca278 100644 --- a/Zotlabs/Module/Photo.php +++ b/Zotlabs/Module/Photo.php @@ -252,6 +252,8 @@ class Photo extends \Zotlabs\Web\Controller { } + header("Last-Modified: " . gmdate("D, d M Y H:i:s", $modified) . " GMT"); + header("Content-Length: " . strlen($data)); // If it's a file resource, stream it. @@ -268,8 +270,6 @@ class Photo extends \Zotlabs\Web\Controller { } } else { - header("Last-Modified: " . gmdate("D, d M Y H:i:s", $modified) . " GMT"); - header("Content-Length: " . strlen($data)); echo $data; } -- cgit v1.2.3 From 40d9277ef38ef1200db59cd2f8c6b9e2a80bc332 Mon Sep 17 00:00:00 2001 From: Max Kostikov Date: Tue, 6 Nov 2018 16:22:34 +0100 Subject: remove 'Expiries' HTTP header --- Zotlabs/Module/Photo.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'Zotlabs/Module/Photo.php') diff --git a/Zotlabs/Module/Photo.php b/Zotlabs/Module/Photo.php index d76fca278..0f47ee103 100644 --- a/Zotlabs/Module/Photo.php +++ b/Zotlabs/Module/Photo.php @@ -246,8 +246,7 @@ class Photo extends \Zotlabs\Web\Controller { // leave it alone. $cache = get_config('system','photo_cache_time', 86400); // 1 day by default - - header("Expires: " . gmdate("D, d M Y H:i:s", time() + $cache) . " GMT"); + header("Cache-Control: max-age=" . $cache); } -- cgit v1.2.3 From a5a77d1e7c3ae190e01848c0cc4567fcdb3edfb1 Mon Sep 17 00:00:00 2001 From: Max Kostikov Date: Wed, 7 Nov 2018 08:41:32 +0100 Subject: Revert "remove 'Expiries' HTTP header" This reverts commit 40d9277ef38ef1200db59cd2f8c6b9e2a80bc332 --- Zotlabs/Module/Photo.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Zotlabs/Module/Photo.php') diff --git a/Zotlabs/Module/Photo.php b/Zotlabs/Module/Photo.php index 0f47ee103..d76fca278 100644 --- a/Zotlabs/Module/Photo.php +++ b/Zotlabs/Module/Photo.php @@ -246,7 +246,8 @@ class Photo extends \Zotlabs\Web\Controller { // leave it alone. $cache = get_config('system','photo_cache_time', 86400); // 1 day by default - + + header("Expires: " . gmdate("D, d M Y H:i:s", time() + $cache) . " GMT"); header("Cache-Control: max-age=" . $cache); } -- cgit v1.2.3 From eaf117cce19f0fd78f551fea27f382d3b8b49110 Mon Sep 17 00:00:00 2001 From: Max Kostikov Date: Wed, 7 Nov 2018 18:22:55 +0100 Subject: Added `If-Modified-Since` header support for better image caching and fixed absent 404 for photos --- Zotlabs/Module/Photo.php | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) (limited to 'Zotlabs/Module/Photo.php') diff --git a/Zotlabs/Module/Photo.php b/Zotlabs/Module/Photo.php index d76fca278..d3d82f035 100644 --- a/Zotlabs/Module/Photo.php +++ b/Zotlabs/Module/Photo.php @@ -10,7 +10,7 @@ require_once('include/photos.php'); class Photo extends \Zotlabs\Web\Controller { function init() { - + $prvcachecontrol = false; $streaming = null; $channel = null; @@ -32,6 +32,7 @@ class Photo extends \Zotlabs\Web\Controller { } $observer_xchan = get_observer_hash(); + $ismodified = $_SERVER['HTTP_IF_MODIFIED_SINCE']; if(isset($type)) { @@ -86,6 +87,7 @@ class Photo extends \Zotlabs\Web\Controller { if(intval($r[0]['os_storage'])) $data = file_get_contents($data); } + if(! $data) { $data = fetch_image_from_url($default,$mimetype); } @@ -179,8 +181,19 @@ class Photo extends \Zotlabs\Web\Controller { } } + } else { + http_status_exit(404,'not found'); } } + + header_remove('Pragma'); + + if($ismodified === gmdate("D, d M Y H:i:s", $modified) . " GMT") { + header_remove('Expires'); + header_remove('Cache-Control'); + header_remove('Set-Cookie'); + http_status_exit(304,'not modified'); + } if(! isset($data)) { if(isset($resolution)) { @@ -219,11 +232,6 @@ class Photo extends \Zotlabs\Web\Controller { } - if(function_exists('header_remove')) { - header_remove('Pragma'); - header_remove('pragma'); - } - header("Content-type: " . $mimetype); if($prvcachecontrol) { -- cgit v1.2.3 From 3f6cd5a6634481024853f7823043e6b6ea1e4784 Mon Sep 17 00:00:00 2001 From: Max Kostikov Date: Wed, 7 Nov 2018 19:52:38 +0100 Subject: Disable image caching if personal or group permissions enabled --- Zotlabs/Module/Photo.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'Zotlabs/Module/Photo.php') diff --git a/Zotlabs/Module/Photo.php b/Zotlabs/Module/Photo.php index d3d82f035..09c698b1a 100644 --- a/Zotlabs/Module/Photo.php +++ b/Zotlabs/Module/Photo.php @@ -128,9 +128,7 @@ class Photo extends \Zotlabs\Web\Controller { $photo = substr($photo,0,-2); // If viewing on a high-res screen, attempt to serve a higher resolution image: if ($resolution == 2 && ($cookie_value > 1)) - { $resolution = 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']); if(intval($e[0]['os_storage'])) $streaming = $data; + if($e[0]['allow_cid'] != '' || $e[0]['allow_gid'] != '' || $e[0]['deny_gid'] != '' || $e[0]['deny_gid'] != '') + $prvcachecontrol = true; } else { if(! $allowed) { @@ -188,13 +188,13 @@ class Photo extends \Zotlabs\Web\Controller { 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('Cache-Control'); header_remove('Set-Cookie'); - http_status_exit(304,'not modified'); - } - + http_status_exit(304,'not modified'); + } + if(! isset($data)) { if(isset($resolution)) { switch($resolution) { -- cgit v1.2.3 From e0a0570cc4409943d546ba114f5e9ba5e4aaa5d1 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 8 Nov 2018 11:06:44 +0100 Subject: $data only contains the link to the image if the image is in os storage. The size is calculatet wrong in this case and the download fails. rely on filesize from the db for content-length --- Zotlabs/Module/Photo.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Zotlabs/Module/Photo.php') diff --git a/Zotlabs/Module/Photo.php b/Zotlabs/Module/Photo.php index 09c698b1a..de11b41c7 100644 --- a/Zotlabs/Module/Photo.php +++ b/Zotlabs/Module/Photo.php @@ -165,6 +165,7 @@ class Photo extends \Zotlabs\Web\Controller { if($exists && $allowed) { $data = dbunescbin($e[0]['content']); + $filesize = $e[0]['filesize']; $mimetype = $e[0]['mimetype']; $modified = strtotime($e[0]['edited']); if(intval($e[0]['os_storage'])) @@ -261,7 +262,7 @@ class Photo extends \Zotlabs\Web\Controller { } header("Last-Modified: " . gmdate("D, d M Y H:i:s", $modified) . " GMT"); - header("Content-Length: " . strlen($data)); + header("Content-Length: " . $filesize); // If it's a file resource, stream it. -- cgit v1.2.3 From dc0335d1d56f1d76fa170ef0b222560176e074b5 Mon Sep 17 00:00:00 2001 From: Max Kostikov Date: Thu, 8 Nov 2018 11:53:27 +0100 Subject: Correct "Content-Length:" calculation added --- 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 de11b41c7..e218d1c53 100644 --- a/Zotlabs/Module/Photo.php +++ b/Zotlabs/Module/Photo.php @@ -262,7 +262,7 @@ class Photo extends \Zotlabs\Web\Controller { } header("Last-Modified: " . gmdate("D, d M Y H:i:s", $modified) . " GMT"); - header("Content-Length: " . $filesize); + header("Content-Length: " . (isset($filesize) ? $filesize : strlen($data))); // If it's a file resource, stream it. -- cgit v1.2.3 From dc59561a95f8354209f423a07bfd7fb3381f3633 Mon Sep 17 00:00:00 2001 From: Max Kostikov Date: Fri, 9 Nov 2018 22:17:11 +0100 Subject: Fixed timezone conversion --- Zotlabs/Module/Photo.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'Zotlabs/Module/Photo.php') diff --git a/Zotlabs/Module/Photo.php b/Zotlabs/Module/Photo.php index e218d1c53..6d2c400a9 100644 --- a/Zotlabs/Module/Photo.php +++ b/Zotlabs/Module/Photo.php @@ -80,7 +80,7 @@ class Photo extends \Zotlabs\Web\Controller { intval(PHOTO_PROFILE) ); if($r) { - $modified = strtotime($r[0]['edited']); + $modified = strtotime($r[0]['edited'] . "Z"); $data = dbunescbin($r[0]['content']); $mimetype = $r[0]['mimetype']; } @@ -167,7 +167,7 @@ class Photo extends \Zotlabs\Web\Controller { $data = dbunescbin($e[0]['content']); $filesize = $e[0]['filesize']; $mimetype = $e[0]['mimetype']; - $modified = strtotime($e[0]['edited']); + $modified = strtotime($e[0]['edited'] . 'Z'); if(intval($e[0]['os_storage'])) $streaming = $data; if($e[0]['allow_cid'] != '' || $e[0]['allow_gid'] != '' || $e[0]['deny_gid'] != '' || $e[0]['deny_gid'] != '') @@ -193,7 +193,7 @@ class Photo extends \Zotlabs\Web\Controller { header_remove('Expires'); header_remove('Cache-Control'); header_remove('Set-Cookie'); - http_status_exit(304,'not modified'); + http_status_exit(304,'not modified'); } if(! isset($data)) { @@ -261,7 +261,7 @@ class Photo extends \Zotlabs\Web\Controller { } - header("Last-Modified: " . gmdate("D, d M Y H:i:s", $modified) . " GMT"); + header("Last-Modified: " . gmdate("D, d M Y H:i:s", $modified . "Z") . " GMT"); header("Content-Length: " . (isset($filesize) ? $filesize : strlen($data))); // If it's a file resource, stream it. -- cgit v1.2.3 From f7b00c62a4f9a13cf7737697b89df45342c55ea2 Mon Sep 17 00:00:00 2001 From: Max Kostikov Date: Sat, 10 Nov 2018 10:05:28 +0100 Subject: Remove unnecessary Zulu timezone mention --- 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 6d2c400a9..95e3404fb 100644 --- a/Zotlabs/Module/Photo.php +++ b/Zotlabs/Module/Photo.php @@ -261,7 +261,7 @@ class Photo extends \Zotlabs\Web\Controller { } - header("Last-Modified: " . gmdate("D, d M Y H:i:s", $modified . "Z") . " GMT"); + header("Last-Modified: " . gmdate("D, d M Y H:i:s", $modified) . " GMT"); header("Content-Length: " . (isset($filesize) ? $filesize : strlen($data))); // If it's a file resource, stream it. -- cgit v1.2.3 From 286326a98e8d5de102ce58eee581c6c2e9fa6c06 Mon Sep 17 00:00:00 2001 From: Max Kostikov Date: Tue, 13 Nov 2018 11:38:49 +0100 Subject: Replace fetch_image_from_url() with z_fetch_url() --- Zotlabs/Module/Photo.php | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'Zotlabs/Module/Photo.php') diff --git a/Zotlabs/Module/Photo.php b/Zotlabs/Module/Photo.php index 95e3404fb..68cd7c4ac 100644 --- a/Zotlabs/Module/Photo.php +++ b/Zotlabs/Module/Photo.php @@ -89,9 +89,8 @@ class Photo extends \Zotlabs\Web\Controller { } if(! $data) { - $data = fetch_image_from_url($default,$mimetype); - } - if(! $mimetype) { + $x = z_fetch_url($default,true,0,[ 'novalidate' => true ]); + $data = ($x['success'] ? $x['body'] : EMPTY_STR); $mimetype = 'image/png'; } } @@ -200,19 +199,22 @@ class Photo extends \Zotlabs\Web\Controller { if(isset($resolution)) { switch($resolution) { case 4: - $data = fetch_image_from_url(z_root() . '/' . get_default_profile_photo(),$mimetype); + $default = z_root() . '/' . get_default_profile_photo(); break; case 5: - $data = fetch_image_from_url(z_root() . '/' . get_default_profile_photo(80),$mimetype); + $default = z_root() . '/' . get_default_profile_photo(80); break; case 6: - $data = fetch_image_from_url(z_root() . '/' . get_default_profile_photo(48),$mimetype); + $default = z_root() . '/' . get_default_profile_photo(48); break; default: killme(); // NOTREACHED break; } + $x = z_fetch_url($default,true,0,[ 'novalidate' => true ]); + $data = ($x['success'] ? $x['body'] : EMPTY_STR); + $mimetype = 'image/png'; } } -- cgit v1.2.3 From d029e3dc167feb9048d2ba06d44b2162d1c45643 Mon Sep 17 00:00:00 2001 From: Max Kostikov Date: Tue, 13 Nov 2018 11:39:42 +0100 Subject: Text formatting in Photo.php --- Zotlabs/Module/Photo.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Zotlabs/Module/Photo.php') diff --git a/Zotlabs/Module/Photo.php b/Zotlabs/Module/Photo.php index 68cd7c4ac..27cdbf779 100644 --- a/Zotlabs/Module/Photo.php +++ b/Zotlabs/Module/Photo.php @@ -90,8 +90,8 @@ class Photo extends \Zotlabs\Web\Controller { if(! $data) { $x = z_fetch_url($default,true,0,[ 'novalidate' => true ]); - $data = ($x['success'] ? $x['body'] : EMPTY_STR); - $mimetype = 'image/png'; + $data = ($x['success'] ? $x['body'] : EMPTY_STR); + $mimetype = 'image/png'; } } else { -- cgit v1.2.3 From a1455596621fb19b614e71d6f5b3249067d2566b Mon Sep 17 00:00:00 2001 From: Max Kostikov Date: Tue, 13 Nov 2018 11:45:18 +0100 Subject: Remove uneccessary include/photos.php --- Zotlabs/Module/Photo.php | 1 - 1 file changed, 1 deletion(-) (limited to 'Zotlabs/Module/Photo.php') diff --git a/Zotlabs/Module/Photo.php b/Zotlabs/Module/Photo.php index 27cdbf779..8d55eed2f 100644 --- a/Zotlabs/Module/Photo.php +++ b/Zotlabs/Module/Photo.php @@ -4,7 +4,6 @@ namespace Zotlabs\Module; require_once('include/security.php'); require_once('include/attach.php'); require_once('include/photo/photo_driver.php'); -require_once('include/photos.php'); class Photo extends \Zotlabs\Web\Controller { -- cgit v1.2.3 From cf2f7f2132e11dc37d1d62576a5ea7ed8ee9839d Mon Sep 17 00:00:00 2001 From: Max Kostikov Date: Tue, 13 Nov 2018 12:52:35 +0100 Subject: Update Photo.php --- Zotlabs/Module/Photo.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'Zotlabs/Module/Photo.php') diff --git a/Zotlabs/Module/Photo.php b/Zotlabs/Module/Photo.php index 8d55eed2f..30e8340e2 100644 --- a/Zotlabs/Module/Photo.php +++ b/Zotlabs/Module/Photo.php @@ -198,20 +198,20 @@ class Photo extends \Zotlabs\Web\Controller { if(isset($resolution)) { switch($resolution) { case 4: - $default = z_root() . '/' . get_default_profile_photo(); + $default = get_default_profile_photo(); break; case 5: - $default = z_root() . '/' . get_default_profile_photo(80); + $default = get_default_profile_photo(80); break; case 6: - $default = z_root() . '/' . get_default_profile_photo(48); + $default = get_default_profile_photo(48); break; default: killme(); // NOTREACHED break; } - $x = z_fetch_url($default,true,0,[ 'novalidate' => true ]); + $x = z_fetch_url(z_root() . '/' . $default,true,0,[ 'novalidate' => true ]); $data = ($x['success'] ? $x['body'] : EMPTY_STR); $mimetype = 'image/png'; } -- cgit v1.2.3