Merge pull request #1 from fguillot/master

3 files changed, 49 insertions, 5 deletions

diff --git a/app/User/Avatar/AvatarFileProvider.php b/app/User/Avatar/AvatarFileProvider.php
new file mode 100644
index 00000000..eea565f0
--- /dev/null
+++ b/app/User/Avatar/AvatarFileProvider.php
@@ -0,0 +1,42 @@
+<?php
+
+namespace Kanboard\User\Avatar;
+
+use Kanboard\Core\Base;
+use Kanboard\Core\User\Avatar\AvatarProviderInterface;
+
+/**
+ * Avatar Local Image File Provider
+ *
+ * @package  avatar
+ * @author   Frederic Guillot
+ */
+class AvatarFileProvider extends Base implements AvatarProviderInterface
+{
+    /**
+     * Render avatar html
+     *
+     * @access public
+     * @param  array $user
+     * @param  int   $size
+     * @return string
+     */
+    public function render(array $user, $size)
+    {
+        $url = $this->helper->url->href('AvatarFile', 'image', array('user_id' => $user['id'], 'size' => $size));
+        $title = $this->helper->text->e($user['name'] ?: $user['username']);
+        return '<img src="' . $url . '" alt="' . $title . '" title="' . $title . '">';
+    }
+
+    /**
+     * Determine if the provider is active
+     *
+     * @access public
+     * @param  array $user
+     * @return boolean
+     */
+    public function isActive(array $user)
+    {
+        return !empty($user['avatar_path']);
+    }
+}
diff --git a/app/User/Avatar/GravatarProvider.php b/app/User/Avatar/GravatarProvider.php
index 7a719734..87ca51b1 100644
--- a/app/User/Avatar/GravatarProvider.php
+++ b/app/User/Avatar/GravatarProvider.php
@@ -17,8 +17,9 @@ class GravatarProvider extends Base implements AvatarProviderInterface
      * Render avatar html
      *
      * @access public
-     * @param array $user
-     * @param int   $size
+     * @param  array $user
+     * @param  int   $size
+     * @return string
      */
     public function render(array $user, $size)
     {
diff --git a/app/User/Avatar/LetterAvatarProvider.php b/app/User/Avatar/LetterAvatarProvider.php
index 81c4586d..f9659e61 100644
--- a/app/User/Avatar/LetterAvatarProvider.php
+++ b/app/User/Avatar/LetterAvatarProvider.php
@@ -24,13 +24,14 @@ class LetterAvatarProvider extends Base implements AvatarProviderInterface
      * Render avatar html
      *
      * @access public
-     * @param array $user
-     * @param int   $size
+     * @param  array $user
+     * @param  int   $size
+     * @return string
      */
     public function render(array $user, $size)
     {
         $initials = $this->helper->user->getInitials($user['name'] ?: $user['username']);
-        $rgb = $this->getBackgroundColor($initials);
+        $rgb = $this->getBackgroundColor($user['name'] ?: $user['username']);
 
         return sprintf(
             '<div class="avatar-letter" style="background-color: rgb(%d, %d, %d)" title="%s">%s</div>',