Remove gravatar and no-avatar functionality, prepare for default avatars even more and reword some stuff

1 files changed, 30 insertions, 84 deletions

diff --git a/lib/avatar.php b/lib/avatar.php
index b091161aef0..fa8fece080c 100644
--- a/lib/avatar.php
+++ b/lib/avatar.php
@@ -8,52 +8,44 @@
 
 /**
  * This class gets and sets users avatars.
- * Available backends are local (saved in users root at avatar.[png|jpg]), gravatar TODO and custom backends.
- * However the get function is easy to extend with further backends.
-*/
+ */
 
 class OC_Avatar {
 	/**
-	 * @brief gets the users avatar
-	 * @param $user string username, if not provided, the default avatar will be returned
-	 * @param $size integer size in px of the avatar, defaults to 64
-	 * @return mixed \OC_Image containing the avatar, a link to the avatar, false if avatars are disabled
-	*/
-	public static function get ($user = false, $size = 64) {
-		$mode = self::getMode();
-		if ($mode === "none") {
-			// avatars are disabled
-			return false;
-		} else {
-			if ($user === false) {
-				return self::getDefaultAvatar($size);
-			} elseif ($mode === "gravatar") {
-				return self::getGravatar($user, $size);
-			} elseif ($mode === "local") {
-				return self::getLocalAvatar($user, $size);
-			} elseif ($mode === "custom") {
-				return self::getCustomAvatar($user, $size);
-			}
+         * @brief get the users avatar
+         * @param $user string which user to get the avatar for
+         * @param $size integer size in px of the avatar, defaults to 64
+         * @return \OC_Image containing the avatar
+        */
+        public static function get ($user, $size = 64) {
+		if ($user === false) {
+			return self::getDefaultAvatar($user, $size);
 		}
-	}
 
-	/**
-	 * @brief returns the active avatar mode
-	 * @return string active avatar mode
-	*/
-	public static function getMode () {
-		return \OC_Config::getValue("avatar", "local");
-	}
+                $view = new \OC\Files\View('/'.$user);
+
+                if ($view->file_exists('avatar.jpg')) {
+                        $ext = 'jpg';
+                } elseif ($view->file_exists('avatar.png')) {
+                        $ext = 'png';
+                } else {
+                        return self::getDefaultAvatar($user, $size);
+                }
+
+                $avatar = new OC_Image($view->file_get_contents('avatar.'.$ext));
+                $avatar->resize($size);
+                return $avatar;
+        }
 
 	/**
-	 * @brief sets the users local avatar
+	 * @brief sets the users avatar
 	 * @param $user string user to set the avatar for
 	 * @param $data mixed imagedata or path to set a new avatar, or false to delete the current 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
 	 * @return true on success
 	*/
-	public static function setLocalAvatar ($user, $data) {
+	public static function set ($user, $data) {
 		$view = new \OC\Files\View('/'.$user);
 
 		if ($data === false) {
@@ -66,7 +58,7 @@ class OC_Avatar {
 			if ($type === 'peg') { $type = 'jpg'; }
 			if ($type !== 'jpg' && $type !== 'png') {
 				$l = \OC_L10N::get('lib');
-				throw new \Exception($l->t("Unknown filetype for avatar"));
+				throw new \Exception($l->t("Unknown filetype"));
 			}
 
 			if (!( $img->valid() && ($img->height() === $img->width()) )) {
@@ -82,54 +74,6 @@ class OC_Avatar {
 	}
 
 	/**
-	 * @brief get the users gravatar
-	 * @param $user string which user to get the gravatar for
-	 * @param $size integer size in px of the avatar, defaults to 64
-	 * @return string link to the gravatar, or \OC_Image with the default avatar
-	*/
-	public static function getGravatar ($user, $size = 64) {
-		$email = \OC_Preferences::getValue($user, 'settings', 'email');
-		if ($email !== null) {
-			$emailhash = md5(strtolower(trim($email)));
-			$url = "http://secure.gravatar.com/avatar/".$emailhash."?d=404&s=".$size;
-			$headers = get_headers($url, 1);
-			if (strpos($headers[0], "404 Not Found") === false) {
-				return $url;
-			}
-		}
-		return self::getDefaultAvatar($user, $size);
-	}
-
-	/**
-	 * @brief get the local avatar
-	 * @param $user string which user to get the avatar for
-	 * @param $size integer size in px of the avatar, defaults to 64
-	 * @return string \OC_Image containing the avatar
-	*/
-	public static function getLocalAvatar ($user, $size = 64) {
-		$view = new \OC\Files\View('/'.$user);
-
-		if ($view->file_exists('avatar.jpg')) {
-			$ext = 'jpg';
-		} elseif ($view->file_exists('avatar.png')) {
-			$ext = 'png';
-		} else {
-			return self::getDefaultAvatar($user, $size);
-		}
-
-		$avatar = new OC_Image($view->file_get_contents('avatar.'.$ext));
-		$avatar->resize($size);
-		return $avatar;
-	}
-
-	/**
-	 * @todo todo
-	*/
-	public static function getCustomAvatar($user, $size) {
-		// TODO
-	}
-
-	/**
 	 * @brief gets the default avatar
 	 * @brief $user string which user to get the avatar for
 	 * @param $size integer size of the avatar in px, defaults to 64
@@ -137,8 +81,10 @@ class OC_Avatar {
 	 * @todo use custom default images, when they arive
 	*/
 	public static function getDefaultAvatar ($user, $size = 64) {
-		$default = new OC_Image(OC::$SERVERROOT."/core/img/defaultavatar.png");
+		// TODO
+		/*$default = new OC_Image(OC::$SERVERROOT."/core/img/defaultavatar.png");
 		$default->resize($size);
-		return $default;
+		return $default;*/
+		return;
 	}
 }