* @link http://status.net/
*/
-if (!defined('STATUSNET') && !defined('LACONICA')) {
- exit(1);
-}
-
-
-
-define('MAX_ORIGINAL', 480);
+if (!defined('GNUSOCIAL')) { exit(1); }
/**
* Upload an avatar
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;
}
- $original = $profile->getOriginalAvatar();
-
$this->elementStart('form', array('enctype' => 'multipart/form-data',
'method' => 'post',
'id' => 'form_settings_avatar',
if (Event::handle('StartAvatarFormData', array($this))) {
$this->elementStart('ul', 'form_data');
- if ($original) {
+ try {
+ $original = Avatar::getUploaded($profile);
+
$this->elementStart('li', array('id' => 'avatar_original',
'class' => 'avatar_view'));
// TRANS: Header on avatar upload page for thumbnail of originally uploaded avatar (h2).
$this->element('h2', null, _("Original"));
$this->elementStart('div', array('id'=>'avatar_original_view'));
- $this->element('img', array('src' => $original->url,
+ $this->element('img', array('src' => $original->displayUrl(),
'width' => $original->width,
'height' => $original->height,
'alt' => $user->nickname));
$this->elementEnd('div');
$this->elementEnd('li');
+ } catch (NoAvatarException $e) {
+ // No original avatar found!
}
- $avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE);
-
- if ($avatar) {
+ try {
+ $avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE);
$this->elementStart('li', array('id' => 'avatar_preview',
'class' => 'avatar_view'));
// TRANS: Header on avatar upload page for thumbnail of to be used rendition of uploaded avatar (h2).
$this->element('h2', null, _("Preview"));
$this->elementStart('div', array('id'=>'avatar_preview_view'));
- $this->element('img', array('src' => $avatar->url,
+ $this->element('img', array('src' => $avatar->displayUrl(),
'width' => AVATAR_PROFILE_SIZE,
'height' => AVATAR_PROFILE_SIZE,
'alt' => $user->nickname));
$this->submit('delete', _m('BUTTON','Delete'));
}
$this->elementEnd('li');
+ } catch (NoAvatarException $e) {
+ // No previously uploaded avatar to preview.
}
$this->elementStart('li', array ('id' => 'settings_attach'));
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;
}
- $original = $profile->getOriginalAvatar();
-
$this->elementStart('form', array('method' => 'post',
'id' => 'form_settings_avatar',
'class' => 'form_settings',
'tmp'.common_timestamp());
$filepath = Avatar::path($filename);
- $imagefile->copyTo($filepath);
+ $imagefile = $imagefile->copyTo($filepath);
$filedata = array('filename' => $filename,
'filepath' => $filepath,
*
* @return void
*/
- function cropAvatar()
+ public function cropAvatar()
{
$filedata = $_SESSION['FILEDATA'];
if (!$filedata) {
// TRANS: Server error displayed if an avatar upload went wrong somehow server side.
$this->serverError(_('Lost our file data.'));
- return;
}
$file_d = ($filedata['width'] > $filedata['height'])
$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 = min($dest_w, $dest_h, MAX_ORIGINAL);
+ $size = intval(min($dest_w, $dest_h, common_config('avatar', 'maxsize')));
+
+ $box = array('width' => $size, 'height' => $size,
+ 'x' => $dest_x, 'y' => $dest_y,
+ 'w' => $dest_w, 'h' => $dest_h);
$user = common_current_user();
$profile = $user->getProfile();
- $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($profile->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)) {
@unlink($filedata['filepath']);
$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.'));
$user = common_current_user();
$profile = $user->getProfile();
- $avatar = $profile->getOriginalAvatar();
- if($avatar) $avatar->delete();
- $avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE);
- if($avatar) $avatar->delete();
- $avatar = $profile->getAvatar(AVATAR_STREAM_SIZE);
- if($avatar) $avatar->delete();
- $avatar = $profile->getAvatar(AVATAR_MINI_SIZE);
- if($avatar) $avatar->delete();
+ Avatar::deleteFromProfile($profile);
// TRANS: Success message for deleting a user avatar.
$this->showForm(_('Avatar deleted.'), true);
function showStylesheets()
{
parent::showStylesheets();
- $this->cssLink('css/jquery.Jcrop.css','base','screen, projection, tv');
+ $this->cssLink('js/extlib/jquery-jcrop/css/jcrop.css','base','screen, projection, tv');
}
/**
parent::showScripts();
if ($this->mode == 'crop') {
- $this->script('jcrop/jquery.Jcrop.min.js');
- $this->script('jcrop/jquery.Jcrop.go.js');
+ $this->script('extlib/jquery-jcrop/jcrop.js');
+ $this->script('jcrop.go.js');
}
$this->autofocus('avatarfile');