aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/photos.php26
-rw-r--r--include/security.php2
2 files changed, 27 insertions, 1 deletions
diff --git a/include/photos.php b/include/photos.php
index 84352ed32..7ccfd31c6 100644
--- a/include/photos.php
+++ b/include/photos.php
@@ -223,4 +223,28 @@ function photo_upload($channel, $observer, $args) {
call_hooks('photo_post_end',$ret);
return $ret;
-} \ No newline at end of file
+}
+
+
+
+
+function photos_albums_list($channel,$observer) {
+
+ $channel_id = $channel['channel_id'];
+ $observer_xchan = (($observer) ? $observer['xchan_hash'] : '');
+
+ if(! perm_is_allowed($channel_id,$observer_xchan,'view_photos'))
+ return false;
+
+ // FIXME - create a permissions SQL which works on arbitrary observers and channels, regardless of login or web status
+
+ $sql_extra = permissions_sql($channel_id);
+
+ $albums = q("SELECT distinct album from photo where uid = %d $sql_extra order by created desc",
+ intval($channel_id)
+ );
+
+ return $albums;
+
+}
+
diff --git a/include/security.php b/include/security.php
index f28174153..9f4058f88 100644
--- a/include/security.php
+++ b/include/security.php
@@ -166,6 +166,8 @@ function change_channel($change_channel) {
}
+
+
function permissions_sql($owner_id,$remote_verified = false,$groups = null) {
$local_user = local_user();