diff options
Diffstat (limited to 'actions')
| -rw-r--r-- | actions/avatarsettings.php | 190 | ||||
| -rw-r--r-- | actions/clienterror.php | 94 | ||||
| -rw-r--r-- | actions/servererror.php | 92 |
3 files changed, 170 insertions, 206 deletions
diff --git a/actions/avatarsettings.php b/actions/avatarsettings.php index 2c7af9b7a..1db35237e 100644 --- a/actions/avatarsettings.php +++ b/actions/avatarsettings.php @@ -50,6 +50,10 @@ require_once INSTALLDIR.'/lib/accountsettingsaction.php'; class AvatarsettingsAction extends AccountSettingsAction { + var $mode = null; + var $imagefile = null; + var $filename = null; + /** * Title of the page * @@ -69,7 +73,7 @@ class AvatarsettingsAction extends AccountSettingsAction function getInstructions() { - return _('Set your personal avatar.'); + return _('You can upload your personal avatar.'); } /** @@ -82,6 +86,15 @@ class AvatarsettingsAction extends AccountSettingsAction function showContent() { + if ($this->mode == 'crop') { + $this->showCropForm(); + } else { + $this->showUploadForm(); + } + } + + function showUploadForm() + { $user = common_current_user(); $profile = $user->getProfile(); @@ -132,16 +145,6 @@ class AvatarsettingsAction extends AccountSettingsAction 'height' => AVATAR_PROFILE_SIZE, 'alt' => $user->nickname)); $this->elementEnd('div'); - - foreach (array('avatar_crop_x', 'avatar_crop_y', - 'avatar_crop_w', 'avatar_crop_h') as $crop_info) { - $this->element('input', array('name' => $crop_info, - 'type' => 'hidden', - 'id' => $crop_info)); - } - $this->submit('crop', _('Crop')); - - $this->elementEnd('li'); } $this->elementStart('li', array ('id' => 'settings_attach')); @@ -166,6 +169,69 @@ class AvatarsettingsAction extends AccountSettingsAction } + function showCropForm() + { + $user = common_current_user(); + + $profile = $user->getProfile(); + + if (!$profile) { + common_log_db_error($user, 'SELECT', __FILE__); + $this->serverError(_('User without matching profile')); + return; + } + + $original = $profile->getOriginalAvatar(); + + $this->elementStart('form', array('method' => 'post', + 'id' => 'form_settings_avatar', + 'class' => 'form_settings', + 'action' => + common_local_url('avatarsettings'))); + $this->elementStart('fieldset'); + $this->element('legend', null, _('Avatar settings')); + $this->hidden('token', common_session_token()); + + $this->elementStart('ul', 'form_data'); + + $this->elementStart('li', + array('id' => 'avatar_original', + 'class' => 'avatar_view')); + $this->element('h2', null, _("Original")); + $this->elementStart('div', array('id'=>'avatar_original_view')); + $this->element('img', array('src' => common_avatar_url($this->filedata['filename']), + 'width' => $this->filedata['width'], + 'height' => $this->filedata['height'], + 'alt' => $user->nickname)); + $this->elementEnd('div'); + $this->elementEnd('li'); + + $this->elementStart('li', + array('id' => 'avatar_preview', + 'class' => 'avatar_view')); + $this->element('h2', null, _("Preview")); + $this->elementStart('div', array('id'=>'avatar_preview_view')); + $this->element('img', array('src' => common_avatar_url($this->filedata['filename']), + 'width' => AVATAR_PROFILE_SIZE, + 'height' => AVATAR_PROFILE_SIZE, + 'alt' => $user->nickname)); + $this->elementEnd('div'); + + foreach (array('avatar_crop_x', 'avatar_crop_y', + 'avatar_crop_w', 'avatar_crop_h') as $crop_info) { + $this->element('input', array('name' => $crop_info, + 'type' => 'hidden', + 'id' => $crop_info)); + } + $this->submit('crop', _('Crop')); + + $this->elementEnd('li'); + $this->elementEnd('ul'); + $this->elementEnd('fieldset'); + $this->elementEnd('form'); + + } + /** * Handle a post * @@ -212,17 +278,31 @@ class AvatarsettingsAction extends AccountSettingsAction return; } - $user = common_current_user(); + $cur = common_current_user(); - $profile = $user->getProfile(); + $filename = common_avatar_filename($cur->id, + image_type_to_extension($imagefile->type), + null, + 'tmp'.common_timestamp()); - if ($profile->setOriginal($imagefile->filename)) { - $this->showForm(_('Avatar updated.'), true); - } else { - $this->showForm(_('Failed updating avatar.')); - } + $filepath = common_avatar_path($filename); - $imagefile->unlink(); + move_uploaded_file($imagefile->filename, $filepath); + + $filedata = array('filename' => $filename, + 'filepath' => $filepath, + 'width' => $imagefile->width, + 'height' => $imagefile->height, + 'type' => $imagefile->type); + + $_SESSION['FILEDATA'] = $filedata; + + $this->filedata = $filedata; + + $this->mode = 'crop'; + + $this->showForm(_('Pick a square area of the image to be your avatar'), + true); } /** @@ -242,7 +322,77 @@ class AvatarsettingsAction extends AccountSettingsAction $w = $this->arg('avatar_crop_w'); $h = $this->arg('avatar_crop_h'); - if ($profile->crop_avatars($x, $y, $w, $h)) { + $filedata = $_SESSION['FILEDATA']; + + if (!$filedata) { + $this->serverError(_('Lost our file data.')); + return; + } + + $filepath = common_avatar_path($filedata['filename']); + + if (!file_exists($filepath)) { + $this->serverError(_('Lost our file.')); + return; + } + + switch ($filedata['type']) { + case IMAGETYPE_GIF: + $image_src = imagecreatefromgif($filepath); + break; + case IMAGETYPE_JPEG: + $image_src = imagecreatefromjpeg($filepath); + break; + case IMAGETYPE_PNG: + $image_src = imagecreatefrompng($filepath); + break; + default: + $this->serverError(_('Unknown file type')); + return; + } + + common_debug("W = $w, H = $h, X = $x, Y = $y"); + + $image_dest = imagecreatetruecolor($w, $h); + + $background = imagecolorallocate($image_dest, 0, 0, 0); + ImageColorTransparent($image_dest, $background); + imagealphablending($image_dest, false); + + imagecopyresized($image_dest, $image_src, 0, 0, $x, $y, $w, $h, $w, $h); + + $cur = common_current_user(); + + $filename = common_avatar_filename($cur->id, + image_type_to_extension($filedata['type']), + null, + common_timestamp()); + + $filepath = common_avatar_path($filename); + + switch ($filedata['type']) { + case IMAGETYPE_GIF: + imagegif($image_dest, $filepath); + break; + case IMAGETYPE_JPEG: + imagejpeg($image_dest, $filepath); + break; + case IMAGETYPE_PNG: + imagepng($image_dest, $filepath); + break; + default: + $this->serverError(_('Unknown file type')); + return; + } + + $user = common_current_user(); + + $profile = $cur->getProfile(); + + if ($profile->setOriginal($filepath)) { + @unlink(common_avatar_path($filedata['filename'])); + unset($_SESSION['FILEDATA']); + $this->mode = 'upload'; $this->showForm(_('Avatar updated.'), true); } else { $this->showForm(_('Failed updating avatar.')); diff --git a/actions/clienterror.php b/actions/clienterror.php deleted file mode 100644 index ef6fd51df..000000000 --- a/actions/clienterror.php +++ /dev/null @@ -1,94 +0,0 @@ -<?php - -/** - * Client error action. - * - * PHP version 5 - * - * @category Action - * @package Laconica - * @author Evan Prodromou <evan@controlyourself.ca> - * @author Zach Copley <zach@controlyourself.ca> - * @license http://www.fsf.org/licensing/licenses/agpl.html AGPLv3 - * @link http://laconi.ca/ - * - * Laconica - a distributed open-source microblogging tool - * Copyright (C) 2008, Controlez-Vous, 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 - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -if (!defined('LACONICA')) { - exit(1); -} - -require_once INSTALLDIR.'/lib/error.php'; - -/** - * Class for displaying HTTP client errors - * - * @category Action - * @package Laconica - * @author Zach Copley <zach@controlyourself.ca> - * @license http://www.fsf.org/licensing/licenses/agpl.html AGPLv3 - * @link http://laconi.ca/ - */ -class ClientErrorAction extends ErrorAction -{ - function __construct($message='Error', $code=400) - { - parent::__construct($message, $code); - - $this->status = array(400 => 'Bad Request', - 401 => 'Unauthorized', - 402 => 'Payment Required', - 403 => 'Forbidden', - 404 => 'Not Found', - 405 => 'Method Not Allowed', - 406 => 'Not Acceptable', - 407 => 'Proxy Authentication Required', - 408 => 'Request Timeout', - 409 => 'Conflict', - 410 => 'Gone', - 411 => 'Length Required', - 412 => 'Precondition Failed', - 413 => 'Request Entity Too Large', - 414 => 'Request-URI Too Long', - 415 => 'Unsupported Media Type', - 416 => 'Requested Range Not Satisfiable', - 417 => 'Expectation Failed'); - $this->default = 400; - } - - // XXX: Should these error actions even be invokable via URI? - - function handle($args) - { - parent::handle($args); - - $this->code = $this->trimmed('code'); - - if (!$this->code || $code < 400 || $code > 499) { - $this->code = $this->default; - } - - $this->message = $this->trimmed('message'); - - if (!$this->message) { - $this->message = "Client Error $this->code"; - } - - $this->showPage(); - } -} diff --git a/actions/servererror.php b/actions/servererror.php deleted file mode 100644 index a39886591..000000000 --- a/actions/servererror.php +++ /dev/null @@ -1,92 +0,0 @@ -<?php - -/** - * Server error action. - * - * PHP version 5 - * - * @category Action - * @package Laconica - * @author Evan Prodromou <evan@controlyourself.ca> - * @author Zach Copley <zach@controlyourself.ca> - * @license http://www.fsf.org/licensing/licenses/agpl.html AGPLv3 - * @link http://laconi.ca/ - * - * Laconica - a distributed open-source microblogging tool - * Copyright (C) 2008, Controlez-Vous, 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 - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -if (!defined('LACONICA')) { - exit(1); -} - -require_once INSTALLDIR.'/lib/error.php'; - -/** - * Class for displaying HTTP server errors - * - * Note: The older util.php class simply printed a string, but the spec - * says that 500 errors should be treated similarly to 400 errors, and - * it's easier to give an HTML response. Maybe we can customize these - * to display some funny animal cartoons. If not, we can probably role - * these classes up into a single class. - * - * See: http://tools.ietf.org/html/rfc2616#section-10 - * - * @category Action - * @package Laconica - * @author Zach Copley <zach@controlyourself.ca> - * @license http://www.fsf.org/licensing/licenses/agpl.html AGPLv3 - * @link http://laconi.ca/ - */ -class ServerErrorAction extends ErrorAction -{ - function __construct($message='Error', $code=500) - { - parent::__construct($message, $code); - - $this->status = array(500 => 'Internal Server Error', - 501 => 'Not Implemented', - 502 => 'Bad Gateway', - 503 => 'Service Unavailable', - 504 => 'Gateway Timeout', - 505 => 'HTTP Version Not Supported'); - - $this->default = 500; - } - - // XXX: Should these error actions even be invokable via URI? - - function handle($args) - { - parent::handle($args); - - $this->code = $this->trimmed('code'); - - if (!$this->code || $code < 500 || $code > 599) { - $this->code = $this->default; - } - - $this->message = $this->trimmed('message'); - - if (!$this->message) { - $this->message = "Server Error $this->code"; - } - - $this->showPage(); - } - -} |