nilsteampassnet / TeamPass

scripts/traits/UserHandlerTrait.php

Spacing +28 added lines, -28 removed lines

@@ -50,24 +50,24 @@ 
     private function generateUserKeys($arguments) {
         // Get all subtasks related to this task
         $subtasks = DB::query(
-            'SELECT * FROM ' . prefixTable('background_subtasks') . ' WHERE task_id = %i AND is_in_progress = 0 ORDER BY `task` ASC',
+            'SELECT * FROM '.prefixTable('background_subtasks').' WHERE task_id = %i AND is_in_progress = 0 ORDER BY `task` ASC',
             $this->taskId
         );
     
         if (empty($subtasks)) {
-            if (LOG_TASKS=== true) $this->logger->log("No subtask was found for task {$this->taskId}");
+            if (LOG_TASKS === true) $this->logger->log("No subtask was found for task {$this->taskId}");
             return;
         }
     
         // Process each subtask
         foreach ($subtasks as $subtask) {
-            if (LOG_TASKS=== true) $this->logger->log("Processing subtask {$subtask['increment_id']} for task {$this->taskId}");
+            if (LOG_TASKS === true) $this->logger->log("Processing subtask {$subtask['increment_id']} for task {$this->taskId}");
             $this->processGenerateUserKeysSubtask($subtask, $arguments);
         }
     
         // Are all subtasks completed?
         $remainingSubtasks = DB::queryFirstField(
-            'SELECT COUNT(*) FROM ' . prefixTable('background_subtasks') . ' WHERE task_id = %i AND is_in_progress = 0',
+            'SELECT COUNT(*) FROM '.prefixTable('background_subtasks').' WHERE task_id = %i AND is_in_progress = 0',
             $this->taskId
         );    
         if ($remainingSubtasks == 0) {
@@ -98,7 +98,7 @@ 
                 $subtask['increment_id']
             );
             
-            if (LOG_TASKS=== true) $this->logger->log("Subtask is in progress: ".$taskData['step'], 'INFO');
+            if (LOG_TASKS === true) $this->logger->log("Subtask is in progress: ".$taskData['step'], 'INFO');
             switch ($taskData['step'] ?? '') {
                 case 'step0':
                     $this->generateNewUserStep0($arguments);
@@ -152,7 +152,7 @@ 
                 $subtask['increment_id']
             );
             
-            $this->logger->log("Subtask {$subtask['increment_id']} failure: " . $e->getMessage(), 'ERROR');
+            $this->logger->log("Subtask {$subtask['increment_id']} failure: ".$e->getMessage(), 'ERROR');
         }
     }
     
@@ -165,7 +165,7 @@ 
     private function generateNewUserStep0($arguments) {
         // CLear old sharekeys
         if ($arguments['user_self_change'] === 0) {
-            if (LOG_TASKS=== true) $this->logger->log("Deleting old sharekeys for user {$arguments['new_user_id']}", 'INFO');
+            if (LOG_TASKS === true) $this->logger->log("Deleting old sharekeys for user {$arguments['new_user_id']}", 'INFO');
             deleteUserObjetsKeys($arguments['new_user_id'], $this->settings);
         }
     }
@@ -194,7 +194,7 @@ 
         // Loop on items
         $rows = DB::query(
             'SELECT id, pw, perso
-            FROM ' . prefixTable('items') . '
+            FROM ' . prefixTable('items').'
             ORDER BY id ASC
             LIMIT %i, %i',
             $taskData['index'],
@@ -205,7 +205,7 @@ 
             // Get itemKey from current user
             $itemShareKey = DB::queryFirstRow(
                 'SELECT share_key, increment_id
-                FROM ' . prefixTable('sharekeys_items') . '
+                FROM ' . prefixTable('sharekeys_items').'
                 WHERE object_id = %i AND user_id = %i',
                 $record['id'],
                 (int) $arguments['owner_id']
@@ -268,16 +268,16 @@ 
         // Loop on logs
         $rows = DB::query(
             'SELECT increment_id
-            FROM ' . prefixTable('log_items') . '
+            FROM ' . prefixTable('log_items').'
             WHERE raison LIKE "at_pw :%" AND encryption_type = "teampass_aes"
             ORDER BY increment_id ASC
-            LIMIT ' . $taskData['index'] . ', ' . $taskData['nb']
+            LIMIT ' . $taskData['index'].', '.$taskData['nb']
         );
         foreach ($rows as $record) {
             // Get itemKey from current user
             $currentUserKey = DB::queryFirstRow(
                 'SELECT share_key
-                FROM ' . prefixTable('sharekeys_logs') . '
+                FROM ' . prefixTable('sharekeys_logs').'
                 WHERE object_id = %i AND user_id = %i',
                 $record['increment_id'],
                 $arguments['owner_id']
@@ -332,7 +332,7 @@ 
         // Loop on fields
         $rows = DB::query(
             'SELECT id
-            FROM ' . prefixTable('categories_items') . '
+            FROM ' . prefixTable('categories_items').'
             WHERE encryption_type = "teampass_aes"
             ORDER BY id ASC
             LIMIT %i, %i',
@@ -343,7 +343,7 @@ 
             // Get itemKey from current user
             $currentUserKey = DB::queryFirstRow(
                 'SELECT share_key
-                FROM ' . prefixTable('sharekeys_fields') . '
+                FROM ' . prefixTable('sharekeys_fields').'
                 WHERE object_id = %i AND user_id = %i',
                 $record['id'],
                 $arguments['owner_id']
@@ -398,7 +398,7 @@ 
         // Loop on suggestions
         $rows = DB::query(
             'SELECT id
-            FROM ' . prefixTable('suggestion') . '
+            FROM ' . prefixTable('suggestion').'
             ORDER BY id ASC
             LIMIT %i, %i',
             $taskData['index'],
@@ -408,7 +408,7 @@ 
             // Get itemKey from current user
             $currentUserKey = DB::queryFirstRow(
                 'SELECT share_key
-                FROM ' . prefixTable('sharekeys_suggestions') . '
+                FROM ' . prefixTable('sharekeys_suggestions').'
                 WHERE object_id = %i AND user_id = %i',
                 $record['id'],
                 $arguments['owner_id']
@@ -463,9 +463,9 @@ 
         // Loop on files
         $rows = DB::query(
             'SELECT f.id AS id, i.perso AS perso
-            FROM ' . prefixTable('files') . ' AS f
-            INNER JOIN ' . prefixTable('items') . ' AS i ON i.id = f.id_item
-            WHERE f.status = "' . TP_ENCRYPTION_NAME . '"
+            FROM ' . prefixTable('files').' AS f
+            INNER JOIN ' . prefixTable('items').' AS i ON i.id = f.id_item
+            WHERE f.status = "' . TP_ENCRYPTION_NAME.'"
             LIMIT %i, %i',
             $taskData['index'],
             $taskData['nb']
@@ -474,7 +474,7 @@ 
             // Get itemKey from current user
             $currentUserKey = DB::queryFirstRow(
                 'SELECT share_key, increment_id
-                FROM ' . prefixTable('sharekeys_files') . '
+                FROM ' . prefixTable('sharekeys_files').'
                 WHERE object_id = %i AND user_id = %i',
                 $record['id'],
                 (int) $record['perso'] === 0 ? $arguments['owner_id'] : $arguments['new_user_id']
@@ -559,7 +559,7 @@ 
         // get user info
         $userInfo = DB::queryFirstRow(
             'SELECT u.email, u.login, u.auth_type, u.special, u.lastname, u.name
-            FROM ' . prefixTable('users') . ' AS u
+            FROM ' . prefixTable('users').' AS u
             WHERE u.id = %i',
             $arguments['new_user_id']
         );
@@ -574,10 +574,10 @@ 
                 filter_var($userInfo['email'], FILTER_SANITIZE_EMAIL),
                 // @scrutinizer ignore-type
                 empty($arguments['email_body']) === false ? $arguments['email_body'] : $lang->get('email_body_user_config_1'),
-                'TEAMPASS - ' . $lang->get('login_credentials'),
+                'TEAMPASS - '.$lang->get('login_credentials'),
                 (array) filter_var_array(
                     [
-                        '#code#' => cryption($arguments['new_user_code'], '','decrypt', $this->settings)['string'],
+                        '#code#' => cryption($arguments['new_user_code'], '', 'decrypt', $this->settings)['string'],
                         '#lastname#' => isset($userInfo['name']) === true ? $userInfo['name'] : '',
                         '#login#' => isset($userInfo['login']) === true ? $userInfo['login'] : '',
                     ],
@@ -589,7 +589,7 @@ 
 
             // Prepare initial cache
             $userCache = DB::query(
-                'SELECT * FROM ' . prefixTable('cache_tree') . ' WHERE user_id = %i',
+                'SELECT * FROM '.prefixTable('cache_tree').' WHERE user_id = %i',
                 $arguments['new_user_id']
             );
             if (empty($userCache)) {
@@ -662,24 +662,24 @@ 
     private function getOwnerInfos(int $owner_id, string $owner_pwd, ?int $only_personal_items = 0, ?string $owner_private_key = ''): array {
         $userInfo = DB::queryFirstRow(
             'SELECT pw, public_key, private_key, login, name
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id = %i',
             $owner_id
         );
 
         // decrypt owner password 
-        $pwd = cryption($owner_pwd, '','decrypt', $this->settings)['string'];
+        $pwd = cryption($owner_pwd, '', 'decrypt', $this->settings)['string'];
 
         // decrypt private key and send back
         if ((int) $only_personal_items === 1 && empty($owner_private_key) === false) {
             // Explicitely case where we only want personal items and where user has provided his private key
             return [
-                'private_key' => cryption($owner_private_key, '','decrypt')['string'],
+                'private_key' => cryption($owner_private_key, '', 'decrypt')['string'],
                 'public_key' => $userInfo['public_key'],
                 'login' => $userInfo['login'],
                 'name' => $userInfo['name'],
             ];
-        }else {
+        } else {
             // Normal case
             return [
                 'private_key' => decryptPrivateKey($pwd, $userInfo['private_key']),

sources/users.queries.php

Spacing +86 added lines, -86 removed lines

@@ -74,7 +74,7 @@ 
 if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('profile') === false) {
     // Not allowed page
     $session->set('system-error_code', ERR_NOT_ALLOWED);
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit;
 }
 
@@ -145,7 +145,7 @@ 
 
         // Get info about user to modify
         $targetUserInfos = DB::queryFirstRow(
-            'SELECT admin, gestionnaire, can_manage_all_users, isAdministratedByRole FROM ' . prefixTable('users') . '
+            'SELECT admin, gestionnaire, can_manage_all_users, isAdministratedByRole FROM '.prefixTable('users').'
             WHERE id = %i',
             (int) $dataReceived['user_id']
         );
@@ -277,7 +277,7 @@ 
             // Check if user already exists (active user)
             $data = DB::query(
                 'SELECT id, fonction_id, groupes_interdits, groupes_visibles
-                FROM ' . prefixTable('users') . '
+                FROM ' . prefixTable('users').'
                 WHERE login = %s
                 AND deleted_at IS NULL',
                 $login
@@ -286,10 +286,10 @@ 
             // Check if a soft-deleted user with this login exists
             $deletedUser = DB::queryFirstRow(
                 'SELECT id, login, deleted_at
-                FROM ' . prefixTable('users') . '
+                FROM ' . prefixTable('users').'
                 WHERE login LIKE %s
                 AND deleted_at IS NOT NULL',
-                $login . '_deleted_%'
+                $login.'_deleted_%'
             );
 
             if (DB::count() === 0 && empty($deletedUser) === true) {
@@ -469,7 +469,7 @@ 
                 // Check if it's a soft-deleted user
                 $errorMessage = $lang->get('error_user_exists');
                 if (empty($deletedUser) === false) {
-                    $errorMessage = 'A deleted user with this login already exists (ID: ' . $deletedUser['id'] . '). Please restore the user instead of creating a new one.';
+                    $errorMessage = 'A deleted user with this login already exists (ID: '.$deletedUser['id'].'). Please restore the user instead of creating a new one.';
                 }
 
                 echo prepareExchangedData(
@@ -508,7 +508,7 @@ 
             }
 
             // Prepare variables
-            $userId  = filter_var($dataReceived['user_id'], FILTER_SANITIZE_NUMBER_INT);
+            $userId = filter_var($dataReceived['user_id'], FILTER_SANITIZE_NUMBER_INT);
 
             if (empty($userId)) {
                 echo prepareExchangedData(
@@ -523,7 +523,7 @@ 
 
             // Get info about user to delete
             $data_user = DB::queryFirstRow(
-                'SELECT login, admin, isAdministratedByRole FROM ' . prefixTable('users') . '
+                'SELECT login, admin, isAdministratedByRole FROM '.prefixTable('users').'
                 WHERE id = %i',
                 $userId 
             );        
@@ -540,7 +540,7 @@ 
                     || ((int) $session->get('user-can_manage_all_users') === 1 && (int) $data_user['admin'] !== 1)
                 ) {
                     $timestamp = time();
-                    $deletedSuffix = '_deleted_' . $timestamp;
+                    $deletedSuffix = '_deleted_'.$timestamp;
 
                     // delete user in database
                     DB::update(
@@ -560,7 +560,7 @@ 
                     logEvents($SETTINGS, 'user_mngt', 'at_user_deleted', (string) $session->get('user-id'), $session->get('user-login'), $userId);
 
                     // Count deleted users
-                    $deletedAccountsCount = (int) DB::queryFirstField("SELECT COUNT(id) FROM " . prefixTable('users') . " WHERE deleted_at IS NOT NULL");
+                    $deletedAccountsCount = (int) DB::queryFirstField("SELECT COUNT(id) FROM ".prefixTable('users')." WHERE deleted_at IS NOT NULL");
 
                     DB::commit();
 
@@ -589,7 +589,7 @@ 
                 echo prepareExchangedData(
                     [
                         'error' => true,
-                        'message' => $lang->get('error') . ': ' . $e->getMessage(),
+                        'message' => $lang->get('error').': '.$e->getMessage(),
                     ],
                     'encode'
                 );
@@ -603,7 +603,7 @@ 
             $return = array();
             // Check if folder exists
             $data = DB::query(
-                'SELECT * FROM ' . prefixTable('nested_tree') . '
+                'SELECT * FROM '.prefixTable('nested_tree').'
                 WHERE title = %s AND parent_id = %i',
                 filter_input(INPUT_POST, 'domain', FILTER_SANITIZE_FULL_SPECIAL_CHARS),
                 '0'
@@ -616,7 +616,7 @@ 
             }
             // Check if role exists
             $data = DB::query(
-                'SELECT * FROM ' . prefixTable('roles_title') . '
+                'SELECT * FROM '.prefixTable('roles_title').'
                 WHERE title = %s',
                 filter_input(INPUT_POST, 'domain', FILTER_SANITIZE_FULL_SPECIAL_CHARS)
             );
@@ -645,7 +645,7 @@ 
             // Get info about user to delete
             $data_user = DB::queryFirstRow(
                 'SELECT admin, isAdministratedByRole, gestionnaire
-                FROM ' . prefixTable('users') . '
+                FROM ' . prefixTable('users').'
                 WHERE id = %i',
                 $post_user_id
             );
@@ -701,7 +701,7 @@ 
             // Get info about user
             $rowUser = DB::queryFirstRow(
                 'SELECT *
-                FROM ' . prefixTable('users') . '
+                FROM ' . prefixTable('users').'
                 WHERE id = %i',
                 $post_id
             );
@@ -729,7 +729,7 @@ 
                 $session->set('user-roles_array', explode(';', $session->get('user-roles')));
                 $rows = DB::query('
                     SELECT id,title,creator_id 
-                    FROM ' . prefixTable('roles_title') .'
+                    FROM ' . prefixTable('roles_title').'
                     WHERE id IN %li',
                     $session->get('user-roles_array')
                 );
@@ -767,7 +767,7 @@ 
                 $rolesList = array();
                 $managedBy = array();
                 $selected = '';
-                $rows = DB::query('SELECT id,title FROM ' . prefixTable('roles_title') . ' ORDER BY title ASC');
+                $rows = DB::query('SELECT id,title FROM '.prefixTable('roles_title').' ORDER BY title ASC');
                 foreach ($rows as $reccord) {
                     $rolesList[$reccord['id']] = array('id' => $reccord['id'], 'title' => $reccord['title']);
                 }
@@ -798,7 +798,7 @@ 
                         array_push(
                             $managedBy,
                             array(
-                                'title' => $lang->get('managers_of') . ' ' . $fonction['title'],
+                                'title' => $lang->get('managers_of').' '.$fonction['title'],
                                 'id' => $fonction['id'],
                                 'selected' => $selected,
                             )
@@ -880,9 +880,9 @@ 
 
                 // get USER STATUS
                 if ($rowUser['disabled'] == 1) {
-                    $arrData['info'] = $lang->get('user_info_locked') . '<br><input type="checkbox" value="unlock" name="1" class="chk">&nbsp;<label for="1">' . $lang->get('user_info_unlock_question') . '</label><br><input type="checkbox"  value="delete" id="account_delete" class="chk mr-2" name="2" onclick="confirmDeletion()">label for="2">' . $lang->get('user_info_delete_question') . '</label>';
+                    $arrData['info'] = $lang->get('user_info_locked').'<br><input type="checkbox" value="unlock" name="1" class="chk">&nbsp;<label for="1">'.$lang->get('user_info_unlock_question').'</label><br><input type="checkbox"  value="delete" id="account_delete" class="chk mr-2" name="2" onclick="confirmDeletion()">label for="2">'.$lang->get('user_info_delete_question').'</label>';
                 } else {
-                    $arrData['info'] = $lang->get('user_info_active') . '<br><input type="checkbox" value="lock" class="chk">&nbsp;' . $lang->get('user_info_lock_question');
+                    $arrData['info'] = $lang->get('user_info_active').'<br><input type="checkbox" value="lock" class="chk">&nbsp;'.$lang->get('user_info_lock_question');
                 }
 
                 $arrData['error'] = false;
@@ -969,7 +969,7 @@ 
 
             // Get info about user to modify
             $data_user = DB::queryFirstRow(
-                'SELECT admin, gestionnaire, can_manage_all_users, isAdministratedByRole FROM ' . prefixTable('users') . '
+                'SELECT admin, gestionnaire, can_manage_all_users, isAdministratedByRole FROM '.prefixTable('users').'
                 WHERE id = %i',
                 $post_id
             );
@@ -980,7 +980,7 @@ 
                 // count number of admins
                 $users = DB::query(
                     'SELECT id
-                    FROM ' . prefixTable('users') . '
+                    FROM ' . prefixTable('users').'
                     WHERE admin = 1 AND email != "" AND pw != "" AND id != %i',
                     $post_id
                 );
@@ -1003,7 +1003,7 @@ 
             // Exclude roles from AD - PR #3635
             $adRoles = DB::query(
                 'SELECT roles_from_ad_groups
-                FROM ' . prefixTable('users') . '
+                FROM ' . prefixTable('users').'
                 WHERE id = %i',
                 $post_id
             )[0]['roles_from_ad_groups'];
@@ -1105,7 +1105,7 @@ 
                     );
                     // delete personal folder and subfolders
                     $data = DB::queryFirstRow(
-                        'SELECT id FROM ' . prefixTable('nested_tree') . '
+                        'SELECT id FROM '.prefixTable('nested_tree').'
                         WHERE title = %s AND personal_folder = %i',
                         $post_id,
                         '1'
@@ -1118,7 +1118,7 @@ 
                             DB::delete(prefixTable('nested_tree'), 'id = %i AND personal_folder = %i', $folder->id, '1');
                             // delete items & logs
                             $items = DB::query(
-                                'SELECT id FROM ' . prefixTable('items') . '
+                                'SELECT id FROM '.prefixTable('items').'
                                 WHERE id_tree=%i AND perso = %i',
                                 $folder->id,
                                 '1'
@@ -1139,7 +1139,7 @@ 
                 } else {
                     // Get old data about user
                     $oldData = DB::queryFirstRow(
-                        'SELECT * FROM ' . prefixTable('users') . '
+                        'SELECT * FROM '.prefixTable('users').'
                         WHERE id = %i',
                         $post_id
                     );
@@ -1176,7 +1176,7 @@ 
 
                     // update LOG
                     if ($oldData['email'] !== $post_email) {
-                        logEvents($SETTINGS, 'user_mngt', 'at_user_email_changed:' . $oldData['email'], (string) $session->get('user-id'), $session->get('user-login'), $post_id);
+                        logEvents($SETTINGS, 'user_mngt', 'at_user_email_changed:'.$oldData['email'], (string) $session->get('user-id'), $session->get('user-login'), $post_id);
                     }
                 }
                 echo prepareExchangedData(
@@ -1225,7 +1225,7 @@ 
 
             $login = (string) filter_input(INPUT_POST, 'login', FILTER_SANITIZE_FULL_SPECIAL_CHARS);
             DB::queryFirstRow(
-                'SELECT * FROM ' . prefixTable('users') . '
+                'SELECT * FROM '.prefixTable('users').'
                 WHERE (login = %s AND deleted_at IS NULL) 
                 OR login LIKE %s',
                 $login,
@@ -1278,7 +1278,7 @@ 
             // get User info
             $rowUser = DB::queryFirstRow(
                 'SELECT id, login, name, lastname, email, disabled, fonction_id, groupes_interdits, groupes_visibles, isAdministratedByRole, avatar_thumb, roles_from_ad_groups
-                FROM ' . prefixTable('users') . '
+                FROM ' . prefixTable('users').'
                 WHERE id = %i',
                 $post_id
             );
@@ -1289,7 +1289,7 @@ 
             $html = '';
 
             if (isset($SETTINGS['ldap_mode']) === true && (int) $SETTINGS['ldap_mode'] === 1 && isset($SETTINGS['enable_ad_users_with_ad_groups']) === true && (int) $SETTINGS['enable_ad_users_with_ad_groups'] === 1) {
-                $rowUser['fonction_id'] = empty($rowUser['fonction_id'])  === true ? $rowUser['roles_from_ad_groups'] : $rowUser['fonction_id']. ';' . $rowUser['roles_from_ad_groups'];
+                $rowUser['fonction_id'] = empty($rowUser['fonction_id']) === true ? $rowUser['roles_from_ad_groups'] : $rowUser['fonction_id'].';'.$rowUser['roles_from_ad_groups'];
             }
             $arrData['functions'] = array_filter(explode(';', $rowUser['fonction_id']));
             $arrData['allowed_folders'] = array_filter(explode(';', $rowUser['groupes_visibles']));
@@ -1300,8 +1300,8 @@ 
                 // refine folders based upon roles
                 $rows = DB::query(
                     'SELECT rv.folder_id, rv.type
-                    FROM ' . prefixTable('roles_values') . ' as rv
-                    INNER JOIN ' . prefixTable('nested_tree') . ' as nt ON rv.folder_id = nt.id
+                    FROM ' . prefixTable('roles_values').' as rv
+                    INNER JOIN ' . prefixTable('nested_tree').' as nt ON rv.folder_id = nt.id
                     WHERE rv.role_id IN %ls AND nt.personal_folder = 0
                     ORDER BY rv.folder_id ASC',
                     $arrData['functions']
@@ -1324,7 +1324,7 @@ 
                 }
 
                 // add allowed folders
-                foreach($arrData['allowed_folders'] as $Fld) {
+                foreach ($arrData['allowed_folders'] as $Fld) {
                     array_push($arrFolders, array('id' => $Fld, 'type' => 'W', 'special' => true));
                 }
                 
@@ -1339,7 +1339,7 @@ 
                             // get folder name
                             $row = DB::queryFirstRow(
                                 'SELECT title, nlevel, id
-                                FROM ' . prefixTable('nested_tree') . '
+                                FROM ' . prefixTable('nested_tree').'
                                 WHERE id = %i',
                                 $fld['id']
                             );
@@ -1357,8 +1357,8 @@ 
                     }
                 }
 
-                $html_full = '<table id="table-folders" class="table table-bordered table-striped dt-responsive nowrap" style="width:100%"><tbody>' .
-                    $html . '</tbody></table>';
+                $html_full = '<table id="table-folders" class="table table-bordered table-striped dt-responsive nowrap" style="width:100%"><tbody>'.
+                    $html.'</tbody></table>';
             } else {
                 $html_full = '';
             }
@@ -1408,7 +1408,7 @@ 
             if ((int) $session->get('user-admin') === 0 && (int) $session->get('user-can_manage_all_users') === 0) {
                 $rows = DB::query(
                     'SELECT *
-                    FROM ' . prefixTable('users') . '
+                    FROM ' . prefixTable('users').'
                     WHERE admin = %i AND isAdministratedByRole IN %ls AND deleted_at IS NULL and disabled = %i',
                     0,
                     array_filter($session->get('user-roles_array')),
@@ -1417,7 +1417,7 @@ 
             } else {
                 $rows = DB::query(
                     'SELECT *
-                    FROM ' . prefixTable('users') . '
+                    FROM ' . prefixTable('users').'
                     WHERE admin = %i AND deleted_at IS NULL and disabled = %i',
                     0,
                     0
@@ -1430,7 +1430,7 @@ 
                 $groupIds = [];
                 foreach (explode(';', $record['fonction_id']) as $group) {
                     $tmp = DB::queryFirstRow(
-                        'SELECT id, title FROM ' . prefixTable('roles_title') . '
+                        'SELECT id, title FROM '.prefixTable('roles_title').'
                         WHERE id = %i',
                         $group
                     );
@@ -1442,7 +1442,7 @@ 
 
                 // Get managed_by
                 $managedBy = DB::queryFirstRow(
-                    'SELECT id, title FROM ' . prefixTable('roles_title') . '
+                    'SELECT id, title FROM '.prefixTable('roles_title').'
                     WHERE id = %i',
                     $record['isAdministratedByRole']
                 );
@@ -1452,7 +1452,7 @@ 
                 $foldersAllowedIds = [];
                 foreach (explode(';', $record['groupes_visibles']) as $role) {
                     $tmp = DB::queryFirstRow(
-                        'SELECT id, title FROM ' . prefixTable('nested_tree') . '
+                        'SELECT id, title FROM '.prefixTable('nested_tree').'
                         WHERE id = %i',
                         $role
                     );
@@ -1465,7 +1465,7 @@ 
                 $foldersForbiddenIds = [];
                 foreach (explode(';', $record['groupes_interdits']) as $role) {
                     $tmp = DB::queryFirstRow(
-                        'SELECT id, title FROM ' . prefixTable('nested_tree') . '
+                        'SELECT id, title FROM '.prefixTable('nested_tree').'
                         WHERE id = %i',
                         $role
                     );
@@ -1483,7 +1483,7 @@ 
                         'login' => $record['login'],
                         'groups' => implode(', ', $groups),
                         'groupIds' => $groupIds,
-                        'managedBy' => $managedBy=== null ? $lang->get('administrator') : $managedBy['title'],
+                        'managedBy' => $managedBy === null ? $lang->get('administrator') : $managedBy['title'],
                         'managedById' => $managedBy === null ? 0 : $managedBy['id'],
                         'foldersAllowed' => implode(', ', $foldersAllowed),
                         'foldersAllowedIds' => $foldersAllowedIds,
@@ -1584,7 +1584,7 @@ 
 
             // Get info about user
             $data_user = DB::queryFirstRow(
-                'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . '
+                'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').'
                 WHERE id = %i',
                 $inputData['source_id']
             );
@@ -1816,14 +1816,14 @@ 
             if (empty($post_context) === false && $post_context === 'add_one_role_to_user') {
                 $data_user = DB::queryFirstRow(
                     'SELECT fonction_id, public_key
-                    FROM ' . prefixTable('users') . '
+                    FROM ' . prefixTable('users').'
                     WHERE id = %i',
                     $post_user_id
                 );
 
                 if ($data_user) {
                     // Ensure array is unique
-                    $post_new_value = str_replace(',', ';', $data_user['fonction_id']) . ';' . $post_new_value;
+                    $post_new_value = str_replace(',', ';', $data_user['fonction_id']).';'.$post_new_value;
                     $post_new_value = implode(';', array_unique(explode(';', $post_new_value)));
                 } else {
                     // User not found
@@ -1839,14 +1839,14 @@ 
             }
 
             // Manage specific case of api key
-            if($post_field === 'user_api_key') {
+            if ($post_field === 'user_api_key') {
                 $encrypted_key = encryptUserObjectKey(base64_encode($post_new_value), $session->get('user-public_key'));
                 $session->set('user-api_key', $post_new_value);
 
                 // test if user has an api key
                 $data_user = DB::queryFirstRow(
                     'SELECT value
-                    FROM ' . prefixTable('api') . '
+                    FROM ' . prefixTable('api').'
                     WHERE user_id = %i',
                     $post_user_id
                 );
@@ -1966,7 +1966,7 @@ 
             } catch (\LdapRecord\Auth\BindException $e) {
                 $error = $e->getDetailedError();
                 if ($error && defined('LOG_TO_SERVER') && LOG_TO_SERVER === true) {
-                    error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage(). " - ".$error->getDiagnosticMessage());
+                    error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage()." - ".$error->getDiagnosticMessage());
                 }
                 // deepcode ignore ServerLeak: No important data is sent and it is encrypted before sending
                 echo prepareExchangedData(
@@ -1996,7 +1996,7 @@ 
             } catch (\LdapRecord\Auth\BindException $e) {
                 $error = $e->getDetailedError();
                 if ($error && defined('LOG_TO_SERVER') && LOG_TO_SERVER === true) {
-                    error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage(). " - ".$error->getDiagnosticMessage());
+                    error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage()." - ".$error->getDiagnosticMessage());
                 }
                 // deepcode ignore ServerLeak: No important data is sent and it is encrypted before sending
                 echo prepareExchangedData(
@@ -2013,7 +2013,7 @@ 
                 if (isset($adUser[$SETTINGS['ldap_user_attribute']][0]) === false) continue;
                 // Build the list of all groups in AD
                 if (isset($adUser['memberof']) === true) {
-                    foreach($adUser['memberof'] as $j => $adUserGroup) {
+                    foreach ($adUser['memberof'] as $j => $adUserGroup) {
                         if (empty($adUserGroup) === false && $j !== "count") {
                             $adGroup = substr($adUserGroup, 3, strpos($adUserGroup, ',') - 3);
                             if (in_array($adGroup, $adRoles) === false && empty($adGroup) === false) {
@@ -2029,7 +2029,7 @@ 
                     // Get his ID
                     $userInfo = DB::queryFirstRow(
                         'SELECT id, login, fonction_id, auth_type
-                        FROM ' . prefixTable('users') . '
+                        FROM ' . prefixTable('users').'
                         WHERE login = %s',
                         $userLogin
                     );
@@ -2065,7 +2065,7 @@ 
 
             // Get all groups in Teampass
             $teampassRoles = array();
-            $rows = DB::query('SELECT id,title FROM ' . prefixTable('roles_title'));
+            $rows = DB::query('SELECT id,title FROM '.prefixTable('roles_title'));
             foreach ($rows as $record) {
                 array_push(
                     $teampassRoles,
@@ -2130,7 +2130,7 @@ 
             // Check if user already exists
             $data = DB::query(
                 'SELECT id, fonction_id, groupes_interdits, groupes_visibles
-                FROM ' . prefixTable('users') . '
+                FROM ' . prefixTable('users').'
                 WHERE login = %s',
                 $post_login
             );
@@ -2325,7 +2325,7 @@ 
             // Check if user already exists
             DB::query(
                 'SELECT id
-                FROM ' . prefixTable('users') . '
+                FROM ' . prefixTable('users').'
                 WHERE id = %i',
                 $post_id
             );
@@ -2387,7 +2387,7 @@ 
             // Get all groups in Teampass
             $teampassRoles = array();
             $titleToIdMap = [];
-            $rows = DB::query('SELECT id,title FROM ' . prefixTable('roles_title'));
+            $rows = DB::query('SELECT id,title FROM '.prefixTable('roles_title'));
             foreach ($rows as $record) {
                 array_push(
                     $teampassRoles,
@@ -2433,7 +2433,7 @@ 
                     // Get his ID
                     $userInfo = DB::queryFirstRow(
                         'SELECT id, login, fonction_id, auth_type
-                        FROM ' . prefixTable('users') . '
+                        FROM ' . prefixTable('users').'
                         WHERE login = %s',
                         $userLogin
                     );
@@ -2540,7 +2540,7 @@ 
             // Check if user already exists
             DB::query(
                 'SELECT id
-                FROM ' . prefixTable('users') . '
+                FROM ' . prefixTable('users').'
                 WHERE id = %i',
                 $post_id
             );
@@ -2606,7 +2606,7 @@ 
             // Search TP_USER in db        
             $userTP = DB::queryFirstRow(
                 'SELECT pw
-                FROM ' . prefixTable('users') . '
+                FROM ' . prefixTable('users').'
                 WHERE id = %i',
                 TP_USER_ID
             );
@@ -2629,7 +2629,7 @@ 
                     'arguments' => json_encode([
                         'new_user_id' => (int) $post_user_id,
                         'new_user_pwd' => '',
-                        'new_user_code' => cryption($post_user_code, '','encrypt', $SETTINGS)['string'],
+                        'new_user_code' => cryption($post_user_code, '', 'encrypt', $SETTINGS)['string'],
                         'owner_id' => (int) TP_USER_ID,
                         'creator_pwd' => $userTP['pw'],
                         'email_body' => $lang->get('email_body_user_config_5'),
@@ -2736,17 +2736,17 @@ 
             // get user info
             $processesProgress = DB::query(
                 'SELECT u.ongoing_process_id, pt.task, pt.updated_at, pt.finished_at, pt.is_in_progress
-                FROM ' . prefixTable('users') . ' AS u
-                INNER JOIN ' . prefixTable('background_subtasks') . ' AS pt ON (pt.task_id = u.ongoing_process_id)
+                FROM ' . prefixTable('users').' AS u
+                INNER JOIN ' . prefixTable('background_subtasks').' AS pt ON (pt.task_id = u.ongoing_process_id)
                 WHERE u.id = %i',
                 $user_id
             );
 
             $finished_steps = 0;
             $nb_steps = count($processesProgress);
-            foreach($processesProgress as $process) {
+            foreach ($processesProgress as $process) {
                 if ((int) $process['is_in_progress'] === -1) {
-                    $finished_steps ++;
+                    $finished_steps++;
                 }
             }
 
@@ -2755,7 +2755,7 @@ 
                     'error' => false,
                     'message' => '',
                     'user_id' => $user_id,
-                    'status' => $finished_steps === $nb_steps ? 'finished' : number_format($finished_steps/$nb_steps*100, 0).'%',
+                    'status' => $finished_steps === $nb_steps ? 'finished' : number_format($finished_steps / $nb_steps * 100, 0).'%',
                     'debug' => $finished_steps.",".$nb_steps,
                 ),
                 'encode'
@@ -2888,7 +2888,7 @@ 
             }
             
             $result = purgeDeletedUserById($userId);
-            $deletedAccountsCount = (int) DB::queryFirstField("SELECT COUNT(id) FROM " . prefixTable('users') . " WHERE deleted_at IS NOT NULL");
+            $deletedAccountsCount = (int) DB::queryFirstField("SELECT COUNT(id) FROM ".prefixTable('users')." WHERE deleted_at IS NOT NULL");
 
             echo prepareExchangedData(
                 [
@@ -2928,13 +2928,13 @@ 
 
             // Prepare variables
             $daysRetention = filter_var($dataReceived['days_retention'], FILTER_SANITIZE_NUMBER_INT);
-            $daysRetention = empty($daysRetention) ? 90 : (int)$daysRetention;
+            $daysRetention = empty($daysRetention) ? 90 : (int) $daysRetention;
             $cutoffTimestamp = time() - ($daysRetention * 86400);
             
             try {
                 // Get list of users to delete
                 $users = DB::query(
-                    "SELECT id FROM " . prefixTable("users") . " 
+                    "SELECT id FROM ".prefixTable("users")." 
                     WHERE deleted_at IS NOT NULL 
                     AND deleted_at > 0
                     AND deleted_at < %i
@@ -2958,7 +2958,7 @@ 
                 echo prepareExchangedData(
                     [
                         'error' => true,
-                        'message' => $lang->get('error') . ': ' . $e->getMessage(),
+                        'message' => $lang->get('error').': '.$e->getMessage(),
                     ],
                     'encode'
                 );
@@ -3012,10 +3012,10 @@ 
             
             $purgedCount = 0;
             $errors = [];
-            $cutoffTimestamp = time() - ((int)$daysRetention * 86400);        
+            $cutoffTimestamp = time() - ((int) $daysRetention * 86400);        
                         
             foreach ($userIds as $userId) {
-                $userId = (int)$userId;
+                $userId = (int) $userId;
                 
                 try {
                     $result = purgeDeletedUserById($userId);
@@ -3023,11 +3023,11 @@ 
                     
                 } catch (Exception $e) {
                     DB::rollback();
-                    $errors[] = "User ID $userId: " . $e->getMessage();
+                    $errors[] = "User ID $userId: ".$e->getMessage();
                 }
             }
             
-            $deletedAccountsCount = (int) DB::queryFirstField("SELECT COUNT(id) FROM " . prefixTable('users') . " WHERE deleted_at IS NOT NULL");
+            $deletedAccountsCount = (int) DB::queryFirstField("SELECT COUNT(id) FROM ".prefixTable('users')." WHERE deleted_at IS NOT NULL");
 
             echo prepareExchangedData(
                 [
@@ -3035,7 +3035,7 @@ 
                     'purged_count' => $purgedCount,
                     'total_in_batch' => count($userIds),
                     'errors' => $errors,
-                    'message' => $purgedCount . ' user(s) purged in this batch',
+                    'message' => $purgedCount.' user(s) purged in this batch',
                     'deletedAccountsCount' => $deletedAccountsCount,
                 ],
                 'encode'
@@ -3070,7 +3070,7 @@ 
             
             // Get info about user
             $data_user = DB::queryFirstRow(
-                'SELECT login FROM ' . prefixTable('users') . ' WHERE id = %i',
+                'SELECT login FROM '.prefixTable('users').' WHERE id = %i',
                 $userId
             );
             
@@ -3083,12 +3083,12 @@ 
             }
             
             // Remove user suffix "_deleted_timestamp"
-            $deletedSuffix = '_deleted_' . substr($data_user['login'], strrpos($data_user['login'], '_deleted_') + 9);
+            $deletedSuffix = '_deleted_'.substr($data_user['login'], strrpos($data_user['login'], '_deleted_') + 9);
             $originalLogin = str_replace($deletedSuffix, '', $data_user['login']);
                         
             // Check if an active user with the original login already exists
             $existingUser = DB::queryFirstRow(
-                'SELECT id FROM ' . prefixTable('users') . '
+                'SELECT id FROM '.prefixTable('users').'
                 WHERE login = %s AND deleted_at IS NULL AND id != %i',
                 $originalLogin,
                 $userId
@@ -3098,7 +3098,7 @@ 
                 echo prepareExchangedData(
                     array(
                         'error' => true,
-                        'message' => 'Cannot restore user: an active user with login "' . $originalLogin . '" already exists (ID: ' . $existingUser['id'] . ')'
+                        'message' => 'Cannot restore user: an active user with login "'.$originalLogin.'" already exists (ID: '.$existingUser['id'].')'
                     ),
                     'encode'
                 );
@@ -3131,7 +3131,7 @@ 
 
     // Get info about user
     $data_user = DB::queryFirstRow(
-        'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . '
+        'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').'
         WHERE id = %i',
         $value[1]
     );
@@ -3165,7 +3165,7 @@ 
             logEvents(
                 $SETTINGS,
                 'user_mngt',
-                'at_user_new_' . $value[0] . ':' . $value[1],
+                'at_user_new_'.$value[0].':'.$value[1],
                 (string) $session->get('user-id'),
                 $session->get('user-login'),
                 filter_input(INPUT_POST, 'id', FILTER_SANITIZE_FULL_SPECIAL_CHARS)
@@ -3200,7 +3200,7 @@ 
 
     // Get info about user
     $data_user = DB::queryFirstRow(
-        'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . '
+        'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').'
         WHERE id = %i',
         $id[1]
     );
@@ -3239,7 +3239,7 @@ 
     $users = DB::query(
         "SELECT id, login, email, deleted_at, 
                 DATEDIFF(NOW(), FROM_UNIXTIME(deleted_at)) as days_since_deletion
-         FROM " . prefixTable("users") . " 
+         FROM " . prefixTable("users")." 
          WHERE deleted_at IS NOT NULL 
          AND deleted_at > 0
          ORDER BY deleted_at DESC"
@@ -3265,7 +3265,7 @@ 
     
     // Vérifier que l'utilisateur est bien marqué deleted
     $user = DB::queryFirstRow(
-        "SELECT id, login, deleted_at FROM " . prefixTable("users") . " 
+        "SELECT id, login, deleted_at FROM ".prefixTable("users")." 
          WHERE id = %i 
          AND deleted_at IS NOT NULL 
          AND deleted_at > 0",
@@ -3305,7 +3305,7 @@ 
 
         // delete personal folder and subfolders
         $data = DB::queryFirstRow(
-            'SELECT id FROM ' . prefixTable('nested_tree') . '
+            'SELECT id FROM '.prefixTable('nested_tree').'
             WHERE title = %s AND personal_folder = %i',
             $userId,
             '1'
@@ -3327,7 +3327,7 @@ 
                 DB::delete(prefixTable('nested_tree'), 'id = %i AND personal_folder = %i', $folder->id, '1');
                 // delete items & logs
                 $items = DB::query(
-                    'SELECT id FROM ' . prefixTable('items') . '
+                    'SELECT id FROM '.prefixTable('items').'
                     WHERE id_tree=%i AND perso = %i',
                     $folder->id,
                     '1'
@@ -3357,7 +3357,7 @@ 
         // Delete any process related to user
         $processes = DB::query(
             'SELECT increment_id
-            FROM ' . prefixTable('background_tasks') . '
+            FROM ' . prefixTable('background_tasks').'
             WHERE JSON_EXTRACT(arguments, "$.new_user_id") = %i',
             $userId
         );