GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Actually crop your avatar when hitting 'crop' button on profile 

darcs-hash:20081212043018-7b5ce-bc83b66e19007aa0a04fbb40053217ef92c44779.gz
This commit is contained in:
Zach Copley 2008-12-11 23:30:18 -05:00
parent ba24378fdf
commit 6b51941056
8 changed files with 249 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
_darcs/inventory
View File

@ -122,4 +122,6 @@ Zach Copley <zach@controlyourself.ca>**20090105045603]
[Jcrop v2 (POST cropping to be completed) [Jcrop v2 (POST cropping to be completed)
csarven@controlyourself.ca**20081210021607] csarven@controlyourself.ca**20081210021607]
[Jcrop CSS updates to original/preview views [Jcrop CSS updates to original/preview views
csarven@controlyourself.ca**20081210025922] csarven@controlyourself.ca**20081210025922]
[Actually crop your avatar when hitting 'crop' button on profile
Zach Copley <zach@controlyourself.ca>**20081212043018]

BIN
_darcs/patches/20081212043018-7b5ce-bc83b66e19007aa0a04fbb40053217ef92c44779.gz Normal file
View File

Binary file not shown.

223
_darcs/patches/unrevert
View File

@ -2,43 +2,45 @@
New patches: New patches:
[unrevert [unrevert
anonymous**20090106212612] { anonymous**20090106212613] {
hunk ./actions/profilesettings.php 140 hunk ./actions/profilesettings.php 57
common_local_url('profilesettings'))); return;
common_hidden('token', common_session_token()); }
+v v v v v v v +v v v v v v v
if ($original) { if ($this->arg('save')) {
hunk ./actions/profilesettings.php 142 $this->save_profile();
+ common_element_start('div', array('id'=>'avatar_original', 'class'=>'avatar_view')); } else if ($this->arg('upload')) {
+ common_element('h3', null, _("Original:")); hunk ./actions/profilesettings.php 62
+ common_element_start('div', array('id'=>'avatar_original_view')); $this->upload_avatar();
common_element('img', array('src' => $original->url, + } else if ($this->arg('crop')) {
'class' => 'avatar original', + $this->crop_avatar();
'width' => $original->width, } else if ($this->arg('changepass')) {
hunk ./actions/profilesettings.php 150 $this->change_password();
'height' => $original->height, hunk ./actions/profilesettings.php 66
'alt' => $user->nickname)); + } else {
+ common_element_end('div'); + $this->show_form(_('Unexpected form submission.'));
+ common_element_end('div');
} }
hunk ./actions/profilesettings.php 153 hunk ./actions/profilesettings.php 69
+************* +*************
+ if ($original) { + if ($this->arg('save')) {
+ common_element('img', array('src' => $original->url, + $this->save_profile();
+ 'class' => 'avatar original', + } else if ($this->arg('upload')) {
+ 'width' => $original->width, + $this->upload_avatar();
+ 'height' => $original->height, + } else if ($this->arg('changepass')) {
+ 'alt' => $user->nickname)); + $this->change_password();
+ } + }
+^ ^ ^ ^ ^ ^ ^ +^ ^ ^ ^ ^ ^ ^
}
hunk ./actions/profilesettings.php 164
$avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE); $avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE);
hunk ./actions/profilesettings.php 165
+v v v v v v v +v v v v v v v
if ($avatar) { if ($avatar) {
hunk ./actions/profilesettings.php 167 hunk ./actions/profilesettings.php 166
- common_element('img', array('src' => $avatar->url, - common_element('img', array('src' => $avatar->url,
+ common_element_start('div', array('id'=>'avatar_preview', 'class'=>'avatar_view')); + common_element_start('div', array('id'=>'avatar_preview', 'class'=>'avatar_view'));
+ common_element('h3', null, _("Preview:")); + common_element('h3', null, _("Preview:"));
@ -47,7 +49,7 @@ hunk ./actions/profilesettings.php 167
'class' => 'avatar profile', 'class' => 'avatar profile',
'width' => AVATAR_PROFILE_SIZE, 'width' => AVATAR_PROFILE_SIZE,
'height' => AVATAR_PROFILE_SIZE, 'height' => AVATAR_PROFILE_SIZE,
hunk ./actions/profilesettings.php 175 hunk ./actions/profilesettings.php 174
'alt' => $user->nickname)); 'alt' => $user->nickname));
+ common_element_end('div'); + common_element_end('div');
+ common_element_end('div'); + common_element_end('div');
@ -57,9 +59,9 @@ hunk ./actions/profilesettings.php 175
+ 'type' => 'hidden', + 'type' => 'hidden',
+ 'id' => $crop_info)); + 'id' => $crop_info));
+ } + }
+ common_submit('avatar_crop', _('Crop')); + common_submit('crop', _('Crop'));
} }
hunk ./actions/profilesettings.php 185 hunk ./actions/profilesettings.php 184
+************* +*************
+ if ($avatar) { + if ($avatar) {
+ common_element('img', array('src' => $avatar->url, + common_element('img', array('src' => $avatar->url,
@ -72,10 +74,171 @@ hunk ./actions/profilesettings.php 185
common_element('input', array('name' => 'MAX_FILE_SIZE', common_element('input', array('name' => 'MAX_FILE_SIZE',
hunk ./actions/profilesettings.php 429
$this->show_form(_('Failed updating avatar.'));
}
+v v v v v v v
@unlink($_FILES['avatarfile']['tmp_name']);
}
hunk ./actions/profilesettings.php 433
+ function crop_avatar() {
+
+ $user = common_current_user();
+ $profile = $user->getProfile();
+
+ $x = $this->arg('avatar_crop_x');
+ $y = $this->arg('avatar_crop_y');
+ $w = $this->arg('avatar_crop_w');
+ $h = $this->arg('avatar_crop_h');
+
+ if ($profile->crop_avatars($x, $y, $w, $h)) {
+ $this->show_form(_('Avatar updated.'), true);
+ } else {
+ $this->show_form(_('Failed updating avatar.'));
+ }
+ }
+*************
+ @unlink($_FILES['avatarfile']['tmp_name']);
+ }
+^ ^ ^ ^ ^ ^ ^
+
function nickname_exists($nickname)
{
$user = common_current_user();
hunk ./classes/Avatar.php 82
}
}
+v v v v v v v
+ function scale_and_crop($size, $x, $y, $w, $h) {
+
+ $image_s = imagecreatetruecolor($size, $size);
+ $image_a = $this->to_image();
+
+ # Retain alpha channel info if possible for .pngs
+ $background = imagecolorallocate($image_s, 0, 0, 0);
+ ImageColorTransparent($image_s, $background);
+ imagealphablending($image_s, false);
+
+ imagecopyresized($image_s, $image_a, 0, 0, $x, $y, $size, $size, $w, $h);
+
+ $ext = ($this->mediattype == 'image/jpeg') ? ".jpeg" : ".png";
+
+ $filename = common_avatar_filename($this->profile_id, $ext, $size, common_timestamp());
+
+ if ($this->mediatype == 'image/jpeg') {
+ imagejpeg($image_s, common_avatar_path($filename));
+ } else {
+ imagepng($image_s, common_avatar_path($filename));
+ }
+
+ $cropped = DB_DataObject::factory('avatar');
+ $cropped->profile_id = $this->profile_id;
+ $cropped->width = $size;
+ $cropped->height = $size;
+ $cropped->original = false;
+ $cropped->mediatype = ($this->mediattype == 'image/jpeg') ? 'image/jpeg' : 'image/png';
+ $cropped->filename = $filename;
+ $cropped->url = common_avatar_url($filename);
+ $cropped->created = DB_DataObject_Cast::dateTime(); # current time
+
+ if ($cropped->insert()) {
+ return $cropped;
+ } else {
+ return NULL;
+ }
+ }
+
function to_image() {
$filepath = common_avatar_path($this->filename);
if ($this->mediatype == 'image/gif') {
hunk ./classes/Avatar.php 138
function &pkeyGet($kv) {
return Memcached_DataObject::pkeyGet('Avatar', $kv);
}
+*************
+ function to_image()
+ {
+ $filepath = common_avatar_path($this->filename);
+ if ($this->mediatype == 'image/gif') {
+ return imagecreatefromgif($filepath);
+ } else if ($this->mediatype == 'image/jpeg') {
+ return imagecreatefromjpeg($filepath);
+ } else if ($this->mediatype == 'image/png') {
+ return imagecreatefrompng($filepath);
+ } else {
+ return null;
+ }
+ }
+
+ function &pkeyGet($kv)
+ {
+ return Memcached_DataObject::pkeyGet('Avatar', $kv);
+ }
+^ ^ ^ ^ ^ ^ ^
}
hunk ./classes/Profile.php 124
return $avatar;
}
- function delete_avatars() {
+v v v v v v v
+ function crop_avatars($x, $y, $w, $h) {
+
+ $avatar = $this->getOriginalAvatar();
+ $this->delete_avatars(false); # don't delete original
+
+ foreach (array(AVATAR_PROFILE_SIZE, AVATAR_STREAM_SIZE, AVATAR_MINI_SIZE) as $size) {
+ # We don't do a scaled one if original is our scaled size
+ if (!($avatar->width == $size && $avatar->height == $size)) {
+ $s = $avatar->scale_and_crop($size, $x, $y, $w, $h);
+ if (!$s) {
+ return NULL;
+ }
+ }
+ }
+ return true;
+ }
+
+ function delete_avatars($original=true) {
$avatar = new Avatar();
$avatar->profile_id = $this->id;
$avatar->find();
hunk ./classes/Profile.php 147
while ($avatar->fetch()) {
+ if ($avatar->original) {
+ if ($original == false) {
+ continue;
+ }
+ }
$avatar->delete();
}
return true;
hunk ./classes/Profile.php 156
}
+*************
+ function delete_avatars()
+ {
+ $avatar = new Avatar();
+ $avatar->profile_id = $this->id;
+ $avatar->find();
+ while ($avatar->fetch()) {
+ $avatar->delete();
+ }
+ return true;
+ }
+^ ^ ^ ^ ^ ^ ^
function getBestName()
{
} }
Context: Context:
[Actually crop your avatar when hitting 'crop' button on profile
Zach Copley <zach@controlyourself.ca>**20081212043018]
[Jcrop CSS updates to original/preview views [Jcrop CSS updates to original/preview views
csarven@controlyourself.ca**20081210025922] csarven@controlyourself.ca**20081210025922]
[Jcrop v2 (POST cropping to be completed) [Jcrop v2 (POST cropping to be completed)
@ -201,4 +364,4 @@ Sarven Capadisli <csarven@controlyourself.ca>**20081218003302
[TAG 0.6.4.1 [TAG 0.6.4.1
Evan Prodromou <evan@controlezvous.ca>**20081220204906] Evan Prodromou <evan@controlezvous.ca>**20081220204906]
Patch bundle hash: Patch bundle hash:
b75aa06ac49c2ff8a9fa803da998c6ea5f5c1d17 316173068f974bea2f9537d45d347f45c12050bc

34
_darcs/pristine/classes/Avatar.php
View File

@ -79,22 +79,20 @@ class Avatar extends Memcached_DataObject
} }
} }
function to_image() function to_image() {
{ $filepath = common_avatar_path($this->filename);
$filepath = common_avatar_path($this->filename); if ($this->mediatype == 'image/gif') {
if ($this->mediatype == 'image/gif') { return imagecreatefromgif($filepath);
return imagecreatefromgif($filepath); } else if ($this->mediatype == 'image/jpeg') {
} else if ($this->mediatype == 'image/jpeg') { return imagecreatefromjpeg($filepath);
return imagecreatefromjpeg($filepath); } else if ($this->mediatype == 'image/png') {
} else if ($this->mediatype == 'image/png') { return imagecreatefrompng($filepath);
return imagecreatefrompng($filepath); } else {
} else { return NULL;
return null; }
} }
}
function &pkeyGet($kv) {
function &pkeyGet($kv) return Memcached_DataObject::pkeyGet('Avatar', $kv);
{ }
return Memcached_DataObject::pkeyGet('Avatar', $kv);
}
} }

19
_darcs/pristine/classes/Profile.php
View File

@ -121,16 +121,15 @@ class Profile extends Memcached_DataObject
return $avatar; return $avatar;
} }
function delete_avatars() function delete_avatars() {
{ $avatar = new Avatar();
$avatar = new Avatar(); $avatar->profile_id = $this->id;
$avatar->profile_id = $this->id; $avatar->find();
$avatar->find(); while ($avatar->fetch()) {
while ($avatar->fetch()) { $avatar->delete();
$avatar->delete(); }
} return true;
return true; }
}
function getBestName() function getBestName()
{ {

4
_darcs/tentative_inventory
View File

@ -122,4 +122,6 @@ Zach Copley <zach@controlyourself.ca>**20090105045603]
[Jcrop v2 (POST cropping to be completed) [Jcrop v2 (POST cropping to be completed)
csarven@controlyourself.ca**20081210021607] csarven@controlyourself.ca**20081210021607]
[Jcrop CSS updates to original/preview views [Jcrop CSS updates to original/preview views
csarven@controlyourself.ca**20081210025922] csarven@controlyourself.ca**20081210025922]
[Actually crop your avatar when hitting 'crop' button on profile
Zach Copley <zach@controlyourself.ca>**20081212043018]

34
classes/Avatar.php
View File

@ -79,22 +79,20 @@ class Avatar extends Memcached_DataObject
} }
} }
function to_image() function to_image() {
{ $filepath = common_avatar_path($this->filename);
$filepath = common_avatar_path($this->filename); if ($this->mediatype == 'image/gif') {
if ($this->mediatype == 'image/gif') { return imagecreatefromgif($filepath);
return imagecreatefromgif($filepath); } else if ($this->mediatype == 'image/jpeg') {
} else if ($this->mediatype == 'image/jpeg') { return imagecreatefromjpeg($filepath);
return imagecreatefromjpeg($filepath); } else if ($this->mediatype == 'image/png') {
} else if ($this->mediatype == 'image/png') { return imagecreatefrompng($filepath);
return imagecreatefrompng($filepath); } else {
} else { return NULL;
return null; }
} }
}
function &pkeyGet($kv) {
function &pkeyGet($kv) return Memcached_DataObject::pkeyGet('Avatar', $kv);
{ }
return Memcached_DataObject::pkeyGet('Avatar', $kv);
}
} }

19
classes/Profile.php
View File

@ -121,16 +121,15 @@ class Profile extends Memcached_DataObject
return $avatar; return $avatar;
} }
function delete_avatars() function delete_avatars() {
{ $avatar = new Avatar();
$avatar = new Avatar(); $avatar->profile_id = $this->id;
$avatar->profile_id = $this->id; $avatar->find();
$avatar->find(); while ($avatar->fetch()) {
while ($avatar->fetch()) { $avatar->delete();
$avatar->delete(); }
} return true;
return true; }
}
function getBestName() function getBestName()
{ {