* @link http://status.net/
*/
-if (!defined('STATUSNET') && !defined('LACONICA')) {
- exit(1);
-}
-
-
-
-define('MAX_ORIGINAL', 480);
+if (!defined('GNUSOCIAL')) { exit(1); }
/**
* Upload an avatar
/**
* Content area of the page
*
- * Shows a form for uploading an avatar.
+ * Shows a form for uploading an avatar. Currently overrides FormAction's showContent
+ * since we haven't made classes out of AvatarCropForm and AvatarUploadForm.
*
* @return void
*/
-
function showContent()
{
if ($this->mode == 'crop') {
common_log_db_error($user, 'SELECT', __FILE__);
// TRANS: Error message displayed when referring to a user without a profile.
$this->serverError(_('User has no profile.'));
- return;
}
$this->elementStart('form', array('enctype' => 'multipart/form-data',
if (Event::handle('StartAvatarFormData', array($this))) {
$this->elementStart('ul', 'form_data');
try {
- $original = Avatar::getOriginal($profile);
+ $original = Avatar::getUploaded($profile);
$this->elementStart('li', array('id' => 'avatar_original',
'class' => 'avatar_view'));
'alt' => $user->nickname));
$this->elementEnd('div');
$this->elementEnd('li');
- } catch (NoResultException $e) {
+ } catch (NoAvatarException $e) {
// No original avatar found!
}
$this->submit('delete', _m('BUTTON','Delete'));
}
$this->elementEnd('li');
- } catch (Exception $e) {
+ } catch (NoAvatarException $e) {
// No previously uploaded avatar to preview.
}
common_log_db_error($user, 'SELECT', __FILE__);
// TRANS: Error message displayed when referring to a user without a profile.
$this->serverError(_('User has no profile.'));
- return;
}
$this->elementStart('form', array('method' => 'post',
$this->elementEnd('form');
}
- /**
- * Handle a post
- *
- * We mux on the button name to figure out what the user actually wanted.
- *
- * @return void
- */
- function handlePost()
+ protected function doPost()
{
- // Workaround for PHP returning empty $_POST and $_FILES when POST
- // length > post_max_size in php.ini
-
- if (empty($_FILES)
- && empty($_POST)
- && ($_SERVER['CONTENT_LENGTH'] > 0)
- ) {
- // TRANS: Client error displayed when the number of bytes in a POST request exceeds a limit.
- // TRANS: %s is the number of bytes of the CONTENT_LENGTH.
- $msg = _m('The server was unable to handle that much POST data (%s byte) due to its current configuration.',
- 'The server was unable to handle that much POST data (%s bytes) due to its current configuration.',
- intval($_SERVER['CONTENT_LENGTH']));
- $this->showForm(sprintf($msg, $_SERVER['CONTENT_LENGTH']));
- return;
- }
-
- // CSRF protection
-
- $token = $this->trimmed('token');
- if (!$token || $token != common_session_token()) {
- // TRANS: Client error displayed when the session token does not match or is not given.
- $this->showForm(_('There was a problem with your session token. '.
- 'Try again, please.'));
- return;
- }
-
if (Event::handle('StartAvatarSaveForm', array($this))) {
- if ($this->arg('upload')) {
- $this->uploadAvatar();
- } else if ($this->arg('crop')) {
- $this->cropAvatar();
- } else if ($this->arg('delete')) {
- $this->deleteAvatar();
- } else {
- // TRANS: Unexpected validation error on avatar upload form.
- $this->showForm(_('Unexpected form submission.'));
- }
+ if ($this->trimmed('upload')) {
+ return $this->uploadAvatar();
+ } else if ($this->trimmed('crop')) {
+ return $this->cropAvatar();
+ } else if ($this->trimmed('delete')) {
+ return $this->deleteAvatar();
+ } else {
+ // TRANS: Unexpected validation error on avatar upload form.
+ throw new ClientException(_('Unexpected form submission.'));
+ }
Event::handle('EndAvatarSaveForm', array($this));
}
}
*/
function uploadAvatar()
{
- try {
- $imagefile = ImageFile::fromUpload('avatarfile');
- } catch (Exception $e) {
- $this->showForm($e->getMessage());
- return;
- }
- if ($imagefile === null) {
- // TRANS: Validation error on avatar upload form when no file was uploaded.
- $this->showForm(_('No file uploaded.'));
- return;
- }
+ // ImageFile throws exception if something goes wrong, which we'll
+ // pick up and show as an error message above the form.
+ $imagefile = ImageFile::fromUpload('avatarfile');
- $cur = common_current_user();
$type = $imagefile->preferredType();
- $filename = Avatar::filename($cur->id,
+ $filename = Avatar::filename($this->scoped->getID(),
image_type_to_extension($type),
null,
'tmp'.common_timestamp());
$filepath = Avatar::path($filename);
- $imagefile->copyTo($filepath);
+ $imagefile = $imagefile->copyTo($filepath);
$filedata = array('filename' => $filename,
'filepath' => $filepath,
$this->mode = 'crop';
// TRANS: Avatar upload form instruction after uploading a file.
- $this->showForm(_('Pick a square area of the image to be your avatar.'),
- true);
+ return _('Pick a square area of the image to be your avatar.');
}
/**
{
$filedata = $_SESSION['FILEDATA'];
- if (!$filedata) {
+ if (empty($filedata)) {
// TRANS: Server error displayed if an avatar upload went wrong somehow server side.
- $this->serverError(_('Lost our file data.'));
- return;
+ throw new ServerException(_('Lost our file data.'));
}
- $file_d = ($filedata['width'] > $filedata['height'])
- ? $filedata['height'] : $filedata['width'];
+ $file_d = min($filedata['width'], $filedata['height']);
$dest_x = $this->arg('avatar_crop_x') ? $this->arg('avatar_crop_x'):0;
$dest_y = $this->arg('avatar_crop_y') ? $this->arg('avatar_crop_y'):0;
$dest_w = $this->arg('avatar_crop_w') ? $this->arg('avatar_crop_w'):$file_d;
$dest_h = $this->arg('avatar_crop_h') ? $this->arg('avatar_crop_h'):$file_d;
- $size = floor(min($dest_w, $dest_h, MAX_ORIGINAL));
+ $size = intval(min($dest_w, $dest_h, common_config('avatar', 'maxsize')));
- $user = common_current_user();
- $profile = $user->getProfile();
+ $box = array('width' => $size, 'height' => $size,
+ 'x' => $dest_x, 'y' => $dest_y,
+ 'w' => $dest_w, 'h' => $dest_h);
- $imagefile = new ImageFile($user->id, $filedata['filepath']);
- $filename = $imagefile->resize($size, $dest_x, $dest_y, $dest_w, $dest_h);
+ $imagefile = new ImageFile(null, $filedata['filepath']);
+ $filename = Avatar::filename($this->scoped->getID(), image_type_to_extension($imagefile->preferredType()),
+ $size, common_timestamp());
+ try {
+ $imagefile->resizeTo(Avatar::path($filename), $box);
+ } catch (UseFileAsThumbnailException $e) {
+ common_debug('Using uploaded avatar directly without resizing, copying it to: '.$filename);
+ if (!copy($filedata['filepath'], Avatar::path($filename))) {
+ common_debug('Tried to copy image file '.$filedata['filepath'].' to destination '.Avatar::path($filename));
+ throw new ServerException('Could not copy file to destination.');
+ }
+ }
- if ($profile->setOriginal($filename)) {
+ if ($this->scoped->setOriginal($filename)) {
@unlink($filedata['filepath']);
unset($_SESSION['FILEDATA']);
$this->mode = 'upload';
// TRANS: Success message for having updated a user avatar.
- $this->showForm(_('Avatar updated.'), true);
- common_broadcast_profile($profile);
- } else {
- // TRANS: Error displayed on the avatar upload page if the avatar could not be updated for an unknown reason.
- $this->showForm(_('Failed updating avatar.'));
+ return _('Avatar updated.');
}
+
+ // TRANS: Error displayed on the avatar upload page if the avatar could not be updated for an unknown reason.
+ throw new ServerException(_('Failed updating avatar.'));
}
/**
*/
function deleteAvatar()
{
- $user = common_current_user();
- $profile = $user->getProfile();
-
- Avatar::deleteFromProfile($profile);
+ Avatar::deleteFromProfile($this->scoped);
// TRANS: Success message for deleting a user avatar.
- $this->showForm(_('Avatar deleted.'), true);
+ return _('Avatar deleted.');
}
/**
projects / quix0rs-gnu-social.git / blobdiff