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

photos_album_exists() requires an observer to work correctly; provide it.

Browse Source
This commit is contained in:
zotlabs 2017-03-21 21:13:14 -07:00
parent a7bf4366ce
commit 83a78a949d
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Zotlabs/Module/Photos.php
View File

@ -95,7 +95,7 @@ class Photos extends \Zotlabs\Web\Controller {
$album = argv(3); $album = argv(3);
if(! photos_album_exists($page_owner_uid,$album)) { if(! photos_album_exists($page_owner_uid, get_observer_hash(), $album)) {
notice( t('Album not found.') . EOL); notice( t('Album not found.') . EOL);
goaway(z_root() . '/' . $_SESSION['photo_return']); goaway(z_root() . '/' . $_SESSION['photo_return']);
} }
@ -681,7 +681,7 @@ class Photos extends \Zotlabs\Web\Controller {
\App::$page['htmlhead'] .= "\r\n" . '<link rel="alternate" type="application/json+oembed" href="' . z_root() . '/oep?f=&url=' . urlencode(z_root() . '/' . \App::$cmd) . '" title="oembed" />' . "\r\n"; \App::$page['htmlhead'] .= "\r\n" . '<link rel="alternate" type="application/json+oembed" href="' . z_root() . '/oep?f=&url=' . urlencode(z_root() . '/' . \App::$cmd) . '" title="oembed" />' . "\r\n";
if($x = photos_album_exists($owner_uid,$datum)) { if($x = photos_album_exists($owner_uid, get_observer_hash(), $datum)) {
\App::set_pager_itemspage(60); \App::set_pager_itemspage(60);
$album = $x['display_path']; $album = $x['display_path'];
} }

4
include/photos.php
View File

@ -581,9 +581,9 @@ function photos_list_photos($channel, $observer, $album = '') {
* @return boolean * @return boolean
*/ */
function photos_album_exists($channel_id, $album) { function photos_album_exists($channel_id, $observer_hash, $album) {
$sql_extra = permissions_sql($channel_id); $sql_extra = permissions_sql($channel_id,$observer_hash);
$r = q("SELECT folder, hash, is_dir, filename, os_path, display_path FROM attach WHERE hash = '%s' AND is_dir = 1 AND uid = %d $sql_extra limit 1", $r = q("SELECT folder, hash, is_dir, filename, os_path, display_path FROM attach WHERE hash = '%s' AND is_dir = 1 AND uid = %d $sql_extra limit 1",
dbesc($album), dbesc($album),