Merge branch '1.0.x' into people_tags_rebase

[quix0rs-gnu-social.git] / lib / personalgroupnav.php

diff --git a/lib/personalgroupnav.php b/lib/personalgroupnav.php
index ccd4ab506fcc4b992dd7af31ab749e410180896b..28bf8c529fd1091df9f019605febef408f957a4b 100644 (file)
--- a/lib/personalgroupnav.php
+++ b/lib/personalgroupnav.php
@@ -2,7 +2,7 @@
 /**
  * StatusNet, the distributed open-source microblogging tool
  *
- * Base class for all actions (~views)
+ * Menu for personal group of actions
  *
  * PHP version 5
  *
@@ -19,11 +19,11 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- * @category  Action
+ * @category  Menu
  * @package   StatusNet
  * @author    Evan Prodromou <evan@status.net>
  * @author    Sarven Capadisli <csarven@status.net>
- * @copyright 2008 StatusNet, Inc.
+ * @copyright 2008-2011 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
  */
@@ -32,41 +32,20 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
-require_once INSTALLDIR.'/lib/widget.php';
-
 /**
- * Base class for all actions
- *
- * This is the base class for all actions in the package. An action is
- * more or less a "view" in an MVC framework.
- *
- * Actions are responsible for extracting and validating parameters; using
- * model classes to read and write to the database; and doing ouput.
+ * Menu for personal group of actions
  *
- * @category Output
+ * @category Menu
  * @package  StatusNet
  * @author   Evan Prodromou <evan@status.net>
  * @author   Sarven Capadisli <csarven@status.net>
+ * @copyright 2008-2011 StatusNet, Inc.
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
- *
- * @see      HTMLOutputter
  */
-class PersonalGroupNav extends Widget
-{
-    var $action = null;
-
-    /**
-     * Construction
-     *
-     * @param Action $action current action, used for output
-     */
-    function __construct($action=null)
-    {
-        parent::__construct($action);
-        $this->action = $action;
-    }
 
+class PersonalGroupNav extends Menu
+{
     /**
      * Show the menu
      *
@@ -74,22 +53,18 @@ class PersonalGroupNav extends Widget
      */
     function show()
     {
-        $user = null;
+        $user         = common_current_user();
 
-        // FIXME: we should probably pass this in
+        if (empty($user)) {
+            throw new ServerException('Do not show personal group nav with no current user.');
+        }
 
-        $action = $this->action->trimmed('action');
-        $nickname = $this->action->trimmed('nickname');
+        $user_profile = $user->getProfile();
+        $nickname     = $user->nickname;
+        $name         = $user_profile->getBestName();
 
-        if ($nickname) {
-            $user = User::staticGet('nickname', $nickname);
-            $user_profile = $user->getProfile();
-            $name = $user_profile->getBestName();
-        } else {
-            // @fixme can this happen? is this valid?
-            $user_profile = false;
-            $name = $nickname;
-        }
+        $action = $this->actionName;
+        $mine = ($this->action->arg('nickname') == $nickname); // @fixme kinda vague
 
         $this->out->elementStart('ul', array('class' => 'nav'));
 
@@ -98,21 +73,27 @@ class PersonalGroupNav extends Widget
                                                                $nickname)),
                                  _('Home'),
                                  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)),
+                                 _('Profile'),
+                                 _('Your profile'),
+                                 $mine && $action =='showstream',
+                                 'nav_profile');
             $this->out->menuItem(common_local_url('replies', array('nickname' =>
                                                                    $nickname)),
                                  _('Replies'),
                                  sprintf(_('Replies to %s'), $name),
-                                 $action == 'replies', 'nav_timeline_replies');
+                                 $mine && $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 =='showfavorites', 'nav_timeline_favorites');
             $this->out->menuItem(common_local_url('peopletagsbyuser', array('nickname' =>
                                                                   $nickname)),
                              _('People tags'),
-                             sprintf(_('People tags by %s'), ($user_profile) ? $user_profile->getBestName() : _('User')),
+                             sprintf(_('People tags by %s'), ($user_profile) ? $name : _('User')),
                              in_array($action, array('peopletagsbyuser', 'peopletagsforuser')),
                              'nav_timeline_peopletags');
 
@@ -123,15 +104,11 @@ class PersonalGroupNav extends Widget
 
                 $this->out->menuItem(common_local_url('inbox', array('nickname' =>
                                                                      $nickname)),
-                                     _('Inbox'),
+                                     _('Messages'),
                                      _('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));
         }
         $this->out->elementEnd('ul');