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
         );

includes/core/load.js.php

Spacing +12 added lines, -12 removed lines

@@ -329,7 +329,7 @@ 
 
                             // Show passwords inputs and form
                             $('#dialog-user-change-password-info')
-                                .html('<i class="icon fa-solid fa-info mr-2"></i><?php echo $lang->get('user_has_to_change_password_info');?>')
+                                .html('<i class="icon fa-solid fa-info mr-2"></i><?php echo $lang->get('user_has_to_change_password_info'); ?>')
                                 .removeClass('hidden');
                             $('#dialog-user-change-password').removeClass('hidden');
 
@@ -342,7 +342,7 @@ 
 
                             // Show passwords inputs and form
                             $('#dialog-ldap-user-change-password-info')
-                                .html('<i class="icon fa-solid fa-info mr-2"></i><?php echo $lang->get('ldap_user_has_changed_his_password');?>')
+                                .html('<i class="icon fa-solid fa-info mr-2"></i><?php echo $lang->get('ldap_user_has_changed_his_password'); ?>')
                                 .removeClass('hidden');
                             $('#dialog-ldap-user-change-password').removeClass('hidden');
                             
@@ -371,7 +371,7 @@ 
 
                             if (data.queryResults.auth_type === 'oauth2') {
                                 // LDAP or local account to OAuth2 account
-                                var info_message = '<?php echo $lang->get('oauth2_need_user_old_password');?>';
+                                var info_message = '<?php echo $lang->get('oauth2_need_user_old_password'); ?>';
 
                                 // Hide the "new password" field that users can't fill in manually
                                 $('#new-password-field').hide();
@@ -383,7 +383,7 @@ 
                                 $('#dialog-ldap-user-change-password-current').val(oauth2_encryption_hash);
                             } else {
                                 // LDAP password updated
-                                var info_message = '<?php echo $lang->get('ldap_user_has_changed_his_password');?>';
+                                var info_message = '<?php echo $lang->get('ldap_user_has_changed_his_password'); ?>';
                             }
 
                             // Display info tip
@@ -507,7 +507,7 @@ 
         /*console.log('User has to regenerate keys')
         // HIde
         $('.content-header, .content').addClass('hidden');
-        $('#dialog-user-temporary-code-info').html('<i class="icon fa-solid fa-info mr-2"></i><?php echo $lang->get('renecyption_expected');?>');
+        $('#dialog-user-temporary-code-info').html('<i class="icon fa-solid fa-info mr-2"></i><?php echo $lang->get('renecyption_expected'); ?>');
 
         // Show passwords inputs and form
         $('#dialog-user-temporary-code').removeClass('hidden');
@@ -533,13 +533,13 @@ 
             {
                 if (step === 'psk') {
                     // Inform user
-                    $("#user-current-defuse-psk-progress").html('<b><?php echo $lang->get('encryption_keys'); ?> </b> [' + start + ' - ' + (parseInt(start) + <?php echo NUMBER_ITEMS_IN_BATCH;?>) + '] ' +
+                    $("#user-current-defuse-psk-progress").html('<b><?php echo $lang->get('encryption_keys'); ?> </b> [' + start + ' - ' + (parseInt(start) + <?php echo NUMBER_ITEMS_IN_BATCH; ?>) + '] ' +
                         '... <?php echo $lang->get('please_wait'); ?><i class="fa-solid fa-spinner fa-pulse ml-3 text-primary"></i>');
 
                     var data = {
                         'userPsk' : $('#user-current-defuse-psk').val(),
                         'start': start,
-                        'length': <?php echo NUMBER_ITEMS_IN_BATCH;?>,
+                        'length': <?php echo NUMBER_ITEMS_IN_BATCH; ?>,
                         'user_id': userId,
                         'counterItemsToTreat': counterItemsToTreat
                     };
@@ -620,7 +620,7 @@ 
 
                 // Show passwords inputs and form
                 $('#dialog-ldap-user-change-password-info')
-                    .html('<i class="icon fa-solid fa-info mr-2"></i><?php echo $lang->get('ldap_user_has_changed_his_password');?>')
+                    .html('<i class="icon fa-solid fa-info mr-2"></i><?php echo $lang->get('ldap_user_has_changed_his_password'); ?>')
                     .removeClass('hidden');
                 $('#dialog-ldap-user-change-password').removeClass('hidden');
 
@@ -1257,15 +1257,15 @@ 
             // Prepare data
             var data = {
                 'receipt': $('#temp-user-email').val(),
-                'subject': '[Teampass] <?php echo $lang->get('your_new_password');?>',
-                'body': '<?php echo $lang->get('email_body_temporary_login_password');?>',
+                'subject': '[Teampass] <?php echo $lang->get('your_new_password'); ?>',
+                'body': '<?php echo $lang->get('email_body_temporary_login_password'); ?>',
                 'pre_replace' : {
                     '#enc_code#' : $('#temp-user-pwd').val(),
                 }
             }
             if (debugJavascript === true) console.log(data);
             // Prepare form
-            $('#dialog-admin-change-user-password-info').html('<?php echo $lang->get('sending_email_message');?>');
+            $('#dialog-admin-change-user-password-info').html('<?php echo $lang->get('sending_email_message'); ?>');
             toastr.remove();
             toastr.info(
                 '<?php echo $lang->get('in_progress'); ?><i class="fa-solid fa-circle-notch fa-spin fa-2x ml-3"></i>'
@@ -1796,7 +1796,7 @@ 
                         '#warningModal',
                         '<i class="fa-solid fa-clock fa-lg warning mr-2"></i><?php echo $lang->get('index_add_one_hour'); ?>',
                         '<div class="form-group">' +
-                        '<label for="warningModal-input" class="col-form-label"><?php echo $lang->get('extend_session_duration_by') . ' (' . $lang->get('minutes') . ')'; ?>:</label>' +
+                        '<label for="warningModal-input" class="col-form-label"><?php echo $lang->get('extend_session_duration_by').' ('.$lang->get('minutes').')'; ?>:</label>' +
                         '<input type="number" max="'+(60*60*24)+'" class="form-control" id="warningModal-input" value="60">' +
                         '</div>' +
                         '<div class="form-text text-muted"><i class=\"fa-solid fa-info-circle mr-2\"></i><?php echo $lang->get('maximum_session_expiration_time'); ?>: '+data.max_session_duration+'</div>',

sources/main.queries.php

Spacing +122 added lines, -122 removed lines

@@ -79,7 +79,7 @@ 
 ) {
     // Not allowed page
     $session->set('system-error_code', ERR_NOT_ALLOWED);
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit;
 }
 
@@ -207,7 +207,7 @@ 
  * @param array $SETTINGS
  * @return string
  */
-function passwordHandler(string $post_type, array|null|string $dataReceived, array $SETTINGS): string
+function passwordHandler(string $post_type, array | null | string $dataReceived, array $SETTINGS): string
 {
     $session = SessionManager::getSession();
     $lang = new Language($session->get('user-language') ?? 'english');
@@ -275,7 +275,7 @@ 
 
             // Get current user hash
             $userHash = DB::queryFirstRow(
-                "SELECT pw FROM " . prefixtable('users') . " WHERE id = %d;",
+                "SELECT pw FROM ".prefixtable('users')." WHERE id = %d;",
                 $session->get('user-id')
             )['pw'];
 
@@ -330,7 +330,7 @@ 
  * @param string $post_key
  * @return string
  */
-function userHandler(string $post_type, array|null|string $dataReceived, array $SETTINGS, string $post_key): string
+function userHandler(string $post_type, array | null | string $dataReceived, array $SETTINGS, string $post_key): string
 {
     $session = SessionManager::getSession();
 
@@ -365,7 +365,7 @@ 
     if (isset($dataReceived['user_id'])) {
         // 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',
             $dataReceived['user_id']
         );
@@ -514,7 +514,7 @@ 
         case 'mail_me'://action_mail
             // Get info about user to send email
             $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 email = %s',
                 filter_var($dataReceived['receipt'], FILTER_SANITIZE_FULL_SPECIAL_CHARS)
             );
@@ -634,7 +634,7 @@ 
     if (isset($dataReceived['user_id'])) {
         // 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',
             $dataReceived['user_id']
         );
@@ -718,7 +718,7 @@ 
 
             // Get current user hash
             $userHash = DB::queryFirstRow(
-                "SELECT pw FROM " . prefixtable('users') . " WHERE id = %d;",
+                "SELECT pw FROM ".prefixtable('users')." WHERE id = %d;",
                 $session->get('user-id')
             )['pw'];
 
@@ -756,7 +756,7 @@ 
 
                 // Get current user hash
                 $userHash = DB::queryFirstRow(
-                    "SELECT pw FROM " . prefixtable('users') . " WHERE id = %d;",
+                    "SELECT pw FROM ".prefixtable('users')." WHERE id = %d;",
                     $session->get('user-id')
                 )['pw'];
 
@@ -801,7 +801,7 @@ 
 
                 // Get current user hash
                 $userHash = DB::queryFirstRow(
-                    "SELECT pw FROM " . prefixtable('users') . " WHERE id = %i;",
+                    "SELECT pw FROM ".prefixtable('users')." WHERE id = %i;",
                     $session->get('user-id')
                 )['pw'];
 
@@ -853,7 +853,7 @@ 
  * @param array $SETTINGS
  * @return string
  */
-function systemHandler(string $post_type, array|null|string $dataReceived, array $SETTINGS): string
+function systemHandler(string $post_type, array | null | string $dataReceived, array $SETTINGS): string
 {
     $session = SessionManager::getSession();
     switch ($post_type) {
@@ -954,7 +954,7 @@ 
                 )
             );
 
-            return '[{"token" : "' . $token . '"}]';
+            return '[{"token" : "'.$token.'"}]';
 
         /*
         * Default case
@@ -970,7 +970,7 @@ 
 }
 
 
-function utilsHandler(string $post_type, array|null|string $dataReceived, array $SETTINGS): string
+function utilsHandler(string $post_type, array | null | string $dataReceived, array $SETTINGS): string
 {
     switch ($post_type) {
         /*
@@ -1039,7 +1039,7 @@ 
         array(
             'error' => false,
             'timestamp' => $session->get('user-session_duration'),
-            'max_time_to_add' => intdiv((($maximum_session_expiration_time*60) - ((int) $session->get('user-session_duration') - time())), 60),
+            'max_time_to_add' => intdiv((($maximum_session_expiration_time * 60) - ((int) $session->get('user-session_duration') - time())), 60),
             'max_session_duration' => $maximum_session_expiration_time,
         ),
         'encode'
@@ -1091,7 +1091,7 @@ 
     // get number of items
     DB::queryFirstRow(
         'SELECT increment_id
-        FROM ' . prefixTable('sharekeys_items') .
+        FROM ' . prefixTable('sharekeys_items').
         ' WHERE user_id = %i',
         $userId
     );
@@ -1146,7 +1146,7 @@ 
         // check if expected security level is reached
         $dataUser = DB::queryFirstRow(
             'SELECT *
-            FROM ' . prefixTable('users') . ' WHERE id = %i',
+            FROM ' . prefixTable('users').' WHERE id = %i',
             $post_user_id
         );
 
@@ -1167,8 +1167,8 @@ 
         if (empty($dataUser['fonction_id']) === false) {
             $data = DB::queryFirstRow(
                 'SELECT complexity
-                FROM ' . prefixTable('roles_title') . '
-                WHERE id IN (' . $dataUser['fonction_id'] . ')
+                FROM ' . prefixTable('roles_title').'
+                WHERE id IN (' . $dataUser['fonction_id'].')
                 ORDER BY complexity DESC'
             );
         } else {
@@ -1181,8 +1181,8 @@ 
             return prepareExchangedData(
                 array(
                     'error' => true,
-                    'message' => '<div style="margin:10px 0 10px 15px;">' . $lang->get('complexity_level_not_reached') . '.<br>' .
-                        $lang->get('expected_complexity_level') . ': <b>' . TP_PW_COMPLEXITY[$data['complexity']][1] . '</b></div>',
+                    'message' => '<div style="margin:10px 0 10px 15px;">'.$lang->get('complexity_level_not_reached').'.<br>'.
+                        $lang->get('expected_complexity_level').': <b>'.TP_PW_COMPLEXITY[$data['complexity']][1].'</b></div>',
                 ),
                 'encode'
             );
@@ -1286,14 +1286,14 @@ 
         // Get data about user
         $dataUser = DB::queryFirstRow(
             'SELECT id, email, pw
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE login = %s',
             $post_login
         );
     } else {
         $dataUser = DB::queryFirstRow(
             'SELECT id, login, email, pw
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id = %i',
             $post_id
         );
@@ -1347,7 +1347,7 @@ 
     // Check if token already used
     $dataToken = DB::queryFirstRow(
         'SELECT end_timestamp, reason
-        FROM ' . prefixTable('tokens') . '
+        FROM ' . prefixTable('tokens').'
         WHERE token = %s AND user_id = %i',
         $post_token,
         $dataUser['id']
@@ -1358,11 +1358,11 @@ 
         return prepareExchangedData(
             array(
                 'error' => true,
-                'message' => 'TOKEN already used',//$lang->get('no_email_set'),
+                'message' => 'TOKEN already used', //$lang->get('no_email_set'),
             ),
             'encode'
         );
-    } elseif(DB::count() === 0) {
+    } elseif (DB::count() === 0) {
         // Store token for this action
         DB::insert(
             prefixTable('tokens'),
@@ -1424,7 +1424,7 @@ 
                 'email' => $dataUser['email'],
                 'email_result' => str_replace(
                     '#email#',
-                    '<b>' . obfuscateEmail($dataUser['email']) . '</b>',
+                    '<b>'.obfuscateEmail($dataUser['email']).'</b>',
                     addslashes($lang->get('admin_email_result_ok'))
                 ),
             ),
@@ -1440,7 +1440,7 @@ 
             'email' => $dataUser['email'],
             'email_result' => str_replace(
                 '#email#',
-                '<b>' . obfuscateEmail($dataUser['email']) . '</b>',
+                '<b>'.obfuscateEmail($dataUser['email']).'</b>',
                 addslashes($lang->get('admin_email_result_ok'))
             ),
         ),
@@ -1457,7 +1457,7 @@ 
 
     if (isKeyExistingAndEqual('enable_send_email_on_user_login', 1, $SETTINGS) === true) {
         $row = DB::queryFirstRow(
-            'SELECT valeur FROM ' . prefixTable('misc') . ' WHERE type = %s AND intitule = %s',
+            'SELECT valeur FROM '.prefixTable('misc').' WHERE type = %s AND intitule = %s',
             'cron',
             'sending_emails'
         );
@@ -1465,7 +1465,7 @@ 
         if ((int) (time() - $row['valeur']) >= 300 || (int) $row['valeur'] === 0) {
             $rows = DB::query(
                 'SELECT *
-                FROM ' . prefixTable('emails') .
+                FROM ' . prefixTable('emails').
                 ' WHERE status != %s',
                 'sent'
             );
@@ -1517,8 +1517,8 @@ 
     $arr_html = array();
     $rows = DB::query(
         'SELECT i.id AS id, i.label AS label, i.id_tree AS id_tree, l.date, i.perso AS perso, i.restricted_to AS restricted
-        FROM ' . prefixTable('log_items') . ' AS l
-        RIGHT JOIN ' . prefixTable('items') . ' AS i ON (l.id_item = i.id)
+        FROM ' . prefixTable('log_items').' AS l
+        RIGHT JOIN ' . prefixTable('items').' AS i ON (l.id_item = i.id)
         WHERE l.action = %s AND l.id_user = %i
         ORDER BY l.date DESC
         LIMIT 0, 100',
@@ -1550,7 +1550,7 @@ 
     if (isKeyExistingAndEqual('enable_suggestion', 1, $SETTINGS) === true
         && ((int) $session->get('user-admin') === 1 || (int) $session->get('user-manager') === 1)
     ) {
-        DB::query('SELECT * FROM ' . prefixTable('suggestion'));
+        DB::query('SELECT * FROM '.prefixTable('suggestion'));
         $nb_suggestions_waiting = DB::count();
     }
 
@@ -1585,13 +1585,13 @@ 
             if ($data === 'stat_languages') {
                 $tmp = '';
                 foreach ($stats_data[$data] as $key => $value) {
-                    $tmp .= $tmp === '' ? $key . '-' . $value : ',' . $key . '-' . $value;
+                    $tmp .= $tmp === '' ? $key.'-'.$value : ','.$key.'-'.$value;
                 }
                 $statsToSend[$data] = $tmp;
             } elseif ($data === 'stat_country') {
                 $tmp = '';
                 foreach ($stats_data[$data] as $key => $value) {
-                    $tmp .= $tmp === '' ? $key . '-' . $value : ',' . $key . '-' . $value;
+                    $tmp .= $tmp === '' ? $key.'-'.$value : ','.$key.'-'.$value;
                 }
                 $statsToSend[$data] = $tmp;
             } else {
@@ -1678,7 +1678,7 @@ 
             $url_found = $value;
             if (empty($url_found) === false) {
                 $tmp = parse_url($url_found);
-                $anonym_url = $tmp['scheme'] . '://<anonym_url>' . (isset($tmp['path']) === true ? $tmp['path'] : '');
+                $anonym_url = $tmp['scheme'].'://<anonym_url>'.(isset($tmp['path']) === true ? $tmp['path'] : '');
                 $value = $anonym_url;
             } else {
                 $value = '';
@@ -1708,7 +1708,7 @@ 
     $teampass_errors = '';
     $rows = DB::query(
         'SELECT label, date AS error_date
-        FROM ' . prefixTable('log_system') . "
+        FROM ' . prefixTable('log_system')."
         WHERE `type` LIKE 'error'
         ORDER BY `date` DESC
         LIMIT 0, 10"
@@ -1716,9 +1716,9 @@ 
     if (DB::count() > 0) {
         foreach ($rows as $record) {
             if (empty($teampass_errors) === true) {
-                $teampass_errors = ' * ' . date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['error_date']) . ' - ' . $record['label'];
+                $teampass_errors = ' * '.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['error_date']).' - '.$record['label'];
             } else {
-                $teampass_errors .= ' * ' . date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['error_date']) . ' - ' . $record['label'];
+                $teampass_errors .= ' * '.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['error_date']).' - '.$record['label'];
             }
         }
     }
@@ -1730,7 +1730,7 @@ 
 
     // Now prepare text
     $txt = '### Page on which it happened
-' . $data['current_page'] . '
+' . $data['current_page'].'
 
 ### Steps to reproduce
 1.
@@ -1745,39 +1745,39 @@ 
 Tell us what happens instead
 
 ### Server configuration
-**Operating system**: ' . php_uname() . '
+**Operating system**: ' . php_uname().'
 
-**Web server:** ' . $_SERVER['SERVER_SOFTWARE'] . '
+**Web server:** ' . $_SERVER['SERVER_SOFTWARE'].'
 
-**Database:** ' . ($link === false ? $lang->get('undefined') : mysqli_get_server_info($link)) . '
+**Database:** ' . ($link === false ? $lang->get('undefined') : mysqli_get_server_info($link)).'
 
-**PHP version:** ' . PHP_VERSION . '
+**PHP version:** ' . PHP_VERSION.'
 
-**Teampass version:** ' . TP_VERSION . '.' . TP_VERSION_MINOR . '
+**Teampass version:** ' . TP_VERSION.'.'.TP_VERSION_MINOR.'
 
 **Teampass configuration variables:**
 ```
-' . $list_of_options . '
+' . $list_of_options.'
 ```
 
 **Updated from an older Teampass or fresh install:**
 
 ### Client configuration
 
-**Browser:** ' . $data['browser_name'] . ' - ' . $data['browser_version'] . '
+**Browser:** ' . $data['browser_name'].' - '.$data['browser_version'].'
 
-**Operating system:** ' . $data['os'] . ' - ' . $data['os_archi'] . 'bits
+**Operating system:** ' . $data['os'].' - '.$data['os_archi'].'bits
 
 ### Logs
 
 #### Web server error log
 ```
-' . $err['message'] . ' - ' . $err['file'] . ' (' . $err['line'] . ')
+' . $err['message'].' - '.$err['file'].' ('.$err['line'].')
 ```
 
 #### Teampass 10 last system errors
 ```
-' . $teampass_errors . '
+' . $teampass_errors.'
 ```
 
 #### Log from the web-browser developer console (CTRL + SHIFT + i)
@@ -1819,7 +1819,7 @@ 
         // Check if user exists
         $userInfo = DB::queryFirstRow(
             'SELECT public_key, private_key, pw, auth_type
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id = %i',
             $post_user_id
         );
@@ -1828,9 +1828,9 @@ 
             // Get one item
             $currentUserKey = DB::queryFirstRow(
                 'SELECT object_id, share_key, increment_id
-                FROM ' . prefixTable('sharekeys_items') . ' AS si
-                INNER JOIN ' . prefixTable('items') . ' AS i ON  (i.id = si.object_id)
-                INNER JOIN ' . prefixTable('nested_tree') . ' AS nt ON  (i.id_tree = nt.id)
+                FROM ' . prefixTable('sharekeys_items').' AS si
+                INNER JOIN ' . prefixTable('items').' AS i ON  (i.id = si.object_id)
+                INNER JOIN ' . prefixTable('nested_tree').' AS nt ON  (i.id_tree = nt.id)
                 WHERE user_id = %i AND nt.personal_folder = %i',
                 $post_user_id,
                 0
@@ -1949,7 +1949,7 @@ 
         // Get user info
         $userData = DB::queryFirstRow(
             'SELECT private_key
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id = %i',
             $post_user_id
         );
@@ -2041,7 +2041,7 @@ 
         // Get user info
         $userData = DB::queryFirstRow(
             'SELECT email, auth_type, login
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id = %i',
             $post_user_id
         );
@@ -2139,7 +2139,7 @@ 
         // Get user info
         $userData = DB::queryFirstRow(
             'SELECT email, auth_type, login
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id = %i',
             $userId
         );
@@ -2198,7 +2198,7 @@ 
         // Check if user exists
         DB::queryFirstRow(
             'SELECT *
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id = %i',
             $post_user_id
         );
@@ -2268,7 +2268,7 @@ 
         // Check if user exists
         $userInfo = DB::queryFirstRow(
             'SELECT public_key
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id = %i',
             $post_user_id
         );
@@ -2416,15 +2416,15 @@ 
     // Loop on items
     $rows = DB::query(
         'SELECT id, pw
-        FROM ' . prefixTable('items') . '
+        FROM ' . prefixTable('items').'
         WHERE perso = 0
-        LIMIT ' . $post_start . ', ' . $post_length
+        LIMIT ' . $post_start.', '.$post_length
     );
     foreach ($rows as $record) {
         // Get itemKey from current user
         $currentUserKey = 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'],
             $session->get('user-id')
@@ -2454,7 +2454,7 @@ 
             if ((int) $post_user_id !== (int) $session->get('user-id')) {
                 $currentUserKey = DB::queryFirstRow(
                     'SELECT increment_id
-                    FROM ' . prefixTable('sharekeys_items') . '
+                    FROM ' . prefixTable('sharekeys_items').'
                     WHERE object_id = %i AND user_id = %i',
                     $record['id'],
                     $post_user_id
@@ -2485,7 +2485,7 @@ 
     // SHould we change step?
     DB::query(
         'SELECT *
-        FROM ' . prefixTable('items') . '
+        FROM ' . prefixTable('items').'
         WHERE perso = 0'
     );
 
@@ -2510,15 +2510,15 @@ 
     // 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"
-        LIMIT ' . $post_start . ', ' . $post_length
+        LIMIT ' . $post_start.', '.$post_length
     );
     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'],
             $session->get('user-id')
@@ -2548,7 +2548,7 @@ 
             if ((int) $post_user_id !== (int) $session->get('user-id')) {
                 $currentUserKey = DB::queryFirstRow(
                     'SELECT increment_id
-                    FROM ' . prefixTable('sharekeys_items') . '
+                    FROM ' . prefixTable('sharekeys_items').'
                     WHERE object_id = %i AND user_id = %i',
                     $record['id'],
                     $post_user_id
@@ -2570,7 +2570,7 @@ 
     // SHould we change step?
     DB::query(
         'SELECT increment_id
-        FROM ' . prefixTable('log_items') . '
+        FROM ' . prefixTable('log_items').'
         WHERE raison LIKE "at_pw :%" AND encryption_type = "teampass_aes"'
     );
 
@@ -2595,15 +2595,15 @@ 
     // Loop on fields
     $rows = DB::query(
         'SELECT id
-        FROM ' . prefixTable('categories_items') . '
+        FROM ' . prefixTable('categories_items').'
         WHERE encryption_type = "teampass_aes"
-        LIMIT ' . $post_start . ', ' . $post_length
+        LIMIT ' . $post_start.', '.$post_length
     );
     foreach ($rows as $record) {
         // 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'],
             $session->get('user-id')
@@ -2633,7 +2633,7 @@ 
             if ((int) $post_user_id !== (int) $session->get('user-id')) {
                 $currentUserKey = DB::queryFirstRow(
                     'SELECT increment_id
-                    FROM ' . prefixTable('sharekeys_items') . '
+                    FROM ' . prefixTable('sharekeys_items').'
                     WHERE object_id = %i AND user_id = %i',
                     $record['id'],
                     $post_user_id
@@ -2655,7 +2655,7 @@ 
     // SHould we change step?
     DB::query(
         'SELECT *
-        FROM ' . prefixTable('categories_items') . '
+        FROM ' . prefixTable('categories_items').'
         WHERE encryption_type = "teampass_aes"'
     );
 
@@ -2680,14 +2680,14 @@ 
     // Loop on suggestions
     $rows = DB::query(
         'SELECT id
-        FROM ' . prefixTable('suggestion') . '
-        LIMIT ' . $post_start . ', ' . $post_length
+        FROM ' . prefixTable('suggestion').'
+        LIMIT ' . $post_start.', '.$post_length
     );
     foreach ($rows as $record) {
         // 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'],
             $session->get('user-id')
@@ -2717,7 +2717,7 @@ 
             if ((int) $post_user_id !== (int) $session->get('user-id')) {
                 $currentUserKey = DB::queryFirstRow(
                     'SELECT increment_id
-                    FROM ' . prefixTable('sharekeys_items') . '
+                    FROM ' . prefixTable('sharekeys_items').'
                     WHERE object_id = %i AND user_id = %i',
                     $record['id'],
                     $post_user_id
@@ -2763,15 +2763,15 @@ 
     // Loop on files
     $rows = DB::query(
         'SELECT id
-        FROM ' . prefixTable('files') . '
-        WHERE status = "' . TP_ENCRYPTION_NAME . '"
-        LIMIT ' . $post_start . ', ' . $post_length
+        FROM ' . prefixTable('files').'
+        WHERE status = "' . TP_ENCRYPTION_NAME.'"
+        LIMIT ' . $post_start.', '.$post_length
     ); //aes_encryption
     foreach ($rows as $record) {
         // Get itemKey from current user
         $currentUserKey = DB::queryFirstRow(
             'SELECT share_key
-            FROM ' . prefixTable('sharekeys_files') . '
+            FROM ' . prefixTable('sharekeys_files').'
             WHERE object_id = %i AND user_id = %i',
             $record['id'],
             $session->get('user-id')
@@ -2801,7 +2801,7 @@ 
             if ((int) $post_user_id !== (int) $session->get('user-id')) {
                 $currentUserKey = DB::queryFirstRow(
                     'SELECT increment_id
-                    FROM ' . prefixTable('sharekeys_items') . '
+                    FROM ' . prefixTable('sharekeys_items').'
                     WHERE object_id = %i AND user_id = %i',
                     $record['id'],
                     $post_user_id
@@ -2823,8 +2823,8 @@ 
     // SHould we change step?
     DB::query(
         'SELECT *
-        FROM ' . prefixTable('files') . '
-        WHERE status = "' . TP_ENCRYPTION_NAME . '"'
+        FROM ' . prefixTable('files').'
+        WHERE status = "' . TP_ENCRYPTION_NAME.'"'
     );
 
     $next_start = (int) $post_start + (int) $post_length;
@@ -2857,9 +2857,9 @@ 
     if (count($session->get('user-personal_folders')) > 0) {
         $rows = DB::query(
             'SELECT id, pw
-            FROM ' . prefixTable('items') . '
+            FROM ' . prefixTable('items').'
             WHERE perso = 1 AND id_tree IN %ls AND encryption_type = %s
-            LIMIT ' . $post_start . ', ' . $post_length,
+            LIMIT ' . $post_start.', '.$post_length,
             $session->get('user-personal_folders'),
             "defuse"
         );
@@ -2867,7 +2867,7 @@ 
             // Get itemKey from current user
             $currentUserKey = 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'],
                 $session->get('user-id')
@@ -2892,7 +2892,7 @@ 
                 if ((int) $post_user_id !== (int) $session->get('user-id')) {
                     $currentUserKey = DB::queryFirstRow(
                         'SELECT increment_id
-                        FROM ' . prefixTable('sharekeys_items') . '
+                        FROM ' . prefixTable('sharekeys_items').'
                         WHERE object_id = %i AND user_id = %i',
                         $record['id'],
                         $post_user_id
@@ -2915,7 +2915,7 @@ 
     // SHould we change step?
     DB::query(
         'SELECT *
-        FROM ' . prefixTable('items') . '
+        FROM ' . prefixTable('items').'
         WHERE perso = 0'
     );
 
@@ -2943,7 +2943,7 @@ 
         // Check if user exists
         $userInfo = DB::queryFirstRow(
             'SELECT public_key, encrypted_psk
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id = %i',
             $post_user_id
         );
@@ -2969,7 +2969,7 @@ 
                 if ($post_counterItemsToTreat === -1) {
                     DB::query(
                         'SELECT id
-                        FROM ' . prefixTable('items') . '
+                        FROM ' . prefixTable('items').'
                         WHERE perso = 1 AND id_tree IN %ls AND encryption_type != %s',
                         $session->get('user-personal_folders'),
                         'teampass_aes'
@@ -2982,7 +2982,7 @@ 
                 // Loop on persoanl items
                 $rows = DB::query(
                     'SELECT id, pw
-                    FROM ' . prefixTable('items') . '
+                    FROM ' . prefixTable('items').'
                     WHERE perso = 1 AND id_tree IN %ls AND encryption_type != %s
                     LIMIT ' . $post_length,
                     $session->get('user-personal_folders'),
@@ -3024,7 +3024,7 @@ 
                     // Loop on files
                     $rows = DB::query(
                         'SELECT id, file
-                        FROM ' . prefixTable('files') . '
+                        FROM ' . prefixTable('files').'
                         WHERE status != %s
                         AND id_item = %i',
                         TP_ENCRYPTION_NAME,
@@ -3035,13 +3035,13 @@ 
                         // Now decrypt the file
                         prepareFileWithDefuse(
                             'decrypt',
-                            $SETTINGS['path_to_upload_folder'] . '/' . $record2['file'],
-                            $SETTINGS['path_to_upload_folder'] . '/' . $record2['file'] . '.delete',
+                            $SETTINGS['path_to_upload_folder'].'/'.$record2['file'],
+                            $SETTINGS['path_to_upload_folder'].'/'.$record2['file'].'.delete',
                             $post_user_psk
                         );
 
                         // Encrypt the file
-                        $encryptedFile = encryptFile($record2['file'] . '.delete', $SETTINGS['path_to_upload_folder']);
+                        $encryptedFile = encryptFile($record2['file'].'.delete', $SETTINGS['path_to_upload_folder']);
 
                         DB::update(
                             prefixTable('files'),
@@ -3062,7 +3062,7 @@ 
                         );
 
                         // Unlink original file
-                        unlink($SETTINGS['path_to_upload_folder'] . '/' . $record2['file']);
+                        unlink($SETTINGS['path_to_upload_folder'].'/'.$record2['file']);
                     }
                 }
 
@@ -3070,7 +3070,7 @@ 
                 $next_start = (int) $post_start + (int) $post_length;
                 DB::query(
                     'SELECT id
-                    FROM ' . prefixTable('items') . '
+                    FROM ' . prefixTable('items').'
                     WHERE perso = 1 AND id_tree IN %ls AND encryption_type != %s',
                     $session->get('user-personal_folders'),
                     'teampass_aes'
@@ -3140,7 +3140,7 @@ 
         // Get user info
         $userData = DB::queryFirstRow(
             'SELECT special, auth_type, is_ready_for_usage, ongoing_process_id, otp_provided, personal_items_migrated
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id = %i',
             $post_user_id
         );
@@ -3187,7 +3187,7 @@ 
         // Get user info
         $userData = DB::queryFirstRow(
             'SELECT auth_type, login, private_key
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id = %i',
             $post_user_id
         );
@@ -3237,7 +3237,7 @@ 
                 return prepareExchangedData(
                     array(
                         'error' => false,
-                        'message' => $lang->get('done'),'',
+                        'message' => $lang->get('done'), '',
                     ),
                     'encode'
                 );
@@ -3286,7 +3286,7 @@ 
         // Get user info
         $userData = DB::queryFirstRow(
             'SELECT u.auth_type, u.login, u.private_key, u.special
-            FROM ' . prefixTable('users') . ' AS u
+            FROM ' . prefixTable('users').' AS u
             WHERE u.id = %i',
             $post_user_id
         );
@@ -3322,7 +3322,7 @@ 
                     return prepareExchangedData(
                         array(
                             'error' => false,
-                            'message' => $lang->get('done'),'',
+                            'message' => $lang->get('done'), '',
                         ),
                         'encode'
                     );
@@ -3343,8 +3343,8 @@ 
                 // Get one itemKey from current user
                 $currentUserKey = DB::queryFirstRow(
                     'SELECT ski.share_key, ski.increment_id, l.id_user
-                    FROM ' . prefixTable('sharekeys_items') . ' AS ski
-                    INNER JOIN ' . prefixTable('log_items') . ' AS l ON ski.object_id = l.id_item
+                    FROM ' . prefixTable('sharekeys_items').' AS ski
+                    INNER JOIN ' . prefixTable('log_items').' AS l ON ski.object_id = l.id_item
                     WHERE ski.user_id = %i
                     ORDER BY RAND()
                     LIMIT 1',
@@ -3411,8 +3411,8 @@ 
                             'process_type' => 'create_user_keys',
                             'arguments' => json_encode([
                                 'new_user_id' => (int) $post_user_id,
-                                'new_user_pwd' => cryption($post_previous_pwd, '','encrypt')['string'],
-                                'new_user_private_key' => cryption($validPreviousKey['private_key'], '','encrypt')['string'],
+                                'new_user_pwd' => cryption($post_previous_pwd, '', 'encrypt')['string'],
+                                'new_user_private_key' => cryption($validPreviousKey['private_key'], '', 'encrypt')['string'],
                                 'send_email' => 0,
                                 'otp_provided_new_value' => 0,
                                 'user_self_change' => 1,
@@ -3481,7 +3481,7 @@ 
             id,
             private_key,
             created_at
-        FROM " . prefixTable('user_private_keys') . "
+        FROM " . prefixTable('user_private_keys')."
         WHERE user_id = %i
         ORDER BY created_at DESC, id DESC",
         $userId
@@ -3503,9 +3503,9 @@ 
             // Select one personal item share_key to test decryption
             $currentUserItemKey = DB::queryFirstRow(
                 'SELECT si.share_key, si.increment_id, l.id_user, i.perso
-                FROM ' . prefixTable('sharekeys_items') . ' AS si
-                INNER JOIN ' . prefixTable('log_items') . ' AS l ON si.object_id = l.id_item
-                INNER JOIN ' . prefixTable('items') . ' AS i ON i.id = l.id_item
+                FROM ' . prefixTable('sharekeys_items').' AS si
+                INNER JOIN ' . prefixTable('log_items').' AS l ON si.object_id = l.id_item
+                INNER JOIN ' . prefixTable('items').' AS i ON i.id = l.id_item
                 WHERE si.user_id = %i AND i.perso = 1 AND si.share_key != ""
                 ORDER BY RAND()
                 LIMIT 1',
@@ -3556,7 +3556,7 @@ 
             $session->get('user-id')
         );
         // Return data
-        return '[{"new_value":"' . $session->get('user-session_duration') . '"}]';
+        return '[{"new_value":"'.$session->get('user-session_duration').'"}]';
     }
     
     return '[{"new_value":"expired"}]';
@@ -3606,8 +3606,8 @@ 
 {
     $personalItems = DB::query(
         'SELECT i.id, i.pw, s.share_key, s.increment_id
-        FROM ' . prefixTable('items') . ' i
-        INNER JOIN ' . prefixTable('sharekeys_items') . ' s ON i.id = s.object_id
+        FROM ' . prefixTable('items').' i
+        INNER JOIN ' . prefixTable('sharekeys_items').' s ON i.id = s.object_id
         WHERE i.perso = %i
         AND s.user_id = %i',
         1,
@@ -3662,8 +3662,8 @@ 
     if ($skipPasswordChange === true) {
         // Remove all sharekeys for personal items
         DB::query(
-            'UPDATE ' . prefixTable('sharekeys_items') . ' AS ski
-            INNER JOIN ' . prefixTable('items') . ' AS i ON ski.object_id = i.id
+            'UPDATE '.prefixTable('sharekeys_items').' AS ski
+            INNER JOIN ' . prefixTable('items').' AS i ON ski.object_id = i.id
             SET ski.share_key = ""
             WHERE i.perso = 1
             AND ski.user_id = %i',
@@ -3672,8 +3672,8 @@ 
 
         // Remove all sharekeys for personal files
         DB::query(
-            'UPDATE ' . prefixTable('sharekeys_files') . ' AS skf
-            INNER JOIN ' . prefixTable('items') . ' AS i ON skf.object_id = i.id
+            'UPDATE '.prefixTable('sharekeys_files').' AS skf
+            INNER JOIN ' . prefixTable('items').' AS i ON skf.object_id = i.id
             SET skf.share_key = ""
             WHERE i.perso = 1
             AND skf.user_id = %i',
@@ -3682,8 +3682,8 @@ 
 
         // Remove all sharekeys for personal fields
         DB::query(
-            'UPDATE ' . prefixTable('sharekeys_fields') . ' AS skf
-            INNER JOIN ' . prefixTable('items') . ' AS i ON skf.object_id = i.id
+            'UPDATE '.prefixTable('sharekeys_fields').' AS skf
+            INNER JOIN ' . prefixTable('items').' AS i ON skf.object_id = i.id
             SET skf.share_key = ""
             WHERE i.perso = 1
             AND skf.user_id = %i',
@@ -3727,8 +3727,8 @@ 
                 'process_type' => 'create_user_keys',
                 'arguments' => json_encode([
                     'new_user_id' => (int) $userId,
-                    'new_user_pwd' => cryption($userCurrentPwd, '','encrypt')['string'],
-                    'new_user_private_key' => cryption($validPreviousKey['private_key'], '','encrypt')['string'],
+                    'new_user_pwd' => cryption($userCurrentPwd, '', 'encrypt')['string'],
+                    'new_user_private_key' => cryption($validPreviousKey['private_key'], '', 'encrypt')['string'],
                     'send_email' => 0,
                     'otp_provided_new_value' => 0,
                     'user_self_change' => 1,

sources/identify.php

Spacing +53 added lines, -53 removed lines

@@ -146,7 +146,7 @@ 
     $sessionPwdAttempts = $session->get('pwd_attempts');
     $sessionUrl = $session->get('user-initial_url');
     $server = [];
-    $server['PHP_AUTH_USER'] =  $request->getUser();
+    $server['PHP_AUTH_USER'] = $request->getUser();
     $server['PHP_AUTH_PW'] = $request->getPassword();
     
     // decrypt and retreive data in JSON format
@@ -166,18 +166,18 @@ 
     }
 
     // Check if Duo auth is in progress and pass the pw and login back to the standard login process
-    if(
+    if (
         isKeyExistingAndEqual('duo', 1, $SETTINGS) === true
         && $dataReceived['user_2fa_selection'] === 'duo'
         && $session->get('user-duo_status') === 'IN_PROGRESS'
         && !empty($dataReceived['duo_state'])
-    ){
+    ) {
         $key = hash('sha256', $dataReceived['duo_state']);
         $iv = substr(hash('sha256', $dataReceived['duo_state']), 0, 16);
         $duo_data_dec = openssl_decrypt(base64_decode($session->get('user-duo_data')), 'AES-256-CBC', $key, 0, $iv);
         // Clear the data from the Duo process to continue clean with the standard login process
-        $session->set('user-duo_data','');
-        if($duo_data_dec === false) {
+        $session->set('user-duo_data', '');
+        if ($duo_data_dec === false) {
             // Add failed authentication log
             addFailedAuthentication(filter_var($dataReceived['login'], FILTER_SANITIZE_FULL_SPECIAL_CHARS), getClientIpServer());
 
@@ -195,7 +195,7 @@ 
         $dataReceived['login'] = $duo_data['duo_login'];
     }
 
-    if(isset($dataReceived['pw']) === false || isset($dataReceived['login']) === false) {
+    if (isset($dataReceived['pw']) === false || isset($dataReceived['login']) === false) {
         echo json_encode([
             'data' => prepareExchangedData(
                 [
@@ -503,7 +503,7 @@ 
                 0,
                 (string) $return,
                 (array) $userInfo ?? [],
-                false,  // not success
+                false, // not success
                 'user_is_locked',
                 $lang->get('account_is_locked')
             ),
@@ -519,7 +519,7 @@ 
             (int) $sessionPwdAttempts,
             (string) $return,
             (array) $userInfo ?? [],
-            false,  // not success
+            false, // not success
             true,
             $lang->get('error_not_allowed_to_authenticate')
         ),
@@ -801,7 +801,7 @@ 
     // Get cache tree info
     $cacheTreeData = DB::queryFirstRow(
         'SELECT visible_folders
-        FROM ' . prefixTable('cache_tree') . '
+        FROM ' . prefixTable('cache_tree').'
         WHERE user_id=%i',
         (int) $session->get('user-id')
     );
@@ -832,7 +832,7 @@ 
         && (int) $userInfo['admin'] !== 1
     ) {
         // get all Admin users
-        $val = DB::queryFirstRow('SELECT email FROM ' . prefixTable('users') . " WHERE admin = %i and email != ''", 1);
+        $val = DB::queryFirstRow('SELECT email FROM '.prefixTable('users')." WHERE admin = %i and email != ''", 1);
         if (DB::count() > 0) {
             // Add email to table
             prepareSendingEmail(
@@ -844,7 +844,7 @@ 
                         '#tp_time#',
                     ],
                     [
-                        ' ' . $session->get('user-login') . ' (IP: ' . getClientIpServer() . ')',
+                        ' '.$session->get('user-login').' (IP: '.getClientIpServer().')',
                         date($SETTINGS['date_format'], (int) time()),
                         date($SETTINGS['time_format'], (int) time()),
                     ],
@@ -951,7 +951,7 @@ 
     if (is_null($userInfo['roles_from_ad_groups']) === false) {
         $userInfo['fonction_id'] = empty($userInfo['fonction_id']) === true 
             ? $userInfo['roles_from_ad_groups'] 
-            : $userInfo['fonction_id'] . ';' . $userInfo['roles_from_ad_groups'];
+            : $userInfo['fonction_id'].';'.$userInfo['roles_from_ad_groups'];
     }
     
     // Store roles in session
@@ -968,7 +968,7 @@ 
         // Get roles from database
         $rolesList = DB::query(
             'SELECT id, title, complexity
-            FROM ' . prefixTable('roles_title') . '
+            FROM ' . prefixTable('roles_title').'
             WHERE id IN %li',
             $session->get('user-roles_array')
         );
@@ -1057,7 +1057,7 @@ 
 {
     $rows = DB::query(
         'SELECT date
-        FROM ' . prefixTable('log_system') . "
+        FROM ' . prefixTable('log_system')."
         WHERE field_1 = %s
         AND type = 'failed_auth'
         AND label = 'password_is_not_correct'
@@ -1071,7 +1071,7 @@ 
         foreach ($rows as $record) {
             array_push(
                 $arrAttempts,
-                date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date'])
+                date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['date'])
             );
         }
     }
@@ -1106,7 +1106,7 @@ 
     $ldapConnection
 ) : bool
 {
-    include_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+    include_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
 
     if ((int) $userInfoDisabled === 1) {
         return false;
@@ -1194,7 +1194,7 @@ 
         // If user has seed but no backup, create it on first successful login
         if (!empty($userInfo['user_derivation_seed']) && empty($userInfo['private_key_backup'])) {
             if (defined('LOG_TO_SERVER') && LOG_TO_SERVER === true) {
-                error_log('TEAMPASS Transparent Recovery - Creating backup for user ' . ($userInfo['login'] ?? 'unknown'));
+                error_log('TEAMPASS Transparent Recovery - Creating backup for user '.($userInfo['login'] ?? 'unknown'));
             }
 
             $derivedKey = deriveBackupKey($userInfo['user_derivation_seed'], $userInfo['public_key'], $SETTINGS);
@@ -1364,7 +1364,7 @@ 
     } catch (Exception $e) {
         return [
             'error' => true,
-            'message' => "Error: " . $e->getMessage(),
+            'message' => "Error: ".$e->getMessage(),
         ];
     }
 }
@@ -1395,7 +1395,7 @@ 
                 'type' => 'OpenLDAP'
             ];
         default:
-            throw new Exception("Unsupported LDAP type: " . $SETTINGS['ldap_type']);
+            throw new Exception("Unsupported LDAP type: ".$SETTINGS['ldap_type']);
     }
 }
 
@@ -1532,7 +1532,7 @@ 
         );
     }
     
-    throw new Exception("Unsupported LDAP type: " . $ldapHandler['type']);
+    throw new Exception("Unsupported LDAP type: ".$ldapHandler['type']);
 }
 
 /**
@@ -1549,12 +1549,12 @@ 
     if (isset($SETTINGS['enable_ad_users_with_ad_groups']) === true && (int) $SETTINGS['enable_ad_users_with_ad_groups'] === 1) {
         // Get user groups from AD
         $user_ad_groups = [];
-        foreach($groups as $group) {
+        foreach ($groups as $group) {
             //print_r($group);
             // get relation role id for AD group
             $role = DB::queryFirstRow(
                 'SELECT lgr.role_id
-                FROM ' . prefixTable('ldap_groups_roles') . ' AS lgr
+                FROM ' . prefixTable('ldap_groups_roles').' AS lgr
                 WHERE lgr.ldap_group_id = %s',
                 $group
             );
@@ -1617,7 +1617,7 @@ 
     $passwordManager = new PasswordManager();
     
     // Migrate password if needed
-    $result  = $passwordManager->migratePassword(
+    $result = $passwordManager->migratePassword(
         $userInfo['pw'],
         $passwordClear,
         (int) $userInfo['id']
@@ -1695,7 +1695,7 @@ 
             // Check if exists in DB
             $groupData = DB::queryFirstRow(
                 'SELECT id
-                FROM ' . prefixTable('roles_title') . '
+                FROM ' . prefixTable('roles_title').'
                 WHERE title = %s',
                 $group["displayName"]
             );
@@ -1844,7 +1844,7 @@ 
             
             // generate new QR
             $new_2fa_qr = $tfa->getQRCodeImageAsDataUri(
-                'Teampass - ' . $username,
+                'Teampass - '.$username,
                 $userInfo['ga']
             );
             // clear temporary code from DB
@@ -1857,7 +1857,7 @@ 
                 $userInfo['id']
             );
             $firstTime = [
-                'value' => '<img src="' . $new_2fa_qr . '">',
+                'value' => '<img src="'.$new_2fa_qr.'">',
                 'user_admin' => isset($sessionAdmin) ? (int) $sessionAdmin : '',
                 'initial_url' => isset($sessionUrl) === true ? $sessionUrl : '',
                 'pwd_attempts' => (int) $sessionPwdAttempts,
@@ -2013,7 +2013,7 @@ 
         }*/
         return [
             'error' => true,
-            'message' => $duo_error . $lang->get('duo_error_check_config'),
+            'message' => $duo_error.$lang->get('duo_error_check_config'),
             'pwd_attempts' => (int) $sessionPwdAttempts,
             'debug_message' => $e->getMessage(),
             'proceedIdentification' => false,
@@ -2029,7 +2029,7 @@ 
         } catch (DuoException $e) {
             return [
                 'error' => true,
-                'message' => $duo_error . $lang->get('duo_error_url'),
+                'message' => $duo_error.$lang->get('duo_error_url'),
                 'pwd_attempts' => (int) $sessionPwdAttempts,
                 'debug_message' => $e->getMessage(),
                 'proceedIdentification' => false,
@@ -2037,7 +2037,7 @@ 
         }
         
         // Somethimes Duo return success but fail to return a URL, double check if the URL has been created
-        if (!empty($duo_redirect_url) && filter_var($duo_redirect_url,FILTER_SANITIZE_URL)) {
+        if (!empty($duo_redirect_url) && filter_var($duo_redirect_url, FILTER_SANITIZE_URL)) {
             // Since Duo Universal requires a redirect, let's store some info when the user get's back after completing the Duo prompt
             $key = hash('sha256', $duo_state);
             $iv = substr(hash('sha256', $duo_state), 0, 16);
@@ -2065,7 +2065,7 @@ 
         } else {
             return [
                 'error' => true,
-                'message' => $duo_error . $lang->get('duo_error_url'),
+                'message' => $duo_error.$lang->get('duo_error_url'),
                 'pwd_attempts' => (int) $sessionPwdAttempts,
                 'proceedIdentification' => false,
             ];
@@ -2086,8 +2086,8 @@ 
         // return the response (which should be the user name)
         if ($decoded_token['preferred_username'] === $username) {
             $session->set('user-duo_status', 'COMPLET');
-            $session->set('user-duo_state','');
-            $session->set('user-duo_data','');
+            $session->set('user-duo_state', '');
+            $session->set('user-duo_data', '');
             $session->set('user-login', $username);
 
             return [
@@ -2098,9 +2098,9 @@ 
             ];
         } else {
             // Something wrong, username from the original Duo request is different than the one received now
-            $session->set('user-duo_status','');
-            $session->set('user-duo_state','');
-            $session->set('user-duo_data','');
+            $session->set('user-duo_status', '');
+            $session->set('user-duo_state', '');
+            $session->set('user-duo_data', '');
 
             return [
                 'error' => true,
@@ -2111,9 +2111,9 @@ 
         }
     }
     // If we are here something wrong
-    $session->set('user-duo_status','');
-    $session->set('user-duo_state','');
-    $session->set('user-duo_data','');
+    $session->set('user-duo_status', '');
+    $session->set('user-duo_state', '');
+    $session->set('user-duo_data', '');
     return [
         'error' => true,
         'message' => $lang->get('duo_login_mismatch'),
@@ -2232,7 +2232,7 @@ 
         // Check for existing lock
         $unlock_at = DB::queryFirstField(
             'SELECT MAX(unlock_at)
-             FROM ' . prefixTable('auth_failures') . '
+             FROM ' . prefixTable('auth_failures').'
              WHERE unlock_at > %s
              AND ((source = %s AND value = %s) OR (source = %s AND value = %s))',
             date('Y-m-d H:i:s', time()),
@@ -2254,8 +2254,8 @@ 
         // Get user info from DB
         $data = DB::queryFirstRow(
             'SELECT u.*, a.value AS api_key
-            FROM ' . prefixTable('users') . ' AS u
-            LEFT JOIN ' . prefixTable('api') . ' AS a ON (u.id = a.user_id)
+            FROM ' . prefixTable('users').' AS u
+            LEFT JOIN ' . prefixTable('api').' AS a ON (u.id = a.user_id)
             WHERE login = %s AND deleted_at IS NULL',
             $login
         );
@@ -2274,9 +2274,9 @@ 
         // Check if similar login deleted exists
         DB::queryFirstRow(
             'SELECT id, login
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE login LIKE %s AND deleted_at IS NOT NULL',
-            $login . '_deleted_%'
+            $login.'_deleted_%'
         );
 
         if (DB::count() > 0) {
@@ -2386,7 +2386,7 @@ 
             'array' => [
                 'value' => 'bruteforce_wait',
                 'error' => true,
-                'message' => $lang->get('bruteforce_wait') . (string) $e->getMessage(),
+                'message' => $lang->get('bruteforce_wait').(string) $e->getMessage(),
             ]
         ];
     }
@@ -2491,7 +2491,7 @@ 
     // Clean previous failed attempts
     $failedTasks = DB::query(
         'SELECT increment_id
-        FROM ' . prefixTable('background_tasks') . '
+        FROM ' . prefixTable('background_tasks').'
         WHERE process_type = %s
         AND JSON_EXTRACT(arguments, "$.new_user_id") = %i
         AND status = %s',
@@ -2608,7 +2608,7 @@ 
                         $userKeys['public_key']
                     );
                 }*/
-                    error_log('Switch user ' . $username . ' auth_type to oauth2');
+                    error_log('Switch user '.$username.' auth_type to oauth2');
                 // Update user in database:
                 DB::update(
                     prefixTable('users'),
@@ -2832,12 +2832,12 @@ 
 {
     // Find the latest "create_user_keys" task for the given user_id
     $latestTask = DB::queryFirstRow(
-        'SELECT arguments, status FROM ' . prefixTable('background_tasks') . '
+        'SELECT arguments, status FROM '.prefixTable('background_tasks').'
         WHERE process_type = %s
         AND arguments LIKE %s
         ORDER BY increment_id DESC
         LIMIT 1',
-        'create_user_keys', '%"new_user_id":' . $userId . '%'
+        'create_user_keys', '%"new_user_id":'.$userId.'%'
     );
 
     // If a failed task is found, return an error message
@@ -3049,15 +3049,15 @@ 
 
             if ($ret['error'] !== false) {
                 logEvents($SETTINGS, 'failed_auth', 'bad_duo_mfa', '', stripslashes($username), stripslashes($username));
-                $session->set('user-duo_status','');
-                $session->set('user-duo_state','');
-                $session->set('user-duo_data','');
+                $session->set('user-duo_status', '');
+                $session->set('user-duo_state', '');
+                $session->set('user-duo_data', '');
                 return [
                     'error' => true,
                     'mfaData' => $ret,
                     'mfaQRCodeInfos' => false,
                 ];
-            } else if ($ret['duo_url_ready'] === true){
+            } else if ($ret['duo_url_ready'] === true) {
                 return [
                     'error' => false,
                     'mfaData' => $ret,
@@ -3121,7 +3121,7 @@ 
     // Count failed attempts from this source
     $count = DB::queryFirstField(
         'SELECT COUNT(*)
-        FROM ' . prefixTable('auth_failures') . '
+        FROM ' . prefixTable('auth_failures').'
         WHERE source = %s AND value = %s',
         $source,
         $value

pages/users.js.php

Spacing +8 added lines, -8 removed lines

@@ -72,7 +72,7 @@ 
 if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('users') === 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;
 }
 ?>
@@ -307,8 +307,8 @@ 
         if (store.get('teampassApplication').formUserAction === "add_new_user") {
             var data = {
                 'receipt': $('#form-email').val(),
-                'subject': 'TEAMPASS - <?php echo $lang->get('temporary_encryption_code');?>',
-                'body': '<?php echo $lang->get('email_body_new_user');?>',
+                'subject': 'TEAMPASS - <?php echo $lang->get('temporary_encryption_code'); ?>',
+                'body': '<?php echo $lang->get('email_body_new_user'); ?>',
                 'pre_replace' : {
                     '#code#' : store.get('teampassUser').admin_new_user_temporary_encryption_code,
                     '#login#' : store.get('teampassUser').admin_new_user_login,
@@ -318,8 +318,8 @@ 
         } else {
             var data = {
                 'receipt': $('#form-email').val(),
-                'subject': 'TEAMPASS - <?php echo $lang->get('temporary_encryption_code');?>',
-                'body': '<?php echo $lang->get('email_body_temporary_encryption_code');?>',
+                'subject': 'TEAMPASS - <?php echo $lang->get('temporary_encryption_code'); ?>',
+                'body': '<?php echo $lang->get('email_body_temporary_encryption_code'); ?>',
                 'pre_replace' : {
                     '#enc_code#' : store.get('teampassUser').admin_new_user_temporary_encryption_code,
                 }
@@ -514,13 +514,13 @@ 
             }
             // Inform user
             $("#warningModalBody").html('<b><?php echo $lang->get('encryption_keys'); ?> - ' +
-                stepText + '</b> [' + start + ' - ' + (parseInt(start) + <?php echo NUMBER_ITEMS_IN_BATCH;?>) + ']<span id="warningModalBody_extra">' + $nbItemsToConvert + '</span> ' +
+                stepText + '</b> [' + start + ' - ' + (parseInt(start) + <?php echo NUMBER_ITEMS_IN_BATCH; ?>) + ']<span id="warningModalBody_extra">' + $nbItemsToConvert + '</span> ' +
                 '... <?php echo $lang->get('please_wait'); ?><i class="fa-solid fa-spinner fa-pulse ml-3 text-primary"></i>');
 
             var data = {
                 action: step,
                 start: start,
-                length: <?php echo NUMBER_ITEMS_IN_BATCH;?>,
+                length: <?php echo NUMBER_ITEMS_IN_BATCH; ?>,
                 user_id: userId,
             }
             if (debugJavascript === true) {
@@ -1417,7 +1417,7 @@ 
                         } else {
                             // Show icon or not
                             if ($('#user-disabled').prop('checked') === true) {
-                                $('#user-login-'+userID).before('<i class="fa-solid fa-user-slash infotip text-danger mr-2" title="<?php echo $lang->get('account_is_locked');?>" id="user-disable-'+userID+'"></i>');
+                                $('#user-login-'+userID).before('<i class="fa-solid fa-user-slash infotip text-danger mr-2" title="<?php echo $lang->get('account_is_locked'); ?>" id="user-disable-'+userID+'"></i>');
                             } else {
                                 $('#user-disable-'+userID).remove();
                             }