Merge pull request #2170 from fabrixxm/issue_1953

[friendica.git] / mod / photos.php

diff --git a/mod/photos.php b/mod/photos.php
index e911c65054f1530ba13f962fcf2a708a0e00fe45..6b97d7d4fb42bbb2231a91dbed4a0aa92b197e43 100644 (file)
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -18,27 +18,38 @@ function photos_init(&$a) {
                return;
        }
 
+       nav_set_selected('home');
+
        $o = '';
 
        if($a->argc > 1) {
                $nick = $a->argv[1];
-               $r = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `blocked` = 0 LIMIT 1",
+               $user = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `blocked` = 0 LIMIT 1",
                        dbesc($nick)
                );
 
-               if(! count($r))
+               if(! count($user))
                        return;
 
-               $a->data['user'] = $r[0];
-               $a->profile_uid = $r[0]['uid'];
+               $a->data['user'] = $user[0];
+               $a->profile_uid = $user[0]['uid'];
+               $is_owner = (local_user() && (local_user() == $a->profile_uid));
+
+               $profile = get_profiledata_by_nick($nick, $a->profile_uid);
 
-               $profilephoto = $a->get_cached_avatar_image($a->get_baseurl() . '/photo/profile/' . $a->data['user']['uid'] . '.jpg');
+               if((x($profile['page-flags']) == 2) || (x($profile['page-flags']) == 5))
+                       $account_type = t('Forum');
+               else
+                       $account_type = "";
 
                $tpl = get_markup_template("vcard-widget.tpl");
 
                $vcard_widget .= replace_macros($tpl, array(
-                       '$name' => $a->data['user']['username'],
-                       '$photo' => $profilephoto
+                       '$name' => $profile['name'],
+                       '$photo' => $profile['photo'],
+                       '$addr' => (($profile['addr'] != "") ? $profile['addr'] : ""),
+                       '$account_type' => $account_type,
+                       '$pdesc' => (($profile['pdesc'] != "") ? $profile['pdesc'] : ""),
                ));
 
 
@@ -63,6 +74,9 @@ function photos_init(&$a) {
 
                        $ret['albums'] = array();
                        foreach($albums as $k => $album) {
+                               //hide profile photos to others
+                               if((! $is_owner) && (! remote_user()) && ($album['album'] == t('Profile Photos')))
+                                       continue;
                                $entry = array(
                                        'text'      => $album['album'],
                                        'total'     => $album['total'],
@@ -83,7 +97,7 @@ function photos_init(&$a) {
                        $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'),
+                               '$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'),
@@ -547,7 +561,7 @@ function photos_post(&$a) {
                                                                                $salmon = '$url:' . str_replace(',','%sc',$link['@attributes']['href']);
                                                                                if(strlen($inform))
                                                                                        $inform .= ',';
-                                                                                       $inform .= $salmon;
+                                                       $inform .= $salmon;
                                                                        }
                                                                }
                                                        }
@@ -1079,8 +1093,8 @@ function photos_content(&$a) {
        $o = "";
 
        // tabs
-       $_is_owner = (local_user() && (local_user() == $owner_uid));
-       $o .= profile_tabs($a,$_is_owner, $a->data['user']['nickname']);
+       $is_owner = (local_user() && (local_user() == $owner_uid));
+       $o .= profile_tabs($a,$is_owner, $a->data['user']['nickname']);
 
        /**
         * Display upload form
@@ -1629,18 +1643,22 @@ function photos_content(&$a) {
                        $like = '';
                        $dislike = '';
 
+                       $conv_responses = array(
+                               'like' => array('title' => t('Likes','title')),'dislike' => array('title' => t('Dislikes','title')),
+                               'attendyes' => array('title' => t('Attending','title')), 'attendno' => array('title' => t('Not attending','title')), 'attendmaybe' => array('title' => t('Might attend','title'))
+                       );
+
 
 
                        // display comments
                        if(count($r)) {
 
                                foreach($r as $item) {
-                                       like_puller($a,$item,$alike,'like');
-                                       like_puller($a,$item,$dlike,'dislike');
+                                       builtin_activity_puller($item, $conv_responses);
                                }
 
-                               $like    = ((isset($alike[$link_item['id']])) ? format_like($alike[$link_item['id']],$alike[$link_item['id'] . '-l'],'like',$link_item['id']) : '');
-                               $dislike = ((isset($dlike[$link_item['id']])) ? format_like($dlike[$link_item['id']],$dlike[$link_item['id'] . '-l'],'dislike',$link_item['id']) : '');
+                               $like    = ((x($conv_responses['like'],$link_item['uri'])) ? format_like($conv_responses['like'][$link_item['uri']],$conv_responses['like'][$link_item['uri'] . '-l'],'like',$link_item['id']) : '');
+                               $dislike = ((x($conv_responses['dislike'],$link_item['uri'])) ? format_like($conv_responses['dislike'][$link_item['uri']],$conv_responses['dislike'][$link_item['uri'] . '-l'],'dislike',$link_item['id']) : '');
 
 
 
@@ -1759,6 +1777,12 @@ function photos_content(&$a) {
                        $paginate = paginate($a);
                }
 
+
+               $response_verbs = array('like');
+               if(feature_enabled($owner_uid,'dislike'))
+                       $response_verbs[] = 'dislike';
+               $responses = get_responses($conv_responses,$response_verbs,'',$link_item);
+
                $photo_tpl = get_markup_template('photo_view.tpl');
 
                if($a->theme['template_engine'] === 'internal') {
@@ -1790,6 +1814,7 @@ function photos_content(&$a) {
                        '$likebuttons' => $likebuttons,
                        '$like' => $like_e,
                        '$dislike' => $dikslike_e,
+                       'responses' => $responses,
                        '$comments' => $comments,
                        '$paginate' => $paginate,
                ));
@@ -1833,6 +1858,10 @@ function photos_content(&$a) {
        if(count($r)) {
                $twist = 'rotright';
                foreach($r as $rr) {
+                       //hide profile photos to others
+                       if((! $is_owner) && (! remote_user()) && ($rr['album'] == t('Profile Photos')))
+                                       continue;
+                       
                        if($twist == 'rotright')
                                $twist = 'rotleft';
                        else
@@ -1849,8 +1878,8 @@ function photos_content(&$a) {
                        }
 
                        $photos[] = array(
-                               'id'       => $rr['id'],
-                               'twist'    => ' ' . $twist . rand(2,4),
+                               'id'            => $rr['id'],
+                               'twist'         => ' ' . $twist . rand(2,4),
                                'link'          => $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/image/' . $rr['resource-id'],
                                'title'         => t('View Photo'),
                                'src'           => $a->get_baseurl() . '/photo/' . $rr['resource-id'] . '-' . ((($rr['scale']) == 6) ? 4 : $rr['scale']) . '.' . $ext,