@@ -21,8 +21,8 @@ use Contao\Controller;

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

     'avatar' => '{title_legend},name,headline,type;{source_legend},imgSize;{template_legend:hide},memberTpl;{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},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},groups,memberFields,imgSize;{template_legend:hide},customTpl,memberReaderTpl;{protected_legend:hide},protected;{expert_legend:hide},guests,cssID'

+    'memberList' => '{title_legend},name,headline,type;{config_legend},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']['fields']['memberListTpl'] = [

@@ -49,6 +49,15 @@ $GLOBALS['TL_DCA']['tl_module']['fields']['memberFields'] = [

     'sql' => "blob NULL"

 ];

+$GLOBALS['TL_DCA']['tl_module']['fields']['ext_groups'] = [

+    'exclude' => true,

+    'inputType' => 'checkbox',

+    'foreignKey' => 'tl_member_group.name',

+    'eval' => ['multiple'=>true],

+    'sql' => "blob NULL",

+    'relation' => ['type'=>'hasMany', 'load'=>'lazy']

+];

+

 class tl_module_extension extends Backend

 {

     /**

@@ -24,7 +24,9 @@ use Contao\System;

 /**

  * Class ModuleMemberList

  *

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

+ * @property string $ext_groups considered member groups

+ * @property string $memberFields Fields to be displayed

+ * @property string $memberListTpl Frontend list template

  */

 class ModuleMemberList extends ModuleMemberExtension

 {

@@ -70,17 +72,30 @@ class ModuleMemberList extends ModuleMemberExtension

 	 */

 	protected function compile()

 	{

-        $objGroups = MemberModel::findAll();

-        $arrGroups = StringUtil::deserialize($this->groups);

-        $arrMembers = null;

+        $arrGroups = StringUtil::deserialize($this->ext_groups);

-        if($objGroups->count())

+        if(empty($arrGroups) || !\is_array($arrGroups))

         {

-            while($objGroups->next())

+            $this->Template->empty = $GLOBALS['TL_LANG']['MSC']['emptyMemberList'];

+            return;

+        }

+

+        $objMembers = MemberModel::findAll();

+        $arrMembers = [];

+

+        if($objMembers->count())

+        {

+            while($objMembers->next())

             {

-                $memberGroups = StringUtil::deserialize($objGroups->groups);

+                // Skip disabled users instantly

+                if($objMembers->disable)

+                {

+                    continue;

+                }

+

+                $memberGroups = StringUtil::deserialize($objMembers->groups);

-                if($objGroups->disable || empty($arrGroups) || !\is_array($arrGroups) || !\count(array_intersect($arrGroups, $memberGroups)))

+                if(!\count(array_intersect($arrGroups, $memberGroups)))

                 {

                     continue;

                 }

@@ -88,9 +103,9 @@ class ModuleMemberList extends ModuleMemberExtension

                 $arrMemberFields = StringUtil::deserialize($this->memberFields, true);

                 $objTemplate = new FrontendTemplate($this->memberListTpl ?: $this->strMemberTemplate);

-                $objTemplate->setData($objGroups->current()->row());

+                $objTemplate->setData($objMembers->current()->row());

-                $arrMembers[] = $this->parseMemberTemplate($objGroups->current(), $objTemplate, $arrMemberFields, $this->imgSize);

+                $arrMembers[] = $this->parseMemberTemplate($objMembers->current(), $objTemplate, $arrMemberFields, $this->imgSize);

             }

         }

@@ -27,8 +27,10 @@ use Contao\System;

 /**

  * Class ModuleMemberList

- *

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

+ * 

+ * @property string $ext_groups considered member groups

+ * @property string $memberFields Fields to be displayed

+ * @property string $memberReaderTpl Frontend reader template

  */

 class ModuleMemberReader extends ModuleMemberExtension

 {

@@ -86,14 +88,14 @@ class ModuleMemberReader extends ModuleMemberExtension

         // Get the member

         $objMember = MemberModel::findByIdOrAlias(Input::get('items'));

-        // The member does not exist

+        // The member does not exist and is not deactivated

         if ($objMember === null || $objMember->disable)

         {

             throw new PageNotFoundException('Page not found: ' . Environment::get('uri'));

         }

-        // Check groups

-        $arrGroups = StringUtil::deserialize($this->groups);

+        // Check for group intersection

+        $arrGroups = StringUtil::deserialize($this->ext_groups);

         $memberGroups = StringUtil::deserialize($objMember->groups);

         if (empty($arrGroups) || !\is_array($arrGroups) || !\count(array_intersect($arrGroups, $memberGroups)))