@@ -29,7 +29,7 @@ use Contao\System;

  * @author Fabian Ekert <fabian@oveleon.de>

  * @author Sebastian Zoglowek <https://github.com/zoglo>

  */

-class ModuleAvatar extends Module

+class ModuleAvatar extends ModuleMemberExtension

 {

     /**

      * Template.

@@ -38,8 +38,6 @@ class ModuleAvatar extends Module

      */

     protected $strTemplate = 'memberExtension_avatar';

-    const DEFAULT_PICTURE = 'bundles/contaomemberextension/avatar.png';

-

     /**

      * Return a wildcard in the back end

      *

@@ -82,36 +80,9 @@ class ModuleAvatar extends Module

     {

         $objTemplate = $this->Template;

-        $this->size = $this->imgSize;

-

-        $objTemplate->noAvatar = true;

-

         $this->import(FrontendUser::class, 'User');

         $objMember = MemberModel::findByPk($this->User->id);

-        $projectDir = System::getContainer()->getParameter('kernel.project_dir');

-

-        // Check for avatar

-        if(!!$objMember->avatar)

-        {

-            $objFile = FilesModel::findByUuid($objMember->avatar);

-        }

-        // Check for standard avatar from member configuration

-        else if(!!Config::get('defaultAvatar'))

-        {

-            $objFile = FilesModel::findByUuid(Config::get('defaultAvatar'));

-        }

-

-        // If file does not exist use default image

-        if (null !== $objFile || is_file($projectDir . '/' . $objFile->path))

-        {

-            $objTemplate->noAvatar = false;

-            $this->singleSRC = $objFile->path;

-            $this->addImageToTemplate($this->Template, $this->arrData);

-        }

-        else

-        {

-            $objTemplate->singleSRC = self::DEFAULT_PICTURE;

-        }

+        $this->parseMemberAvatar($objMember, $objTemplate, $this->imgSize);

     }

 }

@@ -31,17 +31,18 @@ use Contao\System;

  */

 abstract class ModuleMemberExtension extends Module

 {

+    const DEFAULT_PICTURE = 'bundles/contaomemberextension/avatar.png';

+

     /**

      * Parse member template

      *

      * @param $objMember

      * @param $objTemplate

      * @param $arrMemberFields

-     * @param $varImgSize

-     *

+     * @param $strImgSize

      * @return string

      */

-    protected function parseMemberTemplate($objMember, $objTemplate, $arrMemberFields, $varImgSize)

+    protected function parseMemberTemplate($objMember, $objTemplate, $arrMemberFields, $strImgSize)

     {

         $arrFields = [];

@@ -50,7 +51,7 @@ abstract class ModuleMemberExtension extends Module

             switch($field)

             {

                 case 'avatar':

-                    $this->addAvatarToTemplate($objMember, $objTemplate, $varImgSize);

+                    $this->parseMemberAvatar($objMember, $objTemplate, $strImgSize);

                     break;

                 default:

@@ -79,42 +80,46 @@ abstract class ModuleMemberExtension extends Module

     }

     /**

-     * Add avatar to template

+     * Parses an avatar to the template

      *

-     * @param $objMember

+     * @param MemberModel $objMember

      * @param $objTemplate

-     * @param $varImgSize

+     * @param $strImgSize

+     * @return void

      */

-    protected function addAvatarToTemplate($objMember, $objTemplate, $varImgSize)

+    protected function parseMemberAvatar(MemberModel $objMember, $objTemplate, $strImgSize)

     {

+        $objTemplate->singleSRC = self::DEFAULT_PICTURE;

         $objTemplate->addImage = false;

-        if (!$objMember->avatar && !Config::get('defaultAvatar'))

-        {

-            return;

-        }

+        $uuidDefault = Config::get('defaultAvatar');

-        $arrData = ['size' => $varImgSize];

-        

         if(!!$objMember->avatar)

         {

             $objFile = FilesModel::findByUuid($objMember->avatar);

         }

+        else if(!!$uuidDefault)

+        {

+            $objFile = FilesModel::findByUuid($uuidDefault);

+        }

         else

         {

-            $objFile = FilesModel::findByUuid(Config::get('defaultAvatar'));

+            return;

         }

-        if ($objFile === null || !is_file(System::getContainer()->getParameter('kernel.project_dir') . '/' . $objFile->path))

+        $projectDir = System::getContainer()->getParameter('kernel.project_dir');

+

+        // If file does not exist use default image

+        if (null === $objFile || !\is_file($projectDir . '/' . $objFile->path))

         {

             return;

         }

-        $arrData['singleSRC'] = $objFile->path;

         $objTemplate->addImage = true;

-

+        $this->size = $strImgSize;

+        $this->singleSRC = $objFile->path;

         //ToDo: Change to FigureBuilder in the future

-        $this->addImageToTemplate($objTemplate, $arrData, null, null, $objFile);

+        $this->addImageToTemplate($objTemplate, $this->arrData);

     }

     /**

new file mode 100644

@@ -0,0 +1,8 @@

+<figure class="image_container">

+

+  <?php if($this->addImage): ?>

+    <?php $this->insert('picture_default', $this->picture); ?>

+  <?php else: ?>

+    <img src="<?= $this->singleSRC; ?>" width="200" height="200" itemprop="image">

+  <?php endif; ?>

+</figure>

@@ -2,14 +2,6 @@

 <?php $this->block('content'); ?>

-<?php if($this->noAvatar):?>

-  <figure class="image_container">

-    <img src="<?= $this->singleSRC; ?>" width="200" height="200" itemprop="image">

-  </figure>

-<?php else: ?>

-  <figure class="image_container">

-      <?php $this->insert('picture_default', $this->picture); ?>

-  </figure>

-<?php endif; ?>

+<?php $this->insert('memberExtension_image', $this->arrData); ?>

 <?php $this->endblock(); ?>

@@ -1,15 +1,12 @@

 <div class="member_list_default">

-    <?php if($this->addImage): ?>

-        <figure class="image_container">

-          <?php $this->insert('picture_default', $this->picture); ?>

-        </figure>

-    <?php endif; ?>

-    <ul>

-        <?php foreach ($this->fields as $k => $v): ?>

-            <li class="<?= $k ?>"><?= $v ?></li>

-        <?php endforeach; ?>

-    </ul>

-    <?php if($this->link): ?>

-        <a href="<?=$this->link?>"><?=$GLOBALS['TL_LANG']['MSC']['memberDetail']?></a>

-    <?php endif; ?>

+  <?php $this->insert('memberExtension_image', $this->arrData); ?>

+

+  <ul>

+    <?php foreach ($this->fields as $k => $v): ?>

+      <li class="<?= $k ?>"><?= $v ?></li>

+    <?php endforeach; ?>

+  </ul>

+  <?php if($this->link): ?>

+    <a href="<?=$this->link?>"><?=$GLOBALS['TL_LANG']['MSC']['memberDetail']?></a>

+  <?php endif; ?>

 </div>

@@ -1,12 +1,9 @@

 <div class="member_reader_full">

-    <?php if($this->addImage): ?>

-        <figure class="image_container">

-          <?php $this->insert('picture_default', $this->picture); ?>

-        </figure>

-    <?php endif; ?>

-    <ul>

-        <?php foreach ($this->fields as $k => $v): ?>

-            <li class="<?= $k ?>"><?= $v ?></li>

-        <?php endforeach; ?>

-    </ul>

+  <?php $this->insert('memberExtension_image', $this->arrData); ?>

+

+  <ul>

+    <?php foreach ($this->fields as $k => $v): ?>

+      <li class="<?= $k ?>"><?= $v ?></li>

+    <?php endforeach; ?>

+  </ul>

 </div>