Don't trust local HTML either

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

diff --git a/lib/peopletaggroupnav.php b/lib/peopletaggroupnav.php
index a93499ce76b291c29ba8a266f0b1db932fd9c237..fb579affe09c77f73774aca20243fbd040713279 100644 (file)
--- a/lib/peopletaggroupnav.php
+++ b/lib/peopletaggroupnav.php
@@ -61,7 +61,7 @@ class PeopletagGroupNav extends Widget
      *
      * @param Action $action current action, used for output
      */
-    function __construct($action=null)
+    function __construct(Action $action=null)
     {
         parent::__construct($action);
         $this->action = $action;
@@ -76,14 +76,20 @@ class PeopletagGroupNav extends Widget
     {
         $user = null;
 
-       // FIXME: we should probably pass this in
+       // FIXME: we should probably pass this in and check when PeopletagGroupNav is actually loaded etc.
 
         $action = $this->action->trimmed('action');
-        $nickname = $this->action->trimmed('tagger');
+
+        if (common_config('singleuser', 'enabled')) {
+            $nickname = User::singleUserNickname();
+        } else {
+            $nickname = $this->action->arg('tagger');
+        }
+
         $tag = $this->action->trimmed('tag');
 
         if ($nickname) {
-            $user = User::staticGet('nickname', $nickname);
+            $user = User::getKV('nickname', $nickname);
             $user_profile = $user->getProfile();
 
             if ($tag) {
@@ -101,12 +107,12 @@ class PeopletagGroupNav extends Widget
 
         if (Event::handle('StartPeopletagGroupNav', array($this))) {
             // People tag timeline
-            $this->out->menuItem(common_local_url('showprofiletag', array('tagger' => $user_profile->nickname,
+            $this->out->menuItem(common_local_url('showprofiletag', array('nickname' => $user_profile->nickname,
                                                                           'tag'    => $tag->tag)),
-                             // TRANS: Menu item in people tag navigation panel.
+                             // TRANS: Menu item in list navigation panel.
                              _m('MENU','List'),
-                             // TRANS: Menu item title in people tag navigation panel.
-                             // TRANS: %1$s is a tag, %2$s is a nickname.
+                             // TRANS: Menu item title in list navigation panel.
+                             // TRANS: %1$s is a list, %2$s is a nickname.
                              sprintf(_('%1$s list by %2$s.'), $tag->tag,
                                 (($user_profile && $user_profile->fullname) ? $user_profile->fullname : $nickname)),
                              $action == 'showprofiletag', 'nav_timeline_peopletag');
@@ -114,10 +120,10 @@ class PeopletagGroupNav extends Widget
             // Tagged
             $this->out->menuItem(common_local_url('peopletagged', array('tagger' => $user->nickname,
                                                                         'tag'    => $tag->tag)),
-                             // TRANS: Menu item in people tag navigation panel.
+                             // TRANS: Menu item in list navigation panel.
                              _m('MENU','Listed'),
-                             // TRANS: Menu item title in people tag navigation panel.
-                             // TRANS: %1$s is a tag, %2$s is a nickname.
+                             // TRANS: Menu item title in list navigation panel.
+                             // TRANS: %1$s is a list, %2$s is a nickname.
                              sprintf(_('%1$s list by %2$s.'), $tag->tag,
                                 (($user_profile && $user_profile->fullname) ? $user_profile->fullname : $nickname)),
                              $action == 'peopletagged', 'nav_peopletag_tagged');
@@ -125,10 +131,10 @@ class PeopletagGroupNav extends Widget
             // Subscribers
             $this->out->menuItem(common_local_url('peopletagsubscribers', array('tagger' => $user->nickname,
                                                                                 'tag'    => $tag->tag)),
-                             // TRANS: Menu item in people tag navigation panel.
+                             // TRANS: Menu item in list navigation panel.
                              _m('MENU','Subscribers'),
-                             // TRANS: Menu item title in people tag navigation panel.
-                             // TRANS: %1$s is a tag, %2$s is a nickname.
+                             // TRANS: Menu item title in list navigation panel.
+                             // TRANS: %1$s is a list, %2$s is a nickname.
                              sprintf(_('Subscribers to %1$s list by %2$s.'), $tag->tag,
                                 (($user_profile && $user_profile->fullname) ? $user_profile->fullname : $nickname)),
                              $action == 'peopletagsubscribers', 'nav_peopletag_subscribers');
@@ -138,10 +144,10 @@ class PeopletagGroupNav extends Widget
                 // Edit
                 $this->out->menuItem(common_local_url('editpeopletag', array('tagger' => $user->nickname,
                                                                              'tag'    => $tag->tag)),
-                                 // TRANS: Menu item in people tag navigation panel.
+                                 // TRANS: Menu item in list navigation panel.
                                  _m('MENU','Edit'),
-                                 // TRANS: Menu item title in people tag navigation panel.
-                                 // TRANS: %s is a tag.
+                                 // TRANS: Menu item title in list navigation panel.
+                                 // TRANS: %s is a list.
                                  sprintf(_('Edit %s list by you.'), $tag->tag,
                                     (($user_profile && $user_profile->fullname) ? $user_profile->fullname : $nickname)),
                                  $action == 'editpeopletag', 'nav_peopletag_edit');