diff --git a/actions/showstream.php b/actions/showstream.php index 9e89b1b48c..13241dc30f 100644 --- a/actions/showstream.php +++ b/actions/showstream.php @@ -57,16 +57,14 @@ class ShowstreamAction extends ProfileAction { var $notice; - function prepare($args) + protected function prepare($args) { parent::prepare($args); - $p = Profile::current(); - if (empty($this->tag)) { - $stream = new ProfileNoticeStream($this->profile, $p); + $stream = new ProfileNoticeStream($this->profile, $this->scoped); } else { - $stream = new TaggedProfileNoticeStream($this->profile, $this->tag, $p); + $stream = new TaggedProfileNoticeStream($this->profile, $this->tag, $this->scoped); } $this->notice = $stream->getNotices(($this->page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1); @@ -105,11 +103,9 @@ class ShowstreamAction extends ProfileAction } } - function handle($args) + protected function handle() { - // Looks like we're good; start output - - // For YADIS discovery, we also have a tag + parent::handle(); $this->showPage(); } @@ -135,12 +131,12 @@ class ShowstreamAction extends ProfileAction if (!empty($this->tag)) { return array(new Feed(Feed::RSS1, common_local_url('userrss', - array('nickname' => $this->user->nickname, + array('nickname' => $this->target->nickname, 'tag' => $this->tag)), // TRANS: Title for link to notice feed. // TRANS: %1$s is a user nickname, %2$s is a hashtag. sprintf(_('Notice feed for %1$s tagged %2$s (RSS 1.0)'), - $this->user->nickname, $this->tag))); + $this->target->nickname, $this->tag))); } return array(new Feed(Feed::JSON, @@ -151,14 +147,14 @@ class ShowstreamAction extends ProfileAction // TRANS: Title for link to notice feed. // TRANS: %s is a user nickname. sprintf(_('Notice feed for %s (Activity Streams JSON)'), - $this->user->nickname)), + $this->target->nickname)), new Feed(Feed::RSS1, common_local_url('userrss', - array('nickname' => $this->user->nickname)), + array('nickname' => $this->target->nickname)), // TRANS: Title for link to notice feed. // TRANS: %s is a user nickname. sprintf(_('Notice feed for %s (RSS 1.0)'), - $this->user->nickname)), + $this->target->nickname)), new Feed(Feed::RSS2, common_local_url('ApiTimelineUser', array( @@ -167,7 +163,7 @@ class ShowstreamAction extends ProfileAction // TRANS: Title for link to notice feed. // TRANS: %s is a user nickname. sprintf(_('Notice feed for %s (RSS 2.0)'), - $this->user->nickname)), + $this->target->nickname)), new Feed(Feed::ATOM, common_local_url('ApiTimelineUser', array( @@ -176,13 +172,13 @@ class ShowstreamAction extends ProfileAction // TRANS: Title for link to notice feed. // TRANS: %s is a user nickname. sprintf(_('Notice feed for %s (Atom)'), - $this->user->nickname)), + $this->target->nickname)), new Feed(Feed::FOAF, common_local_url('foaf', array('nickname' => - $this->user->nickname)), + $this->target->nickname)), // TRANS: Title for link to notice feed. FOAF stands for Friend of a Friend. // TRANS: More information at http://www.foaf-project.org. %s is a user nickname. - sprintf(_('FOAF for %s'), $this->user->nickname))); + sprintf(_('FOAF for %s'), $this->target->nickname))); } function extraHead() @@ -222,7 +218,7 @@ class ShowstreamAction extends ProfileAction function showEmptyListMessage() { // TRANS: First sentence of empty list message for a timeline. $1%s is a user nickname. - $message = sprintf(_('This is the timeline for %1$s, but %1$s hasn\'t posted anything yet.'), $this->user->nickname) . ' '; + $message = sprintf(_('This is the timeline for %1$s, but %1$s hasn\'t posted anything yet.'), $this->target->nickname) . ' '; if (common_logged_in()) { $current_user = common_current_user(); @@ -232,13 +228,13 @@ class ShowstreamAction extends ProfileAction } else { // TRANS: Second sentence of empty list message for a non-self timeline. %1$s is a user nickname, %2$s is a part of a URL. // TRANS: This message contains a Markdown link. Keep "](" together. - $message .= sprintf(_('You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%%?status_textarea=%2$s).'), $this->user->nickname, '@' . $this->user->nickname); + $message .= sprintf(_('You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%%?status_textarea=%2$s).'), $this->target->nickname, '@' . $this->target->nickname); } } else { // TRANS: Second sentence of empty message for anonymous users. %s is a user nickname. // TRANS: This message contains a Markdown link. Keep "](" together. - $message .= sprintf(_('Why not [register an account](%%%%action.register%%%%) and then nudge %s or post a notice to them.'), $this->user->nickname); + $message .= sprintf(_('Why not [register an account](%%%%action.register%%%%) and then nudge %s or post a notice to them.'), $this->target->nickname); } $this->elementStart('div', 'guide'); @@ -257,7 +253,7 @@ class ShowstreamAction extends ProfileAction $this->showEmptyListMessage(); } - $args = array('nickname' => $this->user->nickname); + $args = array('nickname' => $this->target->nickname); if (!empty($this->tag)) { $args['tag'] = $this->tag; @@ -274,13 +270,13 @@ class ShowstreamAction extends ProfileAction $m = sprintf(_('**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-blogging) service ' . 'based on the Free Software [StatusNet](http://status.net/) tool. ' . '[Join now](%%%%action.register%%%%) to follow **%s**\'s notices and many more! ([Read more](%%%%doc.help%%%%))'), - $this->user->nickname, $this->user->nickname); + $this->target->nickname, $this->target->nickname); } else { // TRANS: Announcement for anonymous users showing a timeline if site registrations are closed or invite only. // TRANS: This message contains a Markdown link. Keep "](" together. $m = sprintf(_('**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-blogging) service ' . 'based on the Free Software [StatusNet](http://status.net/) tool.'), - $this->user->nickname, $this->user->nickname); + $this->target->nickname, $this->target->nickname); } $this->elementStart('div', array('id' => 'anon_notice')); $this->raw(common_markup_to_html($m)); diff --git a/classes/Profile.php b/classes/Profile.php index dacfb2ee92..2f734aafd7 100644 --- a/classes/Profile.php +++ b/classes/Profile.php @@ -1099,7 +1099,7 @@ class Profile extends Managed_DataObject * @param $right string Name of the right, usually a constant in class Right * @return boolean whether the user has the right in question */ - function hasRight($right) + public function hasRight($right) { $result = false; diff --git a/lib/profileaction.php b/lib/profileaction.php index f36f099c71..bf1582eeca 100644 --- a/lib/profileaction.php +++ b/lib/profileaction.php @@ -49,50 +49,59 @@ require_once INSTALLDIR.'/lib/groupminilist.php'; class ProfileAction extends Action { var $page = null; - var $profile = null; var $tag = null; - function prepare($args) + protected $target = null; // Profile that we're showing + + protected function prepare($args) { parent::prepare($args); - $nickname_arg = $this->arg('nickname'); - $nickname = common_canonical_nickname($nickname_arg); + try { + $nickname_arg = $this->arg('nickname'); + $nickname = common_canonical_nickname($nickname_arg); - // Permanent redirect on non-canonical nickname + // Permanent redirect on non-canonical nickname - if ($nickname_arg != $nickname) { - $args = array('nickname' => $nickname); - if ($this->arg('page') && $this->arg('page') != 1) { - $args['page'] = $this->arg['page']; + if ($nickname_arg != $nickname) { + $args = array('nickname' => $nickname); + if ($this->arg('page') && $this->arg('page') != 1) { + $args['page'] = $this->arg['page']; + } + common_redirect(common_local_url($this->trimmed('action'), $args), 301); + } + $this->user = User::getKV('nickname', $nickname); + + if (!$this->user) { + // TRANS: Client error displayed when calling a profile action without specifying a user. + $this->clientError(_('No such user.'), 404); + } + + $this->target = $this->user->getProfile(); + } catch (NicknameException $e) { + $id = (int)$this->arg('id'); + $this->target = Profile::getKV('id', $id); + + if (!($this->target instanceof Profile)) { + // TRANS: Error message displayed when referring to a user without a profile. + $this->serverError(_m('Profile ID does not exist.')); + } + + $user = User::getKV('id', $this->target->id); + if ($user instanceof User) { + // This is a local user -- send to their regular profile. + common_redirect(common_local_url('showstream', array('nickname' => $user->nickname))); } - common_redirect(common_local_url($this->trimmed('action'), $args), 301); - return false; } - $this->user = User::getKV('nickname', $nickname); - - if (!$this->user) { - // TRANS: Client error displayed when calling a profile action without specifying a user. - $this->clientError(_('No such user.'), 404); - return false; - } - - $this->profile = $this->user->getProfile(); - - if (!$this->profile) { - // TRANS: Error message displayed when referring to a user without a profile. - $this->serverError(_('User has no profile.')); - return false; - } - - $user = common_current_user(); - - if ($this->profile->hasRole(Profile_role::SILENCED) && - (empty($user) || !$user->hasRight(Right::SILENCEUSER))) { + if ($this->target->hasRole(Profile_role::SILENCED) && + (empty($this->scoped) || !$this->scoped->hasRight(Right::SILENCEUSER))) { throw new ClientException(_('This profile has been silenced by site moderators'), 403); } + // backwards compatibility until all actions are fixed to use $this->target + $this->profile = $this->target; + $this->tag = $this->trimmed('tag'); $this->page = ($this->arg('page')) ? ($this->arg('page')+0) : 1; common_set_returnto($this->selfUrl()); diff --git a/plugins/ModPlus/actions/remoteprofile.php b/plugins/ModPlus/actions/remoteprofile.php index bfcc5a84ca..133646480c 100644 --- a/plugins/ModPlus/actions/remoteprofile.php +++ b/plugins/ModPlus/actions/remoteprofile.php @@ -6,53 +6,10 @@ class RemoteProfileAction extends ShowstreamAction { - function prepare($args) - { - Action::prepare($args); // skip the ProfileAction code and replace it... - - $id = $this->arg('id'); - $this->user = false; - $this->profile = Profile::getKV('id', $id); - - if (!$this->profile) { - // TRANS: Error message displayed when referring to a user without a profile. - $this->serverError(_m('User has no profile.')); - return false; - } - - $user = User::getKV('id', $this->profile->id); - if ($user) { - // This is a local user -- send to their regular profile. - $url = common_local_url('showstream', array('nickname' => $user->nickname)); - common_redirect($url); - return false; - } - - $this->tag = $this->trimmed('tag'); - $this->page = ($this->arg('page')) ? ($this->arg('page')+0) : 1; - common_set_returnto($this->selfUrl()); - - $p = Profile::current(); - if (empty($this->tag)) { - $stream = new ProfileNoticeStream($this->profile, $p); - } else { - $stream = new TaggedProfileNoticeStream($this->profile, $this->tag, $p); - } - $this->notice = $stream->getNotices(($this->page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1); - - return true; - } - - function handle($args) - { - // skip yadis thingy - $this->showPage(); - } - function title() { - $base = $this->profile->getBestName(); - $host = parse_url($this->profile->profileurl, PHP_URL_HOST); + $base = $this->target->getBestName(); + $host = parse_url($this->target->profileurl, PHP_URL_HOST); // TRANS: Remote profile action page title. // TRANS: %1$s is a username, %2$s is a hostname. return sprintf(_m('%1$s on %2$s'), $base, $host); @@ -63,20 +20,20 @@ class RemoteProfileAction extends ShowstreamAction */ function showNotices() { - $url = $this->profile->profileurl; + $url = $this->target->profileurl; $host = parse_url($url, PHP_URL_HOST); $markdown = sprintf( // TRANS: Message on remote profile page. // TRANS: This message contains Markdown links in the form [description](link). // TRANS: %1$s is a profile nickname, %2$s is a hostname, %3$s is a URL. _m('This remote profile is registered on another site; see [%1$s\'s original profile page on %2$s](%3$s).'), - $this->profile->nickname, + $this->target->nickname, $host, $url); $html = common_markup_to_html($markdown); $this->raw($html); - if ($this->profile->hasRole(Profile_role::SILENCED)) { + if ($this->target->hasRole(Profile_role::SILENCED)) { // TRANS: Message on blocked remote profile page. $markdown = _m('Site moderators have silenced this profile, which prevents delivery of new messages to any users on this site.'); $this->raw(common_markup_to_html($markdown)); @@ -91,7 +48,7 @@ class RemoteProfileAction extends ShowstreamAction $this->showEmptyListMessage(); } - $args = array('id' => $this->profile->id); + $args = array('id' => $this->target->id); if (!empty($this->tag)) { $args['tag'] = $this->tag;