X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Favatarbynickname.php;h=b366c62d80259181ee07f793a2f82ff24461d9d0;hb=b53e1439969bfa2c0b551d8cc2fc8fe15652c62a;hp=4aeb4112ae801749c0bff957242d7af5f71944a5;hpb=04ef1ba8eee7a9e2a565d7b4b747ef607665d562;p=quix0rs-gnu-social.git

diff --git a/actions/avatarbynickname.php b/actions/avatarbynickname.php
index 4aeb4112ae..b366c62d80 100644
--- a/actions/avatarbynickname.php
+++ b/actions/avatarbynickname.php
@@ -1,7 +1,18 @@
 <?php
-/*
- * Laconica - a distributed open-source microblogging tool
- * Copyright (C) 2008, Controlez-Vous, Inc.
+/**
+ * Retrieve user avatar by nickname action class.
+ *
+ * PHP version 5
+ *
+ * @category Action
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Robin Millette <millette@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
+ * @link     http://status.net/
+ *
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2008, 2009, StatusNet, Inc.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -17,53 +28,65 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('GNUSOCIAL')) { exit(1); }
 
-class AvatarbynicknameAction extends Action {
-    function handle($args)
+/**
+ * Retrieve user avatar by nickname action class.
+ *
+ * @category Action
+ * @package  GNUsocial
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Robin Millette <millette@status.net>
+ * @author   Mikael Nordfeldth <mmn@hethane.se>
+ * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
+ * @link     http://www.gnu.org/software/social/
+ */
+class AvatarbynicknameAction extends Action
+{
+    /**
+     * Class handler.
+     *
+     * @param array $args query arguments
+     *
+     * @return boolean false if nickname or user isn't found
+     */
+    protected function handle()
     {
-        parent::handle($args);
+        parent::handle();
         $nickname = $this->trimmed('nickname');
         if (!$nickname) {
-            $this->client_error(_('No nickname.'));
-            return;
-        }
-        $size = $this->trimmed('size');
-        if (!$size) {
-            $this->client_error(_('No size.'));
-            return;
-        }
-        $size = strtolower($size);
-        if (!in_array($size, array('original', '96', '48', '24'))) {
-            $this->client_error(_('Invalid size.'));
-            return;
+            // TRANS: Client error displayed trying to get an avatar without providing a nickname.
+            $this->clientError(_('No nickname.'));
         }
+        $size = $this->trimmed('size') ?: 'original';
 
-        $user = User::staticGet('nickname', $nickname);
+        $user = User::getKV('nickname', $nickname);
         if (!$user) {
-            $this->client_error(_('No such user.'));
-            return;
+            // TRANS: Client error displayed trying to get an avatar for a non-existing user.
+            $this->clientError(_('No such user.'));
         }
         $profile = $user->getProfile();
         if (!$profile) {
-            $this->client_error(_('User has no profile.'));
-            return;
-        }
-        if ($size == 'original') {
-            $avatar = $profile->getOriginal();
-        } else {
-            $avatar = $profile->getAvatar($size+0);
+            // TRANS: Error message displayed when referring to a user without a profile.
+            $this->clientError(_('User has no profile.'));
         }
 
-        if ($avatar) {
-            $url = $avatar->url;
-        } else {
-            if ($size == 'original') {
-                $url = common_default_avatar(AVATAR_PROFILE_SIZE);
-            } else {
-                $url = common_default_avatar($size+0);
+        if ($size === 'original') {
+            try {
+                $avatar = Avatar::getUploaded($profile);
+                $url = $avatar->displayUrl();
+            } catch (NoAvatarException $e) {
+                $url = Avatar::defaultImage(AVATAR_PROFILE_SIZE);
             }
+        } else {
+            $url = $profile->avatarUrl($size);
         }
+
         common_redirect($url, 302);
     }
+
+    function isReadOnly(array $args=array())
+    {
+        return true;
+    }
 }