@@ -1,30 +1,50 @@

 {

-  "name":"oveleon/contao-member-extension-bundle",

-  "type":"contao-bundle",

-  "description":"Member feature extension for Contao.",

-  "keywords":["contao","member-extension-bundle"],

-  "homepage":"https://oveleon.de/",

-  "license":"MIT",

-  "authors":[

+  "name": "oveleon/contao-member-extension-bundle",

+  "type": "contao-bundle",

+  "description": "Member feature extension for Contao.",

+  "keywords": ["contao","member-extension-bundle"],

+  "homepage": "https://oveleon.de/",

+  "license": "MIT",

+  "authors": [

     {

-      "name":"Oveleon",

-      "homepage":"https://oveleon.de/",

+      "name": "Oveleon",

+      "homepage": "https://oveleon.de/",

+      "role": "Developer"

+    },

+    {

+      "name": "Daniele Sciannimanica",

+      "homepage": "https://github.com/doishub",

       "role":"Developer"

+    },

+    {

+      "name": "Fabian Ekert",

+      "homepage": "https://github.com/eki89",

+      "role": "Developer"

+    },

+    {

+      "name": "Sebastian Zoglowek",

+      "homepage": "https://github.com/zoglo",

+      "role": "Developer"

     }

   ],

-  "require":{

-    "php":">=7.1",

-    "contao/core-bundle":"^4.4"

+  "require": {

+    "php": "^7.4 || ^8.0",

+    "contao/core-bundle":"^4.9"

   },

   "require-dev": {

-    "contao/manager-plugin": "^2.0"

+    "contao/manager-plugin": "^2.3.1"

   },

   "conflict": {

     "contao/core": "*",

-    "contao/core-bundle": "4.4.1",

     "contao/manager-plugin": "<2.0 || >=3.0"

   },

-  "autoload":{

+  "extra": {

+    "branch-alias": {

+      "dev-master": "1.2.x-dev"

+    },

+    "contao-manager-plugin": "Oveleon\\ContaoMemberExtensionBundle\\ContaoManager\\Plugin"

+  },

+  "autoload": {

     "psr-4": {

       "Oveleon\\ContaoMemberExtensionBundle\\": "src/"

     },

@@ -38,7 +58,7 @@

       "src/Resources/contao/templates/"

     ]

   },

-  "extra":{

-    "contao-manager-plugin": "Oveleon\\ContaoMemberExtensionBundle\\ContaoManager\\Plugin"

+  "support": {

+    "issues": "https://github.com/oveleon/contao-member-extension-bundle/issues"

   }

 }

\ No newline at end of file

@@ -1,105 +1,119 @@

 <?php

+declare(strict_types=1);

+

 /*

  * This file is part of Oveleon ContaoMemberExtension Bundle.

  *

- * (c) https://www.oveleon.de/

+ * @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;

-use Patchwork\Utf8;

+use Contao\BackendTemplate;

+use Contao\FilesModel;

+use Contao\FrontendUser;

+use Contao\MemberModel;

+use Contao\Module;

+use Contao\System;

 /**

  * Class ModuleAvatar

  *

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

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

  */

-class ModuleAvatar extends \Module

+class ModuleAvatar extends Module

 {

+    /**

+     * Template.

+     *

+     * @var string

+     */

+    protected $strTemplate = 'member_avatar';

+

+    /**

+     * Default avatar file path

+     *

+     * @var string

+     */

+    private static $strDefaultPath = 'bundles/contaomemberextension/avatar.png';

+

+    /**

+     * Return a wildcard in the back end

+     *

+     * @return string

+     */

+    public function generate()

+    {

+        $request = System::getContainer()->get('request_stack')->getCurrentRequest();

+

+        if ($request && System::getContainer()->get('contao.routing.scope_matcher')->isBackendRequest($request))

+        {

+            $objTemplate = new BackendTemplate('be_wildcard');

+            $objTemplate->wildcard = '### ' . mb_strtoupper($GLOBALS['TL_LANG']['FMD']['avatar'][0], 'UTF-8') . ' ###';

+            $objTemplate->title = $this->headline;

+            $objTemplate->id = $this->id;

+            $objTemplate->link = $this->name;

+            $objTemplate->href = 'contao/main.php?do=themes&table=tl_module&act=edit&id=' . $this->id;

+

+            return $objTemplate->parse();

+        }

-	/**

-	 * Template

-	 * @var string

-	 */

-	protected $strTemplate = 'member_avatar';

-

-	/**

-	 * Return a wildcard in the back end

-	 *

-	 * @return string

-	 */

-	public function generate()

-	{

-		if (TL_MODE == 'BE')

-		{

-			/** @var BackendTemplate|object $objTemplate */

-			$objTemplate = new \BackendTemplate('be_wildcard');

-

-			$objTemplate->wildcard = '### ' . Utf8::strtoupper($GLOBALS['TL_LANG']['FMD']['avatar'][0]) . ' ###';

-			$objTemplate->title = $this->headline;

-			$objTemplate->id = $this->id;

-			$objTemplate->link = $this->name;

-			$objTemplate->href = 'contao/main.php?do=themes&table=tl_module&act=edit&id=' . $this->id;

-

-			return $objTemplate->parse();

-		}

-

-		// Return if user is not logged in

-		if (!FE_USER_LOGGED_IN)

-		{

-			return '';

-		}

-

-		if ($this->memberTpl != '')

-		{

-			$this->strTemplate = $this->memberTpl;

-		}

-

-		return parent::generate();

-	}

-

-	/**

-	 * Generate the module

-	 */

-	protected function compile()

-	{

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

-

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

+        // Return if user is not logged in

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

+        $blnFeUserLoggedIn = $tokenChecker->hasFrontendUser();

-        if ($this->User->avatar == '' && \Config::get('defaultAvatar') == '')

+        if (!$blnFeUserLoggedIn)

         {

             return '';

         }

-        if ($this->User->avatar == '')

-        {

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

+        $this->strTemplate = $this->memberTpl ?: 'member_avatar';

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

-            {

-                return '';

-            }

+        return parent::generate();

+    }

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

+    /**

+     * Generate the module

+     */

+    protected function compile()

+    {

+        $objTemplate = $this->Template;

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

-            return;

-        }

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

-        $objFile = \FilesModel::findByUuid($this->User->avatar);

+        $objTemplate->noAvatar = true;

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

-        {

-            $this->singleSRC = \FilesModel::findByUuid(\Config::get('defaultAvatar'))->path;

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

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

+

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

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

-            return;

-        }

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

+        if (!$this->User->avatar)

+        {

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

+        }

+        else

+        {

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

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

-	}

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

+            {

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

+            }

+            else

+            {

+                $objTemplate->noAvatar = false;

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

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

+            }

+        }

+    }

 }