@@ -41,18 +41,11 @@ class Member extends Frontend

     /**

      * MemberAvatar file name

-     *

-     * @var string

      */

-    protected $avatarName = 'memberAvatar';

+    protected string $avatarName = 'memberAvatar';

     /**

      * Create avatar for a member | Registration

-     *

-     * @param int   $userId

-     * @param array $arrData

-     *

-     * @return void

      */

     public function createAvatar(int $userId, array $arrData): void

     {

@@ -62,13 +55,8 @@ class Member extends Frontend

     /**

      * Update avatar of a member | Login

-     *

-     * @param FrontendUser  $objUser

-     * @param array         $arrData

-     *

-     * @return void

      */

-    public function updateAvatar(FrontendUser $objUser, $arrData): void

+    public function updateAvatar(FrontendUser $objUser, array $arrData): void

     {

         $objMember = MemberModel::findById($objUser->id);

         $this->processAvatar($objMember, $arrData);

@@ -76,11 +64,6 @@ class Member extends Frontend

     /**

      * Process avatar upload for a member

-     *

-     * @param MemberModel   $objMember

-     * @param array         $arrData

-     *

-     * @return void

      */

     protected function processAvatar(MemberModel $objMember, ?array $arrData): void

     {

@@ -173,6 +156,7 @@ class Member extends Frontend

         // Upload valid file type with no width and height -> svg

         // Don't upload if no homedir is assigned

+        // ToDo: Create homedir?

         if (!$objMember->assignDir || !$objMember->homeDir)

         {

             // ToDo: add error message for no homedir

@@ -186,7 +170,7 @@ class Member extends Frontend

         // The upload folder could not be found

         if ($objUploadFolder === null)

         {

-            throw new \Exception("Invalid upload folder ID $intUploadFolder");

+            throw new Exception("Invalid upload folder ID $intUploadFolder");

         }

         $strUploadFolder = $objUploadFolder->path;

@@ -246,7 +230,7 @@ class Member extends Frontend

             // Add a log entry

             $logger = System::getContainer()->get('monolog.logger.contao');

-            $logger->log(LogLevel::INFO, 'File "' . $strUploadFolder . '/' . $file['name'] . '" has been uploaded', array('contao' => new ContaoContext(__METHOD__, TL_FILES)));

+            $logger->log(LogLevel::INFO, 'File "' . $strUploadFolder . '/' . $file['name'] . '" has been uploaded', ['contao' => new ContaoContext(__METHOD__, TL_FILES)]);

         }

         unset($_SESSION['FILES']['avatar']);

@@ -254,10 +238,8 @@ class Member extends Frontend

     /**

      * Return the maximum upload file size in bytes

-     *

-     * @return string

      */

-    protected function getMaximumUploadSize()

+    protected function getMaximumUploadSize(): string

     {

         if ($this->maxlength > 0)

         {

@@ -269,13 +251,8 @@ class Member extends Frontend

     /**

      * Parses an avatar to the template

-     *

-     * @param MemberModel|null $objMember

-     * @param $objTemplate

-     * @param $strImgSize

-     * @return void

      */

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

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

     {

         $objTemplate->addImage= true;

@@ -305,9 +282,6 @@ class Member extends Frontend

     /**

      * Gets the url for a member avatar

-     *

-     * @param MemberModel|null $objMember

-     * @return string

      */

     public static function getMemberAvatarURL(?MemberModel $objMember): string

     {

@@ -329,9 +303,7 @@ class Member extends Frontend

     }

     /**

-     * @param MemberModel $objMember

-     *

-     * @return void

+     * Deletes an avatar

      */

     public static function deleteAvatar(MemberModel $objMember): void

     {

@@ -13,21 +13,22 @@ declare(strict_types=1);

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

  */

+use Contao\Config;

+use Contao\CoreBundle\DataContainer\PaletteManipulator;

+

 // Extend the default palette

-Contao\CoreBundle\DataContainer\PaletteManipulator::create()

-    ->addField(['avatar'], 'personal_legend', Contao\CoreBundle\DataContainer\PaletteManipulator::POSITION_APPEND)

+PaletteManipulator::create()

+    ->addField(['avatar'], 'personal_legend', PaletteManipulator::POSITION_APPEND)

     ->applyToPalette('default', 'tl_member')

 ;

 // Add global operations

-array_insert($GLOBALS['TL_DCA']['tl_member']['list']['global_operations'], 0, [

-    'settings' => [

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

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

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

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

-    ]

-]);

+$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"'

+];

 // Add fields to tl_user

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

@@ -12,6 +12,9 @@ declare(strict_types=1);

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

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

  */

+

+use Contao\Config;

+

 $GLOBALS['TL_DCA']['tl_member_settings'] = [

 	// Config

@@ -20,13 +20,10 @@ use Contao\System;

 System::loadLanguageFile('tl_member_settings');

 // Add palettes to tl_module

-// ToDo: Change to ArrayUtil::arrayInsert in the future

-array_insert($GLOBALS['TL_DCA']['tl_module']['palettes'], 0, [

-    'avatar' => '{title_legend},name,headline,type;{source_legend},imgSize;{template_legend:hide},customTpl;{protected_legend:hide},protected;{expert_legend:hide},guests,cssID',

-    'deleteAvatar' => '{title_legend},name,headline,type;{template_legend:hide},customTpl;{protected_legend:hide},protected;{expert_legend:hide},guests,cssID',

-    'memberList' => '{title_legend},name,headline,type;{config_legend},ext_order,ext_orderField,numberOfItems,perPage,ext_groups,memberFields,imgSize;{redirect_legend},jumpTo;{template_legend:hide},customTpl,memberListTpl;{protected_legend:hide},protected;{expert_legend:hide},guests,cssID',

-    'memberReader' => '{title_legend},name,headline,type;{config_legend},ext_groups,memberFields,imgSize;{template_legend:hide},customTpl,memberReaderTpl;{protected_legend:hide},protected;{expert_legend:hide},guests,cssID'

-]);

+$GLOBALS['TL_DCA']['tl_module']['palettes']['avatar']       = '{title_legend},name,headline,type;{source_legend},imgSize;{template_legend:hide},customTpl;{protected_legend:hide},protected;{expert_legend:hide},guests,cssID';

+$GLOBALS['TL_DCA']['tl_module']['palettes']['deleteAvatar'] = '{title_legend},name,headline,type;{template_legend:hide},customTpl;{protected_legend:hide},protected;{expert_legend:hide},guests,cssID';

+$GLOBALS['TL_DCA']['tl_module']['palettes']['memberList']   = '{title_legend},name,headline,type;{config_legend},ext_order,ext_orderField,numberOfItems,perPage,ext_groups,memberFields,imgSize;{redirect_legend},jumpTo;{template_legend:hide},customTpl,memberListTpl;{protected_legend:hide},protected;{expert_legend:hide},guests,cssID';

+$GLOBALS['TL_DCA']['tl_module']['palettes']['memberReader'] = '{title_legend},name,headline,type;{config_legend},ext_groups,memberFields,imgSize;{template_legend:hide},customTpl,memberReaderTpl;{protected_legend:hide},protected;{expert_legend:hide},guests,cssID';

 $GLOBALS['TL_DCA']['tl_module']['fields']['memberListTpl'] = [

     'exclude' => true,

@@ -90,28 +87,9 @@ class tl_module_extension extends Backend

     }

     /**

-     * Check permissions to edit the table

-     *

-     * @throws Contao\CoreBundle\Exception\AccessDeniedException

-     */

-    public function checkPermission()

-    {

-        if ($this->User->isAdmin)

-        {

-            return;

-        }

-

-        if (!$this->User->hasAccess('modules', 'themes')) {

-            throw new Contao\CoreBundle\Exception\AccessDeniedException('Not enough permissions to access the front end modules module.');

-        }

-    }

-

-    /**

      * Return all fields of table tl_member without account data

-     *

-     * @return array

      */

-    public function getMemberProperties()

+    public function getMemberProperties(): array

     {

         $return = [];

@@ -131,11 +109,9 @@ class tl_module_extension extends Backend

     /**

      * Return all sortable fields of table tl_member

-     *

-     * @return array

      */

-    public function getViewableMemberFields()

-    {

+    public function getViewableMemberFields(): array

+	{

         $return = [];

         Contao\System::loadLanguageFile('tl_member');

@@ -143,7 +119,7 @@ class tl_module_extension extends Backend

         foreach ($GLOBALS['TL_DCA']['tl_member']['fields'] as $k=>$v)

         {

-            if (!empty($v['inputType']) && $v['eval']['feViewable'] === true && $k !== 'avatar')

+            if (!empty($v['inputType']) && $k !== 'avatar' && isset($v['eval']['feViewable']) && $v['eval']['feViewable'] === true)

             {

                 $return[$k] = $GLOBALS['TL_DCA']['tl_member']['fields'][$k]['label'][0] . ' ['.$k.']';

             }

@@ -39,47 +39,47 @@ use Contao\System;

 class ModuleMemberList extends ModuleMemberExtension

 {

-	/**

-	 * Template

-	 * @var string

-	 */

-	protected $strTemplate = 'mod_memberList';

-

-	/**

-	 * Template

-	 * @var string

-	 */

-	protected $strMemberTemplate = 'memberExtension_list_default';

-

-	/**

-	 * Return a wildcard in the back end

-	 *

-	 * @return string

-	 */

-	public function generate()

-	{

+    /**

+     * Template

+     * @var string

+     */

+    protected $strTemplate = 'mod_memberList';

+

+    /**

+     * Template

+     * @var string

+     */

+    protected $strMemberTemplate = 'memberExtension_list_default';

+

+    /**

+     * 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']['memberList'][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 parent::generate();

-	}

-

-	/**

-	 * Generate the module

-	 */

-	protected function compile()

-	{

+            $objTemplate->wildcard = '### ' . mb_strtoupper($GLOBALS['TL_LANG']['FMD']['memberList'][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 parent::generate();

+    }

+

+    /**

+     * Generate the module

+     */

+    protected function compile()

+    {

         $limit = null;

         $offset = 0;

@@ -162,7 +162,7 @@ class ModuleMemberList extends ModuleMemberExtension

         }

         $this->Template->members = $arrMembers;

-	}

+    }

     /**

      * Checks whether a member is in any given group

@@ -195,8 +195,8 @@ class ModuleMemberList extends ModuleMemberExtension

      */

     private function getMembers()

     {

-        $arrOptions = [];

         $t = MemberModel::getTable();

+        $arrOptions = ['order' => ''];

         if (!!$this->ext_orderField)

         {

@@ -206,7 +206,7 @@ class ModuleMemberList extends ModuleMemberExtension

         switch ($this->ext_order)

         {

             case 'order_random':

-                $arrOptions['order'] = "RAND()";

+                $arrOptions['order'] .= "RAND()";

                 break;

             case 'order_desc':