Add public API for \OC\Avatar

2 files changed, 23 insertions, 2 deletions

diff --git a/lib/private/avatar.php b/lib/private/avatar.php
index 720740569df..e9b02a7d34c 100644
--- a/lib/private/avatar.php
+++ b/lib/private/avatar.php
@@ -24,7 +24,7 @@ class OC_Avatar {
 
 	/**
 	 * @brief get the users avatar
-	 * @param $size integer size in px of the avatar, defaults to 64
+	 * @param $size integer size in px of the avatar, avatars are square, defaults to 64
 	 * @return boolean|\OC_Image containing the avatar or false if there's no image
 	*/
 	public function get ($size = 64) {
diff --git a/lib/private/server.php b/lib/private/server.php
index 65899f3007e..65542d19ab5 100644
--- a/lib/private/server.php
+++ b/lib/private/server.php
@@ -56,7 +56,7 @@ class Server extends SimpleContainer implements IServerContainer {
 		});
 		$this->registerService('TagManager', function($c) {
 			$user = \OC_User::getUser();
-			return new TagManager($user);
+			return new Tags($user);
 		});
 		$this->registerService('RootFolder', function($c) {
 			// TODO: get user and user manager from container as well
@@ -131,6 +131,9 @@ class Server extends SimpleContainer implements IServerContainer {
 		$this->registerService('ActivityManager', function($c) {
 			return new ActivityManager();
 		});
+		$this->registerService('AvatarManager', function($c) {
+			return new AvatarManager(); //TODO AvatarManager needs $user
+		});
 	}
 
 	/**
@@ -161,6 +164,15 @@ class Server extends SimpleContainer implements IServerContainer {
 	}
 
 	/**
+	 * Returns the avatar manager, used for avatar functionality
+	 *
+	 * @return \OCP\IAvatar
+	 */
+	function getAvatarManager() {
+		return $this->query('AvatarManager');
+	}
+
+	/**
 	 * Returns the tag manager which can get and set tags for different object types
 	 *
 	 * @see \OCP\ITagManager::load()
@@ -171,6 +183,15 @@ class Server extends SimpleContainer implements IServerContainer {
 	}
 
 	/**
+	 * Returns the avatar manager, used for avatar functionality
+	 *
+	 * @return \OCP\IAvatar
+	 */
+	function getAvatarManager() {
+		return $this->query('AvatarManager');
+	}
+
+	/**
 	 * Returns the root folder of ownCloud's data directory
 	 *
 	 * @return \OCP\Files\Folder