Use Jcrop, have inline errormsg, work on cropping, clean up, WIP

3 files changed, 21 insertions, 8 deletions

diff --git a/lib/avatar.php b/lib/avatar.php
index 86be0ea2635..9ab905c852e 100644
--- a/lib/avatar.php
+++ b/lib/avatar.php
@@ -26,7 +26,7 @@ class OC_Avatar {
 			$ext = 'png';
 		} else {
 			return false;
-                }
+		}
 
 		$avatar = new OC_Image($view->file_get_contents('avatar.'.$ext));
 		$avatar->resize($size);
@@ -38,7 +38,8 @@ class OC_Avatar {
 	 * @param $user string user to set the avatar for
 	 * @param $data mixed imagedata or path to set a new avatar
 	 * @throws Exception if the provided file is not a jpg or png image
-	 * @throws Exception if the provided image is not valid, or not a square
+	 * @throws Exception if the provided image is not valid
+	 * @throws \OC\NotSquareException if the image is not square
 	 * @return true on success
 	*/
 	public static function set ($user, $data) {
@@ -52,9 +53,13 @@ class OC_Avatar {
 			throw new \Exception($l->t("Unknown filetype"));
 		}
 
-		if (!( $img->valid() && ($img->height() === $img->width()) )) {
+		if (!$img->valid()) {
 			$l = \OC_L10N::get('lib');
-			throw new \Exception($l->t("Invalid image, or the provided image is not square"));
+			throw new \Excpeption($l->t("Invalid image"));
+		}
+
+		if (!($img->height() === $img->width())) {
+			throw new \OC\NotSquareException();
 		}
 
 		$view->unlink('avatar.jpg');
diff --git a/lib/notsquareexception.php b/lib/notsquareexception.php
new file mode 100644
index 00000000000..03dba8fb25f
--- /dev/null
+++ b/lib/notsquareexception.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * Copyright (c) 2013 Christopher Schäpers <christopher@schaepers.it>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC;
+
+class NotSquareException extends \Exception {
+}
diff --git a/lib/public/avatar.php b/lib/public/avatar.php
index 768d292346f..55eff57d161 100644
--- a/lib/public/avatar.php
+++ b/lib/public/avatar.php
@@ -12,8 +12,4 @@ class Avatar {
 	public static function get ($user, $size = 64) {
 		return \OC_Avatar::get($user, $size);
 	}
-
-	public static function getMode () {
-		return \OC_Avatar::getMode();
-	}
 }