From eb7f9645986ade69dd0b111192aa3e05fcfbaa0f Mon Sep 17 00:00:00 2001 From: Mikael Nordfeldth Date: Wed, 28 May 2014 17:00:34 +0200 Subject: [PATCH] Modernising subscribers/subscriptions to use $this->scoped/target They extend GalleryAction from ProfileAction, where $this->target is set. --- actions/subscribers.php | 41 +++++++++++++++++---------------------- actions/subscriptions.php | 35 +++++++++++++-------------------- 2 files changed, 31 insertions(+), 45 deletions(-) diff --git a/actions/subscribers.php b/actions/subscribers.php index 9e1fb4cf73..2724927878 100644 --- 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'); @@ -166,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; diff --git a/actions/subscriptions.php b/actions/subscriptions.php index 56892243b6..c4dda3f627 100644 --- a/actions/subscriptions.php +++ b/actions/subscriptions.php @@ -48,20 +48,19 @@ class SubscriptionsAction extends GalleryAction if ($this->page == 1) { // TRANS: Header for subscriptions overview for a user (first page). // TRANS: %s is a user nickname. - return sprintf(_('%s subscriptions'), $this->user->nickname); + return sprintf(_('%s subscriptions'), $this->target->getNickname()); } else { // TRANS: Header for subscriptions overview for a user (not first page). // TRANS: %1$s is a user nickname, %2$d is the page number. return sprintf(_('%1$s subscriptions, 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 subscriptions // TRANS: of the logged in user's own profile. @@ -73,7 +72,7 @@ class SubscriptionsAction extends GalleryAction // TRANS: than the logged in user. %s is the user nickname. sprintf(_('These are the people whose '. 'notices %s listens to.'), - $this->profile->nickname)); + $this->target->getNickname())); } } @@ -93,13 +92,13 @@ class SubscriptionsAction extends GalleryAction $cnt = 0; if ($this->tag) { - $subscriptions = $this->user->getTaggedSubscriptions($this->tag, $offset, $limit); + $subscriptions = $this->target->getTaggedSubscriptions($this->tag, $offset, $limit); } else { - $subscriptions = $this->user->getSubscribed($offset, $limit); + $subscriptions = $this->target->getSubscribed($offset, $limit); } if ($subscriptions) { - $subscriptions_list = new SubscriptionsList($subscriptions, $this->user, $this); + $subscriptions_list = new SubscriptionsList($subscriptions, $this->target, $this); $cnt = $subscriptions_list->show(); if (0 == $cnt) { $this->showEmptyListMessage(); @@ -108,7 +107,7 @@ class SubscriptionsAction extends GalleryAction $this->pagination($this->page > 1, $cnt > PROFILES_PER_PAGE, $this->page, 'subscriptions', - array('nickname' => $this->user->nickname)); + array('nickname' => $this->target->getNickname())); Event::handle('EndShowSubscriptionsContent', array($this)); @@ -123,9 +122,7 @@ class SubscriptionsAction extends GalleryAction function showEmptyListMessage() { - if (common_logged_in()) { - $current_user = common_current_user(); - if ($this->user->id === $current_user->id) { + if ($this->scoped instanceof Profile && $this->target->id === $this->scoped->id) { // TRANS: Subscription list text when the logged in user has no subscriptions. // TRANS: This message contains Markdown URLs. The link description is between // TRANS: square brackets, and the link between parentheses. Do not separate "](" @@ -133,16 +130,10 @@ class SubscriptionsAction extends GalleryAction $message = _('You\'re not listening to anyone\'s notices right now, try subscribing to people you know. '. 'Try [people search](%%action.peoplesearch%%), look for members in groups you\'re interested '. 'in and in our [featured users](%%action.featured%%).'); - } else { - // TRANS: Subscription list text when looking at the subscriptions for a of a user other - // TRANS: than the logged in user that has no subscriptions. %s is the user nickname. - $message = sprintf(_('%s is not listening to anyone.'), $this->user->nickname); - } - } - else { + } else { // TRANS: Subscription list text when looking at the subscriptions for a of a user that has none // TRANS: as an anonymous user. %s is the user nickname. - $message = sprintf(_('%s is not listening to anyone.'), $this->user->nickname); + $message = sprintf(_('%s is not listening to anyone.'), $this->target->getNickname()); } $this->elementStart('div', 'guide'); @@ -159,10 +150,10 @@ class SubscriptionsAction extends GalleryAction { return array(new Feed(Feed::ATOM, common_local_url('AtomPubSubscriptionFeed', - array('subscriber' => $this->profile->id)), + array('subscriber' => $this->target->id)), // TRANS: Atom feed title. %s is a profile nickname. sprintf(_('Subscription feed for %s (Atom)'), - $this->profile->nickname))); + $this->target->getNickname()))); } }