3 files changed, 44 insertions, 6 deletions

diff --git a/include/photo/photo_driver.php b/include/photo/photo_driver.php
index 0de3b9c97..3bea54fd4 100644
--- a/include/photo/photo_driver.php
+++ b/include/photo/photo_driver.php
@@ -69,6 +69,8 @@ abstract class photo_driver {
 
 	abstract function cropImage($max,$x,$y,$w,$h);
 
+	abstract function cropImageRect($maxx,$maxy,$x,$y,$w,$h);
+
 	abstract function imageString();
 
 
@@ -229,6 +231,7 @@ abstract class photo_driver {
 		$this->doScaleImage($dest_width,$dest_height);
 	}
 
+
 	public function scaleImageSquare($dim) {
 		if(!$this->is_valid())
 			return FALSE;
@@ -676,9 +679,9 @@ function import_xchan_photo($photo,$xchan,$thing = false) {
 			if($r === false)
 				$photo_failure = true;
 
-			$photo = $a->get_baseurl() . '/photo/' . $hash . '-4';
-			$thumb = $a->get_baseurl() . '/photo/' . $hash . '-5';
-			$micro = $a->get_baseurl() . '/photo/' . $hash . '-6';
+			$photo = z_root() . '/photo/' . $hash . '-4';
+			$thumb = z_root() . '/photo/' . $hash . '-5';
+			$micro = z_root() . '/photo/' . $hash . '-6';
 		}
 		else {
 			logger('import_xchan_photo: invalid image from ' . $photo);	
@@ -686,9 +689,9 @@ function import_xchan_photo($photo,$xchan,$thing = false) {
 		}
 	}
 	if($photo_failure) {
-		$photo = $a->get_baseurl() . '/' . get_default_profile_photo();
-		$thumb = $a->get_baseurl() . '/' . get_default_profile_photo(80);
-		$micro = $a->get_baseurl() . '/' . get_default_profile_photo(48);
+		$photo = z_root() . '/' . get_default_profile_photo();
+		$thumb = z_root() . '/' . get_default_profile_photo(80);
+		$micro = z_root() . '/' . get_default_profile_photo(48);
 		$type = 'image/png';
 	}
 
diff --git a/include/photo/photo_gd.php b/include/photo/photo_gd.php
index 2ac7287e4..24bdc204f 100644
--- a/include/photo/photo_gd.php
+++ b/include/photo/photo_gd.php
@@ -108,6 +108,23 @@ class photo_gd extends photo_driver {
 		$this->setDimensions();
 	}
 
+	public function cropImageRect($maxx,$maxy,$x,$y,$w,$h) {
+		if(!$this->is_valid())
+			return FALSE;
+
+		$dest = imagecreatetruecolor( $maxx, $maxy );
+		imagealphablending($dest, false);
+		imagesavealpha($dest, true);
+		if ($this->type=='image/png') imagefill($dest, 0, 0, imagecolorallocatealpha($dest, 0, 0, 0, 127)); // fill with alpha
+		imagecopyresampled($dest, $this->image, 0, 0, $x, $y, $maxx, $maxy, $w, $h);
+		if($this->image)
+			imagedestroy($this->image);
+		$this->image = $dest;
+		$this->setDimensions();
+	}
+
+
+
 	public function imageString() {
 		if(!$this->is_valid())
 			return FALSE;
diff --git a/include/photo/photo_imagick.php b/include/photo/photo_imagick.php
index 3f84fd06c..32bb61342 100644
--- a/include/photo/photo_imagick.php
+++ b/include/photo/photo_imagick.php
@@ -163,6 +163,24 @@ class photo_imagick extends photo_driver {
 		$this->doScaleImage($max,$max);
 	}
 
+	public function cropImageRect($maxx,$maxy,$x,$y,$w,$h) {
+		if(!$this->is_valid())
+			return FALSE;
+
+		$this->image->setFirstIterator();
+		do {
+			$this->image->cropImage($w, $h, $x, $y);
+			/**
+			 * We need to remove the canvas,
+			 * or the image is not resized to the crop:
+			 * http://php.net/manual/en/imagick.cropimage.php#97232
+			 */
+			$this->image->setImagePage(0, 0, 0, 0);
+		} while ($this->image->nextImage());
+
+		$this->doScaleImage($maxx,$maxy);
+	}
+
 	public function imageString() {
 		if(!$this->is_valid())
 			return FALSE;