summaryrefslogtreecommitdiff
path: root/actions
diff options
context:
space:
mode:
Diffstat (limited to 'actions')
-rw-r--r--actions/avatarsettings.php190
-rw-r--r--actions/facebookhome.php5
-rw-r--r--actions/remotesubscribe.php16
-rw-r--r--actions/showstream.php2
4 files changed, 190 insertions, 23 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/facebookhome.php b/actions/facebookhome.php
index ea56ec071..b05e51b91 100644
--- a/actions/facebookhome.php
+++ b/actions/facebookhome.php
@@ -91,6 +91,9 @@ class FacebookhomeAction extends FacebookAction
function login()
{
+
+ $this->showStylesheets();
+
$nickname = common_canonical_nickname($this->trimmed('nickname'));
$password = $this->arg('password');
@@ -185,6 +188,8 @@ class FacebookhomeAction extends FacebookAction
function getUpdatePermission() {
+ $this->showStylesheets();
+
$this->elementStart('div', array('class' => 'content'));
$instructions = sprintf(_('If you would like the %s app to automatically update ' .
diff --git a/actions/remotesubscribe.php b/actions/remotesubscribe.php
index 3c8346fbe..f727a63b8 100644
--- a/actions/remotesubscribe.php
+++ b/actions/remotesubscribe.php
@@ -92,14 +92,26 @@ class RemotesubscribeAction extends Action
{
# id = remotesubscribe conflicts with the
# button on profile page
- $this->elementStart('form', array('id' => 'remsub', 'method' => 'post',
- 'action' => common_local_url('remotesubscribe')));
+ $this->elementStart('form', array('id' => 'form_remote_subscribe',
+ 'method' => 'post',
+ 'class' => 'form_settings',
+ 'action' => common_local_url('remotesubscribe')));
+ $this->elementStart('fieldset');
+ $this->element('legend', 'Subscribe to a remote user');
$this->hidden('token', common_session_token());
+
+ $this->elementStart('ul', 'form_data');
+ $this->elementStart('li');
$this->input('nickname', _('User nickname'), $this->nickname,
_('Nickname of the user you want to follow'));
+ $this->elementEnd('li');
+ $this->elementStart('li');
$this->input('profile_url', _('Profile URL'), $this->profile_url,
_('URL of your profile on another compatible microblogging service'));
+ $this->elementEnd('li');
+ $this->elementEnd('ul');
$this->submit('submit', _('Subscribe'));
+ $this->elementEnd('fieldset');
$this->elementEnd('form');
}
diff --git a/actions/showstream.php b/actions/showstream.php
index 157ccdd0c..2fd56ad2e 100644
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -367,7 +367,7 @@ class ShowstreamAction extends Action
$url = common_local_url('remotesubscribe',
array('nickname' => $this->profile->nickname));
$this->element('a', array('href' => $url,
- 'id' => 'entity_subscribe_remote'),
+ 'class' => 'entity_remote_subscribe'),
_('Subscribe'));
}
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-11-03 21:49:42 +0000