diff --git a/app/Core/User/UserSession.php b/app/Core/User/UserSession.php
index 534e51924..e494e7b43 100644
--- a/app/Core/User/UserSession.php
+++ b/app/Core/User/UserSession.php
@@ -35,6 +35,17 @@ class UserSession extends Base
$this->sessionStorage->postAuthenticationValidated = false;
}
+ /**
+ * Get user properties
+ *
+ * @access public
+ * @return array
+ */
+ public function getAll()
+ {
+ return $this->sessionStorage->user;
+ }
+
/**
* Get user application role
*
diff --git a/app/Helper/AvatarHelper.php b/app/Helper/AvatarHelper.php
new file mode 100644
index 000000000..c4e27ed95
--- /dev/null
+++ b/app/Helper/AvatarHelper.php
@@ -0,0 +1,64 @@
+avatarManager->renderDefault($size);
+ } else {
+ $html = $this->avatarManager->render($user_id, $username, $name, $email, $size);
+ }
+
+ return ''.$html.'
';
+ }
+
+ /**
+ * Render small user avatar
+ *
+ * @access public
+ * @param string $user_id
+ * @param string $username
+ * @param string $name
+ * @param string $email
+ * @return string
+ */
+ public function small($user_id, $username, $name, $email, $css = '')
+ {
+ return $this->render($user_id, $username, $name, $email, $css, 20);
+ }
+
+ /**
+ * Get a small avatar for the current user
+ *
+ * @access public
+ * @return string
+ */
+ public function currentUserSmall($css = '')
+ {
+ $user = $this->userSession->getAll();
+ return $this->small($user['id'], $user['username'], $user['name'], $user['email'], $css);
+ }
+}
diff --git a/app/Helper/UserHelper.php b/app/Helper/UserHelper.php
index c60c35c2e..ee7d8ba56 100644
--- a/app/Helper/UserHelper.php
+++ b/app/Helper/UserHelper.php
@@ -156,27 +156,6 @@ class UserHelper extends Base
*/
public function getFullname(array $user = array())
{
- return $this->user->getFullname(empty($user) ? $this->sessionStorage->user : $user);
- }
-
- /**
- * Display avatar
- *
- * @access public
- * @param string $user_id
- * @param string $username
- * @param string $name
- * @param string $email
- * @return string
- */
- public function avatar($user_id, $username, $name, $email)
- {
- if (empty($user_id) && empty($username)) {
- $html = $this->avatarManager->renderDefault(48);
- } else {
- $html = $this->avatarManager->render($user_id, $username, $name, $email, 48);
- }
-
- return ''.$html.'
';
+ return $this->user->getFullname(empty($user) ? $this->userSession->getAll() : $user);
}
}
diff --git a/app/ServiceProvider/HelperProvider.php b/app/ServiceProvider/HelperProvider.php
index 42a0c85ee..37be5a05d 100644
--- a/app/ServiceProvider/HelperProvider.php
+++ b/app/ServiceProvider/HelperProvider.php
@@ -26,6 +26,7 @@ class HelperProvider implements ServiceProviderInterface
$container['helper']->register('text', '\Kanboard\Helper\TextHelper');
$container['helper']->register('url', '\Kanboard\Helper\UrlHelper');
$container['helper']->register('user', '\Kanboard\Helper\UserHelper');
+ $container['helper']->register('avatar', '\Kanboard\Helper\AvatarHelper');
$container['template'] = new Template($container['helper']);
diff --git a/app/Template/comment/show.php b/app/Template/comment/show.php
index ebf4142b1..ce456c5d8 100644
--- a/app/Template/comment/show.php
+++ b/app/Template/comment/show.php
@@ -1,6 +1,6 @@