Merge pull request #1937 from annando/1510-follow-notifications

[friendica.git] / mod / photos.php

diff --git a/mod/photos.php b/mod/photos.php
index e911c65054f1530ba13f962fcf2a708a0e00fe45..03021e55018ba678805c701d7065580b77e237ae 100644 (file)
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -18,6 +18,8 @@ function photos_init(&$a) {
                return;
        }
 
+       nav_set_selected('home');
+
        $o = '';
 
        if($a->argc > 1) {
@@ -31,6 +33,7 @@ function photos_init(&$a) {
 
                $a->data['user'] = $r[0];
                $a->profile_uid = $r[0]['uid'];
+               $is_owner = (local_user() && (local_user() == $a->profile_uid));
 
                $profilephoto = $a->get_cached_avatar_image($a->get_baseurl() . '/photo/profile/' . $a->data['user']['uid'] . '.jpg');
 
@@ -63,6 +66,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'],
@@ -547,7 +553,7 @@ function photos_post(&$a) {
                                                                                $salmon = '$url:' . str_replace(',','%sc',$link['@attributes']['href']);
                                                                                if(strlen($inform))
                                                                                        $inform .= ',';
-                                                                                       $inform .= $salmon;
+                                                       $inform .= $salmon;
                                                                        }
                                                                }
                                                        }
@@ -1079,8 +1085,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
@@ -1833,6 +1839,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 +1859,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,