Browse code

[Update] Sort out disabled members within query

Sebastian Zoglowek authored on28/02/2022 00:46:06
Showing1 changed files
... ...
@@ -18,6 +18,7 @@ namespace Oveleon\ContaoMemberExtensionBundle;
18 18
 use Contao\BackendTemplate;
19 19
 use Contao\FrontendTemplate;
20 20
 use Contao\MemberModel;
21
+use Contao\Model\Collection;
21 22
 use Contao\StringUtil;
22 23
 use Contao\System;
23 24
 
... ...
@@ -80,19 +81,13 @@ class ModuleMemberList extends ModuleMemberExtension
80 81
             return;
81 82
         }
82 83
 
83
-        $objMembers = MemberModel::findAll();
84
+        $objMembers = $this->getMembers();
84 85
         $arrMembers = [];
85 86
 
86 87
         if($objMembers->count())
87 88
         {
88 89
             while($objMembers->next())
89 90
             {
90
-                // Skip disabled users instantly
91
-                if($objMembers->disable)
92
-                {
93
-                    continue;
94
-                }
95
-
96 91
                 $memberGroups = StringUtil::deserialize($objMembers->groups);
97 92
 
98 93
                 if(!\count(array_intersect($arrGroups, $memberGroups)))
... ...
@@ -116,4 +111,17 @@ class ModuleMemberList extends ModuleMemberExtension
116 111
 
117 112
         $this->Template->members = $arrMembers;
118 113
 	}
114
+
115
+    /**
116
+     * Get members
117
+     *
118
+     * @return Collection|MemberModel|null
119
+     */
120
+    protected function getMembers()
121
+    {
122
+        $arrOptions = [];
123
+        $t = MemberModel::getTable();
124
+
125
+        return MemberModel::findBy(["$t.disable=''"], null, $arrOptions);
126
+    }
119 127
 }