FIX #177 Get only available users

src/app/user/controllers/UserController.php

@@ -48,7 +48,7 @@ class UserController
             ]);
         } else {
             $entities = EntityModel::getAllEntitiesByUserId(['userId' => $GLOBALS['userId']]);
-            $users = UserModel::getByEntities([
+            $users = UserEntityModel::getUsersByEntities([
                 'select'    => ['DISTINCT users.id', 'users.user_id', 'firstname', 'lastname', 'status', 'enabled', 'mail'],
                 'entities'  => $entities
             ]);
@@ -850,7 +850,7 @@ class UserController
                 }
                 if ($GLOBALS['userId'] != 'superadmin') {
                     $entities = EntityModel::getAllEntitiesByUserId(['userId' => $GLOBALS['userId']]);
-                    $users = UserModel::getByEntities([
+                    $users = UserEntityModel::getUsersByEntities([
                         'select'    => ['users.id'],
                         'entities'  => $entities
                     ]);

src/app/user/models/UserEntityModelAbstract.php

@@ -29,8 +29,8 @@ class UserEntityModelAbstract
             'select'    => empty($aArgs['select']) ? ['*'] : $aArgs['select'],
             'table'     => ['users', 'users_entities'],
             'left_join' => ['users.user_id = users_entities.user_id'],
-            'where'     => ['users_entities IS NULL', 'users.user_id not in (?)'],
-            'data'      => [$excludedUsers]
+            'where'     => ['users_entities IS NULL', 'users.user_id not in (?)', 'status != ?'],
+            'data'      => [$excludedUsers, 'DEL']
         ]);
 
         return $aUsersEntities;
@@ -143,4 +143,19 @@ class UserEntityModelAbstract
 
         return true;
     }
+
+    public static function getUsersByEntities(array $aArgs)
+    {
+        ValidatorModel::notEmpty($aArgs, ['entities']);
+        ValidatorModel::arrayType($aArgs, ['entities', 'select']);
+
+        $aUsers = DatabaseModel::select([
+            'select'    => empty($aArgs['select']) ? ['*'] : $aArgs['select'],
+            'table'     => ['users, users_entities'],
+            'where'     => ['users.user_id = users_entities.user_id', 'users_entities.entity_id in (?)', 'status != ?'],
+            'data'      => [$aArgs['entities'], 'DEL']
+        ]);
+
+        return $aUsers;
+    }
 }

src/app/user/models/UserModelAbstract.php

@@ -144,21 +144,6 @@ class UserModelAbstract
         return $aUser[0];
     }
 
-    public static function getByEntities(array $aArgs = [])
-    {
-        ValidatorModel::notEmpty($aArgs, ['entities']);
-        ValidatorModel::arrayType($aArgs, ['entities']);
-
-        $aUsers = DatabaseModel::select([
-            'select'    => empty($aArgs['select']) ? ['*'] : $aArgs['select'],
-            'table'     => ['users, users_entities'],
-            'where'     => ['users.user_id = users_entities.user_id', 'users_entities.entity_id in (?)'],
-            'data'      => [$aArgs['entities']]
-        ]);
-
-        return $aUsers;
-    }
-
     public static function getByEmail(array $aArgs = [])
     {
         ValidatorModel::notEmpty($aArgs, ['mail']);