use colorbox to display upcomming events

[friendica.git] / mod / photos.php

diff --git a/mod/photos.php b/mod/photos.php
index f8bba01b00cd0de593986470127ed752e86c681d..bd23cf104f2fa7d282918abbde39d0eb861f4238 100644 (file)
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -30,49 +30,70 @@ function photos_init(&$a) {
 
                $a->data['user'] = $r[0];
 
-               $o .= '<div class="vcard">';
-               $o .= '<div class="fn">' . $a->data['user']['username'] . '</div>';
-               $o .= '<div id="profile-photo-wrapper"><img class="photo" style="width: 175px; height: 175px;" src="' . $a->get_cached_avatar_image($a->get_baseurl() . '/photo/profile/' . $a->data['user']['uid'] . '.jpg') . '" alt="' . $a->data['user']['username'] . '" /></div>';
-               $o .= '</div>';
+                $profilephoto = $a->get_cached_avatar_image($a->get_baseurl() . '/photo/profile/' . $a->data['user']['uid'] . '.jpg');
 
+                $tpl = get_markup_template("vcard-widget.tpl");
 
-               $sql_extra = permissions_sql($a->data['user']['uid']);
-
-               $albums = q("SELECT distinct(`album`) AS `album` FROM `photo` WHERE `uid` = %d $sql_extra order by created desc",
-                       intval($a->data['user']['uid'])
-               );
+               $vcard_widget .= replace_macros($tpl, array(
+                        '$name' => $a->data['user']['username'],
+                        '$photo' => $profilephoto
+                ));
 
-               if(count($albums)) {
-                       $a->data['albums'] = $albums;
 
-                       $albums_visible = ((intval($a->data['user']['hidewall']) && (! local_user()) && (! remote_user())) ? false : true);     
-
-                       if($albums_visible) {
-                               $o .= '<div id="side-bar-photos-albums" class="widget">';
-                               $o .= '<h3>' . '<a href="' . $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '">' . t('Photo Albums') . '</a></h3>';
-
-                               $o .= '<ul>';
-                               foreach($albums as $album) {
+               $sql_extra = permissions_sql($a->data['user']['uid']);
 
-                                       // don't show contact photos. We once translated this name, but then you could still access it under
-                                       // a different language setting. Now we store the name in English and check in English (and translated for legacy albums).
+               $albums = q("SELECT count(distinct `resource-id`) AS `total`, `album` FROM `photo` WHERE `uid` = %d  AND `album` != '%s' AND `album` != '%s' 
+                        $sql_extra group by album order by created desc",
+                       intval($a->data['user']['uid']),
+                        dbesc('Contact Photos'),
+                        dbesc( t('Contact Photos'))
+               );
 
-                                       if((! strlen($album['album'])) || ($album['album'] === 'Contact Photos') || ($album['album'] === t('Contact Photos')))
-                                               continue;
-                                       $o .= '<li>' . '<a href="photos/' . $a->argv[1] . '/album/' . bin2hex($album['album']) . '" >' . $album['album'] . '</a></li>'; 
-                               }
-                               $o .= '</ul>';
-                       }
-                       if(local_user() && $a->data['user']['uid'] == local_user()) {
-                               $o .= '<div id="photo-albums-upload-link"><a href="' . $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/upload" >' .t('Upload New Photos') . '</a></div>';
-                       }
+                $albums_visible = ((intval($a->data['user']['hidewall']) && (! local_user()) && (! remote_user())) ? false : true);
+
+                // add various encodings to the array so we can just loop through and pick them out in a template
+                $ret = array('success' => false);
+
+                if($albums) {
+                        $a->data['albums'] = $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/' . $a->data['user']['nickname'] . '/album/' . bin2hex($album['album']),
+                                        'urlencode' => urlencode($album['album']),
+                                        'bin2hex'   => bin2hex($album['album'])
+                                );
+                                $ret['albums'][] = $entry;
+                        }
+                }
+
+                $albums = $ret;
+
+                if(local_user() && $a->data['user']['uid'] == local_user())
+                        $can_post = true;
+
+                if($albums['success']) {
+                        $photo_albums_widget = replace_macros(get_markup_template('photo_albums.tpl'),array(
+                                '$nick'     => $a->data['user']['nickname'],
+                                '$title'    => t('Photo Albums'),
+                                'recent'    => t('Recent Photos'),
+                                '$albums'   => $albums['albums'],
+                                '$baseurl'  => z_root(),
+                                '$upload'   => array( t('Upload New Photos'), $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/upload/' . bin2hex($album)),
+                                '$can_post' => $can_post
+                        ));
+                }
 
-                       $o .= '</div>';
-               }
 
                if(! x($a->page,'aside'))
                        $a->page['aside'] = '';
-               $a->page['aside'] .= $o;
+                $a->page['aside'] .= $vcard_widget;
+                $a->page['aside'] .= $photo_albums_widget;
 
 
                $tpl = get_markup_template("photos_head.tpl");