@@ -10,7 +10,7 @@

 ---

-> Working with **Contao 4.9** and up to **Contao 4.13** (PHP ^7.4 and PHP 8)

+> Working with **Contao 4.13** (PHP ^8.0)

 ---

@@ -20,7 +20,7 @@ Additionally, you can display members with their details in a reader page.

 + [Features](#features)

 + [Installation](#installation)

-   + [Upgrading](#upgrading-to-version-12)

+   + [Upgrading (v.1.1 to >=v.1.2)](#upgrading-to-version--12)

    + [Composer](#via-composer)

    + [Contao Manager](#via-contao-manager)

 + [Initial Setup](#initial-setup)

@@ -36,7 +36,7 @@ Additionally, you can display members with their details in a reader page.

 ## Features

-- Compatible with Contao 4.9 and higher versions (PHP 8 Support)

+- Compatible with Contao 4.13 (PHP ^8.0)

 - Extends members with avatars

 - Paginated member lists

 - Member detail pages

@@ -46,8 +46,8 @@ Additionally, you can display members with their details in a reader page.

 ## Installation

-#### Upgrading to version 1.2

-> After upgrading from version 1.1 to version 1.2, make sure to edit your modules (memberlist, memberreader and avatar/profile picture) and set up the new templates.

+#### Upgrading to version >=1.2

+> After upgrading from version 1.1 to version >=1.2, make sure to edit your modules (memberlist, memberreader and avatar/profile picture) and set up the new templates.

 #### Via composer

 ```

@@ -23,8 +23,8 @@

         }

     ],

     "require": {

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

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

+        "php": "^8.0",

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

     },

     "require-dev": {

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

@@ -35,7 +35,7 @@

     },

     "extra": {

         "branch-alias": {

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

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

         },

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

     },

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

  */

 // Back end modules

-use Contao\System;

+use Contao\ArrayUtil;

 $GLOBALS['BE_MOD']['system']['member_settings'] = [

     'tables'            => ['tl_member_settings'],

@@ -22,8 +22,7 @@ $GLOBALS['BE_MOD']['system']['member_settings'] = [

 ];

 // Front end modules

-// ToDo: Change to ArrayUtil::arrayInsert when Contao 4.9 support ends

-array_insert($GLOBALS['FE_MOD']['user'], -1, [

+ArrayUtil::arrayInsert($GLOBALS['FE_MOD']['user'], -1, [

     'avatar'       => 'Oveleon\ContaoMemberExtensionBundle\ModuleAvatar',

     'deleteAvatar' => 'Oveleon\ContaoMemberExtensionBundle\ModuleDeleteAvatar',

     'memberList'   => 'Oveleon\ContaoMemberExtensionBundle\ModuleMemberList',

@@ -31,8 +30,5 @@ array_insert($GLOBALS['FE_MOD']['user'], -1, [

 ]);

 // Register hooks

-$GLOBALS['TL_HOOKS']['createNewUser'][] = ['Oveleon\ContaoMemberExtensionBundle\Member', 'createAvatar'];

+$GLOBALS['TL_HOOKS']['createNewUser'][] =      ['Oveleon\ContaoMemberExtensionBundle\Member', 'createAvatar'];

 $GLOBALS['TL_HOOKS']['updatePersonalData'][] = ['Oveleon\ContaoMemberExtensionBundle\Member', 'updateAvatar'];

-

-// Style sheet

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

@@ -24,17 +24,17 @@ PaletteManipulator::create()

 // Add global operations

 $GLOBALS['TL_DCA']['tl_member']['list']['global_operations']['settings'] = [

-    'label' => &$GLOBALS['TL_LANG']['tl_member']['settings'],

-    'href' => 'do=member_settings',

-    'icon' => 'edit.svg',

-    'attributes' => 'onclick="Backend.getScrollOffset()" accesskey="e"'

+    'label'         => &$GLOBALS['TL_LANG']['tl_member']['settings'],

+    'href'          => 'do=member_settings',

+    'icon'          => 'edit.svg',

+    'attributes'    => 'onclick="Backend.getScrollOffset()" accesskey="e"'

 ];

 // Add fields to tl_user

 $GLOBALS['TL_DCA']['tl_member']['fields']['avatar'] = [

-    'label' => &$GLOBALS['TL_LANG']['tl_member']['avatar'],

-    'exclude' => true,

-    'inputType' => 'fileTree',

-    'eval' => ['feEditable'=>true, 'feViewable'=>true, 'feGroup'=>'personal', 'fieldType'=>'radio', 'filesOnly'=>true, 'isGallery'=>true, 'extensions'=>Config::get('validImageTypes'), 'tl_class'=>'clr'],

-    'sql' => "binary(16) NULL"

+    'label'         => &$GLOBALS['TL_LANG']['tl_member']['avatar'],

+    'exclude'       => true,

+    'inputType'     => 'fileTree',

+    'eval'          => ['feEditable'=>true, 'feViewable'=>true, 'feGroup'=>'personal', 'fieldType'=>'radio', 'filesOnly'=>true, 'isGallery'=>true, 'extensions'=>Config::get('validImageTypes'), 'tl_class'=>'clr'],

+    'sql'           => "binary(16) NULL"

 ];

@@ -26,9 +26,9 @@ $GLOBALS['TL_DCA']['tl_member_settings'] = [

     'fields' => [

         'defaultAvatar' => [

-            'label' => &$GLOBALS['TL_LANG']['tl_member_settings']['defaultAvatar'],

+            'label'     => &$GLOBALS['TL_LANG']['tl_member_settings']['defaultAvatar'],

             'inputType' => 'fileTree',

-            'eval' => array('fieldType'=>'radio', 'filesOnly'=>true, 'isGallery'=>true, 'extensions'=>Config::get('validImageTypes'), 'tl_class'=>'clr')

+            'eval'      => ['fieldType'=>'radio', 'filesOnly'=>true, 'isGallery'=>true, 'extensions'=>Config::get('validImageTypes'), 'tl_class'=>'clr']

         ]

     ]

 ];

@@ -16,11 +16,9 @@ declare(strict_types=1);

 namespace Oveleon\ContaoMemberExtensionBundle;

 use Contao\BackendTemplate;

-use Contao\Config;

-use Contao\FilesModel;

 use Contao\FrontendUser;

 use Contao\MemberModel;

-use Contao\Module;

+use Contao\StringUtil;

 use Contao\System;

 /**

@@ -39,22 +37,23 @@ class ModuleAvatar extends ModuleMemberExtension

     protected $strTemplate = 'memberExtension_avatar';

     /**

-     * Return a wildcard in the back end

+     * Display a wildcard in the back end

      *

      * @return string

      */

     public function generate()

     {

+        $container = System::getContainer();

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

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

+        if ($request && $container->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->wildcard = '### ' . $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;

+            $objTemplate->href = StringUtil::specialcharsUrl(System::getContainer()->get('router')->generate('contao_backend', ['do'=>'themes', 'table'=>'tl_module', 'act'=>'edit', 'id'=>$this->id]));

             return $objTemplate->parse();

         }

@@ -39,24 +39,23 @@ class ModuleDeleteAvatar extends Module

     protected $strTemplate = 'memberExtension_deleteAvatar';

     /**

-     * Return a wildcard in the back end

+     * Display a wildcard in the back end

      *

      * @return string

      */

     public function generate()

     {

         $container = System::getContainer();

-

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

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

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

         {

             $objTemplate = new BackendTemplate('be_wildcard');

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

+            $objTemplate->wildcard = '### ' . $GLOBALS['TL_LANG']['FMD']['deleteAvatar'][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;

+            $objTemplate->href = StringUtil::specialcharsUrl(System::getContainer()->get('router')->generate('contao_backend', ['do'=>'themes', 'table'=>'tl_module', 'act'=>'edit', 'id'=>$this->id]));

             return $objTemplate->parse();

         }

@@ -101,12 +101,12 @@ abstract class ModuleMemberExtension extends Module

         if (!$objPage instanceof PageModel)

         {

-            $strLink = ampersand(Environment::get('request'));

+            $strLink = StringUtil::ampersand(Environment::get('request'));

         }

         else

         {

             $params = (Config::get('useAutoItem') ? '/' : '/items/') . ($objMember->alias ?: $objMember->id);

-            $strLink = ampersand($objPage->getFrontendUrl($params));

+            $strLink = StringUtil::ampersand($objPage->getFrontendUrl($params));

         }

         return $strLink;

@@ -53,22 +53,23 @@ class ModuleMemberList extends ModuleMemberExtension

     protected $strMemberTemplate = 'memberExtension_list_default';

     /**

-     * Return a wildcard in the back end

+     * Display a wildcard in the back end

      *

      * @return string

      */

     public function generate()

     {

+        $container = System::getContainer();

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

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

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

         {

             $objTemplate = new BackendTemplate('be_wildcard');

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

+            $objTemplate->wildcard = '### ' . $GLOBALS['TL_LANG']['FMD']['memberList'][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;

+            $objTemplate->href = StringUtil::specialcharsUrl(System::getContainer()->get('router')->generate('contao_backend', ['do'=>'themes', 'table'=>'tl_module', 'act'=>'edit', 'id'=>$this->id]));

             return $objTemplate->parse();

         }

@@ -48,22 +48,23 @@ class ModuleMemberReader extends ModuleMemberExtension

     protected $strMemberTemplate = 'memberExtension_reader_full';

     /**

-     * Return a wildcard in the back end

+     * Display a wildcard in the back end

      *

      * @return string

      */

     public function generate()

     {

+        $container = System::getContainer();

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

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

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

         {

             $objTemplate = new BackendTemplate('be_wildcard');

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

+            $objTemplate->wildcard = '### ' . $GLOBALS['TL_LANG']['FMD']['memberList'][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;

+            $objTemplate->href = StringUtil::specialcharsUrl(System::getContainer()->get('router')->generate('contao_backend', ['do'=>'themes', 'table'=>'tl_module', 'act'=>'edit', 'id'=>$this->id]));

             return $objTemplate->parse();

         }