Added support for invalid group type filter

diff --git a/wcfsetup/install/files/lib/data/user/group/UserGroup.class.php b/wcfsetup/install/files/lib/data/user/group/UserGroup.class.php
index 74f26b8d8fe3e82b4d40b77211c1c3971b143e4a..34a4bf4d58c1642b069dad367de3ef2b42ea07cb 100644 (file)
--- a/wcfsetup/install/files/lib/data/user/group/UserGroup.class.php
+++ b/wcfsetup/install/files/lib/data/user/group/UserGroup.class.php
@@ -94,20 +94,17 @@ class UserGroup extends DatabaseObject {
         * Returns groups by given type. Returns all groups if no types given.
         * 
         * @param       array<integer>          $types
+        * @param       array<integer>          $invalidGroupTypes
         * @return      array<wcf\data\user\group\UserGroup>
         */
-       public static function getGroupsByType(array $types = array()) {
+       public static function getGroupsByType(array $types = array(), array $invalidGroupTypes = array()) {
                self::getCache();
                
-               // get all groups
-               if (empty($types)) return self::$cache['groups'];
-               
-               // get groups by type
-               $groupIDs = self::getGroupIDsByType($types);
                $groups = array();
-               
-               foreach ($groupIDs as $groupID) {
-                       $groups[$groupID] = self::$cache['groups'][$groupID];
+               foreach (self::$cache['groups'] as $group) {
+                       if ((empty($types) || in_array($group->groupType, $types)) && !in_array($group->groupType, $invalidGroupTypes)) {
+                               $groups[$group->groupID] = $group;
+                       }
                }
                
                return $groups;
@@ -186,17 +183,10 @@ class UserGroup extends DatabaseObject {
         * 
         * @param       array<integer>          $groupTypes
         * @param       array<integer>          $invalidGroupTypes
-        * @return      array<UserGroup>
+        * @return      array<wcf\data\user\group\UserGroup>
         */
        public static function getAccessibleGroups(array $groupTypes = array(), array $invalidGroupTypes = array()) {
-               $groups = self::getGroupsByType($groupTypes);
-               
-               if (!empty($invalidGroupTypes)) {
-                       $invalidGroups = self::getGroupsByType($invalidGroupTypes);
-                       foreach ($invalidGroups as $groupID => $group) {
-                               unset($groups[$groupID]);
-                       }
-               }
+               $groups = self::getGroupsByType($groupTypes, $invalidGroupTypes);
                
                foreach ($groups as $key => $value) {
                        if (!self::isAccessibleGroup(array($key))) {