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

prepare for Comanchification of mod_photos

Browse Source
This commit is contained in:
friendica 2013-12-13 13:30:33 -08:00
parent 94975f8d30
commit 0215043826
3 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
include/Contact.php
View File

@ -77,6 +77,19 @@ function vcard_from_xchan($xchan, $observer = null, $mode = '') {
$a = get_app(); $a = get_app();
if(! $xchan) {
if($a->profile['channel_hash'])
$r = q("select * from xchan where xchan_hash = '%s' limit 1",
dbesc($a->profile['channel_hash'])
);
if($r)
$xchan = $r[0];
}
if(! $xchan)
return;
// FIXME - show connect button to observer if appropriate
$connect = false; $connect = false;
if(local_user()) { if(local_user()) {
$r = q("select * from abook where abook_xchan = '%s' and abook_channel = %d limit 1", $r = q("select * from abook where abook_xchan = '%s' and abook_channel = %d limit 1",

12
include/photos.php
View File

@ -279,8 +279,16 @@ function photos_album_widget($channelx,$observer,$albums = null) {
$o = ''; $o = '';
if(! $albums) // If we weren't passed an album list, see if the photos module
$albums = photos_albums_list($channelx,$observer); // dropped one for us to find in $a->data['albums'].
// If all else fails, load it.
if(! $albums) {
if(array_key_exists('albums', get_app()->data))
$albums = get_app()->data['albums'];
else
$albums = photos_albums_list($channelx,$observer);
}
if($albums) { if($albums) {
$o = replace_macros(get_markup_template('photo_albums.tpl'),array( $o = replace_macros(get_markup_template('photo_albums.tpl'),array(

5
mod/photos.php
View File

@ -19,6 +19,9 @@ function photos_init(&$a) {
if(argc() > 1) { if(argc() > 1) {
$nick = argv(1); $nick = argv(1);
profile_load($a,$nick);
$channelx = channelx_by_nick($nick); $channelx = channelx_by_nick($nick);
if(! $channelx) if(! $channelx)
@ -35,7 +38,7 @@ function photos_init(&$a) {
$a->set_widget('vcard',vcard_from_xchan($a->data['channel'],$observer)); $a->set_widget('vcard',vcard_from_xchan('',$observer));
head_set_icon($a->data['channel']['xchan_photo_s']); head_set_icon($a->data['channel']['xchan_photo_s']);
if($a->data['perms']['view_photos']) { if($a->data['perms']['view_photos']) {
$a->data['albums'] = photos_albums_list($a->data['channel'],$observer); $a->data['albums'] = photos_albums_list($a->data['channel'],$observer);