Merge remote-tracking branch 'upstream/master' into social-master

[quix0rs-gnu-social.git] / actions / subscribers.php

diff --git a/actions/subscribers.php b/actions/subscribers.php
index ad522a4bae63372b0632f302ec794a329ba88735..682faf869e44d437728c63d62afa87f78f9a8b24 100644 (file)
--- a/actions/subscribers.php
+++ b/actions/subscribers.php
@@ -48,20 +48,19 @@ class SubscribersAction extends GalleryAction
         if ($this->page == 1) {
             // TRANS: Header for list of subscribers for a user (first page).
             // TRANS: %s is the user's nickname.
-            return sprintf(_('%s subscribers'), $this->user->nickname);
+            return sprintf(_('%s subscribers'), $this->target->getNickname());
         } else {
             // TRANS: Header for list of subscribers for a user (not first page).
             // TRANS: %1$s is the user's nickname, $2$d is the page number.
             return sprintf(_('%1$s subscribers, page %2$d'),
-                           $this->user->nickname,
+                           $this->target->getNickname(),
                            $this->page);
         }
     }
 
     function showPageNotice()
     {
-        $user = common_current_user();
-        if ($user && ($user->id == $this->profile->id)) {
+        if ($this->scoped instanceof Profile && $this->scoped->id === $this->target->id) {
             $this->element('p', null,
                            // TRANS: Page notice for page with an overview of all subscribers
                            // TRANS: of the logged in user's own profile.
@@ -73,7 +72,7 @@ class SubscribersAction extends GalleryAction
                            // TRANS: than the logged in user. %s is the user nickname.
                            sprintf(_('These are the people who '.
                                      'listen to %s\'s notices.'),
-                                   $this->profile->nickname));
+                                   $this->target->getNickname()));
         }
     }
 
@@ -87,13 +86,13 @@ class SubscribersAction extends GalleryAction
         $cnt = 0;
 
         if ($this->tag) {
-            $subscribers = $this->user->getTaggedSubscribers($this->tag, $offset, $limit);
+            $subscribers = $this->target->getTaggedSubscribers($this->tag, $offset, $limit);
         } else {
-            $subscribers = $this->user->getSubscribers($offset, $limit);
+            $subscribers = $this->target->getSubscribers($offset, $limit);
         }
 
         if ($subscribers) {
-            $subscribers_list = new SubscribersList($subscribers, $this->user, $this);
+            $subscribers_list = new SubscribersList($subscribers, $this->target, $this);
             $cnt = $subscribers_list->show();
             if (0 == $cnt) {
                 $this->showEmptyListMessage();
@@ -102,29 +101,25 @@ class SubscribersAction extends GalleryAction
 
         $this->pagination($this->page > 1, $cnt > PROFILES_PER_PAGE,
                           $this->page, 'subscribers',
-                          array('nickname' => $this->user->nickname));
+                          array('nickname' => $this->target->getNickname()));
     }
 
     function showEmptyListMessage()
     {
-        if (common_logged_in()) {
-            $current_user = common_current_user();
-            if ($this->user->id === $current_user->id) {
-                // TRANS: Subscriber list text when the logged in user has no subscribers.
-                $message = _('You have no subscribers. Try subscribing to people you know and they might return the favor.');
-            } else {
-                // TRANS: Subscriber list text when looking at the subscribers for a of a user other
-                // TRANS: than the logged in user that has no subscribers. %s is the user nickname.
-                $message = sprintf(_('%s has no subscribers. Want to be the first?'), $this->user->nickname);
-            }
-        }
-        else {
+        if ($this->scoped instanceof Profile && $this->target->id === $this->scoped->id) {
+            // TRANS: Subscriber list text when the logged in user has no subscribers.
+            $message = _('You have no subscribers. Try subscribing to people you know and they might return the favor.');
+        } elseif ($this->scoped instanceof Profile) {
+            // TRANS: Subscriber list text when looking at the subscribers for a of a user other
+            // TRANS: than the logged in user that has no subscribers. %s is the user nickname.
+            $message = sprintf(_('%s has no subscribers. Want to be the first?'), $this->target->getNickname());
+        } else {
             // TRANS: Subscriber list text when looking at the subscribers for a of a user that has none
             // TRANS: as an anonymous user. %s is the user nickname.
             // TRANS: This message contains a Markdown URL. The link description is between
             // TRANS: square brackets, and the link between parentheses. Do not separate "]("
             // TRANS: and do not change the URL part.
-            $message = sprintf(_('%s has no subscribers. Why not [register an account](%%%%action.register%%%%) and be the first?'), $this->user->nickname);
+            $message = sprintf(_('%s has no subscribers. Why not [register an account](%%%%action.register%%%%) and be the first?'), $this->target->getNickname());
         }
 
         $this->elementStart('div', 'guide');
@@ -135,17 +130,12 @@ class SubscribersAction extends GalleryAction
     function showSections()
     {
         parent::showSections();
-        $cloud = new SubscribersPeopleTagCloudSection($this);
-        $cloud->show();
-
-        $cloud2 = new SubscribersPeopleSelfTagCloudSection($this);
-        $cloud2->show();
     }
 }
 
 class SubscribersList extends SubscriptionList
 {
-    function newListItem($profile)
+    function newListItem(Profile $profile)
     {
         return new SubscribersListItem($profile, $this->owner, $this->action);
     }
@@ -171,7 +161,7 @@ class SubscribersListItem extends SubscriptionListItem
 
         if (!empty($user) && $this->owner->id == $user->id) {
             $returnto = array('action' => 'subscribers',
-                              'nickname' => $this->owner->nickname);
+                              'nickname' => $this->owner->getNickname());
             $page = $this->out->arg('page');
             if ($page) {
                 $returnto['param-page'] = $page;