X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fprofileaction.php;h=1ba5ed77eb9abde963511aecd81d9c125bce7a3f;hb=d6b28c64830f632bb2f4b6f3c9369b9e56ad217a;hp=3da3c11246d3e7997ffbd098232c0dac8246a58c;hpb=8f0a5ffd57459352e178eed60709e350a09554b7;p=quix0rs-gnu-social.git

diff --git a/lib/profileaction.php b/lib/profileaction.php
index 3da3c11246..1ba5ed77eb 100644
--- a/lib/profileaction.php
+++ b/lib/profileaction.php
@@ -50,66 +50,57 @@ abstract class ProfileAction extends ManagedAction
 
     protected function doPreparation()
     {
-        try {
-            $nickname_arg = $this->arg('nickname');
-            $nickname     = common_canonical_nickname($nickname_arg);
-
-            // 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'];
-                }
-                common_redirect(common_local_url($this->getActionName(), $args), 301);
+        // showstream requires a nickname
+        $nickname_arg = $this->trimmed('nickname');
+        $nickname     = common_canonical_nickname($nickname_arg);
+
+        // 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'];
             }
-            $this->user = User::getKV('nickname', $nickname);
+            common_redirect(common_local_url($this->getActionName(), $args), 301);
+        }
 
-            if (!$this->user) {
-                $group = Local_group::getKV('nickname', $nickname);
-                if ($group instanceof Local_group) {
-                    common_redirect($group->getProfile()->getUrl());
-                }
-                // TRANS: Client error displayed when calling a profile action without specifying a user.
-                $this->clientError(_('No such user.'), 404);
+        try {
+            $user = User::getByNickname($nickname);
+        } catch (NoSuchUserException $e) {
+            $group = Local_group::getKV('nickname', $nickname);
+            if ($group instanceof Local_group) {
+                common_redirect($group->getProfile()->getUrl());
             }
 
-            $this->target = $this->user->getProfile();
-        } catch (NicknameException $e) {
-            $id = (int)$this->arg('id');
-            $this->target = Profile::getKV('id', $id);
+            // No user nor group found, throw the NoSuchUserException again
+            throw $e;
+        }
 
-            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.'));
-            }
+        $this->target = $user->getProfile();
+    }
 
-            if ($this->target->isLocal()) {
-                // For local users when accessed by id number, redirect to
-                // the same action but using the nickname as argument.
-                common_redirect(common_local_url($this->getActionName(),
-                                                array('nickname'=>$user->getNickname())));
-            }
-        }
+    protected function prepare(array $args=array())
+    {
+        // this will call ->doPreparation() which child classes use to set $this->target
+        parent::prepare($args);
 
-        if ($this->target->hasRole(Profile_role::SILENCED) &&
-            (empty($this->scoped) || !$this->scoped->hasRight(Right::SILENCEUSER))) {
+        if ($this->target->hasRole(Profile_role::SILENCED)
+                && (!$this->scoped instanceof Profile || !$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());
 
-        return $this->profileActionPreparation();
+        return true;
     }
 
-    protected function profileActionPreparation()
+    public function getTarget()
     {
-        // No-op by default.
+        if (!$this->target instanceof Profile) {
+            throw new ServerException('No target profile in ProfileAction class');
+        }
+        return $this->target;
     }
 
     function isReadOnly(array $args=array())
@@ -323,7 +314,7 @@ abstract class ProfileAction extends ManagedAction
                         $url = $lists->mainpage;
                     } else {
                         $url = common_local_url('showprofiletag',
-                                                array('tagger' => $this->target->getNickname(),
+                                                array('nickname' => $this->target->getNickname(),
                                                       'tag'    => $lists->tag));
                     }
                     if (!$first) {