Streams/streams
Streams/streams
1
0
Fork 0
mirror of https://codeberg.org/streams/streams.git synced 2024-09-19 21:55:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

further baby steps on the photos API

Browse source
This commit is contained in:
friendica 2013-01-25 23:32:44 -08:00
parent 93af193218
commit 70aa8421b3
3 changed files with 35 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
include/photos.php
View file

@ -223,4 +223,28 @@ function photo_upload($channel, $observer, $args) {
call_hooks('photo_post_end',$ret);
return $ret;
}
}
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;
}

2
include/security.php
View file

@ -166,6 +166,8 @@ function change_channel($change_channel) {
}
function permissions_sql($owner_id,$remote_verified = false,$groups = null) {
$local_user = local_user();

19
mod/photos.php
View file

@ -5,6 +5,7 @@ require_once('include/items.php');
require_once('include/acl_selectors.php');
require_once('include/bbcode.php');
require_once('include/security.php');
require_once('include/Contact.php');
function photos_init(&$a) {
@ -17,7 +18,7 @@ function photos_init(&$a) {
if(argc() > 1) {
$nick = argv(1);
$r = q("SELECT * FROM channel WHERE channel_address = '%s' LIMIT 1",
$r = q("SELECT * FROM channel left join xchan on channel_hash = xchan_hash WHERE channel_address = '%s' LIMIT 1",
dbesc($nick)
);
@ -27,21 +28,17 @@ function photos_init(&$a) {
$a->data['channel'] = $r[0];
$observer = $a->get_observer();
$a->data['perms'] = get_all_perms($r[0]['channel_id'],(($observer) ? $observer['xchan_hash'] : ''));
$a->data['observer'] = $observer;
$o .= '<div class="vcard">';
$o .= '<div class="fn">' . $a->data['channel']['channel_name'] . '</div>';
$o .= '<div id="profile-photo-wrapper"><img class="photo" style="width: 175px; height: 175px;" src="' . $a->get_baseurl() . '/photo/profile/l/' . $a->data['channel']['channel_id'] . '" alt="' . $a->data['channel']['channel_name'] . '" /></div>';
$o .= '</div>';
$observer_xchan = (($observer) ? $observer['xchan_hash'] : '');
$a->data['perms'] = get_all_perms($r[0]['channel_id'],$observer_xchan);
$sql_extra = permissions_sql($a->data['channel']['channel_id']);
$o .= vcard_from_xchan($a->data['channel'],$observer_xchan);
$albums = q("SELECT distinct(`album`) AS `album` FROM `photo` WHERE `uid` = %d $sql_extra order by created desc",
intval($a->data['channel']['channel_id'])
);
$albums = photos_albums_list($a->data['channel'],$observer);
if(count($albums)) {
if($albums) {
$a->data['albums'] = $albums;
// FIXME
$albums_visible = ((intval($a->data['user']['hidewall']) && (! local_user()) && (! remote_user())) ? false : true);