Merge branch '0.7.x' of git://gitorious.org/laconica/sgmurphy-clone into sgmurphy...

Conflicts:

	actions/avatarsettings.php

diff --cc actions/avatarsettings.php
index 3029b06211e21c6aa0fb1e2611b1af00f1cc65c9,643c0e567590dc102e05d519074a9ae5d9dbc5d2..68c6ce701d524896cea954b272c3b95c2cc2deaf
--- 1/actions/avatarsettings.php
--- 2/actions/avatarsettings.php
+++ b/actions/avatarsettings.php
@@@ -322,74 -320,23 +320,23 @@@ class AvatarsettingsAction extends Acco
              $this->serverError(_('Lost our file data.'));
              return;
          }
 -        
 +
-         $x = $this->arg('avatar_crop_x');
-         $y = $this->arg('avatar_crop_y');
-         $w = ($this->arg('avatar_crop_w')) ? $this->arg('avatar_crop_w') : $filedata['width'];
-         $h = ($this->arg('avatar_crop_h')) ? $this->arg('avatar_crop_h') : $filedata['height'];
- 
-         $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();
-         $profile = $cur->getProfile();
 +
+         $imagefile = new ImageFile($user->id, $filedata['filepath']);
+         $filename = $imagefile->resize($size, $dest_x, $dest_y, $dest_w, $dest_h);
  
-         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);

diff --cc actions/login.php
Simple merge

diff --cc lib/util.php
Simple merge