nilsteampassnet / TeamPass

sources/export.queries.php

Spacing +64 added lines, -64 removed lines

@@ -78,7 +78,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;
 }
 
@@ -100,7 +100,7 @@ 
 $antiXss = new AntiXSS();
 
 // User's language loading
-require_once $SETTINGS['cpassman_dir'] . '/includes/language/' . $session->get('user-language') . '.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/language/'.$session->get('user-language').'.php';
 
 // Prepare POST variables
 $id = filter_input(INPUT_POST, 'id', FILTER_SANITIZE_NUMBER_INT);
@@ -152,9 +152,9 @@ 
                         'SELECT i.id as id, i.id_tree as id_tree, i.restricted_to as restricted_to, i.perso as perso,
                             i.label as label, i.description as description, i.pw as pw, i.login as login, i.url as url,
                             i.email as email,l.date as date, i.pw_iv as pw_iv,n.renewal_period as renewal_period
-                        FROM ' . prefixTable('items') . ' as i
-                        INNER JOIN ' . prefixTable('nested_tree') . ' as n ON (i.id_tree = n.id)
-                        INNER JOIN ' . prefixTable('log_items') . ' as l ON (i.id = l.id_item)
+                        FROM ' . prefixTable('items').' as i
+                        INNER JOIN ' . prefixTable('nested_tree').' as n ON (i.id_tree = n.id)
+                        INNER JOIN ' . prefixTable('log_items').' as l ON (i.id = l.id_item)
                         WHERE i.inactif = %i
                         AND i.id_tree= %i
                         AND (l.action = %s OR (l.action = %s AND l.raison LIKE %s))
@@ -177,8 +177,8 @@ 
                                 // Run query
                                 $dataItem = DB::queryFirstRow(
                                     'SELECT i.pw AS pw, s.share_key AS share_key
-                                    FROM ' . prefixTable('items') . ' AS i
-                                    INNER JOIN ' . prefixTable('sharekeys_items') . ' AS s ON (s.object_id = i.id)
+                                    FROM ' . prefixTable('items').' AS i
+                                    INNER JOIN ' . prefixTable('sharekeys_items').' AS s ON (s.object_id = i.id)
                                     WHERE user_id = %i AND i.id = %i',
                                     $session->get('user-id'),
                                     $record['id']
@@ -202,8 +202,8 @@ 
                                 $arr_kbs = [];
                                 $rows_kb = DB::query(
                                     'SELECT b.label, b.id
-                                    FROM ' . prefixTable('kb_items') . ' AS a
-                                    INNER JOIN ' . prefixTable('kb') . ' AS b ON (a.kb_id = b.id)
+                                    FROM ' . prefixTable('kb_items').' AS a
+                                    INNER JOIN ' . prefixTable('kb').' AS b ON (a.kb_id = b.id)
                                     WHERE a.item_id = %i',
                                     $record['id']
                                 );
@@ -215,7 +215,7 @@ 
                                 $arr_tags = [];
                                 $rows_tag = DB::query(
                                     'SELECT tag
-                                    FROM ' . prefixTable('tags') . '
+                                    FROM ' . prefixTable('tags').'
                                     WHERE item_id = %i',
                                     $record['id']
                                 );
@@ -227,18 +227,18 @@ 
                                 $arr_trees = [];
                                 $rows_child_tree = DB::query(
                                     'SELECT t.id, t.title
-                                    FROM ' . prefixTable('nested_tree') . ' AS t
-                                    INNER JOIN ' . prefixTable('items') . ' AS i ON (t.id = i.id_tree)
+                                    FROM ' . prefixTable('nested_tree').' AS t
+                                    INNER JOIN ' . prefixTable('items').' AS i ON (t.id = i.id_tree)
                                     WHERE i.id = %i',
                                     $record['id']
                                 );
                                 foreach ($rows_child_tree as $rec_child_tree) {
                                     $stack = array();
                                     $parent = $rec_child_tree['id'];
-                                    while($parent != 0){
+                                    while ($parent != 0) {
                                         $rows_parent_tree = DB::query(
                                             'SELECT parent_id, title
-                                            FROM ' . prefixTable('nested_tree') . '
+                                            FROM ' . prefixTable('nested_tree').'
                                             WHERE id = %i',
                                             $parent
                                         );
@@ -325,7 +325,7 @@ 
             // Prepare variables
             $post_export_tag = filter_var($dataReceived['export_tag'], FILTER_SANITIZE_FULL_SPECIAL_CHARS);
             if (empty($post_export_tag) === false) {
-                DB::query('DELETE FROM ' . prefixTable('export') . ' WHERE export_tag = %s', $post_export_tag);
+                DB::query('DELETE FROM '.prefixTable('export').' WHERE export_tag = %s', $post_export_tag);
             }
             break;
 
@@ -375,9 +375,9 @@ 
                         l.date as date, i.pw_iv as pw_iv,
                         n.renewal_period as renewal_period,
                         i.id_tree as tree_id
-                        FROM ' . prefixTable('items') . ' as i
-                        INNER JOIN ' . prefixTable('nested_tree') . ' as n ON (i.id_tree = n.id)
-                        INNER JOIN ' . prefixTable('log_items') . ' as l ON (i.id = l.id_item)
+                        FROM ' . prefixTable('items').' as i
+                        INNER JOIN ' . prefixTable('nested_tree').' as n ON (i.id_tree = n.id)
+                        INNER JOIN ' . prefixTable('log_items').' as l ON (i.id = l.id_item)
                         WHERE i.inactif = %i
                         AND i.id_tree= %i
                         AND (l.action = %s OR (l.action = %s AND l.raison LIKE %s))
@@ -403,8 +403,8 @@ 
                             // Run query
                             $dataItem = DB::queryFirstRow(
                                 'SELECT i.pw AS pw, s.share_key AS share_key
-                                FROM ' . prefixTable('items') . ' AS i
-                                INNER JOIN ' . prefixTable('sharekeys_items') . ' AS s ON (s.object_id = i.id)
+                                FROM ' . prefixTable('items').' AS i
+                                INNER JOIN ' . prefixTable('sharekeys_items').' AS s ON (s.object_id = i.id)
                                 WHERE user_id = %i AND i.id = %i',
                                 $session->get('user-id'),
                                 $record['id']
@@ -428,8 +428,8 @@ 
                             $arr_kbs = '';
                             $rows_kb = DB::query(
                                 'SELECT b.label, b.id
-                                FROM ' . prefixTable('kb_items') . ' AS a
-                                INNER JOIN ' . prefixTable('kb') . ' AS b ON (a.kb_id = b.id)
+                                FROM ' . prefixTable('kb_items').' AS a
+                                INNER JOIN ' . prefixTable('kb').' AS b ON (a.kb_id = b.id)
                                 WHERE a.item_id = %i',
                                 $record['id']
                             );
@@ -437,7 +437,7 @@ 
                                 if (empty($arr_kbs)) {
                                     $arr_kbs = $rec_kb['label'];
                                 } else {
-                                    $arr_kbs .= ' | ' . $rec_kb['label'];
+                                    $arr_kbs .= ' | '.$rec_kb['label'];
                                 }
                             }
 
@@ -445,7 +445,7 @@ 
                             $arr_tags = '';
                             $rows_tag = DB::query(
                                 'SELECT tag
-                                FROM ' . prefixTable('tags') . '
+                                FROM ' . prefixTable('tags').'
                                 WHERE item_id = %i',
                                 $record['id']
                             );
@@ -453,7 +453,7 @@ 
                                 if (empty($arr_tags)) {
                                     $arr_tags = $rec_tag['tag'];
                                 } else {
-                                    $arr_tags .= ' ' . $rec_tag['tag'];
+                                    $arr_tags .= ' '.$rec_tag['tag'];
                                 }
                             }
 
@@ -531,7 +531,7 @@ 
             // query
             $rows = DB::query(
                 'SELECT * 
-                FROM ' . prefixTable('export') . ' 
+                FROM ' . prefixTable('export').' 
                 WHERE export_tag = %s',
                 $dataReceived['export_tag']
             );
@@ -543,7 +543,7 @@ 
                 $prev_path = '';
 
                 //Prepare the PDF file
-                require_once $SETTINGS['cpassman_dir'] . '/vendor/tecnickcom/tcpdf/tcpdf.php';
+                require_once $SETTINGS['cpassman_dir'].'/vendor/tecnickcom/tcpdf/tcpdf.php';
 
                 $pdf = new TCPDF(PDF_PAGE_ORIENTATION, PDF_UNIT, PDF_PAGE_FORMAT, true, 'UTF-8', false);
                 $pdf->SetProtection(array('print'), $dataReceived['pdf_password'], null);
@@ -555,7 +555,7 @@ 
 
                 // set default header data
                 $pdf->SetHeaderData(
-                    $SETTINGS['cpassman_dir'] . '/includes/images/teampass-logo2-home.png',
+                    $SETTINGS['cpassman_dir'].'/includes/images/teampass-logo2-home.png',
                     PDF_HEADER_LOGO_WIDTH,
                     'Teampass export',
                     $session->get('user-lastname')." ".$session->get('user-name').' @ '.date($SETTINGS['date_format']." ".$SETTINGS['time_format'], (int) time())
@@ -665,7 +665,7 @@ 
                 logEvents($SETTINGS, 'pdf_export', '', (string) $session->get('user-id'), $session->get('user-login'));
 
                 //clean table
-                DB::query('TRUNCATE TABLE ' . prefixTable('export'));
+                DB::query('TRUNCATE TABLE '.prefixTable('export'));
 
                 // Clean any content of the output buffer
                 ob_end_clean();
@@ -704,13 +704,13 @@ 
             // step 1:
             // - prepare export file
             // - get full list of objects id to export
-            include $SETTINGS['cpassman_dir'] . '/includes/config/include.php';
+            include $SETTINGS['cpassman_dir'].'/includes/config/include.php';
             $idsList = array();
 
             // query
             $rows = DB::query(
                 'SELECT * 
-                FROM ' . prefixTable('export') . ' 
+                FROM ' . prefixTable('export').' 
                 WHERE export_tag = %s',
                 $inputData['export_tag']
             );
@@ -747,13 +747,13 @@ 
             }
             // prepare export file
             //save the file
-            $outstream = fopen($SETTINGS['path_to_files_folder'] . (substr($SETTINGS['path_to_files_folder'] , -1) === '/' ? '' : '/') . $inputData['filename'], 'w');
+            $outstream = fopen($SETTINGS['path_to_files_folder'].(substr($SETTINGS['path_to_files_folder'], -1) === '/' ? '' : '/').$inputData['filename'], 'w');
             if ($outstream === false) {
                 echo (string) prepareExchangedData(
                     [
                         'error' => true,
                         'message' => $lang->get('error_while_creating_file'),
-                        'detail' => $SETTINGS['path_to_files_folder'] . $inputData['filename'],
+                        'detail' => $SETTINGS['path_to_files_folder'].$inputData['filename'],
                     ],
                     'encode'
                 );
@@ -779,12 +779,12 @@ 
     </style>
     </head>
     <body>
-    <input type="hidden" id="generation_date" value="' . GibberishAES::enc(/** @scrutinizer ignore-type */ (string) time(), $inputData['password']) . '" />
+    <input type="hidden" id="generation_date" value="' . GibberishAES::enc(/** @scrutinizer ignore-type */ (string) time(), $inputData['password']).'" />
     <div id="header">
-    ' . TP_TOOL_NAME . ' - Off Line mode
+    ' . TP_TOOL_NAME.' - Off Line mode
     </div>
     <div style="margin:10px; font-size:9px;">
-    <i>This page was generated by <b>' . $session->get('user-name') . ' ' . $session->get('user-lastname') . '</b>, the ' . date('Y/m/d H:i:s') . '.</i>
+    <i>This page was generated by <b>' . $session->get('user-name').' '.$session->get('user-lastname').'</b>, the '.date('Y/m/d H:i:s').'.</i>
     <span id="info_page" style="margin-left:20px; font-weight:bold; font-size: 14px; color:red;"></span>
     </div>
     <div id="information"></div>
@@ -795,11 +795,11 @@ 
     <div>
     <table id="itemsTable">
         <thead><tr>
-            <th style="width:15%;">' . $lang->get('label') . '</th>
-            <th style="width:10%;">' . $lang->get('pw') . '</th>
-            <th style="width:30%;">' . $lang->get('description') . '</th>
-            <th style="width:5%;">' . $lang->get('user_login') . '</th>
-            <th style="width:20%;">' . $lang->get('url') . '</th>
+            <th style="width:15%;">' . $lang->get('label').'</th>
+            <th style="width:10%;">' . $lang->get('pw').'</th>
+            <th style="width:30%;">' . $lang->get('description').'</th>
+            <th style="width:5%;">' . $lang->get('user_login').'</th>
+            <th style="width:20%;">' . $lang->get('url').'</th>
         </tr></thead>
         <tbody id="itemsTable_tbody">'
             );
@@ -813,8 +813,8 @@ 
                     'loop' => true,
                     'ids_list' => json_encode($idsList),
                     'ids_count' => count($idsList),
-                    'file_path' => $SETTINGS['path_to_files_folder'] . (substr($SETTINGS['path_to_files_folder'] , -1) === '/' ? '' : '/') . $inputData['filename'],
-                    'file_link' => $SETTINGS['url_to_files_folder'] . (substr($SETTINGS['path_to_files_folder'] , -1) === '/' ? '' : '/') . $inputData['filename'],
+                    'file_path' => $SETTINGS['path_to_files_folder'].(substr($SETTINGS['path_to_files_folder'], -1) === '/' ? '' : '/').$inputData['filename'],
+                    'file_link' => $SETTINGS['url_to_files_folder'].(substr($SETTINGS['path_to_files_folder'], -1) === '/' ? '' : '/').$inputData['filename'],
                     'export_tag' => $inputData['export_tag'],
                 ],
                 'encode'
@@ -854,12 +854,12 @@ 
             $full_listing = array();
             $items_id_list = array();
             $outstream = '';
-            include $SETTINGS['cpassman_dir'] . '/includes/config/include.php';
+            include $SETTINGS['cpassman_dir'].'/includes/config/include.php';
 
             // query
             $rows = DB::query(
                 'SELECT * 
-                FROM ' . prefixTable('export') . ' 
+                FROM ' . prefixTable('export').' 
                 WHERE export_tag = %s AND item_id IN %ls',
                 $inputData['export_tag'],
                 $inputData['idsList']
@@ -873,7 +873,7 @@ 
                         [
                             'error' => true,
                             'message' => $lang->get('error_while_creating_file'),
-                            'detail' => $SETTINGS['path_to_files_folder'] . $inputData['filename'],
+                            'detail' => $SETTINGS['path_to_files_folder'].$inputData['filename'],
                         ],
                         'encode'
                     );
@@ -906,13 +906,13 @@ 
                         if (empty($arboHtml)) {
                             $arboHtml = $arboHtml_tmp;
                         } else {
-                            $arboHtml .= ' » ' . $arboHtml_tmp;
+                            $arboHtml .= ' » '.$arboHtml_tmp;
                         }
                     }
                     fputs(
                         $outstream,
                         '
-        <tr class="path"><td colspan="5">' . $arboHtml . '</td></tr>'
+        <tr class="path"><td colspan="5">' . $arboHtml.'</td></tr>'
                     );
                     $idTree = $record['folder_id'];
 
@@ -920,12 +920,12 @@ 
                     fputs(
                         $outstream,
                         '
-        <tr class="' . $lineType . '">
-            <td>' . addslashes($record['label']) . '</td>
-            <td align="center"><span class="span_pw" id="span_' . $record['item_id'] . '"><a href="#" onclick="decryptme(' . $record['item_id'] . ', \'' . $encPw . '\');return false;">Decrypt </a></span><input type="hidden" id="hide_' . $record['item_id'] . '" value="' . $encPw . '" /></td>
-            <td>' . (empty($record['description']) === true ? '&nbsp;' : addslashes(str_replace(array(';', '<br />'), array('|', "\n\r"), stripslashes(mb_convert_encoding($record['description'], 'ISO-8859-1', 'UTF-8'))))) . '</td>
-            <td align="center">' . (empty($record['login']) === true ? '&nbsp;' : addslashes($record['login'])) . '</td>
-            <td align="center">' . (empty($record['url']) === true ? '&nbsp;' : addslashes($record['url'])) . '</td>
+        <tr class="' . $lineType.'">
+            <td>' . addslashes($record['label']).'</td>
+            <td align="center"><span class="span_pw" id="span_' . $record['item_id'].'"><a href="#" onclick="decryptme('.$record['item_id'].', \''.$encPw.'\');return false;">Decrypt </a></span><input type="hidden" id="hide_'.$record['item_id'].'" value="'.$encPw.'" /></td>
+            <td>' . (empty($record['description']) === true ? '&nbsp;' : addslashes(str_replace(array(';', '<br />'), array('|', "\n\r"), stripslashes(mb_convert_encoding($record['description'], 'ISO-8859-1', 'UTF-8'))))).'</td>
+            <td align="center">' . (empty($record['login']) === true ? '&nbsp;' : addslashes($record['login'])).'</td>
+            <td align="center">' . (empty($record['url']) === true ? '&nbsp;' : addslashes($record['url'])).'</td>
         </tr>'
                     );
                 }
@@ -975,7 +975,7 @@ 
             $inputData['password'] = (string) $dataReceived['password'];
             
             // Load includes
-            include $SETTINGS['cpassman_dir'] . '/includes/config/include.php';
+            include $SETTINGS['cpassman_dir'].'/includes/config/include.php';
 
             // read the content of the temporary file
             $handle = fopen($inputData['filename'].'.txt', 'r');
@@ -984,7 +984,7 @@ 
                     [
                         'error' => true,
                         'message' => $lang->get('error_while_creating_file'),
-                        'detail' => $SETTINGS['path_to_files_folder'] . $inputData['filename'],
+                        'detail' => $SETTINGS['path_to_files_folder'].$inputData['filename'],
                     ],
                     'encode'
                 );
@@ -996,7 +996,7 @@ 
                     [
                         'error' => true,
                         'message' => $lang->get('error_while_creating_file'),
-                        'detail' => $SETTINGS['path_to_files_folder'] . $inputData['filename'],
+                        'detail' => $SETTINGS['path_to_files_folder'].$inputData['filename'],
                     ],
                     'encode'
                 );
@@ -1012,9 +1012,9 @@ 
             $chunks = explode('|#|#|', chunk_split($contents, 10000, '|#|#|'));
             foreach ($chunks as $chunk) {
                 if (empty($encrypted_text) === true) {
-                    $encrypted_text = GibberishAES::enc(/** @scrutinizer ignore-type */ $chunk, $inputData['password'] );
+                    $encrypted_text = GibberishAES::enc(/** @scrutinizer ignore-type */ $chunk, $inputData['password']);
                 } else {
-                    $encrypted_text .= '|#|#|' . GibberishAES::enc(/** @scrutinizer ignore-type */ $chunk, $inputData['password'] );
+                    $encrypted_text .= '|#|#|'.GibberishAES::enc(/** @scrutinizer ignore-type */ $chunk, $inputData['password']);
                 }
             }
 
@@ -1025,7 +1025,7 @@ 
                     [
                         'error' => true,
                         'message' => $lang->get('error_while_creating_file'),
-                        'detail' => $SETTINGS['path_to_files_folder'] . $inputData['filename'],
+                        'detail' => $SETTINGS['path_to_files_folder'].$inputData['filename'],
                     ],
                     'encode'
                 );
@@ -1038,9 +1038,9 @@ 
         </table></div>
         <input type="button" value="Hide all" onclick="hideAll()" />
         <div id="footer" style="text-align:center;">
-            <a href="https://teampass.net/about/" target="_blank">' . TP_TOOL_NAME . '&nbsp;' . TP_VERSION . '&nbsp;' . TP_COPYRIGHT . '</a>
+            <a href="https://teampass.net/about/" target="_blank">' . TP_TOOL_NAME.'&nbsp;'.TP_VERSION.'&nbsp;'.TP_COPYRIGHT.'</a>
         </div>
-        <div id="enc_html" style="display:none;">' . $encrypted_text . '</div>
+        <div id="enc_html" style="display:none;">' . $encrypted_text.'</div>
         </body>
     </html>
     <script type="text/javascript">
@@ -1143,12 +1143,12 @@ 
             fclose($outstream);
 
             //clean table
-            DB::query('TRUNCATE TABLE ' . prefixTable('export'));
+            DB::query('TRUNCATE TABLE '.prefixTable('export'));
 
             echo (string) prepareExchangedData(
                 [
                     'error' => false,
-                    'filelink' => $inputData['file_link'] ,
+                    'filelink' => $inputData['file_link'],
                 ],
                 'encode'
             );

api/Model/AuthModel.php

Spacing +7 added lines, -7 removed lines

@@ -51,7 +51,7 @@ 
         // Sanitize
         // IMPORTANT: Password should NOT be escaped/sanitized - treat as opaque binary data
         // Only trim whitespace which is safe and expected (fix 3.1.5.10)
-        include_once API_ROOT_PATH . '/../sources/main.functions.php';
+        include_once API_ROOT_PATH.'/../sources/main.functions.php';
         $inputData = dataSanitizer(
             [
                 'login' => isset($login) === true ? $login : '',
@@ -115,7 +115,7 @@ 
 
                 // Encrypt the decrypted private key with the session key
                 // This allows us to store it securely in the database without exposing it
-                require_once API_ROOT_PATH . '/inc/encryption_utils.php';
+                require_once API_ROOT_PATH.'/inc/encryption_utils.php';
                 $encryptedPrivateKey = encrypt_with_session_key($privateKeyClear, $sessionKey);
 
                 if ($encryptedPrivateKey === false) {
@@ -283,7 +283,7 @@ 
         if (count($userFunctionId) > 0) {
             $rows = DB::query(
                 'SELECT * 
-                FROM ' . prefixTable('roles_values') . '
+                FROM ' . prefixTable('roles_values').'
                 WHERE role_id IN %li  AND type IN ("W", "ND", "NE", "NDNE", "R")',
                 $userFunctionId
             );
@@ -309,7 +309,7 @@ 
         $inc = 0;
         $rows = DB::query(
             'SELECT id, id_tree 
-            FROM ' . prefixTable('items') . '
+            FROM ' . prefixTable('items').'
             WHERE restricted_to LIKE %s'.
             (count($userFunctionId) > 0 ? ' AND id_tree NOT IN %li' : ''),
             $userInfo['id'],
@@ -324,8 +324,8 @@ 
         // Check for the users roles if some specific rights exist on items
         $rows = DB::query(
             'SELECT i.id_tree, r.item_id
-            FROM ' . prefixTable('items') . ' AS i
-            INNER JOIN ' . prefixTable('restriction_to_roles') . ' AS r ON (r.item_id=i.id)
+            FROM ' . prefixTable('items').' AS i
+            INNER JOIN ' . prefixTable('restriction_to_roles').' AS r ON (r.item_id=i.id)
             WHERE '.(count($userFunctionId) > 0 ? ' id_tree NOT IN %li AND ' : '').' i.id_tree != ""
             ORDER BY i.id_tree ASC',
             count($userFunctionId) > 0 ? $userFunctionId : DB::sqleval('0')
@@ -341,7 +341,7 @@ 
         // Add all personal folders
         $rows = DB::queryFirstRow(
             'SELECT id 
-            FROM ' . prefixTable('nested_tree') . '
+            FROM ' . prefixTable('nested_tree').'
             WHERE title = %i AND personal_folder = 1'.
             (count($userFunctionId) > 0 ? ' AND id NOT IN %li' : ''),
             $userInfo['id'],

api/Controller/Api/ItemController.php

Indentation +6 added lines, -6 removed lines

@@ -360,12 +360,12 @@
     //end getAction()
 
     /**
- * Find items by URL
- * Searches for items matching a specific URL
- *
- * @param array $userData User data from JWT token
- * @return void
- */
+     * Find items by URL
+     * Searches for items matching a specific URL
+     *
+     * @param array $userData User data from JWT token
+     * @return void
+     */
 public function findByUrlAction(array $userData): void
 {
     $request = symfonyRequest::createFromGlobals();

Spacing +12 added lines, -12 removed lines

@@ -40,11 +40,11 @@ 
      */
     private function getUserPrivateKey(array $userData): ?string
     {
-        include_once API_ROOT_PATH . '/inc/jwt_utils.php';
+        include_once API_ROOT_PATH.'/inc/jwt_utils.php';
 
         // Verify session_key exists in JWT payload
         if (!isset($userData['session_key']) || empty($userData['session_key'])) {
-            error_log('getUserPrivateKey: Missing session_key in JWT token for user ID ' . $userData['id']);
+            error_log('getUserPrivateKey: Missing session_key in JWT token for user ID '.$userData['id']);
             return null;
         }
 
@@ -88,7 +88,7 @@ 
             // SQL where clause with folders list
             if (isset($arrQueryStringParams['folders']) === true) {
                 // convert the folders to an array
-                $arrQueryStringParams['folders'] = explode(',', str_replace( array('[',']') , ''  , $arrQueryStringParams['folders']));
+                $arrQueryStringParams['folders'] = explode(',', str_replace(array('[', ']'), '', $arrQueryStringParams['folders']));
 
                 // ensure to only use the intersection
                 $foldersList = implode(',', array_intersect($arrQueryStringParams['folders'], $userData['folders_list']));
@@ -256,7 +256,7 @@ 
                 } else {
                     // Gérer le cas où les paramètres ne sont pas un tableau
                     $strErrorDesc = 'Data not consistent';
-                    $strErrorHeader = 'Expected array, received ' . gettype($arrQueryStringParams);
+                    $strErrorHeader = 'Expected array, received '.gettype($arrQueryStringParams);
                 }
             }
         } else {
@@ -307,10 +307,10 @@ 
             // SQL where clause with item id
             if (isset($arrQueryStringParams['id']) === true) {
                 // build sql where clause by ID
-                $sqlExtra = ' WHERE i.id = '.$arrQueryStringParams['id'] . $sql_constraint;
+                $sqlExtra = ' WHERE i.id = '.$arrQueryStringParams['id'].$sql_constraint;
             } else if (isset($arrQueryStringParams['label']) === true) {
                 // build sql where clause by LABEL
-                $sqlExtra = ' WHERE i.label '.(isset($arrQueryStringParams['like']) === true && (int) $arrQueryStringParams['like'] === 1 ? ' LIKE '.$arrQueryStringParams['label'] : ' = '.$arrQueryStringParams['label']) . $sql_constraint;
+                $sqlExtra = ' WHERE i.label '.(isset($arrQueryStringParams['like']) === true && (int) $arrQueryStringParams['like'] === 1 ? ' LIKE '.$arrQueryStringParams['label'] : ' = '.$arrQueryStringParams['label']).$sql_constraint;
             } else if (isset($arrQueryStringParams['description']) === true) {
                 // build sql where clause by LABEL
                 $sqlExtra = ' WHERE i.description '.(isset($arrQueryStringParams['like']) === true && (int) $arrQueryStringParams['like'] === 1 ? ' LIKE '.$arrQueryStringParams['description'] : ' = '.$arrQueryStringParams['description']).$sql_constraint;
@@ -393,9 +393,9 @@ 
         }*/
 
         // Build SQL constraint for accessible folders
-        $sql_constraint = ' AND (i.id_tree IN (' . $userData['folders_list'] . ')';
+        $sql_constraint = ' AND (i.id_tree IN ('.$userData['folders_list'].')';
         if (!empty($userData['restricted_items_list'])) {
-            $sql_constraint .= ' OR i.id IN (' . $userData['restricted_items_list'] . ')';
+            $sql_constraint .= ' OR i.id IN ('.$userData['restricted_items_list'].')';
         }
         $sql_constraint .= ')';
 
@@ -412,8 +412,8 @@ 
                 // Query items with the specific URL
                 $rows = DB::query(
                     'SELECT i.id, i.label, i.login, i.url, i.id_tree
-                    FROM ' . prefixTable('items') . ' AS i
-                    WHERE i.url LIKE %s' . $sql_constraint . '
+                    FROM ' . prefixTable('items').' AS i
+                    WHERE i.url LIKE %s' . $sql_constraint.'
                     ORDER BY i.label ASC',
                     $searchUrl."%"
                 );
@@ -423,7 +423,7 @@ 
                     // Get user's sharekey for this item
                     $shareKey = DB::queryfirstrow(
                         'SELECT share_key
-                        FROM ' . prefixTable('sharekeys_items') . '
+                        FROM ' . prefixTable('sharekeys_items').'
                         WHERE user_id = %i AND object_id = %i',
                         $userData['id'],
                         $row['id']
@@ -455,7 +455,7 @@ 
                 }
             }
         } catch (Error $e) {
-            $strErrorDesc = $e->getMessage() . '. Something went wrong! Please contact support.';
+            $strErrorDesc = $e->getMessage().'. Something went wrong! Please contact support.';
             $strErrorHeader = 'HTTP/1.1 500 Internal Server Error';
         }
     } else {

api/Controller/Api/AuthController.php

Spacing +2 added lines, -2 removed lines

@@ -61,7 +61,7 @@ 
                     $strErrorDesc = 'Missing required parameters: login, password, and apikey must be provided in request body';
                     $strErrorHeader = 'HTTP/1.1 400 Bad Request';
                 } else {
-                    require API_ROOT_PATH . "/Model/AuthModel.php";
+                    require API_ROOT_PATH."/Model/AuthModel.php";
                     try {
                         $authModel = new AuthModel();
                         $arrUser = $authModel->getUserAuth(
@@ -72,7 +72,7 @@ 
                         if (array_key_exists("token", $arrUser)) {
                             $responseData = json_encode($arrUser);
                         } else {
-                            $strErrorDesc = $arrUser['error'] . " (" . $arrUser['info'] . ")";
+                            $strErrorDesc = $arrUser['error']." (".$arrUser['info'].")";
                             $strErrorHeader = 'HTTP/1.1 401 Unauthorized';
                         }
                     } catch (Error $e) {

api/inc/jwt_utils.php

Spacing +7 added lines, -7 removed lines

@@ -148,34 +148,34 @@ 
  */
 function get_user_keys(int $userId, string $keyTempo, string $sessionKey): ?array
 {
-    require_once API_ROOT_PATH . '/inc/encryption_utils.php';
+    require_once API_ROOT_PATH.'/inc/encryption_utils.php';
 
     // Retrieve user's public key and encrypted private key from database
     $userInfo = DB::queryfirstrow(
         "SELECT u.public_key, a.encrypted_private_key, a.session_key AS key_tempo
-        FROM " . prefixTable('users') . " AS u
-        INNER JOIN " . prefixTable('api') . " AS a ON (a.user_id = u.id)
+        FROM " . prefixTable('users')." AS u
+        INNER JOIN " . prefixTable('api')." AS a ON (a.user_id = u.id)
         WHERE u.id = %i",
         $userId
     );
 
     if (DB::count() === 0) {
         // User not found or no API configuration
-        error_log('[API] get_user_keys: User not found or no API config for user ID ' . $userId);
+        error_log('[API] get_user_keys: User not found or no API config for user ID '.$userId);
         return null;
     }
 
     // Validate key_tempo matches (security check - ensures session is still valid)
     if (($userInfo['key_tempo']) !== $keyTempo) {
         // Session invalid or expired
-        error_log('[API] get_user_keys: Invalid key_tempo for user ID ' . $userId);
+        error_log('[API] get_user_keys: Invalid key_tempo for user ID '.$userId);
         return null;
     }
 
     // Check if encrypted private key exists
     if (empty($userInfo['encrypted_private_key'])) {
         // No encrypted key found - user needs to re-authenticate
-        error_log('[API] get_user_keys: No encrypted private key found for user ID ' . $userId);
+        error_log('[API] get_user_keys: No encrypted private key found for user ID '.$userId);
         return null;
     }
 
@@ -195,7 +195,7 @@ 
 
     if ($privateKeyDecrypted === false) {
         // Decryption failed - wrong key or tampered data
-        error_log('[API] get_user_keys: Failed to decrypt private key for user ID ' . $userId);
+        error_log('[API] get_user_keys: Failed to decrypt private key for user ID '.$userId);
         return null;
     }
 

sources/roles.queries.php

Spacing +5 added lines, -5 removed lines

@@ -76,7 +76,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;
 }
 
@@ -557,7 +557,7 @@ 
 
             // Parse all users to remove this role from users_roles table
             DB::query(
-                'DELETE FROM ' . prefixTable('users_roles') . '
+                'DELETE FROM '.prefixTable('users_roles').'
                 WHERE role_id = %i',
                 $post_roleId
             );
@@ -619,7 +619,7 @@ 
                         $groupsData = $openLdapExtra->getADGroups($ldapConnection, $SETTINGS);
                         break;
                     default:
-                        throw new Exception("Unsupported LDAP type: " . $SETTINGS['ldap_type']);
+                        throw new Exception("Unsupported LDAP type: ".$SETTINGS['ldap_type']);
                 }
             } catch (Exception $e) {
                 if (defined('LOG_TO_SERVER') && LOG_TO_SERVER === true) {
@@ -639,7 +639,7 @@ 
             } else {
                 // Handle successful retrieval of groups
                 // exists in Teampass
-                foreach($groupsData['userGroups'] as $key => $group) {
+                foreach ($groupsData['userGroups'] as $key => $group) {
                     $role_detail = DB::queryFirstRow(
                         'SELECT a.increment_id as increment_id, a.role_id as role_id, r.title as title
                         FROM '.prefixTable('ldap_groups_roles').' AS a
@@ -664,7 +664,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,

sources/identify.php

Spacing +52 added lines, -52 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(
                 [
@@ -498,7 +498,7 @@ 
                 0,
                 (string) $return,
                 (array) $userInfo ?? [],
-                false,  // not success
+                false, // not success
                 'user_is_locked',
                 $lang->get('account_is_locked')
             ),
@@ -514,7 +514,7 @@ 
             (int) $sessionPwdAttempts,
             (string) $return,
             (array) $userInfo ?? [],
-            false,  // not success
+            false, // not success
             true,
             $lang->get('error_not_allowed_to_authenticate')
         ),
@@ -791,7 +791,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')
     );
@@ -822,7 +822,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(
@@ -834,7 +834,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()),
                     ],
@@ -941,7 +941,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
@@ -958,7 +958,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')
         );
@@ -1047,7 +1047,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'
@@ -1061,7 +1061,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'])
             );
         }
     }
@@ -1096,7 +1096,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;
@@ -1184,7 +1184,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);
@@ -1354,7 +1354,7 @@ 
     } catch (Exception $e) {
         return [
             'error' => true,
-            'message' => "Error: " . $e->getMessage(),
+            'message' => "Error: ".$e->getMessage(),
         ];
     }
 }
@@ -1385,7 +1385,7 @@ 
                 'type' => 'OpenLDAP'
             ];
         default:
-            throw new Exception("Unsupported LDAP type: " . $SETTINGS['ldap_type']);
+            throw new Exception("Unsupported LDAP type: ".$SETTINGS['ldap_type']);
     }
 }
 
@@ -1522,7 +1522,7 @@ 
         );
     }
     
-    throw new Exception("Unsupported LDAP type: " . $ldapHandler['type']);
+    throw new Exception("Unsupported LDAP type: ".$ldapHandler['type']);
 }
 
 /**
@@ -1539,11 +1539,11 @@ 
     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) {
             // 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
             );
@@ -1589,7 +1589,7 @@ 
     $passwordManager = new PasswordManager();
     
     // Migrate password if needed
-    $result  = $passwordManager->migratePassword(
+    $result = $passwordManager->migratePassword(
         $userInfo['pw'],
         $passwordClear,
         (int) $userInfo['id']
@@ -1666,7 +1666,7 @@ 
             // Check if exists in DB
             $groupData = DB::queryFirstRow(
                 'SELECT id
-                FROM ' . prefixTable('roles_title') . '
+                FROM ' . prefixTable('roles_title').'
                 WHERE title = %s',
                 $group["displayName"]
             );
@@ -1815,7 +1815,7 @@ 
             
             // generate new QR
             $new_2fa_qr = $tfa->getQRCodeImageAsDataUri(
-                'Teampass - ' . $username,
+                'Teampass - '.$username,
                 $userInfo['ga']
             );
             // clear temporary code from DB
@@ -1828,7 +1828,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,
@@ -1984,7 +1984,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,
@@ -2000,7 +2000,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,
@@ -2008,7 +2008,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);
@@ -2036,7 +2036,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,
             ];
@@ -2057,8 +2057,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 [
@@ -2069,9 +2069,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,
@@ -2082,9 +2082,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'),
@@ -2150,7 +2150,7 @@ 
                 prefixTable('users'),
                 [
                     'pw' => $newHash,
-                    'needs_password_migration' => 0,  // 0 = migration completed
+                    'needs_password_migration' => 0, // 0 = migration completed
                     'private_key' => $newUserPrivateKey,
                 ],
                 'id = %i',
@@ -2259,7 +2259,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()),
@@ -2296,9 +2296,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) {
@@ -2408,7 +2408,7 @@ 
             'array' => [
                 'value' => 'bruteforce_wait',
                 'error' => true,
-                'message' => $lang->get('bruteforce_wait') . (string) $e->getMessage(),
+                'message' => $lang->get('bruteforce_wait').(string) $e->getMessage(),
             ]
         ];
     }
@@ -2513,7 +2513,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',
@@ -2630,7 +2630,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'),
@@ -2854,12 +2854,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
@@ -3071,15 +3071,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,
@@ -3143,7 +3143,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

sources/core.php

Spacing +27 added lines, -27 removed lines

@@ -58,16 +58,16 @@ 
 {
     // Load AntiXSS
     $antiXss = new AntiXSS();
-    if (! headers_sent()) {    //If headers not sent yet... then do php redirect
-        header('Location: ' . $antiXss->xss_clean($url));
+    if (!headers_sent()) {    //If headers not sent yet... then do php redirect
+        header('Location: '.$antiXss->xss_clean($url));
     }
 
     //If headers are sent... do java redirect... if java disabled, do html redirect.
     echo '<script type="text/javascript">';
-    echo 'window.location.href="' . $antiXss->xss_clean($url) . '";';
+    echo 'window.location.href="'.$antiXss->xss_clean($url).'";';
     echo '</script>';
     echo '<noscript>';
-    echo '<meta http-equiv="refresh" content="0;url=' . $antiXss->xss_clean($url) . '" />';
+    echo '<meta http-equiv="refresh" content="0;url='.$antiXss->xss_clean($url).'" />';
     echo '</noscript>';
 }
 
@@ -93,7 +93,7 @@ 
     && isset($SETTINGS['enable_sts']) === true
     && (int) $SETTINGS['enable_sts'] === 1
 ) {
-    teampassRedirect('https://' . $server['http_host'] . $server['request_uri']);
+    teampassRedirect('https://'.$server['http_host'].$server['request_uri']);
 }
 
 // Load pwComplexity
@@ -114,11 +114,11 @@ 
 // LOAD CPASSMAN SETTINGS
 if (
     isset($SETTINGS['cpassman_dir']) === true
-    && is_dir($SETTINGS['cpassman_dir'] . '/install') === true
+    && is_dir($SETTINGS['cpassman_dir'].'/install') === true
 ) {
     // Should we delete folder INSTALL?
     $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',
         'install',
         'clear_install_folder'
     );
@@ -136,11 +136,11 @@ 
             if ($directories !== false) {
                 $files = array_diff($directories, ['.', '..']);
                 foreach ($files as $file) {
-                    if (is_dir($dir . '/' . $file)) {
-                        delTree($dir . '/' . $file);
+                    if (is_dir($dir.'/'.$file)) {
+                        delTree($dir.'/'.$file);
                     } else {
                         try {
-                            unlink($dir . '/' . $file);
+                            unlink($dir.'/'.$file);
                         } catch (Exception $e) {
                             // do nothing... php will ignore and continue
                         }
@@ -154,13 +154,13 @@ 
             return false;
         }
 
-        if (is_dir($SETTINGS['cpassman_dir'] . '/install')) {
+        if (is_dir($SETTINGS['cpassman_dir'].'/install')) {
             // Set the permissions on the install directory and delete
             // is server Windows or Linux?
             if (strtoupper(substr(PHP_OS, 0, 3)) !== 'WIN') {
-                recursiveChmod($SETTINGS['cpassman_dir'] . '/install', 0755, 0440);
+                recursiveChmod($SETTINGS['cpassman_dir'].'/install', 0755, 0440);
             }
-            delTree($SETTINGS['cpassman_dir'] . '/install');
+            delTree($SETTINGS['cpassman_dir'].'/install');
         }
 
         // Delete temporary install table
@@ -178,10 +178,10 @@ 
 // Load Languages stuff
 if (isset($languagesList) === false) {
     $languagesList = [];
-    $rows = DB::query('SELECT * FROM ' . prefixTable('languages') . ' GROUP BY name, label, code, flag, id ORDER BY name ASC');
+    $rows = DB::query('SELECT * FROM '.prefixTable('languages').' GROUP BY name, label, code, flag, id ORDER BY name ASC');
     foreach ($rows as $record) {
         array_push($languagesList, $record['name']);
-        if ($session->get('user-language') === $record['name'] ) {
+        if ($session->get('user-language') === $record['name']) {
             $session->set('user-language_flag', $record['flag']);
             $session->set('user-language_code', $record['code']);
             //$session->set('user-language_label', $record['label']);
@@ -238,7 +238,7 @@ 
 // CHECK IF SESSION EXISTS AND IF SESSION IS VALID
 if (empty($session->get('user-session_duration')) === false) {
     $dataSession = DB::queryFirstRow(
-        'SELECT key_tempo, deleted_at FROM ' . prefixTable('users') . ' WHERE id=%i',
+        'SELECT key_tempo, deleted_at FROM '.prefixTable('users').' WHERE id=%i',
         $session->get('user-id')
     );
     // Ensure deleted_at is set
@@ -299,7 +299,7 @@ 
     && ($session->has('user-admin') && $session->get('user-admin') && null !== $session->get('user-admin') && $session->get('user-admin') === 1)
 ) {
     $row = DB::queryFirstRow(
-        'SELECT valeur FROM ' . prefixTable('misc') . ' WHERE type=%s_type AND intitule=%s_intitule',
+        'SELECT valeur FROM '.prefixTable('misc').' WHERE type=%s_type AND intitule=%s_intitule',
         [
             'type' => 'admin',
             'intitule' => 'teampass_version',
@@ -340,7 +340,7 @@ 
 
         syslog(
             LOG_WARNING,
-            'Unlog user: ' . date('Y/m/d H:i:s') . " {$server['remote_addr']} ({$server['http_user_agent']})"
+            'Unlog user: '.date('Y/m/d H:i:s')." {$server['remote_addr']} ({$server['http_user_agent']})"
         );
         // erase session table
         $session->invalidate();
@@ -393,16 +393,16 @@ 
 /* LOAD INFORMATION CONCERNING USER */
 if ($session->has('user-timezone') && null !== $session->get('user-id') && empty($session->get('user-id')) === false) {
     // query on user
-    $data =DB::queryFirstRow(
+    $data = DB::queryFirstRow(
         'SELECT u.login, u.admin, u.gestionnaire, u.can_manage_all_users, u.last_connexion, u.auth_type, u.last_pw_change, u.deleted_at,
         GROUP_CONCAT(DISTINCT ug.group_id ORDER BY ug.group_id SEPARATOR ";") AS groupes_visibles,
         GROUP_CONCAT(DISTINCT ugf.group_id ORDER BY ugf.group_id SEPARATOR ";") AS groupes_interdits,
         GROUP_CONCAT(DISTINCT CASE WHEN ur.source = "manual" THEN ur.role_id END ORDER BY ur.role_id SEPARATOR ";") AS fonction_id,
         GROUP_CONCAT(DISTINCT CASE WHEN ur.source = "ad" THEN ur.role_id END ORDER BY ur.role_id SEPARATOR ";") AS roles_from_ad_groups
-        FROM ' . prefixTable('users') . ' AS u
-        LEFT JOIN ' . prefixTable('users_groups') . ' AS ug ON (u.id = ug.user_id)
-        LEFT JOIN ' . prefixTable('users_groups_forbidden') . ' AS ugf ON (u.id = ugf.user_id)
-        LEFT JOIN ' . prefixTable('users_roles') . ' AS ur ON (u.id = ur.user_id)
+        FROM ' . prefixTable('users').' AS u
+        LEFT JOIN ' . prefixTable('users_groups').' AS ug ON (u.id = ug.user_id)
+        LEFT JOIN ' . prefixTable('users_groups_forbidden').' AS ugf ON (u.id = ugf.user_id)
+        LEFT JOIN ' . prefixTable('users_roles').' AS ur ON (u.id = ur.user_id)
         WHERE u.id = %s
         GROUP BY u.id',
         $session->get('user-id')
@@ -452,7 +452,7 @@ 
             $data['groupes_visibles'] ?? [],
             $data['groupes_interdits'] ?? [],
             $data['admin'],
-            is_null($data['roles_from_ad_groups']) === true ? $data['fonction_id'] : (empty($data['roles_from_ad_groups']) === true ? $data['fonction_id'] : $data['fonction_id'] . ';' . $data['roles_from_ad_groups']),
+            is_null($data['roles_from_ad_groups']) === true ? $data['fonction_id'] : (empty($data['roles_from_ad_groups']) === true ? $data['fonction_id'] : $data['fonction_id'].';'.$data['roles_from_ad_groups']),
             $SETTINGS
         );
         if ($session->has('user-can_create_root_folder') && (int) $session->get('user-can_create_root_folder') && null !== $session->get('user-can_create_root_folder') && (int) $session->get('user-can_create_root_folder') === 1) {
@@ -487,7 +487,7 @@ 
     $session->set('system-item_fields', []);
     $rows = DB::query(
         'SELECT *
-            FROM ' . prefixTable('categories') . '
+            FROM ' . prefixTable('categories').'
             WHERE level=%i',
         '0'
     );
@@ -496,7 +496,7 @@ 
         // get each field
         $rows2 = DB::query(
             'SELECT *
-            FROM ' . prefixTable('categories') . '
+            FROM ' . prefixTable('categories').'
             WHERE parent_id=%i
             ORDER BY `order` ASC',
             $record['id']
@@ -583,5 +583,5 @@ 
 }
 
 /* CHECK NUMBER OF USER ONLINE */
-DB::query('SELECT * FROM ' . prefixTable('users') . ' WHERE timestamp>=%i', time() - 600);
+DB::query('SELECT * FROM '.prefixTable('users').' WHERE timestamp>=%i', time() - 600);
 $session->set('system-nb_users_online', DB::count());

sources/users.queries.php

Spacing +87 added lines, -87 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,11 +277,11 @@ 
             // Check if user exists (active or soft-deleted)
             $existingUser = DB::queryFirstRow(
                 'SELECT id, login, deleted_at
-                FROM ' . prefixTable('users') . '
+                FROM ' . prefixTable('users').'
                 WHERE (login = %s AND deleted_at IS NULL)
                 OR (login LIKE %s AND deleted_at IS NOT NULL)',
                 $login,
-                $login . '_deleted_%'
+                $login.'_deleted_%'
             );
 
             if (is_null($existingUser)) {
@@ -464,7 +464,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(
@@ -503,7 +503,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(
@@ -518,7 +518,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 
             );        
@@ -535,7 +535,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(
@@ -555,7 +555,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();
 
@@ -584,7 +584,7 @@ 
                 echo prepareExchangedData(
                     [
                         'error' => true,
-                        'message' => $lang->get('error') . ': ' . $e->getMessage(),
+                        'message' => $lang->get('error').': '.$e->getMessage(),
                     ],
                     'encode'
                 );
@@ -598,7 +598,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'
@@ -611,7 +611,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)
             );
@@ -640,7 +640,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
             );
@@ -719,7 +719,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')
                 );
@@ -757,7 +757,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']);
                 }
@@ -788,7 +788,7 @@ 
                         array_push(
                             $managedBy,
                             array(
-                                'title' => $lang->get('managers_of') . ' ' . $fonction['title'],
+                                'title' => $lang->get('managers_of').' '.$fonction['title'],
                                 'id' => $fonction['id'],
                                 'selected' => $selected,
                             )
@@ -870,9 +870,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;
@@ -960,7 +960,7 @@ 
             // Get info about user to modify
             $data_user = DB::queryFirstRow(
                 'SELECT admin, gestionnaire, can_manage_all_users, isAdministratedByRole 
-                FROM ' . prefixTable('users') . '
+                FROM ' . prefixTable('users').'
                 WHERE id = %i',
                 $post_id
             );
@@ -971,7 +971,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
                 );
@@ -994,7 +994,7 @@ 
             // Exclude roles from AD - PR #3635
             $adRolesResult = DB::query(
                 'SELECT role_id
-                FROM ' . prefixTable('users_roles') . '
+                FROM ' . prefixTable('users_roles').'
                 WHERE user_id = %i AND source = %s',
                 $post_id,
                 'ad'
@@ -1097,7 +1097,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'
@@ -1110,7 +1110,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'
@@ -1204,7 +1204,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(
@@ -1253,7 +1253,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,
@@ -1312,7 +1312,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']));
@@ -1323,8 +1323,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']
@@ -1347,7 +1347,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));
                 }
                 
@@ -1362,7 +1362,7 @@ 
                             // get folder name
                             $row = DB::queryFirstRow(
                                 'SELECT title, nlevel, id
-                                FROM ' . prefixTable('nested_tree') . '
+                                FROM ' . prefixTable('nested_tree').'
                                 WHERE id = %i',
                                 $fld['id']
                             );
@@ -1380,8 +1380,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 = '';
             }
@@ -1435,10 +1435,10 @@ 
                     GROUP_CONCAT(DISTINCT CASE WHEN ur.source = "manual" THEN ur.role_id END ORDER BY ur.role_id SEPARATOR ";") AS fonction_id,
                     GROUP_CONCAT(DISTINCT ug.group_id ORDER BY ug.group_id SEPARATOR ";") AS groupes_visibles,
                     GROUP_CONCAT(DISTINCT ugf.group_id ORDER BY ugf.group_id SEPARATOR ";") AS groupes_interdits
-                    FROM ' . prefixTable('users') . ' AS u
-                    LEFT JOIN ' . prefixTable('users_roles') . ' AS ur ON (u.id = ur.user_id)
-                    LEFT JOIN ' . prefixTable('users_groups') . ' AS ug ON (u.id = ug.user_id)
-                    LEFT JOIN ' . prefixTable('users_groups_forbidden') . ' AS ugf ON (u.id = ugf.user_id)
+                    FROM ' . prefixTable('users').' AS u
+                    LEFT JOIN ' . prefixTable('users_roles').' AS ur ON (u.id = ur.user_id)
+                    LEFT JOIN ' . prefixTable('users_groups').' AS ug ON (u.id = ug.user_id)
+                    LEFT JOIN ' . prefixTable('users_groups_forbidden').' AS ugf ON (u.id = ugf.user_id)
                     WHERE u.admin = %i AND u.isAdministratedByRole IN %ls AND u.deleted_at IS NULL AND u.disabled = %i
                     GROUP BY u.id',
                     0,
@@ -1451,10 +1451,10 @@ 
                     GROUP_CONCAT(DISTINCT CASE WHEN ur.source = "manual" THEN ur.role_id END ORDER BY ur.role_id SEPARATOR ";") AS fonction_id,
                     GROUP_CONCAT(DISTINCT ug.group_id ORDER BY ug.group_id SEPARATOR ";") AS groupes_visibles,
                     GROUP_CONCAT(DISTINCT ugf.group_id ORDER BY ugf.group_id SEPARATOR ";") AS groupes_interdits
-                    FROM ' . prefixTable('users') . ' AS u
-                    LEFT JOIN ' . prefixTable('users_roles') . ' AS ur ON (u.id = ur.user_id)
-                    LEFT JOIN ' . prefixTable('users_groups') . ' AS ug ON (u.id = ug.user_id)
-                    LEFT JOIN ' . prefixTable('users_groups_forbidden') . ' AS ugf ON (u.id = ugf.user_id)
+                    FROM ' . prefixTable('users').' AS u
+                    LEFT JOIN ' . prefixTable('users_roles').' AS ur ON (u.id = ur.user_id)
+                    LEFT JOIN ' . prefixTable('users_groups').' AS ug ON (u.id = ug.user_id)
+                    LEFT JOIN ' . prefixTable('users_groups_forbidden').' AS ugf ON (u.id = ugf.user_id)
                     WHERE u.admin = %i AND u.deleted_at IS NULL AND u.disabled = %i
                     GROUP BY u.id',
                     0,
@@ -1475,7 +1475,7 @@ 
                     foreach (explode(';', $record['fonction_id']) as $group) {
                         if (!empty($group)) {
                             $tmp = DB::queryFirstRow(
-                                'SELECT id, title FROM ' . prefixTable('roles_title') . '
+                                'SELECT id, title FROM '.prefixTable('roles_title').'
                                 WHERE id = %i',
                                 $group
                             );
@@ -1489,7 +1489,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']
                 );
@@ -1501,7 +1501,7 @@ 
                     foreach (explode(';', $record['groupes_visibles']) as $role) {
                         if (!empty($role)) {
                             $tmp = DB::queryFirstRow(
-                                'SELECT id, title FROM ' . prefixTable('nested_tree') . '
+                                'SELECT id, title FROM '.prefixTable('nested_tree').'
                                 WHERE id = %i',
                                 $role
                             );
@@ -1518,7 +1518,7 @@ 
                     foreach (explode(';', $record['groupes_interdits']) as $role) {
                         if (!empty($role)) {
                             $tmp = DB::queryFirstRow(
-                                'SELECT id, title FROM ' . prefixTable('nested_tree') . '
+                                'SELECT id, title FROM '.prefixTable('nested_tree').'
                                 WHERE id = %i',
                                 $role
                             );
@@ -1640,7 +1640,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']
             );
@@ -1888,14 +1888,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
@@ -1911,14 +1911,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
                 );
@@ -2038,7 +2038,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(
@@ -2068,7 +2068,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(
@@ -2085,7 +2085,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) {
@@ -2133,7 +2133,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,
@@ -2198,7 +2198,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
             );
@@ -2392,7 +2392,7 @@ 
             // Check if user already exists
             DB::query(
                 'SELECT id
-                FROM ' . prefixTable('users') . '
+                FROM ' . prefixTable('users').'
                 WHERE id = %i',
                 $post_id
             );
@@ -2454,7 +2454,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,
@@ -2500,7 +2500,7 @@ 
                     // Get his ID and auth type
                     $userInfo = DB::queryFirstRow(
                         'SELECT id, login, auth_type
-                        FROM ' . prefixTable('users') . '
+                        FROM ' . prefixTable('users').'
                         WHERE login = %s',
                         $userLogin
                     );
@@ -2509,7 +2509,7 @@ 
                     $userGroupsInTeampass = [];
                     if ($userInfo !== null) {
                         $userRoles = DB::query(
-                            'SELECT role_id FROM ' . prefixTable('users_roles') . '
+                            'SELECT role_id FROM '.prefixTable('users_roles').'
                             WHERE user_id = %i',
                             $userInfo['id']
                         );
@@ -2618,7 +2618,7 @@ 
             // Check if user already exists
             DB::query(
                 'SELECT id
-                FROM ' . prefixTable('users') . '
+                FROM ' . prefixTable('users').'
                 WHERE id = %i',
                 $post_id
             );
@@ -2684,7 +2684,7 @@ 
             // Search TP_USER in db        
             $userTP = DB::queryFirstRow(
                 'SELECT pw
-                FROM ' . prefixTable('users') . '
+                FROM ' . prefixTable('users').'
                 WHERE id = %i',
                 TP_USER_ID
             );
@@ -2707,7 +2707,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'),
@@ -2814,17 +2814,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++;
                 }
             }
 
@@ -2833,7 +2833,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'
@@ -2966,7 +2966,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(
                 [
@@ -3006,13 +3006,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
@@ -3036,7 +3036,7 @@ 
                 echo prepareExchangedData(
                     [
                         'error' => true,
-                        'message' => $lang->get('error') . ': ' . $e->getMessage(),
+                        'message' => $lang->get('error').': '.$e->getMessage(),
                     ],
                     'encode'
                 );
@@ -3090,10 +3090,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);
@@ -3101,11 +3101,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(
                 [
@@ -3113,7 +3113,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'
@@ -3148,7 +3148,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
             );
             
@@ -3161,12 +3161,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
@@ -3176,7 +3176,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'
                 );
@@ -3209,7 +3209,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]
     );
@@ -3243,7 +3243,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)
@@ -3278,7 +3278,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]
     );
@@ -3317,7 +3317,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"
@@ -3343,7 +3343,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",
@@ -3383,7 +3383,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'
@@ -3405,7 +3405,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'
@@ -3435,7 +3435,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
         );