X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fpersonalgroupnav.php;h=8c413c6ab951e9c2943aa1796f17f687707c79ee;hb=b66ec247db709a73646f750759a8e4fed408b4d5;hp=6a31358596e540b4e62a16f855815af62fd62465;hpb=0fef2cb66d5e19524a6bb253baff48045bf2f84c;p=quix0rs-gnu-social.git

diff --git a/lib/personalgroupnav.php b/lib/personalgroupnav.php
index 6a31358596..8c413c6ab9 100644
--- a/lib/personalgroupnav.php
+++ b/lib/personalgroupnav.php
@@ -43,7 +43,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
-
 class PersonalGroupNav extends Menu
 {
     /**
@@ -51,54 +50,66 @@ class PersonalGroupNav extends Menu
      *
      * @return void
      */
-    function show()
+    public function show()
     {
-        $user         = common_current_user();
+        // FIXME: Legacy StatusNet behaviour was to do this, but really it should be the GroupNav
+        // of the targeted user! ($this->action->arg('nickname')
+        $target = Profile::current();
 
-        if (empty($user)) {
-            throw new ServerException('Do not show personal group nav with no current user.');
+        if (!$target instanceof Profile) {
+            throw new ServerException('Cannot show personal group navigation without a current user.');
         }
 
-        $user_profile = $user->getProfile();
-        $nickname     = $user->nickname;
-        $name         = $user_profile->getBestName();
+        $nickname  = $target->getNickname();
+        $name      = $target->getBestName();
+
+        $scoped = Profile::current();
+
+        $action = $this->actionName;
+        $mine = ($this->action->arg('nickname') == $nickname); // @fixme kinda vague
 
         $this->out->elementStart('ul', array('class' => 'nav'));
 
-        if (Event::handle('StartPersonalGroupNav', array($this))) {
+        if (Event::handle('StartPersonalGroupNav', array($this, $target, $scoped))) {
             $this->out->menuItem(common_local_url('all', array('nickname' =>
                                                                $nickname)),
-                                 _('Home'),
+                                 // TRANS: Menu item in personal group navigation menu.
+                                 _m('MENU','Home'),
+                                 // TRANS: Menu item title in personal group navigation menu.
+                                 // TRANS: %s is a username.
                                  sprintf(_('%s and friends'), $name),
-                                 $action == 'all', 'nav_timeline_personal');
+                                 $mine && $action =='all', 'nav_timeline_personal');
+            $this->out->menuItem(common_local_url('showstream', array('nickname' =>
+                                                                      $nickname)),
+                                 // TRANS: Menu item in personal group navigation menu.
+                                 _m('MENU','Profile'),
+                                 // TRANS: Menu item title in personal group navigation menu.
+                                 _('Your profile'),
+                                 $mine && $action =='showstream',
+                                 'nav_profile');
             $this->out->menuItem(common_local_url('replies', array('nickname' =>
                                                                    $nickname)),
-                                 _('Replies'),
+                                 // TRANS: Menu item in personal group navigation menu.
+                                 _m('MENU','Replies'),
+                                 // TRANS: Menu item title in personal group navigation menu.
+                                 // TRANS: %s is a username.
                                  sprintf(_('Replies to %s'), $name),
-                                 $action == 'replies', 'nav_timeline_replies');
-            $this->out->menuItem(common_local_url('showfavorites', array('nickname' =>
-                                                                         $nickname)),
-                                 _('Favorites'),
-                                 sprintf(_('%s\'s favorite notices'), ($user_profile) ? $name : _('User')),
-                                 $action == 'showfavorites', 'nav_timeline_favorites');
+                                 $mine && $action =='replies', 'nav_timeline_replies');
 
-            $cur = common_current_user();
 
-            if ($cur && $cur->id == $user->id &&
+            if ($scoped instanceof Profile && $scoped->id == $target->id &&
                 !common_config('singleuser', 'enabled')) {
 
                 $this->out->menuItem(common_local_url('inbox', array('nickname' =>
                                                                      $nickname)),
-                                     _('Inbox'),
+                                     // TRANS: Menu item in personal group navigation menu.
+                                     _m('MENU','Messages'),
+                                     // TRANS: Menu item title in personal group navigation menu.
                                      _('Your incoming messages'),
-                                     $action == 'inbox');
-                $this->out->menuItem(common_local_url('outbox', array('nickname' =>
-                                                                      $nickname)),
-                                     _('Outbox'),
-                                     _('Your sent messages'),
-                                     $action == 'outbox');
+                                     $mine && $action =='inbox');
             }
-            Event::handle('EndPersonalGroupNav', array($this));
+
+            Event::handle('EndPersonalGroupNav', array($this, $target, $scoped));
         }
         $this->out->elementEnd('ul');
     }