new file mode 100644

@@ -0,0 +1,29 @@

+<?php

+

+/**

+ * Procuna

+ *

+ * @link      https://www.oveleon.de/

+ * @copyright Copyright (c) 2021  Oveleon GbR (https://www.oveleon.de)

+ */

+

+

+namespace Oveleon\ContaoMemberExtensionBundle\DependencyInjection;

+

+use Symfony\Component\Config\FileLocator;

+use Symfony\Component\DependencyInjection\ContainerBuilder;

+use Symfony\Component\DependencyInjection\Extension\Extension;

+use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;

+

+class ContaoMemberExtensionExtension extends Extension

+{

+    public function load(array $configs, ContainerBuilder $container): void

+    {

+        $loader = new YamlFileLoader(

+            $container,

+            new FileLocator(__DIR__.'/../Resources/config')

+        );

+

+        $loader->load('listener.yml');

+    }

+}

new file mode 100644

@@ -0,0 +1,123 @@

+<?php

+

+declare(strict_types=1);

+

+/*

+ * This file is part of Oveleon ContaoMemberExtension Bundle.

+ *

+ * @package     contao-member-extension-bundle

+ * @license     MIT

+ * @author      Daniele Sciannimanica   <https://github.com/doishub>

+ * @author      Fabian Ekert            <https://github.com/eki89>

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

+ * @copyright   Oveleon                 <https://www.oveleon.de/>

+ */

+

+namespace Oveleon\ContaoMemberExtensionBundle\EventListener;

+

+use Contao\FrontendTemplate;

+use Contao\FrontendUser;

+use Contao\Image\ResizeConfiguration;

+use Contao\MemberModel;

+use Contao\System;

+use Contao\CoreBundle\Framework\ContaoFramework;

+use Oveleon\ContaoMemberExtensionBundle\Member;

+

+class InsertTagsListener

+{

+    private const SUPPORTED_TAGS = [

+        'avatar'

+    ];

+

+    /**

+     * @var ContaoFramework

+     */

+    private $framework;

+

+    public function __construct(ContaoFramework $framework)

+    {

+        $this->framework = $framework;

+    }

+

+    /**

+     * @return string|false

+     */

+    public function __invoke(string $tag, bool $useCache, $cacheValue, array $flags)

+    {

+        $elements = explode('::', $tag);

+        $key = strtolower($elements[0]);

+

+        if (\in_array($key, self::SUPPORTED_TAGS, true)) {

+            return $this->replaceEventInsertTag($key, $elements, $flags);

+        }

+

+        return false;

+    }

+

+    private function replaceEventInsertTag(string $insertTag, array $elements, array $flags): string

+    {

+        $this->framework->initialize();

+        $tokenChecker = System::getContainer()->get('contao.security.token_checker');

+

+        if($elements[1] !== 'member')

+        {

+            return '';

+        }

+

+        switch ($elements[2]) {

+

+            case 'current':

+                if(!$tokenChecker->hasFrontendUser())

+                {

+                    return '';

+                }

+                $memberID = FrontendUser::getInstance()->id;

+                break;

+

+            default:

+                if(!\is_numeric($elements[2]))

+                {

+                    return '';

+                }

+                $memberID = $elements[2];

+                break;

+        }

+

+        if(!!$objMember = MemberModel::findByPk($memberID))

+        {

+            $strImgSize = $this->convertImgSize($elements[3]);

+            $objTemplate = new FrontendTemplate('memberExtension_image');

+

+            Member::parseMemberAvatar($objMember, $objTemplate, $strImgSize);

+

+            return $objTemplate->parse();

+        }

+

+        return '';

+    }

+

+    private function convertImgSize($strSize): ?string

+    {

+        if (!$strSize)

+        {

+            return null;

+        }

+

+        list($intWidth, $intHeight, $mode) = explode('x', $strSize);

+

+        $arrSizes = [$intWidth, $intHeight];

+

+        $arrValidModes = [

+            ResizeConfiguration::MODE_BOX,

+            ResizeConfiguration::MODE_PROPORTIONAL,

+            ResizeConfiguration::MODE_CROP,

+        ];

+

+        if(!!$mode && in_array($mode, $arrValidModes, true))

+        {

+            $arrSizes[] = $mode;

+        }

+

+        return serialize($arrSizes);

+    }

+}

new file mode 100644

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

+services:

+    contao_member.listener.insert_tags:

+        class: Oveleon\ContaoMemberExtensionBundle\EventListener\InsertTagsListener

+        arguments:

+            - '@contao.framework'

+        tags:

+          - { name: contao.hook, hook: replaceInsertTags }

+        public: true

@@ -37,6 +37,8 @@ use Psr\Log\LogLevel;

  */

 class Member extends Frontend

 {

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

+

     /**

      * MemberAvatar file name

      *

@@ -266,6 +268,49 @@ class Member extends Frontend

     }

     /**

+     * Parses an avatar to the template

+     *

+     * @param MemberModel $objMember

+     * @param $objTemplate

+     * @param $strImgSize

+     * @return void

+     */

+    public static function parseMemberAvatar(MemberModel $objMember, &$objTemplate, $strImgSize)

+    {

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

+        $objTemplate->addImage = false;

+

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

+

+        if(!!$objMember->avatar)

+        {

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

+        }

+        else if(!!$uuidDefault)

+        {

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

+        }

+        else

+        {

+            return;

+        }

+

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

+

+        // If file does not exist use default image

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

+        {

+            return;

+        }

+

+        $objTemplate->addImage = true;

+        $arrData = ['singleSRC'=>$objFile->path, 'size'=>$strImgSize];

+

+        //ToDo: Change to FigureBuilder in the future

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

+    }

+

+    /**

      * @param MemberModel $objMember

      *

      * @return void

@@ -83,6 +83,6 @@ class ModuleAvatar extends ModuleMemberExtension

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

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

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

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

     }

 }

@@ -31,8 +31,6 @@ use Contao\System;

  */

 abstract class ModuleMemberExtension extends Module

 {

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

-

     /**

      * Parse member template

      *

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

             switch($field)

             {

                 case 'avatar':

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

+                    Member::parseMemberAvatar($objMember, $objTemplate, $strImgSize);

                     break;

                 default:

@@ -80,49 +78,6 @@ abstract class ModuleMemberExtension extends Module

     }

     /**

-     * Parses an avatar to the template

-     *

-     * @param MemberModel $objMember

-     * @param $objTemplate

-     * @param $strImgSize

-     * @return void

-     */

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

-    {

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

-        $objTemplate->addImage = false;

-

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

-

-        if(!!$objMember->avatar)

-        {

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

-        }

-        else if(!!$uuidDefault)

-        {

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

-        }

-        else

-        {

-            return;

-        }

-

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

-

-        // If file does not exist use default image

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

-        {

-            return;

-        }

-

-        $objTemplate->addImage = true;

-        $this->size = $strImgSize;

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

-        //ToDo: Change to FigureBuilder in the future

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

-    }

-

-    /**

      * Generate a URL and return it as string

      *

      * @param MemberModel $objMember