friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

first step to get html code from photos.php removed

This commit is contained in:
rabuzarus 2015-05-27 03:35:29 +02:00
parent dc182d508e
commit 15499ff1aa
2 changed files with 65 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
mod/photos.php
View File

@ -41,8 +41,57 @@ function photos_init(&$a) {
$albums = q("SELECT distinct(`album`) AS `album` FROM `photo` WHERE `uid` = %d $sql_extra order by created desc",
intval($a->data['user']['uid'])
);
$ret = array('success' => false);
$albums_visible = ((intval($a->data['user']['hidewall']) && (! local_user()) && (! remote_user())) ? false : true);
foreach($albums as $k => $album) {
if( $album['album'] === 'Contact Photos') {
unset ($albums[$k]['album']);
}
}
if(count($albums)) {
if($albums) {
if ($albums_visible) {
$ret['success'] = true;
}
$ret['albums'] = array();
foreach($albums as $k => $album) {
$entry = array(
'text' => $album['album'],
'total' => $album['total'],
'url' => z_root() . '/photos/' . $channel['channel_address'] . '/album/' . bin2hex($album['album']),
'urlencode' => urlencode($album['album']),
'bin2hex' => bin2hex($album['album'])
);
$ret['albums'][] = $entry;
}
}
/*return $ret;*/
$o = '';
if(! $albums) {
if(array_key_exists('albums', get_app()->data))
$albums = get_app()->data['albums'];
else
$albums = $ret;
}
$albums = $ret;
if($albums['success']) {
$o = replace_macros(get_markup_template('photo_albums.tpl'),array(
'$nick' => $a->data['user']['nickname'],
'$title' => t('Photo Albums'),
'$albums' => $albums['albums'],
'$baseurl' => z_root()
));
}
/* if(count($albums)) {
$a->data['albums'] = $albums;
$albums_visible = ((intval($a->data['user']['hidewall']) && (! local_user()) && (! remote_user())) ? false : true);
@ -69,6 +118,8 @@ function photos_init(&$a) {
$o .= '</div>';
}
*
*/
if(! x($a->page,'aside'))
$a->page['aside'] = '';

13
view/templates/photo_albums.tpl Normal file
View File

@ -0,0 +1,13 @@
<div id="side-bar-photos-albums" class="widget">
<h3>{{$title}}</h3>
<ul class="nav nav-pills nav-stacked">
<li><a href="{{$baseurl}}/photos/{{$nick}}" title="{{$title}}" >Recent Photos</a></li>
{{if $albums}}
{{foreach $albums as $al}}
{{if $al.text}}
<li><a href="{{$baseurl}}/photos/{{$nick}}/album/{{$al.bin2hex}}">{{$al.text}}</a></li>
{{/if}}
{{/foreach}}
{{/if}}
</ul>
</div>