1 files changed, 18 insertions, 71 deletions

diff --git a/actions/avatarsettings.php b/actions/avatarsettings.php
index 19f53b882..643c0e567 100644
--- a/actions/avatarsettings.php
+++ b/actions/avatarsettings.php
@@ -34,6 +34,8 @@ if (!defined('LACONICA')) {
 
 require_once INSTALLDIR.'/lib/accountsettingsaction.php';
 
+define('MAX_ORIGINAL', 480);
+
 /**
  * Upload an avatar
  *
@@ -286,7 +288,7 @@ class AvatarsettingsAction extends AccountSettingsAction
 
         $filepath = common_avatar_path($filename);
 
-        move_uploaded_file($imagefile->filename, $filepath);
+        move_uploaded_file($imagefile->filepath, $filepath);
 
         $filedata = array('filename' => $filename,
                           'filepath' => $filepath,
@@ -312,84 +314,29 @@ class AvatarsettingsAction extends AccountSettingsAction
 
     function cropAvatar()
     {
-        $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');
-
         $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;
-        }
-
+        
+        // If image is not being cropped assume pos & dimentions of original
+        $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'):$filedata['width'];
+        $dest_h = $this->arg('avatar_crop_h') ? $this->arg('avatar_crop_h'):$filedata['height'];
+        $size = min($dest_w, $dest_h);
+        $size = ($size > MAX_ORIGINAL) ? MAX_ORIGINAL:$size;
+        
         $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);
 
-        $profile = $cur->getProfile();
-
-        if ($profile->setOriginal($filepath)) {
-            @unlink(common_avatar_path($filedata['filename']));
+        if ($profile->setOriginal($filename)) {
+            @unlink($filedata['filepath']);
             unset($_SESSION['FILEDATA']);
             $this->mode = 'upload';
             $this->showForm(_('Avatar updated.'), true);