X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=inline;f=actions%2Favatarbynickname.php;h=10a22e77bc199c61627b836135aaa600e3c0f898;hb=df46f123dd656545c80821931f0a384f7dc5d608;hp=a581d5ae35ab16595e0236b86356ffad7339e9b0;hpb=a2e4a1803c2fef25ffc94d306781cec4ae18a5b5;p=quix0rs-gnu-social.git
diff --git a/actions/avatarbynickname.php b/actions/avatarbynickname.php
index a581d5ae35..10a22e77bc 100644
--- a/actions/avatarbynickname.php
+++ b/actions/avatarbynickname.php
@@ -28,19 +28,18 @@
* along with this program. If not, see .
*/
-if (!defined('STATUSNET') && !defined('LACONICA')) {
- exit(1);
-}
+if (!defined('GNUSOCIAL')) { exit(1); }
/**
* Retrieve user avatar by nickname action class.
*
* @category Action
- * @package StatusNet
+ * @package GNUsocial
* @author Evan Prodromou
* @author Robin Millette
+ * @author Mikael Nordfeldth
* @license http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
- * @link http://status.net/
+ * @link http://www.gnu.org/software/social/
*/
class AvatarbynicknameAction extends Action
{
@@ -51,55 +50,38 @@ class AvatarbynicknameAction extends Action
*
* @return boolean false if nickname or user isn't found
*/
- function handle($args)
+ protected function handle()
{
- parent::handle($args);
+ parent::handle();
$nickname = $this->trimmed('nickname');
if (!$nickname) {
// TRANS: Client error displayed trying to get an avatar without providing a nickname.
$this->clientError(_('No nickname.'));
- return;
- }
- $size = $this->trimmed('size');
- if (!$size) {
- // TRANS: Client error displayed trying to get an avatar without providing an avatar size.
- $this->clientError(_('No size.'));
- return;
- }
- $size = strtolower($size);
- if (!in_array($size, array('original', '96', '48', '24'))) {
- // TRANS: Client error displayed trying to get an avatar providing an invalid avatar size.
- $this->clientError(_('Invalid size.'));
- return;
}
+ $size = $this->trimmed('size') ?: 'original';
- $user = User::staticGet('nickname', $nickname);
+ $user = User::getKV('nickname', $nickname);
if (!$user) {
// TRANS: Client error displayed trying to get an avatar for a non-existing user.
$this->clientError(_('No such user.'));
- return;
}
$profile = $user->getProfile();
if (!$profile) {
// TRANS: Error message displayed when referring to a user without a profile.
$this->clientError(_('User has no profile.'));
- return;
- }
- if ($size == 'original') {
- $avatar = $profile->getOriginal();
- } else {
- $avatar = $profile->getAvatar($size+0);
}
- if ($avatar) {
- $url = $avatar->url;
- } else {
- if ($size == 'original') {
+ if ($size === 'original') {
+ try {
+ $avatar = Avatar::getUploaded($profile);
+ $url = $avatar->displayUrl();
+ } catch (NoAvatarException $e) {
$url = Avatar::defaultImage(AVATAR_PROFILE_SIZE);
- } else {
- $url = Avatar::defaultImage($size+0);
}
+ } else {
+ $url = $profile->avatarUrl($size);
}
+
common_redirect($url, 302);
}