deleted file mode 100644

@@ -1,88 +0,0 @@

-<?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;

-

-use Contao\BackendTemplate;

-use Contao\Config;

-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 ModuleMemberExtension

-{

-    /**

-     * Template.

-     *

-     * @var string

-     */

-    protected $strTemplate = 'memberExtension_avatar';

-

-    /**

-     * 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();

-        }

-

-        // Return if user is not logged in

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

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

-

-        if (!$blnFeUserLoggedIn)

-        {

-            return '';

-        }

-

-        $this->strTemplate = $this->customTpl ?: 'memberExtension_avatar';

-

-        return parent::generate();

-    }

-

-    /**

-     * Generate the module

-     */

-    protected function compile()

-    {

-        $objTemplate = $this->Template;

-

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

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

-

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

-    }

-}

@@ -68,7 +68,7 @@ class ModuleAvatar extends ModuleMemberExtension

             return '';

         }

-        $this->strTemplate = $this->memberTpl ?: 'memberExtension_avatar';

+        $this->strTemplate = $this->customTpl ?: 'memberExtension_avatar';

         return parent::generate();

     }

@@ -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);

     }

 }

@@ -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);

     }

 }

@@ -38,12 +38,7 @@ class ModuleAvatar extends Module

      */

     protected $strTemplate = 'memberExtension_avatar';

-    /**

-     * Default avatar file path

-     *

-     * @var string

-     */

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

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

     /**

      * Return a wildcard in the back end

@@ -106,21 +101,17 @@ class ModuleAvatar extends Module

         {

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

         }

-        else

-        {

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

-        }

         // If file does not exist use default image

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

-        {

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

-        }

-        else

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

+        }

     }

 }

@@ -16,6 +16,7 @@ declare(strict_types=1);

 namespace Oveleon\ContaoMemberExtensionBundle;

 use Contao\BackendTemplate;

+use Contao\Config;

 use Contao\FilesModel;

 use Contao\FrontendUser;

 use Contao\MemberModel;

@@ -95,25 +96,31 @@ class ModuleAvatar extends Module

         $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'));

+        }

+        else

+        {

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

+        }

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

+        // If file does not exist use default image

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

         {

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

         }

         else

         {

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

-

-            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);

-            }

+            $objTemplate->noAvatar = false;

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

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

         }

     }

 }

@@ -35,7 +35,7 @@ class ModuleAvatar extends Module

      *

      * @var string

      */

-    protected $strTemplate = 'member_avatar';

+    protected $strTemplate = 'memberExtension_avatar';

     /**

      * Default avatar file path

@@ -74,7 +74,7 @@ class ModuleAvatar extends Module

             return '';

         }

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

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

         return parent::generate();

     }

@@ -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);

+            }

+        }

+    }

 }

@@ -1,11 +1,9 @@

 <?php

 /*

- * This file is part of Contao.

+ * This file is part of Oveleon ContaoMemberExtension Bundle.

  *

- * (c) Leo Feyer

- *

- * @license LGPL-3.0-or-later

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

  */

 namespace Oveleon\ContaoMemberExtensionBundle;

new file mode 100644

@@ -0,0 +1,107 @@

+<?php

+

+/*

+ * This file is part of Contao.

+ *

+ * (c) Leo Feyer

+ *

+ * @license LGPL-3.0-or-later

+ */

+

+namespace Oveleon\ContaoMemberExtensionBundle;

+

+use Patchwork\Utf8;

+

+/**

+ * Class ModuleAvatar

+ *

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

+ */

+class ModuleAvatar extends \Module

+{

+

+	/**

+	 * 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');

+

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

+        {

+            return '';

+        }

+

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

+        {

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

+

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

+            {

+                return '';

+            }

+

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

+

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

+            return;

+        }

+

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

+

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

+        {

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

+

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

+            return;

+        }

+

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

+

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

+	}

+}