nilsteampassnet / TeamPass

sources/logs.datatables.php

Spacing +24 added lines, -26 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;
 }
 
@@ -168,7 +168,7 @@ 
     
     // Output
     $sOutput = '{';
-    $sOutput .= '"sEcho": '. $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT) . ', ';
+    $sOutput .= '"sEcho": '.$request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT).', ';
     $sOutput .= '"iTotalRecords": '.$iTotal.', ';
     $sOutput .= '"iTotalDisplayRecords": '.$iTotal.', ';
     $sOutput .= '"aaData": ';
@@ -241,7 +241,7 @@ 
 
     // Output
     $sOutput = '{';
-    $sOutput .= '"sEcho": '. $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT) . ', ';
+    $sOutput .= '"sEcho": '.$request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT).', ';
     $sOutput .= '"iTotalRecords": '.$iTotal.', ';
     $sOutput .= '"iTotalDisplayRecords": '.$iTotal.', ';
     $sOutput .= '"aaData": ';
@@ -314,7 +314,7 @@ 
 
     // Output
     $sOutput = '{';
-    $sOutput .= '"sEcho": '. (int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT) . ', ';
+    $sOutput .= '"sEcho": '.(int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT).', ';
     $sOutput .= '"iTotalRecords": '.$iTotal.', ';
     $sOutput .= '"iTotalDisplayRecords": '.$iTotal.', ';
     $sOutput .= '"aaData": ';
@@ -387,7 +387,7 @@ 
 
     // Output
     $sOutput = '{';
-    $sOutput .= '"sEcho": '. (int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT) . ', ';
+    $sOutput .= '"sEcho": '.(int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT).', ';
     $sOutput .= '"iTotalRecords": '.$iTotal.', ';
     $sOutput .= '"iTotalDisplayRecords": '.$iTotal.', ';
     $sOutput .= '"aaData": [ ';
@@ -490,7 +490,7 @@ 
 
     // Output
     $sOutput = '{';
-    $sOutput .= '"sEcho": '. (int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT) . ', ';
+    $sOutput .= '"sEcho": '.(int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT).', ';
     $sOutput .= '"iTotalRecords": '.$iTotal.', ';
     $sOutput .= '"iTotalDisplayRecords": '.$iTotal.', ';
     $sOutput .= '"aaData": [ ';
@@ -573,7 +573,7 @@ 
         $iTotal = 0;
     }
     $sOutput = '{';
-    $sOutput .= '"sEcho": '. (int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT) . ', ';
+    $sOutput .= '"sEcho": '.(int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT).', ';
     $sOutput .= '"iTotalRecords": '.$iTotal.', ';
     $sOutput .= '"iTotalDisplayRecords": '.$iTotal.', ';
     $sOutput .= '"aaData": ';
@@ -649,7 +649,7 @@ 
 
     // Output
     $sOutput = '{';
-    $sOutput .= '"sEcho": '. (int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT) . ', ';
+    $sOutput .= '"sEcho": '.(int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT).', ';
     $sOutput .= '"iTotalRecords": '.$iTotal.', ';
     $sOutput .= '"iTotalDisplayRecords": '.$iTotal.', ';
     $sOutput .= '"aaData": ';
@@ -718,7 +718,7 @@ 
 
     // Output
     $sOutput = '{';
-    $sOutput .= '"sEcho": '. (int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT) . ', ';
+    $sOutput .= '"sEcho": '.(int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT).', ';
     $sOutput .= '"iTotalRecords": '.$iTotal.', ';
     $sOutput .= '"iTotalDisplayRecords": '.$iTotal.', ';
     $sOutput .= '"aaData": ';
@@ -791,7 +791,7 @@ 
 
     // Output
     $sOutput = '{';
-    $sOutput .= '"sEcho": '. (int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT) . ', ';
+    $sOutput .= '"sEcho": '.(int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT).', ';
     $sOutput .= '"iTotalRecords": '.$iTotal.', ';
     $sOutput .= '"iTotalDisplayRecords": '.$iTotal.', ';
     $sOutput .= '"aaData": ';
@@ -868,7 +868,7 @@ 
             FROM '.prefixTable('background_tasks').' AS p 
             LEFT JOIN '.prefixTable('users').' AS u ON %l
             WHERE %l ORDER BY %l %l LIMIT %i, %i';
-    $params = ['u.id = json_extract(p.arguments, "$[0]")',$sWhere, $orderColumn, $orderDirection, $sLimitStart, $sLimitLength];
+    $params = ['u.id = json_extract(p.arguments, "$[0]")', $sWhere, $orderColumn, $orderDirection, $sLimitStart, $sLimitLength];
 
     // Get the records
     $rows = DB::query($sql, ...$params);
@@ -876,7 +876,7 @@ 
 
     // Output
     $sOutput = '{';
-    $sOutput .= '"sEcho": '. (int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT) . ', ';
+    $sOutput .= '"sEcho": '.(int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT).', ';
     $sOutput .= '"iTotalRecords": '.$iTotal.', ';
     $sOutput .= '"iTotalDisplayRecords": '.$iTotal.', ';
     $sOutput .= '"aaData": ';
@@ -891,7 +891,7 @@ 
         //col1
         $sOutput .= '"<span data-done=\"'.$record['is_in_progress'].'\" data-type=\"'.$record['process_type'].'\" data-process-id=\"'.$record['increment_id'].'\"></span>", ';
         //col2
-        $sOutput .= '"'.date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['created_at']).'", ';
+        $sOutput .= '"'.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['created_at']).'", ';
         //col3
         //$sOutput .= '"'.($record['updated_at'] === '' ? '-' : date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['updated_at'])).'", ';
         $sOutput .= '"<div class=\"progress mt-2\"><div class=\"progress-bar\" style=\"width: '.$subtaskProgress.'\">'.$subtaskProgress.'</div></div>", ';
@@ -901,7 +901,7 @@ 
         // col5
         if (in_array($record['process_type'], array('create_user_keys', 'item_copy')) === true) {
             $data_user = DB::queryFirstRow(
-                'SELECT name, lastname FROM ' . prefixTable('users') . '
+                'SELECT name, lastname FROM '.prefixTable('users').'
                 WHERE id = %i',
                 json_decode($record['arguments'], true)['new_user_id']
             );
@@ -966,7 +966,7 @@ 
     FROM '.prefixTable('background_tasks').' AS p 
     LEFT JOIN '.prefixTable('users').' AS u ON %l
     WHERE %l ORDER BY %l %l LIMIT %i, %i';
-    $params = ['u.id = json_extract(p.arguments, "$[0]")',$sWhere, $orderColumn, $orderDirection, $sLimitStart, $sLimitLength];
+    $params = ['u.id = json_extract(p.arguments, "$[0]")', $sWhere, $orderColumn, $orderDirection, $sLimitStart, $sLimitLength];
 
     // Get the records
     $rows = DB::query($sql, ...$params);
@@ -974,7 +974,7 @@ 
 
     // Output
     $sOutput = '{';
-    $sOutput .= '"sEcho": '. (int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT) . ', ';
+    $sOutput .= '"sEcho": '.(int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT).', ';
     $sOutput .= '"iTotalRecords": '.$iTotal.', ';
     $sOutput .= '"iTotalDisplayRecords": '.$iTotal.', ';
     $sOutput .= '"aaData": ';
@@ -992,13 +992,12 @@ 
         $errMsg = preg_replace('/\r\n|\r|\n/', ' ', $errMsg);
         $sOutput .= json_encode($errMsg, JSON_UNESCAPED_UNICODE).', ';
         //col2
-        $sOutput .= '"'.date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['created_at']).'", ';
+        $sOutput .= '"'.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['created_at']).'", ';
         //col3
         $sOutput .= is_null($record['started_at']) === false ?
-            ('"'.date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['started_at']).'", ') :
-                ('"'.date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['created_at']).'", ');
+            ('"'.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['started_at']).'", ') : ('"'.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['created_at']).'", ');
         //col4
-        $sOutput .= '"'.date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['finished_at']).'", '; 
+        $sOutput .= '"'.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['finished_at']).'", '; 
         // col7
         $sOutput .= '"'.gmdate('H:i:s', (int) $record['finished_at'] - (is_null($record['started_at']) === false ? (int) $record['started_at'] : (int) $record['created_at'])).'",';
         //col5
@@ -1021,11 +1020,10 @@ 
         // col6
         $arguments = json_decode($record['arguments'], true);
         $newUserId = array_key_exists('new_user_id', $arguments) ? 
-            $arguments['new_user_id'] : 
-            (array_key_exists('user_id', $arguments) ? $arguments['user_id'] : null);
+            $arguments['new_user_id'] : (array_key_exists('user_id', $arguments) ? $arguments['user_id'] : null);
         if ($record['process_type'] === 'create_user_keys' && is_null($newUserId) === false && empty($newUserId) === false) {
             $data_user = DB::queryFirstRow(
-                'SELECT name, lastname, login FROM ' . prefixTable('users') . '
+                'SELECT name, lastname, login FROM '.prefixTable('users').'
                 WHERE id = %i',
                 $newUserId
             );
@@ -1041,7 +1039,7 @@ 
         } elseif ($record['process_type'] === 'user_build_cache_tree') {
             $user = json_decode($record['arguments'], true)['user_id'];
             $data_user = DB::queryFirstRow(
-                'SELECT name, lastname, login FROM ' . prefixTable('users') . '
+                'SELECT name, lastname, login FROM '.prefixTable('users').'
                 WHERE id = %i',
                 $user
             );
@@ -1075,7 +1073,7 @@ 
 {
     $subtasks = DB::query(
         'SELECT *
-        FROM ' . prefixTable('background_subtasks') . '
+        FROM ' . prefixTable('background_subtasks').'
         WHERE task_id = %i',
         $id
     );
@@ -1091,5 +1089,5 @@ 
         $i++;
     }
 
-    return ($finished_nb !== 0 ? pourcentage($finished_nb, $nb, 100) : 0) .'%';
+    return ($finished_nb !== 0 ? pourcentage($finished_nb, $nb, 100) : 0).'%';
 }

sources/items.queries.php

Spacing +282 added lines, -283 removed lines

@@ -79,7 +79,7 @@ 
 ) {
     // Not allowed page
     $session->set('system-error_code', ERR_NOT_ALLOWED);
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit;
 }
 
@@ -104,7 +104,7 @@ 
     date_default_timezone_set('UTC');
 }
 
-require_once $SETTINGS['cpassman_dir'] . '/includes/language/' . $session->get('user-language') . '.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/language/'.$session->get('user-language').'.php';
 header('Content-type: text/html; charset=utf-8');
 header('Cache-Control: no-cache, must-revalidate');
 
@@ -366,7 +366,7 @@ 
             // About special settings
             $dataFolderSettings = DB::queryFirstRow(
                 'SELECT bloquer_creation, bloquer_modification, personal_folder
-                FROM ' . prefixTable('nested_tree') . ' 
+                FROM ' . prefixTable('nested_tree').' 
                 WHERE id = %i',
                 $inputData['folderId']
             );
@@ -383,7 +383,7 @@ 
             // Get folder complexity
             $folderComplexity = DB::queryFirstRow(
                 'SELECT valeur
-                FROM ' . prefixTable('misc') . '
+                FROM ' . prefixTable('misc').'
                 WHERE type = %s AND intitule = %i',
                 'complex',
                 $inputData['folderId']
@@ -408,7 +408,7 @@ 
             $itemExists = 0;
             $newID = '';
             $data = DB::queryFirstRow(
-                'SELECT * FROM ' . prefixTable('items') . '
+                'SELECT * FROM '.prefixTable('items').'
                 WHERE label = %s AND inactif = %i',
                 $inputData['label'],
                 0
@@ -489,8 +489,8 @@ 
                     (int) $post_folder_is_personal,
                     (int) $newID,
                     $cryptedStuff['objectKey'],
-                    true,   // only for the item creator
-                    false,  // no delete all
+                    true, // only for the item creator
+                    false, // no delete all
                 );
 
                 // update fields
@@ -503,7 +503,7 @@ 
                             // should we encrypt the data
                             $dataTmp = DB::queryFirstRow(
                                 'SELECT encrypted_data
-                                FROM ' . prefixTable('categories') . '
+                                FROM ' . prefixTable('categories').'
                                 WHERE id = %i',
                                 $field['id']
                             );
@@ -532,8 +532,8 @@ 
                                     (int) $post_folder_is_personal,
                                     (int) $newObjectId,
                                     $cryptedStuff['objectKey'],
-                                    true,   // only for the item creator
-                                    false,  // delete all
+                                    true, // only for the item creator
+                                    false, // delete all
                                 );
 
                                 array_push(
@@ -569,7 +569,7 @@ 
                 ) {
                     DB::queryFirstRow(
                         'SELECT *
-                        FROM ' . prefixTable('templates') . '
+                        FROM ' . prefixTable('templates').'
                         WHERE item_id = %i',
                         $newID
                     );
@@ -638,11 +638,11 @@ 
                 ) {
                     foreach ($post_restricted_to as $userRest) {
                         if (empty($userRest) === false) {
-                            $dataTmp = DB::queryFirstRow('SELECT login FROM ' . prefixTable('users') . ' WHERE id= %i', $userRest);
+                            $dataTmp = DB::queryFirstRow('SELECT login FROM '.prefixTable('users').' WHERE id= %i', $userRest);
                             if (empty($listOfRestricted)) {
                                 $listOfRestricted = $dataTmp['login'];
                             } else {
-                                $listOfRestricted .= ';' . $dataTmp['login'];
+                                $listOfRestricted .= ';'.$dataTmp['login'];
                             }
                         }
                     }
@@ -658,7 +658,7 @@ 
                             if (empty($userRest) === false) {
                                 $dataTmp = DB::queryFirstRow(
                                     'SELECT login
-                                    FROM ' . prefixTable('users') . '
+                                    FROM ' . prefixTable('users').'
                                     WHERE id= %i',
                                     $userRest
                                 );
@@ -666,7 +666,7 @@ 
                                 if (empty($oldRestrictionList) === true) {
                                     $oldRestrictionList = $dataTmp['login'];
                                 } else {
-                                    $oldRestrictionList .= ';' . $dataTmp['login'];
+                                    $oldRestrictionList .= ';'.$dataTmp['login'];
                                 }
                             }
                         }
@@ -729,7 +729,7 @@ 
                 if (empty($post_uploaded_file_id) === false) {
                     $rows = DB::query(
                         'SELECT id
-                        FROM ' . prefixTable('files') . '
+                        FROM ' . prefixTable('files').'
                         WHERE id_item = %s',
                         $post_uploaded_file_id
                     );
@@ -785,7 +785,7 @@ 
                                     $lang->get('email_subject_item_updated'),
                                     str_replace(
                                         array('#label', '#link'),
-                                            array($path, $SETTINGS['email_server_url'] . '/index.php?page=items&group=' . $inputData['folderId'] . '&id=' . $newID . $lang['email_body3']),
+                                            array($path, $SETTINGS['email_server_url'].'/index.php?page=items&group='.$inputData['folderId'].'&id='.$newID.$lang['email_body3']),
                                             $lang->get('new_item_email_body')
                                     ),
                                     $emailAddress,
@@ -889,11 +889,11 @@ 
         // Prepare variables
         $itemInfos = array();
         $inputData['label'] = isset($dataReceived['label']) && is_string($dataReceived['label']) ? filter_var($dataReceived['label'], FILTER_SANITIZE_FULL_SPECIAL_CHARS) : '';
-        $post_url = isset($dataReceived['url'])=== true ? filter_var(htmlspecialchars_decode($dataReceived['url']), FILTER_SANITIZE_URL) : '';
+        $post_url = isset($dataReceived['url']) === true ? filter_var(htmlspecialchars_decode($dataReceived['url']), FILTER_SANITIZE_URL) : '';
         $post_password = $original_pw = isset($dataReceived['pw']) && is_string($dataReceived['pw']) ? htmlspecialchars_decode($dataReceived['pw']) : '';
         $post_login = isset($dataReceived['login']) && is_string($dataReceived['login']) ? filter_var(htmlspecialchars_decode($dataReceived['login']), FILTER_SANITIZE_FULL_SPECIAL_CHARS) : '';
-        $post_tags = isset($dataReceived['tags'])=== true ? htmlspecialchars($dataReceived['tags']) : '';
-        $post_email = isset($dataReceived['email'])=== true ? filter_var(htmlspecialchars_decode($dataReceived['email']), FILTER_SANITIZE_EMAIL) : '';
+        $post_tags = isset($dataReceived['tags']) === true ? htmlspecialchars($dataReceived['tags']) : '';
+        $post_email = isset($dataReceived['email']) === true ? filter_var(htmlspecialchars_decode($dataReceived['email']), FILTER_SANITIZE_EMAIL) : '';
         $post_template_id = (int) filter_var($dataReceived['template_id'], FILTER_SANITIZE_NUMBER_INT);
         $inputData['itemId'] = (int) filter_var($dataReceived['id'], FILTER_SANITIZE_NUMBER_INT);
         $post_anyone_can_modify = (int) filter_var($dataReceived['anyone_can_modify'], FILTER_SANITIZE_NUMBER_INT);
@@ -924,8 +924,7 @@ 
         $post_to_be_deleted_after_date = isset($dataReceived['to_be_deleted_after_date']) === true ? filter_var(
                 $dataReceived['to_be_deleted_after_date'],
                 FILTER_SANITIZE_FULL_SPECIAL_CHARS
-            ) :
-            '';
+            ) : '';
         $post_fields = (filter_var_array(
             $dataReceived['fields'],
             FILTER_SANITIZE_FULL_SPECIAL_CHARS
@@ -985,7 +984,7 @@ 
         // About special settings
         $dataFolderSettings = DB::queryFirstRow(
             'SELECT bloquer_creation, bloquer_modification, personal_folder, title
-            FROM ' . prefixTable('nested_tree') . ' 
+            FROM ' . prefixTable('nested_tree').' 
             WHERE id = %i',
             $inputData['folderId']
         );
@@ -1001,7 +1000,7 @@ 
         // Get folder complexity
         $folderComplexity = DB::queryFirstRow(
             'SELECT valeur
-            FROM ' . prefixTable('misc') . '
+            FROM ' . prefixTable('misc').'
             WHERE type = %s AND intitule = %i',
             'complex',
             $inputData['folderId']
@@ -1047,8 +1046,8 @@ 
         $dataItem = DB::queryFirstRow(
             'SELECT i.*,
             IFNULL(l.id_user, 0) AS id_user
-            FROM ' . prefixTable('items') . ' as i
-            LEFT JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id AND l.action = %s)
+            FROM ' . prefixTable('items').' as i
+            LEFT JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id AND l.action = %s)
             WHERE i.id=%i',
             'at_creation',
             $inputData['itemId']
@@ -1090,7 +1089,7 @@ 
         // Does the user has the sharekey for this item?
         DB::query(
             'SELECT *
-            FROM ' . prefixTable('sharekeys_items') . '
+            FROM ' . prefixTable('sharekeys_items').'
             WHERE object_id = %i AND user_id = %s',
             $inputData['itemId'],
             $session->get('user-id')
@@ -1151,9 +1150,9 @@ 
                 'SELECT i.id as id, i.label as label, i.description as description, i.pw as pw, i.url as url, i.id_tree as id_tree, i.perso as perso, i.login as login, 
                 i.inactif as inactif, i.restricted_to as restricted_to, i.anyone_can_modify as anyone_can_modify, i.email as email, i.notification as notification,
                 u.login as user_login, u.email as user_email
-                FROM ' . prefixTable('items') . ' as i
-                LEFT JOIN ' . prefixTable('log_items') . ' as l ON (i.id=l.id_item AND l.action = %s)
-                LEFT JOIN ' . prefixTable('users') . ' as u ON (u.id=l.id_user)
+                FROM ' . prefixTable('items').' as i
+                LEFT JOIN ' . prefixTable('log_items').' as l ON (i.id=l.id_item AND l.action = %s)
+                LEFT JOIN ' . prefixTable('users').' as u ON (u.id=l.id_user)
                 WHERE i.id=%i',
                 'at_creation',
                 $inputData['itemId']
@@ -1162,7 +1161,7 @@ 
             // Should we log a password change?
             $userKey = DB::queryFirstRow(
                 'SELECT share_key
-                FROM ' . prefixTable('sharekeys_items') . '
+                FROM ' . prefixTable('sharekeys_items').'
                 WHERE user_id = %i AND object_id = %i',
                 $session->get('user-id'),
                 $inputData['itemId']
@@ -1226,12 +1225,12 @@ 
                     (int) $post_folder_is_personal,
                     (int) $inputData['itemId'],
                     $encrypted_password_key,
-                    true,   // only for the item creator
-                    true,   // delete all
+                    true, // only for the item creator
+                    true, // delete all
                 );
 
                 // Create a task to create sharekeys for users
-                if (WIP=== true) error_log('createTaskForItem - new password for this item - '.$post_password ." -- ". $pw);
+                if (WIP === true) error_log('createTaskForItem - new password for this item - '.$post_password." -- ".$pw);
                 $tasksToBePerformed = ['item_password'];
                 $encryptionTaskIsRequested = true;
             } else {
@@ -1242,7 +1241,7 @@ 
             // Get list of tags
             $itemTags = DB::queryFirstColumn(
                 'SELECT tag
-                FROM ' . prefixTable('tags') . '
+                FROM ' . prefixTable('tags').'
                 WHERE item_id = %i',
                 $inputData['itemId']
             );
@@ -1288,7 +1287,7 @@ 
                     $session->get('user-id'),
                     'at_modification',
                     $session->get('user-login'),
-                    'at_tag : ' . implode(' ', $itemTags) . ' => ' . $post_tags
+                    'at_tag : '.implode(' ', $itemTags).' => '.$post_tags
                 );
             }
 
@@ -1333,8 +1332,8 @@ 
                             'SELECT c.id AS id, c.title AS title, i.data AS data, i.data_iv AS data_iv,
                             i.encryption_type AS encryption_type, c.encrypted_data AS encrypted_data,
                             c.masked AS masked, i.id AS field_item_id
-                            FROM ' . prefixTable('categories_items') . ' AS i
-                            INNER JOIN ' . prefixTable('categories') . ' AS c ON (i.field_id=c.id)
+                            FROM ' . prefixTable('categories_items').' AS i
+                            INNER JOIN ' . prefixTable('categories').' AS c ON (i.field_id=c.id)
                             WHERE i.field_id = %i AND i.item_id = %i',
                             $field['id'],
                             $inputData['itemId']
@@ -1350,7 +1349,7 @@ 
                             // Perform new query
                             $dataTmpCat = DB::queryFirstRow(
                                 'SELECT id, title, encrypted_data, masked
-                                FROM ' . prefixTable('categories') . '
+                                FROM ' . prefixTable('categories').'
                                 WHERE id = %i',
                                 $field['id']
                             );
@@ -1380,8 +1379,8 @@ 
                                     (int) $post_folder_is_personal,
                                     (int) $newId,
                                     $cryptedStuff['objectKey'],
-                                    true,   // only for the item creator
-                                    true,   // delete all
+                                    true, // only for the item creator
+                                    true, // delete all
                                 );
 
                                 // update value
@@ -1431,7 +1430,7 @@ 
                                 $session->get('user-id'),
                                 'at_modification',
                                 $session->get('user-login'),
-                                'at_field : ' . $dataTmpCat['title'] . ' : ' . $field['value']
+                                'at_field : '.$dataTmpCat['title'].' : '.$field['value']
                             );
                         } else {
                             // Case where the field already exists
@@ -1440,7 +1439,7 @@ 
                                 // Get user sharekey for this field
                                 $userKey = DB::queryFirstRow(
                                     'SELECT share_key
-                                    FROM ' . prefixTable('sharekeys_fields') . '
+                                    FROM ' . prefixTable('sharekeys_fields').'
                                     WHERE user_id = %i AND object_id = %i',
                                     $session->get('user-id'),
                                     $dataTmpCat['field_item_id']
@@ -1479,8 +1478,8 @@ 
                                         (int) $post_folder_is_personal,
                                         (int) $dataTmpCat['field_item_id'],
                                         $cryptedStuff['objectKey'],
-                                        true,   // only for the item creator
-                                        true,   // delete all
+                                        true, // only for the item creator
+                                        true, // delete all
                                     );
 
                                     if ($encryptedFieldIsChanged === false) {
@@ -1522,7 +1521,7 @@ 
                                     $session->get('user-id'),
                                     'at_modification',
                                     $session->get('user-login'),
-                                    'at_field : ' . $dataTmpCat['title'] . ' => ' . $oldVal
+                                    'at_field : '.$dataTmpCat['title'].' => '.$oldVal
                                 );
                             }
                         }
@@ -1576,7 +1575,7 @@ 
             ) {
                 DB::queryFirstRow(
                     'SELECT *
-                    FROM ' . prefixTable('templates') . '
+                    FROM ' . prefixTable('templates').'
                     WHERE item_id = %i',
                     $inputData['itemId']
                 );
@@ -1619,7 +1618,7 @@ 
                 // check if elem exists in Table. If not add it or update it.
                 DB::query(
                     'SELECT *
-                    FROM ' . prefixTable('automatic_del') . '
+                    FROM ' . prefixTable('automatic_del').'
                     WHERE item_id = %i',
                     $inputData['itemId']
                 );
@@ -1646,7 +1645,7 @@ 
                         // Store updates performed
                         array_push(
                             $arrayOfChanges,
-                            $lang->get('automatic_deletion_engaged') . ': ' . $lang->get('enabled')
+                            $lang->get('automatic_deletion_engaged').': '.$lang->get('enabled')
                         );
 
                         // update LOG
@@ -1689,7 +1688,7 @@ 
                         // Store updates performed
                         array_push(
                             $arrayOfChanges,
-                            $lang->get('automatic_deletion_engaged') . ': ' . $lang->get('disabled')
+                            $lang->get('automatic_deletion_engaged').': '.$lang->get('disabled')
                         );
 
                         // update LOG
@@ -1717,7 +1716,7 @@ 
                     if (empty($userId) === false) {
                         $dataTmp = DB::queryFirstRow(
                             'SELECT id, name, lastname
-                            FROM ' . prefixTable('users') . '
+                            FROM ' . prefixTable('users').'
                             WHERE id= %i',
                             $userId
                         );
@@ -1725,7 +1724,7 @@ 
                         // Add to array
                         array_push(
                             $arrayOfUsersRestriction,
-                            $dataTmp['name'] . ' ' . $dataTmp['lastname']
+                            $dataTmp['name'].' '.$dataTmp['lastname']
                         );
                         array_push(
                             $arrayOfUsersIdRestriction,
@@ -1756,8 +1755,8 @@ 
                 // get values before deleting them
                 $rows = DB::query(
                     'SELECT t.title, t.id AS id
-                    FROM ' . prefixTable('roles_title') . ' as t
-                    INNER JOIN ' . prefixTable('restriction_to_roles') . ' as r ON (t.id=r.role_id)
+                    FROM ' . prefixTable('roles_title').' as t
+                    INNER JOIN ' . prefixTable('restriction_to_roles').' as r ON (t.id=r.role_id)
                     WHERE r.item_id = %i
                     ORDER BY t.title ASC',
                     $inputData['itemId']
@@ -1791,7 +1790,7 @@ 
                         );
                         $dataTmp = DB::queryFirstRow(
                             'SELECT title
-                            FROM ' . prefixTable('roles_title') . '
+                            FROM ' . prefixTable('roles_title').'
                             WHERE id = %i',
                             $role
                         );
@@ -1819,7 +1818,7 @@ 
             // Get current status
             $otpStatus = DB::queryFirstRow(
                 'SELECT enabled as otp_is_enabled, phone_number, secret
-                FROM ' . prefixTable('items_otp') . '
+                FROM ' . prefixTable('items_otp').'
                 WHERE item_id = %i',
                 $inputData['itemId']
             );
@@ -1833,7 +1832,7 @@ 
                     'decrypt'
                 )['string'];
             } else {
-                $currentsecret='';
+                $currentsecret = '';
             }
 
             // If OTP secret provided then encrypt it
@@ -1883,7 +1882,7 @@ 
                         $session->get('user-id'),
                         'at_modification',
                         $session->get('user-login'),
-                        'at_otp_status:' . ((int) $post_otp_is_enabled === 0 ? 'disabled' : 'enabled')
+                        'at_otp_status:'.((int) $post_otp_is_enabled === 0 ? 'disabled' : 'enabled')
                     );
                 }
                 if ($otpStatus['phone_number'] !== $post_otp_phone_number) {
@@ -1894,7 +1893,7 @@ 
                         $session->get('user-id'),
                         'at_modification',
                         $session->get('user-login'),
-                        'at_phone_number:' . $otpStatus['phone_number'] . ' => ' . $post_otp_phone_number
+                        'at_phone_number:'.$otpStatus['phone_number'].' => '.$post_otp_phone_number
                     );
                 }
                 if ($currentsecret !== $post_otp_secret) {
@@ -1943,8 +1942,8 @@ 
                     $session->get('user-id'),
                     'at_modification',
                     $session->get('user-login'),
-                    'at_restriction : ' . (count($diffUsersRestiction) > 0 ?
-                        implode(', ', $arrayOfUsersRestriction) . (count($diffRolesRestiction) > 0 ? ', ' : '') : '') . (count($diffRolesRestiction) > 0 ? implode(', ', $arrayOfRestrictionRoles) : '')
+                    'at_restriction : '.(count($diffUsersRestiction) > 0 ?
+                        implode(', ', $arrayOfUsersRestriction).(count($diffRolesRestiction) > 0 ? ', ' : '') : '').(count($diffRolesRestiction) > 0 ? implode(', ', $arrayOfRestrictionRoles) : '')
                 );
             }
 
@@ -1964,7 +1963,7 @@ 
                     $session->get('user-id'),
                     'at_modification',
                     $session->get('user-login'),
-                    'at_label : ' . $data['label'] . ' => ' . $inputData['label']
+                    'at_label : '.$data['label'].' => '.$inputData['label']
                 );
             }
             // LOGIN
@@ -1983,7 +1982,7 @@ 
                     $session->get('user-id'),
                     'at_modification',
                     $session->get('user-login'),
-                    'at_login : ' . $data['login'] . ' => ' . $post_login
+                    'at_login : '.$data['login'].' => '.$post_login
                 );
             }
             // EMAIL
@@ -2002,7 +2001,7 @@ 
                     $session->get('user-id'),
                     'at_modification',
                     $session->get('user-login'),
-                    'at_email : ' . $data['email'] . ' => ' . $post_email
+                    'at_email : '.$data['email'].' => '.$post_email
                 );
             }
             // URL
@@ -2021,7 +2020,7 @@ 
                     $session->get('user-id'),
                     'at_modification',
                     $session->get('user-login'),
-                    'at_url : ' . $data['url'] . ' => ' . $post_url
+                    'at_url : '.$data['url'].' => '.$post_url
                 );
             }
             // DESCRIPTION
@@ -2047,7 +2046,7 @@ 
             // FOLDER
             if ((int) $data['id_tree'] !== (int) $inputData['folderId']) {
                 // Get name of folders
-                $dataTmp = DB::query('SELECT title FROM ' . prefixTable('nested_tree') . ' WHERE id IN %li', array($data['id_tree'], $inputData['folderId']));
+                $dataTmp = DB::query('SELECT title FROM '.prefixTable('nested_tree').' WHERE id IN %li', array($data['id_tree'], $inputData['folderId']));
 
                 // Store updates performed
                 array_push(
@@ -2063,7 +2062,7 @@ 
                     $session->get('user-id'),
                     'at_modification',
                     $session->get('user-login'),
-                    'at_category : ' . $dataTmp[0]['title'] . ' => ' . $dataTmp[1]['title']
+                    'at_category : '.$dataTmp[0]['title'].' => '.$dataTmp[1]['title']
                 );
             }
             // ANYONE_CAN_MODIFY
@@ -2071,7 +2070,7 @@ 
                 // Store updates performed
                 array_push(
                     $arrayOfChanges,
-                    $lang->get('at_anyoneconmodify') . ': ' . ((int) $post_anyone_can_modify === 0 ? $lang->get('disabled') : $lang->get('enabled'))
+                    $lang->get('at_anyoneconmodify').': '.((int) $post_anyone_can_modify === 0 ? $lang->get('disabled') : $lang->get('enabled'))
                 );
 
                 // Log
@@ -2082,7 +2081,7 @@ 
                     $session->get('user-id'),
                     'at_modification',
                     $session->get('user-login'),
-                    'at_anyoneconmodify : ' . ((int) $post_anyone_can_modify === 0 ? 'disabled' : 'enabled')
+                    'at_anyoneconmodify : '.((int) $post_anyone_can_modify === 0 ? 'disabled' : 'enabled')
                 );
             }
 
@@ -2090,8 +2089,8 @@ 
             $dataItem = DB::queryFirstRow(
                 'SELECT i.*,
             IFNULL(l.id_user, 0) AS id_user
-            FROM ' . prefixTable('items') . ' as i
-            LEFT JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id AND l.action = %s)
+            FROM ' . prefixTable('items').' as i
+            LEFT JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id AND l.action = %s)
             WHERE i.id=%i',
             'at_creation',
             $inputData['itemId']
@@ -2100,8 +2099,8 @@ 
             $history = '';
             $rows = DB::query(
                 'SELECT l.date as date, l.action as action, l.raison as raison, u.login as login
-                FROM ' . prefixTable('log_items') . ' as l
-                LEFT JOIN ' . prefixTable('users') . ' as u ON (l.id_user=u.id)
+                FROM ' . prefixTable('log_items').' as l
+                LEFT JOIN ' . prefixTable('users').' as u ON (l.id_user=u.id)
                 WHERE l.action <> %s AND id_item=%s',
                 'at_shown',
                 $inputData['itemId']
@@ -2110,14 +2109,14 @@ 
                 if ($record['raison'] === NULL) continue;
                 $reason = explode(':', $record['raison']);
                 if (count($reason) > 0) {
-                    $sentence = date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date']) . ' - '
-                        . $record['login'] . ' - ' . $lang->get($record['action']) . ' - '
-                        . (empty($record['raison']) === false ? (count($reason) > 1 ? $lang->get(trim($reason[0])) . ' : ' . $reason[1]
+                    $sentence = date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['date']).' - '
+                        . $record['login'].' - '.$lang->get($record['action']).' - '
+                        . (empty($record['raison']) === false ? (count($reason) > 1 ? $lang->get(trim($reason[0])).' : '.$reason[1]
                             : $lang->get(trim($reason[0]))) : '');
                     if (empty($history)) {
                         $history = $sentence;
                     } else {
-                        $history .= '<br />' . $sentence;
+                        $history .= '<br />'.$sentence;
                     }
                 }
             }
@@ -2255,7 +2254,7 @@ 
         ) {
             // load the original record into an array
             $originalRecord = DB::queryFirstRow(
-                'SELECT * FROM ' . prefixTable('items') . '
+                'SELECT * FROM '.prefixTable('items').'
                 WHERE id = %i',
                 $inputData['itemId']
             );
@@ -2274,7 +2273,7 @@ 
 
             // Load the destination folder record into an array
             $dataDestination = DB::queryFirstRow(
-                'SELECT personal_folder FROM ' . prefixTable('nested_tree') . '
+                'SELECT personal_folder FROM '.prefixTable('nested_tree').'
                 WHERE id = %i',
                 $post_dest_id
             );
@@ -2282,7 +2281,7 @@ 
             // Get the ITEM object key for the user
             $userKey = DB::queryFirstRow(
                 'SELECT share_key
-                FROM ' . prefixTable('sharekeys_items') . '
+                FROM ' . prefixTable('sharekeys_items').'
                 WHERE user_id = %i AND object_id = %i',
                 $session->get('user-id'),
                 $inputData['itemId']
@@ -2359,8 +2358,8 @@ 
             // Manage Custom Fields
             $rows = DB::query(
                 'SELECT ci.id AS id, ci.data AS data, ci.field_id AS field_id, c.encrypted_data AS encrypted_data
-                FROM ' . prefixTable('categories_items') . ' AS ci
-                INNER JOIN ' . prefixTable('categories') . ' AS c ON (c.id = ci.field_id)
+                FROM ' . prefixTable('categories_items').' AS ci
+                INNER JOIN ' . prefixTable('categories').' AS c ON (c.id = ci.field_id)
                 WHERE ci.item_id = %i',
                 $inputData['itemId']
             );
@@ -2372,7 +2371,7 @@ 
                     // Get user key
                     $userKey = DB::queryFirstRow(
                         'SELECT share_key
-                        FROM ' . prefixTable('sharekeys_fields') . '
+                        FROM ' . prefixTable('sharekeys_fields').'
                         WHERE user_id = %i AND object_id = %i',
                         $session->get('user-id'),
                         $field['id']
@@ -2439,15 +2438,15 @@ 
             $rows = DB::query(
                 'SELECT f.id AS id, f.file AS file, f.name AS name, f.status AS status, f.extension AS extension,
                 f.size AS size, f.type AS type, s.share_key AS share_key
-                FROM ' . prefixTable('files') . ' AS f
-                INNER JOIN ' . prefixTable('sharekeys_files') . ' AS s ON (f.id = s.object_id)
+                FROM ' . prefixTable('files').' AS f
+                INNER JOIN ' . prefixTable('sharekeys_files').' AS s ON (f.id = s.object_id)
                 WHERE s.user_id = %i AND f.id_item = %i',
                 $session->get('user-id'),
                 $inputData['itemId']
             );
             foreach ($rows as $record) {
                 // Check if file still exists
-                if (file_exists($SETTINGS['path_to_upload_folder'] . DIRECTORY_SEPARATOR . TP_FILE_PREFIX . base64_decode($record['file'])) === true) {
+                if (file_exists($SETTINGS['path_to_upload_folder'].DIRECTORY_SEPARATOR.TP_FILE_PREFIX.base64_decode($record['file'])) === true) {
                     // Step1 - decrypt the file
                     // deepcode ignore PT: path is sanitized inside decryptFile()
                     $fileContent = decryptFile(
@@ -2458,8 +2457,8 @@ 
 
                     // Step2 - create file
                     // deepcode ignore InsecureHash: md5 is used jonly for file name in order to get a hashed value in database
-                    $newFileName = md5(time() . '_' . $record['id']) . '.' . $record['extension'];
-                    $outstream = fopen($SETTINGS['path_to_upload_folder'] . DIRECTORY_SEPARATOR . $newFileName, 'ab');
+                    $newFileName = md5(time().'_'.$record['id']).'.'.$record['extension'];
+                    $outstream = fopen($SETTINGS['path_to_upload_folder'].DIRECTORY_SEPARATOR.$newFileName, 'ab');
                     if ($outstream === false) {
                         echo prepareExchangedData(
                             array(
@@ -2532,7 +2531,7 @@ 
 
             // -------------------------
             // Add specific restrictions
-            $rows = DB::query('SELECT * FROM ' . prefixTable('restriction_to_roles') . ' WHERE item_id = %i', $inputData['itemId']);
+            $rows = DB::query('SELECT * FROM '.prefixTable('restriction_to_roles').' WHERE item_id = %i', $inputData['itemId']);
             foreach ($rows as $record) {
                 DB::insert(
                     prefixTable('restriction_to_roles'),
@@ -2544,7 +2543,7 @@ 
             }
 
             // Add Tags
-            $rows = DB::query('SELECT * FROM ' . prefixTable('tags') . ' WHERE item_id = %i', $inputData['itemId']);
+            $rows = DB::query('SELECT * FROM '.prefixTable('tags').' WHERE item_id = %i', $inputData['itemId']);
             foreach ($rows as $record) {
                 DB::insert(
                     prefixTable('tags'),
@@ -2646,7 +2645,7 @@ 
         // then we can show it
         $item_deleted = DB::queryFirstRow(
             'SELECT *
-            FROM ' . prefixTable('log_items') . '
+            FROM ' . prefixTable('log_items').'
             WHERE id_item = %i AND action = %s
             ORDER BY date DESC
             LIMIT 0, 1',
@@ -2657,7 +2656,7 @@ 
 
         $item_restored = DB::queryFirstRow(
             'SELECT *
-            FROM ' . prefixTable('log_items') . '
+            FROM ' . prefixTable('log_items').'
             WHERE id_item = %i AND action = %s
             ORDER BY date DESC
             LIMIT 0, 1',
@@ -2682,8 +2681,8 @@ 
         $dataItem = DB::queryFirstRow(
             'SELECT i.*,
             IFNULL(l.id_user, 0) AS id_user
-            FROM ' . prefixTable('items') . ' as i
-            LEFT JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id AND l.action = %s)
+            FROM ' . prefixTable('items').' as i
+            LEFT JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id AND l.action = %s)
             WHERE i.id=%i',
             'at_creation',
             $inputData['id']
@@ -2692,7 +2691,7 @@ 
         // Notification
         DB::queryFirstRow(
             'SELECT *
-            FROM ' . prefixTable('notification') . '
+            FROM ' . prefixTable('notification').'
             WHERE item_id = %i AND user_id = %i',
             $inputData['id'],
             $session->get('user-id')
@@ -2711,7 +2710,7 @@ 
 
         // manage case of API user
         if ($dataItem['id_user'] === API_USER_ID) {
-            $arrData['author'] = 'API [' . $dataItem['description'] . ']';
+            $arrData['author'] = 'API ['.$dataItem['description'].']';
             $arrData['id_user'] = API_USER_ID;
             $arrData['author_email'] = '';
             $arrData['notification_status'] = false;
@@ -2721,7 +2720,7 @@ 
         $tags = array();
         $rows = DB::query(
             'SELECT tag
-            FROM ' . prefixTable('tags') . '
+            FROM ' . prefixTable('tags').'
             WHERE item_id = %i',
             $inputData['id']
         );
@@ -2745,7 +2744,7 @@ 
         // Check if user has a role that is accepted
         $rows_tmp = DB::query(
             'SELECT role_id
-            FROM ' . prefixTable('restriction_to_roles') . '
+            FROM ' . prefixTable('restriction_to_roles').'
             WHERE item_id=%i',
             $inputData['id']
         );
@@ -2759,7 +2758,7 @@ 
         // Get the object key for the user
         $userKeys = DB::query(
             'SELECT share_key
-            FROM ' . prefixTable('sharekeys_items') . '
+            FROM ' . prefixTable('sharekeys_items').'
             WHERE user_id = %i AND object_id = %i',
             $session->get('user-id'),
             $inputData['id']
@@ -2872,8 +2871,8 @@ 
                 // Add restriction if item is restricted to roles
                 $rows = DB::query(
                     'SELECT t.title, t.id
-                    FROM ' . prefixTable('roles_title') . ' AS t
-                    INNER JOIN ' . prefixTable('restriction_to_roles') . ' AS r ON (t.id=r.role_id)
+                    FROM ' . prefixTable('roles_title').' AS t
+                    INNER JOIN ' . prefixTable('restriction_to_roles').' AS r ON (t.id=r.role_id)
                     WHERE r.item_id = %i
                     ORDER BY t.title ASC',
                     $inputData['id']
@@ -2889,8 +2888,8 @@ 
                 $tmp = array();
                 $rows = DB::query(
                     'SELECT k.label, k.id
-                    FROM ' . prefixTable('kb_items') . ' as i
-                    INNER JOIN ' . prefixTable('kb') . ' as k ON (i.kb_id=k.id)
+                    FROM ' . prefixTable('kb_items').' as i
+                    INNER JOIN ' . prefixTable('kb').' as k ON (i.kb_id=k.id)
                     WHERE i.item_id = %i
                     ORDER BY k.label ASC',
                     $inputData['id']
@@ -2973,7 +2972,7 @@ 
                 $arrCatList = array();
                 $rows_tmp = DB::query(
                     'SELECT id_category
-                    FROM ' . prefixTable('categories_folders') . '
+                    FROM ' . prefixTable('categories_folders').'
                     WHERE id_folder=%i',
                     $inputData['folderId']
                 );
@@ -2988,8 +2987,8 @@ 
                         'SELECT i.id AS id, i.field_id AS field_id, i.data AS data, i.item_id AS item_id,
                         i.encryption_type AS encryption_type, c.encrypted_data AS encrypted_data, c.parent_id AS parent_id,
                         c.type as field_type, c.masked AS field_masked, c.role_visibility AS role_visibility
-                        FROM ' . prefixTable('categories_items') . ' AS i
-                        INNER JOIN ' . prefixTable('categories') . ' AS c ON (i.field_id=c.id)
+                        FROM ' . prefixTable('categories_items').' AS i
+                        INNER JOIN ' . prefixTable('categories').' AS c ON (i.field_id=c.id)
                         WHERE i.item_id=%i AND c.parent_id IN %ls',
                         $inputData['id'],
                         $arrCatList
@@ -3000,7 +2999,7 @@ 
                         //db::debugmode(true);
                         $userKey = DB::queryFirstRow(
                             'SELECT share_key
-                            FROM ' . prefixTable('sharekeys_fields') . '
+                            FROM ' . prefixTable('sharekeys_fields').'
                             WHERE user_id = %i AND object_id = %i',
                             $session->get('user-id'),
                             $row['id']
@@ -3018,7 +3017,7 @@ 
                         } else if (DB::count() === 0 && (int) $row['encrypted_data'] === 0) {
                             // Data is not encrypted in DB
                             $fieldText = [
-                                'string' => $row['data'],//#3945 - isBase64($row['data']) === true ? base64_decode($row['data']) : 
+                                'string' => $row['data'], //#3945 - isBase64($row['data']) === true ? base64_decode($row['data']) : 
                                 'encrypted' => false,
                                 'error' => false,
                             ];
@@ -3063,7 +3062,7 @@ 
             if (isset($SETTINGS['item_creation_templates']) && (int) $SETTINGS['item_creation_templates'] === 1) {
                 $rows_tmp = DB::queryFirstRow(
                     'SELECT category_id
-                    FROM ' . prefixTable('templates') . '
+                    FROM ' . prefixTable('templates').'
                     WHERE item_id = %i',
                     $inputData['id']
                 );
@@ -3080,7 +3079,7 @@ 
             // Evaluate if item is ready for all users
             $rows_tmp = DB::queryFirstRow(
                 'SELECT finished_at
-                FROM ' . prefixTable('background_tasks') . '
+                FROM ' . prefixTable('background_tasks').'
                 WHERE item_id = %i',
                 $inputData['id']
             );
@@ -3097,7 +3096,7 @@ 
                 // Is the Item to be deleted?
                 $dataDelete = DB::queryFirstRow(
                     'SELECT * 
-                    FROM ' . prefixTable('automatic_del') . '
+                    FROM ' . prefixTable('automatic_del').'
                     WHERE item_id = %i',
                     $inputData['id']
                 );
@@ -3178,14 +3177,14 @@ 
                     if (empty($userRest) === false) {
                         $dataTmp = DB::queryFirstRow(
                             'SELECT login
-                            FROM ' . prefixTable('users') . '
+                            FROM ' . prefixTable('users').'
                             WHERE id= %i',
                             $userRest
                         );
                         if (empty($listOfRestricted)) {
                             $listOfRestricted = $dataTmp['login'];
                         } else {
-                            $listOfRestricted .= ';' . $dataTmp['login'];
+                            $listOfRestricted .= ';'.$dataTmp['login'];
                         }
                     }
                 }
@@ -3259,9 +3258,9 @@ 
         // Load item data
         $dataItem = DB::queryFirstRow(
             'SELECT i.*, n.title AS folder_title, o.enabled AS otp_for_item_enabled, o.phone_number AS otp_phone_number, o.secret AS otp_secret
-            FROM ' . prefixTable('items') . ' AS i
-            INNER JOIN ' . prefixTable('nested_tree') . ' AS n ON (i.id_tree = n.id)
-            LEFT JOIN ' . prefixTable('items_otp') . ' AS o ON (o.item_id = i.id)
+            FROM ' . prefixTable('items').' AS i
+            INNER JOIN ' . prefixTable('nested_tree').' AS n ON (i.id_tree = n.id)
+            LEFT JOIN ' . prefixTable('items_otp').' AS o ON (o.item_id = i.id)
             WHERE i.id = %i',
             $inputData['id']
         );
@@ -3283,7 +3282,7 @@ 
         // Check if user has a role that is accepted
         $rows_tmp = DB::query(
             'SELECT role_id
-            FROM ' . prefixTable('restriction_to_roles') . '
+            FROM ' . prefixTable('restriction_to_roles').'
             WHERE item_id=%i',
             $inputData['id']
         );
@@ -3315,12 +3314,12 @@ 
             // launch query
             $rows = DB::query(
                 'SELECT id, name, file, extension, size
-                FROM ' . prefixTable('files') . '
+                FROM ' . prefixTable('files').'
                 WHERE id_item = %i AND confirmed = 1',
                 $inputData['id']
             );
             foreach ($rows as $record) {
-                $filename = basename($record['name'], '.' . $record['extension']);
+                $filename = basename($record['name'], '.'.$record['extension']);
                 $filename = isBase64($filename) === true ? base64_decode($filename) : $filename;
 
                 array_push(
@@ -3333,7 +3332,7 @@ 
                         'is_image' => in_array(strtolower($record['extension']), TP_IMAGE_FILE_EXT) === true ? 1 : 0,
                         'id' => $record['id'],
                         'key' => $session->get('user-key_tmp'),
-                        'internalFilename' => basename($record['name'], '.' . $record['extension']),
+                        'internalFilename' => basename($record['name'], '.'.$record['extension']),
                     )
                 );
             }
@@ -3375,8 +3374,8 @@ 
             $listOptionsForRoles = array();
             $rows = DB::query(
                 'SELECT r.role_id AS role_id, t.title AS title
-                FROM ' . prefixTable('roles_values') . ' AS r
-                INNER JOIN ' . prefixTable('roles_title') . ' AS t ON (r.role_id = t.id)
+                FROM ' . prefixTable('roles_values').' AS r
+                INNER JOIN ' . prefixTable('roles_title').' AS t ON (r.role_id = t.id)
                 WHERE r.folder_id = %i',
                 $dataItem['id_tree']
             );
@@ -3390,8 +3389,8 @@ 
                 );
                 $rows2 = DB::query(
                     'SELECT DISTINCT u.id, u.login, u.email, u.name, u.lastname, ur.role_id AS fonction_id
-                    FROM ' . prefixTable('users') . ' AS u
-                    INNER JOIN ' . prefixTable('users_roles') . ' AS ur ON (u.id = ur.user_id)
+                    FROM ' . prefixTable('users').' AS u
+                    INNER JOIN ' . prefixTable('users_roles').' AS ur ON (u.id = ur.user_id)
                     WHERE ur.role_id = %i AND ur.source = %s',
                     $record['role_id'],
                     'manual'
@@ -3408,7 +3407,7 @@ 
                                 array(
                                     'id' => (int) $record2['id'],
                                     'login' => $record2['login'],
-                                    'name' => $record2['name'] . ' ' . $record2['lastname'],
+                                    'name' => $record2['name'].' '.$record2['lastname'],
                                     'email' => $record2['email'],
                                 )
                             );
@@ -3427,16 +3426,16 @@ 
                 $path = '';
                 foreach ($arbo as $elem) {
                     if (empty($path) === true) {
-                        $path = htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES) . ' ';
+                        $path = htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES).' ';
                     } else {
-                        $path .= '&#8594; ' . htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES);
+                        $path .= '&#8594; '.htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES);
                     }
                 }
                 // Build text to show user
                 if (empty($path) === true) {
                     $path = addslashes($dataItem['label']);
                 } else {
-                    $path = addslashes($dataItem['label']) . ' (' . $path . ')';
+                    $path = addslashes($dataItem['label']).' ('.$path.')';
                 }
 
                 // Add Admins to notification list if expected
@@ -3459,7 +3458,7 @@ 
                         array(
                             addslashes($session->get('user-login')),
                             $path,
-                            $SETTINGS['cpassman_url'] . '/index.php?page=items&group=' . $dataItem['id_tree'] . '&id=' . $dataItem['id'],
+                            $SETTINGS['cpassman_url'].'/index.php?page=items&group='.$dataItem['id_tree'].'&id='.$dataItem['id'],
                         ),
                         $lang->get('email_on_open_notification_mail')
                     ),
@@ -3469,7 +3468,7 @@ 
             }
 
             // has this item a change proposal
-            DB::query('SELECT * FROM ' . prefixTable('items_change') . ' WHERE item_id = %i', $inputData['id']);
+            DB::query('SELECT * FROM '.prefixTable('items_change').' WHERE item_id = %i', $inputData['id']);
             $returnArray['has_change_proposal'] = DB::count();
 
             // Setting
@@ -3480,7 +3479,7 @@ 
             if (isset($SETTINGS['otv_is_enabled']) === true && (int) $SETTINGS['otv_is_enabled'] === 1) {
                 DB::query(
                     'SELECT *
-                    FROM ' . prefixTable('otv') . '
+                    FROM ' . prefixTable('otv').'
                     WHERE item_id = %i
                     AND time_limit > %i',
                     $inputData['id'],
@@ -3579,7 +3578,7 @@ 
         // Load item data
         $data = DB::queryFirstRow(
             'SELECT id_tree, id, label
-            FROM ' . prefixTable('items') . '
+            FROM ' . prefixTable('items').'
             WHERE id = %i OR item_key = %s',
             $inputData['itemId'],
             $inputData['itemKey']
@@ -3670,7 +3669,7 @@ 
         // Load item data
         $dataItem = DB::queryFirstRow(
             'SELECT secret, enabled
-            FROM ' . prefixTable('items_otp') . '
+            FROM ' . prefixTable('items_otp').'
             WHERE item_id = %i',
             $inputData['id']
         );
@@ -3752,13 +3751,13 @@ 
 
         // Check if user is allowed to access this folder
         if (!in_array($inputData['folderId'], $session->get('user-accessible_folders'))) {
-            echo '[{"error" : "' . $lang->get('error_not_allowed_to') . '"}]';
+            echo '[{"error" : "'.$lang->get('error_not_allowed_to').'"}]';
             break;
         }
 
         // Check if title doesn't contains html codes
         if (preg_match_all('|<[^>]+>(.*)</[^>]+>|U', $title, $out)) {
-            echo '[ { "error" : "' . $lang->get('error_html_codes') . '" } ]';
+            echo '[ { "error" : "'.$lang->get('error_html_codes').'" } ]';
             break;
         }
         // check that title is not numeric
@@ -3769,9 +3768,9 @@ 
 
         // Check if duplicate folders name are allowed
         if (isset($SETTINGS['duplicate_folder']) && $SETTINGS['duplicate_folder'] === '0') {
-            $data = DB::queryFirstRow('SELECT id, title FROM ' . prefixTable('nested_tree') . ' WHERE title = %s', $title);
+            $data = DB::queryFirstRow('SELECT id, title FROM '.prefixTable('nested_tree').' WHERE title = %s', $title);
             if (empty($data['id']) === false && $dataReceived['folder'] !== $data['id']) {
-                echo '[ { "error" : "' . $lang->get('error_group_exist') . '" } ]';
+                echo '[ { "error" : "'.$lang->get('error_group_exist').'" } ]';
                 break;
             }
         }
@@ -3779,7 +3778,7 @@ 
         // query on folder
         $data = DB::queryFirstRow(
             'SELECT parent_id, personal_folder
-            FROM ' . prefixTable('nested_tree') . '
+            FROM ' . prefixTable('nested_tree').'
             WHERE id = %i',
             $inputData['folderId']
         );
@@ -3789,20 +3788,20 @@ 
         if ($session->get('user-admin') !== 1 && $session->get('user-manager') !== 1 && $data['personal_folder'] === '0') {
             $data = DB::queryFirstRow(
                 'SELECT valeur
-                FROM ' . prefixTable('misc') . '
+                FROM ' . prefixTable('misc').'
                 WHERE intitule = %i AND type = %s',
                 $data['parent_id'],
                 'complex'
             );
             if (intval($dataReceived['complexity']) < intval($data['valeur'])) {
-                echo '[ { "error" : "' . $lang->get('error_folder_complexity_lower_than_top_folder') . ' [<b>' . TP_PW_COMPLEXITY[$data['valeur']][1] . '</b>]"} ]';
+                echo '[ { "error" : "'.$lang->get('error_folder_complexity_lower_than_top_folder').' [<b>'.TP_PW_COMPLEXITY[$data['valeur']][1].'</b>]"} ]';
                 break;
             }
         }
 
         // update Folders table
         $tmp = DB::queryFirstRow(
-            'SELECT title, parent_id, personal_folder FROM ' . prefixTable('nested_tree') . ' WHERE id = %i',
+            'SELECT title, parent_id, personal_folder FROM '.prefixTable('nested_tree').' WHERE id = %i',
             $dataReceived['folder']
         );
         if ($tmp['parent_id'] !== 0 || $tmp['title'] !== $session->get('user-id') || $tmp['personal_folder'] !== 1) {
@@ -3916,7 +3915,7 @@ 
             $uniqueLoadData['path'] = $arr_arbo;
 
             // store last folder accessed in cookie
-            $arr_cookie_options = array (
+            $arr_cookie_options = array(
                 'expires' => time() + TP_ONE_DAY_SECONDS * 5,
                 'path' => '/', 
                 'secure' => true,
@@ -3931,7 +3930,7 @@ 
             foreach ($session->get('user-roles_array') as $role) {
                 $roleQ = DB::queryFirstRow(
                     'SELECT allow_pw_change
-                    FROM ' . prefixTable('roles_title') . '
+                    FROM ' . prefixTable('roles_title').'
                     WHERE id = %i',
                     $role
                 );
@@ -3962,11 +3961,11 @@ 
                 
                 foreach ($session->get('user-roles_array') as $role) {
                     $access = DB::queryFirstRow(
-                        'SELECT type FROM ' . prefixTable('roles_values') . ' WHERE role_id = %i AND folder_id = %i',
+                        'SELECT type FROM '.prefixTable('roles_values').' WHERE role_id = %i AND folder_id = %i',
                         $role,
                         $inputData['id']
                     );
-                    if (DB::count()>0) {
+                    if (DB::count() > 0) {
                         if ($access['type'] === 'R') {
                             array_push($arrTmp, 10);
                         } elseif ($access['type'] === 'W') {
@@ -4031,7 +4030,7 @@ 
             } else {
                 DB::query(
                     'SELECT *
-                    FROM ' . prefixTable('items') . '
+                    FROM ' . prefixTable('items').'
                     WHERE inactif = %i',
                     0
                 );
@@ -4041,7 +4040,7 @@ 
 
             // Get folder complexity
             $folderComplexity = DB::queryFirstRow(
-                'SELECT valeur FROM ' . prefixTable('misc') . ' WHERE type = %s AND intitule = %i',
+                'SELECT valeur FROM '.prefixTable('misc').' WHERE type = %s AND intitule = %i',
                 'complex',
                 $inputData['id']
             );
@@ -4053,7 +4052,7 @@ 
             if (isset($SETTINGS['item_extra_fields']) && (int) $SETTINGS['item_extra_fields'] === 1) {
                 $folderRow = DB::query(
                     'SELECT id_category
-                    FROM ' . prefixTable('categories_folders') . '
+                    FROM ' . prefixTable('categories_folders').'
                     WHERE id_folder = %i',
                     $inputData['id']
                 );
@@ -4109,8 +4108,8 @@ 
                 $where->add('i.inactif=%i', 0);
                 $where->add('i.deleted_at IS NULL');
 
-                $query_limit = ' LIMIT ' .
-                    $start . ',' .
+                $query_limit = ' LIMIT '.
+                    $start.','.
                     $post_nb_items_to_display_once;
                     
                 $rows = DB::query(
@@ -4118,8 +4117,8 @@ 
                     i.label, i.description, i.pw, i.login,
                     i.anyone_can_modify, i.id_tree AS tree_id, i.fa_icon,
                     n.renewal_period, i.url AS link, i.email
-                    FROM ' . prefixTable('items') . ' AS i
-                    INNER JOIN ' . prefixTable('nested_tree') . ' AS n ON (i.id_tree = n.id)
+                    FROM ' . prefixTable('items').' AS i
+                    INNER JOIN ' . prefixTable('nested_tree').' AS n ON (i.id_tree = n.id)
                     WHERE %l
                     ORDER BY i.label ASC' . $query_limit,
                     $where
@@ -4133,8 +4132,8 @@ 
                     i.label, i.description, i.pw, i.login,
                     i.anyone_can_modify, i.id_tree AS tree_id, i.fa_icon,
                     n.renewal_period, i.url AS link, i.email
-                    FROM ' . prefixTable('items') . ' AS i
-                    INNER JOIN ' . prefixTable('nested_tree') . ' AS n ON (i.id_tree = n.id)
+                    FROM ' . prefixTable('items').' AS i
+                    INNER JOIN ' . prefixTable('nested_tree').' AS n ON (i.id_tree = n.id)
                     WHERE %l
                     ORDER BY i.label ASC',
                     $where
@@ -4164,7 +4163,7 @@ 
                     $item_is_restricted_to_role = false;
                     DB::queryFirstRow(
                         'SELECT role_id
-                        FROM ' . prefixTable('restriction_to_roles') . '
+                        FROM ' . prefixTable('restriction_to_roles').'
                         WHERE item_id = %i',
                         $record['id']
                     );
@@ -4176,7 +4175,7 @@ 
                     $user_is_included_in_role = false;
                     DB::query(
                         'SELECT role_id
-                        FROM ' . prefixTable('restriction_to_roles') . '
+                        FROM ' . prefixTable('restriction_to_roles').'
                         WHERE item_id = %i AND role_id IN %ls',
                         $record['id'],
                         $session->get('user-roles_array')
@@ -4201,11 +4200,11 @@ 
                     }
 
                     // Get Expiration date
-                    $sql = 'SELECT date FROM ' . prefixTable('log_items') 
-                        . " WHERE action = 'at_creation' AND id_item=" . $record['id']
-                        . ' union all SELECT date FROM '. prefixTable('log_items') 
+                    $sql = 'SELECT date FROM '.prefixTable('log_items') 
+                        . " WHERE action = 'at_creation' AND id_item=".$record['id']
+                        . ' union all SELECT date FROM '.prefixTable('log_items') 
                         . " WHERE action = 'at_modification' AND raison = 'at_pw'
-                        AND id_item=" . $record['id'] . " ORDER BY date DESC LIMIT 1";
+                        AND id_item=" . $record['id']." ORDER BY date DESC LIMIT 1";
                     $record['date'] = DB::queryFirstRow($sql)['date'];
 
                     // Check if item is expired
@@ -4394,8 +4393,8 @@ 
         if ((int) $start === 0) {
             DB::query(
                 'SELECT i.id
-                FROM ' . prefixTable('items') . ' as i
-                INNER JOIN ' . prefixTable('nested_tree') . ' as n ON (i.id_tree = n.id)
+                FROM ' . prefixTable('items').' as i
+                INNER JOIN ' . prefixTable('nested_tree').' as n ON (i.id_tree = n.id)
                 WHERE %l',
                 $where
             );
@@ -4455,8 +4454,8 @@ 
         $dataItem = DB::queryFirstRow(
             'SELECT i.pw AS pw, s.share_key AS share_key, i.id AS id,
                     i.label AS label, i.id_tree AS id_tree
-            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.item_key = %s OR i.id = %i)',
             $session->get('user-id'),
             $inputData['itemKey'] ?? '',
@@ -4568,7 +4567,7 @@ 
         // do query on this folder
         $data_this_folder = DB::queryFirstRow(
             'SELECT id, personal_folder, title
-            FROM ' . prefixTable('nested_tree') . '
+            FROM ' . prefixTable('nested_tree').'
             WHERE id = %s',
             $inputData['folderId']
         );
@@ -4608,8 +4607,8 @@ 
         $visibilite = '';
         $data = DB::queryFirstRow(
             'SELECT m.valeur, n.personal_folder
-            FROM ' . prefixTable('misc') . ' AS m
-            INNER JOIN ' . prefixTable('nested_tree') . ' AS n ON (m.intitule = n.id)
+            FROM ' . prefixTable('misc').' AS m
+            INNER JOIN ' . prefixTable('nested_tree').' AS n ON (m.intitule = n.id)
             WHERE type=%s AND intitule = %s',
             'complex',
             $inputData['folderId']
@@ -4622,8 +4621,8 @@ 
             // Prepare Item actual visibility (what Users/Roles can see it)
             $rows = DB::query(
                 'SELECT t.title
-                FROM ' . prefixTable('roles_values') . ' as v
-                INNER JOIN ' . prefixTable('roles_title') . ' as t ON (v.role_id = t.id)
+                FROM ' . prefixTable('roles_values').' as v
+                INNER JOIN ' . prefixTable('roles_title').' as t ON (v.role_id = t.id)
                 WHERE v.folder_id = %i
                 GROUP BY title',
                 $inputData['folderId']
@@ -4632,7 +4631,7 @@ 
                 if (empty($visibilite)) {
                     $visibilite = $record['title'];
                 } else {
-                    $visibilite .= ' - ' . $record['title'];
+                    $visibilite .= ' - '.$record['title'];
                 }
             }
         } else {
@@ -4642,14 +4641,14 @@ 
             // do new query to know if current folder is pf
             $data_pf = DB::queryFirstRow(
                 'SELECT personal_folder
-                FROM ' . prefixTable('nested_tree') . '
+                FROM ' . prefixTable('nested_tree').'
                 WHERE id = %s',
                 $inputData['folderId']
             );
             
             $folder_is_personal = $data_pf !== null ? (int) $data_pf['personal_folder'] : 0;
             
-            $visibilite = $session->get('user-name') . ' ' . $session->get('user-lastname') . ' (' . $session->get('user-login') . ')';
+            $visibilite = $session->get('user-name').' '.$session->get('user-lastname').' ('.$session->get('user-login').')';
         }
 
         recupDroitCreationSansComplexite($inputData['folderId']);
@@ -4659,8 +4658,8 @@ 
         $listOptionsForRoles = array();
         $rows = DB::query(
             'SELECT r.role_id AS role_id, t.title AS title
-            FROM ' . prefixTable('roles_values') . ' AS r
-            INNER JOIN ' . prefixTable('roles_title') . ' AS t ON (r.role_id = t.id)
+            FROM ' . prefixTable('roles_values').' AS r
+            INNER JOIN ' . prefixTable('roles_title').' AS t ON (r.role_id = t.id)
             WHERE r.folder_id = %i',
             $inputData['folderId']
         );
@@ -4675,8 +4674,8 @@ 
             $rows2 = DB::query(
                 'SELECT u.id, u.login, u.email, u.name, u.lastname,
                 GROUP_CONCAT(DISTINCT ur.role_id ORDER BY ur.role_id SEPARATOR ";") AS fonction_id
-                FROM ' . prefixTable('users') . ' AS u
-                INNER JOIN ' . prefixTable('users_roles') . ' AS ur ON (u.id = ur.user_id)
+                FROM ' . prefixTable('users').' AS u
+                INNER JOIN ' . prefixTable('users_roles').' AS ur ON (u.id = ur.user_id)
                 WHERE u.admin = 0 AND ur.source = %s
                 GROUP BY u.id',
                 'manual'
@@ -4692,7 +4691,7 @@ 
                             array(
                                 'id' => $record2['id'],
                                 'login' => $record2['login'],
-                                'name' => $record2['name'] . ' ' . $record2['lastname'],
+                                'name' => $record2['name'].' '.$record2['lastname'],
                                 'email' => $record2['email'],
                             )
                         );
@@ -4709,12 +4708,12 @@ 
             foreach ($session->get('user-roles_array') as $role) {
                 $access = DB::queryFirstRow(
                     'SELECT type
-                    FROM ' . prefixTable('roles_values') . '
+                    FROM ' . prefixTable('roles_values').'
                     WHERE role_id = %i AND folder_id = %i',
                     $role,
                     $inputData['folderId']
                 );
-                if (DB::count()>0) {
+                if (DB::count() > 0) {
                     if ($access['type'] === 'R') {
                         array_push($arrTmp, 10);
                     } elseif ($access['type'] === 'W') {
@@ -4742,7 +4741,7 @@ 
             // Check if personal folder is owned by user
             $folder = DB::queryFirstRow(
                 'SELECT id
-                FROM ' . prefixTable('nested_tree') . '
+                FROM ' . prefixTable('nested_tree').'
                 WHERE title = %s',
                 $session->get('user-id'),
             );
@@ -4847,7 +4846,7 @@ 
         // Get some info before deleting
         $data = DB::queryFirstRow(
             'SELECT name, id_item, file
-            FROM ' . prefixTable('files') . '
+            FROM ' . prefixTable('files').'
             WHERE id = %i',
             $fileId
         );
@@ -4855,7 +4854,7 @@ 
         // Load item data
         $data_item = DB::queryFirstRow(
             'SELECT id_tree
-            FROM ' . prefixTable('items') . '
+            FROM ' . prefixTable('items').'
             WHERE id = %i',
             $data['id_item']
         );
@@ -4885,7 +4884,7 @@ 
                 $session->get('user-id'),
                 'at_modification',
                 $session->get('user-login'),
-                'at_del_file : ' . $data['name']
+                'at_del_file : '.$data['name']
             );
 
             // DElete sharekeys
@@ -4896,7 +4895,7 @@ 
             );
 
             // Delete file from server
-            $fileToDelete = $SETTINGS['path_to_upload_folder'] . '/' . TP_FILE_PREFIX . base64_decode($data['file']);
+            $fileToDelete = $SETTINGS['path_to_upload_folder'].'/'.TP_FILE_PREFIX.base64_decode($data['file']);
             $fileToDelete = realpath($fileToDelete);
             if ($fileToDelete && strpos($fileToDelete, $SETTINGS['path_to_upload_folder']) === 0) {
                 fileDelete($fileToDelete, $SETTINGS);
@@ -4950,7 +4949,7 @@ 
             // Update SESSION with this new favourite
             $data = DB::queryFirstRow(
                 'SELECT label,id_tree
-                FROM ' . prefixTable('items') . '
+                FROM ' . prefixTable('items').'
                 WHERE id = %i',
                 $inputData['itemId']
             );
@@ -4959,7 +4958,7 @@ 
                 [
                     $inputData['itemId'] => [
                         'label' => $data['label'],
-                        'url' => 'index.php?page=items&amp;group=' . $data['id_tree'] . '&amp;id=' . $inputData['itemId'],
+                        'url' => 'index.php?page=items&amp;group='.$data['id_tree'].'&amp;id='.$inputData['itemId'],
                     ],
                 ],
                 'add'
@@ -5028,8 +5027,8 @@ 
         // get data about item
         $dataSource = DB::queryFirstRow(
             'SELECT i.pw, f.personal_folder,i.id_tree, f.title,i.label
-            FROM ' . prefixTable('items') . ' as i
-            INNER JOIN ' . prefixTable('nested_tree') . ' as f ON (i.id_tree=f.id)
+            FROM ' . prefixTable('items').' as i
+            INNER JOIN ' . prefixTable('nested_tree').' as f ON (i.id_tree=f.id)
             WHERE i.id=%i',
             $inputData['itemId']
         );
@@ -5073,7 +5072,7 @@ 
         // get data about new folder
         $dataDestination = DB::queryFirstRow(
             'SELECT personal_folder, title
-            FROM ' . prefixTable('nested_tree') . '
+            FROM ' . prefixTable('nested_tree').'
             WHERE id = %i',
             $inputData['folderId']
         );
@@ -5126,7 +5125,7 @@ 
             // Get fields for this Item
             $rows = DB::query(
                 'SELECT id
-                FROM ' . prefixTable('categories_items') . '
+                FROM ' . prefixTable('categories_items').'
                 WHERE item_id = %i',
                 $inputData['itemId']
             );
@@ -5143,7 +5142,7 @@ 
             // Get FILES for this Item
             $rows = DB::query(
                 'SELECT id
-                FROM ' . prefixTable('files') . '
+                FROM ' . prefixTable('files').'
                 WHERE id_item = %i',
                 $inputData['itemId']
             );
@@ -5190,7 +5189,7 @@ 
             // Get the ITEM object key for the user
             $userKey = DB::queryFirstRow(
                 'SELECT share_key
-                FROM ' . prefixTable('sharekeys_items') . '
+                FROM ' . prefixTable('sharekeys_items').'
                 WHERE user_id = %i AND object_id = %i',
                 $session->get('user-id'),
                 $inputData['itemId']
@@ -5201,7 +5200,7 @@ 
                 // This is a public object
                 $users = DB::query(
                     'SELECT id, public_key
-                    FROM ' . prefixTable('users') . '
+                    FROM ' . prefixTable('users').'
                     WHERE id NOT IN %li
                     AND public_key != ""',
                     $tpUsersIDs
@@ -5221,14 +5220,14 @@ 
             // Get fields for this Item
             $rows = DB::query(
                 'SELECT id
-                FROM ' . prefixTable('categories_items') . '
+                FROM ' . prefixTable('categories_items').'
                 WHERE item_id = %i',
                 $inputData['itemId']
             );
             foreach ($rows as $field) {
                 $userKey = DB::queryFirstRow(
                     'SELECT share_key
-                    FROM ' . prefixTable('sharekeys_fields') . '
+                    FROM ' . prefixTable('sharekeys_fields').'
                     WHERE user_id = %i AND object_id = %i',
                     $session->get('user-id'),
                     $field['id']
@@ -5239,7 +5238,7 @@ 
                     // This is a public object
                     $users = DB::query(
                         'SELECT id, public_key
-                        FROM ' . prefixTable('users') . '
+                        FROM ' . prefixTable('users').'
                         WHERE id NOT IN %li
                         AND public_key != ""',
                         $tpUsersIDs
@@ -5260,14 +5259,14 @@ 
             // Get FILES for this Item
             $rows = DB::query(
                 'SELECT id
-                FROM ' . prefixTable('files') . '
+                FROM ' . prefixTable('files').'
                 WHERE id_item = %i',
                 $inputData['itemId']
             );
             foreach ($rows as $attachment) {
                 $userKey = DB::queryFirstRow(
                     'SELECT share_key
-                    FROM ' . prefixTable('sharekeys_files') . '
+                    FROM ' . prefixTable('sharekeys_files').'
                     WHERE user_id = %i AND object_id = %i',
                     $session->get('user-id'),
                     $attachment['id']
@@ -5278,7 +5277,7 @@ 
                     // This is a public object
                     $users = DB::query(
                         'SELECT id, public_key
-                        FROM ' . prefixTable('users') . '
+                        FROM ' . prefixTable('users').'
                         WHERE id NOT IN %li
                         AND public_key != ""',
                         $tpUsersIDs
@@ -5317,7 +5316,7 @@ 
             $session->get('user-id'),
             'at_modification',
             $session->get('user-login'),
-            'at_moved : ' . $dataSource['title'] . ' -> ' . $dataDestination['title']
+            'at_moved : '.$dataSource['title'].' -> '.$dataDestination['title']
         );
 
         // Update cache table
@@ -5376,8 +5375,8 @@ 
                 // get data about item
                 $dataSource = DB::queryFirstRow(
                     'SELECT i.pw, f.personal_folder,i.id_tree, f.title,i.label
-                    FROM ' . prefixTable('items') . ' as i
-                    INNER JOIN ' . prefixTable('nested_tree') . ' as f ON (i.id_tree=f.id)
+                    FROM ' . prefixTable('items').' as i
+                    INNER JOIN ' . prefixTable('nested_tree').' as f ON (i.id_tree=f.id)
                     WHERE i.id=%i',
                     $item_id
                 );
@@ -5399,7 +5398,7 @@ 
 
                 // get data about new folder
                 $dataDestination = DB::queryFirstRow(
-                    'SELECT personal_folder, title FROM ' . prefixTable('nested_tree') . ' WHERE id = %i',
+                    'SELECT personal_folder, title FROM '.prefixTable('nested_tree').' WHERE id = %i',
                     $inputData['folderId']
                 );
 
@@ -5433,14 +5432,14 @@ 
                         prefixTable('sharekeys_items'),
                         'object_id = %i AND user_id NOT IN %ls',
                         $item_id,
-                        [$session->get('user-id'), TP_USER_ID, API_USER_ID, OTV_USER_ID,SSH_USER_ID]
+                        [$session->get('user-id'), TP_USER_ID, API_USER_ID, OTV_USER_ID, SSH_USER_ID]
                     );
 
                     // Remove all item sharekeys fields
                     // Get fields for this Item
                     $rows = DB::query(
                         'SELECT id
-                        FROM ' . prefixTable('categories_items') . '
+                        FROM ' . prefixTable('categories_items').'
                         WHERE item_id = %i',
                         $item_id
                     );
@@ -5457,7 +5456,7 @@ 
                     // Get FILES for this Item
                     $rows = DB::query(
                         'SELECT id
-                        FROM ' . prefixTable('files') . '
+                        FROM ' . prefixTable('files').'
                         WHERE id_item = %i',
                         $item_id
                     );
@@ -5512,7 +5511,7 @@ 
                     // Get the ITEM object key for the user
                     $userKey = DB::queryFirstRow(
                         'SELECT share_key
-                        FROM ' . prefixTable('sharekeys_items') . '
+                        FROM ' . prefixTable('sharekeys_items').'
                         WHERE user_id = %i AND object_id = %i',
                         $session->get('user-id'),
                         $item_id
@@ -5523,7 +5522,7 @@ 
                         // This is a public object
                         $users = DB::query(
                             'SELECT id, public_key
-                            FROM ' . prefixTable('users') . '
+                            FROM ' . prefixTable('users').'
                             WHERE id NOT IN %li
                             AND public_key != ""',
                             $tpUsersIDs
@@ -5544,14 +5543,14 @@ 
                     // Get fields for this Item
                     $rows = DB::query(
                         'SELECT id
-                        FROM ' . prefixTable('categories_items') . '
+                        FROM ' . prefixTable('categories_items').'
                         WHERE item_id = %i',
                         $item_id
                     );
                     foreach ($rows as $field) {
                         $userKey = DB::queryFirstRow(
                             'SELECT share_key
-                            FROM ' . prefixTable('sharekeys_fields') . '
+                            FROM ' . prefixTable('sharekeys_fields').'
                             WHERE user_id = %i AND object_id = %i',
                             $session->get('user-id'),
                             $field['id']
@@ -5562,7 +5561,7 @@ 
                             // This is a public object
                             $users = DB::query(
                                 'SELECT id, public_key
-                                FROM ' . prefixTable('users') . '
+                                FROM ' . prefixTable('users').'
                                 WHERE id NOT IN %li
                                 AND public_key != ""',
                                 $tpUsersIDs
@@ -5584,14 +5583,14 @@ 
                     // Get FILES for this Item
                     $rows = DB::query(
                         'SELECT id
-                        FROM ' . prefixTable('files') . '
+                        FROM ' . prefixTable('files').'
                         WHERE id_item = %i',
                         $item_id
                     );
                     foreach ($rows as $attachment) {
                         $userKey = DB::queryFirstRow(
                             'SELECT share_key
-                            FROM ' . prefixTable('sharekeys_files') . '
+                            FROM ' . prefixTable('sharekeys_files').'
                             WHERE user_id = %i AND object_id = %i',
                             $session->get('user-id'),
                             $attachment['id']
@@ -5602,7 +5601,7 @@ 
                             // This is a public object
                             $users = DB::query(
                                 'SELECT id, public_key
-                                FROM ' . prefixTable('users') . '
+                                FROM ' . prefixTable('users').'
                                 WHERE id NOT IN %li
                                 AND public_key != ""',
                                 $tpUsersIDs
@@ -5640,13 +5639,13 @@ 
                     $session->get('user-id'),
                     'at_modification',
                     $session->get('user-login'),
-                    'at_moved : ' . $dataSource['title'] . ' -> ' . $dataDestination['title']
+                    'at_moved : '.$dataSource['title'].' -> '.$dataDestination['title']
                 );
             }
         }
 
         // reload cache table
-        require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+        require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
         updateCacheTable('reload', null);
 
         echo (string) prepareExchangedData(
@@ -5710,7 +5709,7 @@ 
                 // get info
                 $dataSource = DB::queryFirstRow(
                     'SELECT label, id_tree
-                    FROM ' . prefixTable('items') . '
+                    FROM ' . prefixTable('items').'
                     WHERE id=%i',
                     $item_id
                 );
@@ -5811,14 +5810,14 @@ 
             // Variables
             $dataAuthor = DB::queryFirstRow(
                 'SELECT email,login
-                FROM ' . prefixTable('users') . '
+                FROM ' . prefixTable('users').'
                 WHERE id = %i',
                 $post_content[1]
             );
 
             $dataItem = DB::queryFirstRow(
                 'SELECT label, id_tree
-                FROM ' . prefixTable('items') . '
+                FROM ' . prefixTable('items').'
                 WHERE id = %i',
                 $post_content[0]
             );
@@ -5835,7 +5834,7 @@ 
                 $lang->get('email_request_access_subject'),
                 str_replace(
                     array('#tp_item_author#', '#tp_user#', '#tp_item#'),
-                    array(' ' . addslashes($dataAuthor['login']), addslashes($session->get('user-login')), $path),
+                    array(' '.addslashes($dataAuthor['login']), addslashes($session->get('user-login')), $path),
                     $lang->get('email_request_access_mail')
                 ),
                 $dataAuthor['email'],
@@ -5844,7 +5843,7 @@ 
         } elseif ($inputData['cat'] === 'share_this_item') {
             $dataItem = DB::queryFirstRow(
                 'SELECT label,id_tree
-                FROM ' . prefixTable('items') . '
+                FROM ' . prefixTable('items').'
                 WHERE id= %i',
                 $inputData['id']
             );
@@ -5867,7 +5866,7 @@ 
                     ),
                     array(
                         empty($SETTINGS['email_server_url']) === false ?
-                            $SETTINGS['email_server_url'] . '/index.php?page=items&group=' . $dataItem['id_tree'] . '&id=' . $inputData['id'] : $SETTINGS['cpassman_url'] . '/index.php?page=items&group=' . $dataItem['id_tree'] . '&id=' . $inputData['id'],
+                            $SETTINGS['email_server_url'].'/index.php?page=items&group='.$dataItem['id_tree'].'&id='.$inputData['id'] : $SETTINGS['cpassman_url'].'/index.php?page=items&group='.$dataItem['id_tree'].'&id='.$inputData['id'],
                         addslashes($session->get('user-login')),
                         addslashes($path),
                     ),
@@ -5917,8 +5916,8 @@ 
         $dataItem = DB::queryFirstRow(
             'SELECT i.*,
             IFNULL(l.id_user, 0) AS id_user
-            FROM ' . prefixTable('items') . ' as i
-            LEFT JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id AND l.action = %s)
+            FROM ' . prefixTable('items').' as i
+            LEFT JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id AND l.action = %s)
             WHERE i.id=%i',
             'at_creation',
             $item_id
@@ -5947,18 +5946,18 @@ 
                 $session->get('user-login'),
                 htmlspecialchars_decode($label, ENT_QUOTES),
                 null,
-                (string) dateToStamp($date.' '.$time, $SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'])
+                (string) dateToStamp($date.' '.$time, $SETTINGS['date_format'].' '.$SETTINGS['time_format'])
             );
             // Prepare new line
             $data = DB::queryFirstRow(
-                'SELECT * FROM ' . prefixTable('log_items') . ' WHERE id_item = %i ORDER BY date DESC',
+                'SELECT * FROM '.prefixTable('log_items').' WHERE id_item = %i ORDER BY date DESC',
                 $item_id
             );
-            $historic = date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $data['date']) . ' - ' . $session->get('user-login') . ' - ' . $lang->get($data['action']) . ' - ' . $data['raison'];
+            $historic = date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $data['date']).' - '.$session->get('user-login').' - '.$lang->get($data['action']).' - '.$data['raison'];
             // send back
             $data = array(
                 'error' => '',
-                'new_line' => '<br>' . addslashes($historic),
+                'new_line' => '<br>'.addslashes($historic),
             );
             echo (string) prepareExchangedData(
                 $data,
@@ -6033,8 +6032,8 @@ 
         // Should we log a password change?
         $itemQ = DB::queryFirstRow(
             'SELECT s.share_key, i.pw
-            FROM ' . prefixTable('items') . ' AS i
-            INNER JOIN ' . prefixTable('sharekeys_items') . ' AS s ON (i.id = s.object_id)
+            FROM ' . prefixTable('items').' AS i
+            INNER JOIN ' . prefixTable('sharekeys_items').' AS s ON (i.id = s.object_id)
             WHERE s.user_id = %i AND s.object_id = %i',
             $session->get('user-id'),
             $dataReceived['id']
@@ -6089,7 +6088,7 @@ 
         if (isset($SETTINGS['otv_expiration_period']) === false) {
             $SETTINGS['otv_expiration_period'] = 7;
         }
-        $url = $SETTINGS['cpassman_url'] . '/index.php?' . http_build_query($otv_session);
+        $url = $SETTINGS['cpassman_url'].'/index.php?'.http_build_query($otv_session);
 
         echo json_encode(
             array(
@@ -6120,7 +6119,7 @@ 
         // get parameters from original link
         $url = $dataReceived['original_link'];
         $parts = parse_url($url);
-        if(isset($parts['query'])){
+        if (isset($parts['query'])) {
             parse_str($parts['query'], $orignal_link_parameters);
         } else {
             $orignal_link_parameters = array();
@@ -6151,13 +6150,13 @@ 
             $domain_scheme = parse_url($SETTINGS['cpassman_url'], PHP_URL_SCHEME);
             $domain_host = parse_url($SETTINGS['cpassman_url'], PHP_URL_HOST);
             if (str_contains($domain_host, 'www.') === true) {
-                $domain_host = (string) $SETTINGS['otv_subdomain'] . '.' . substr($domain_host, 4);
+                $domain_host = (string) $SETTINGS['otv_subdomain'].'.'.substr($domain_host, 4);
             } else {
-                $domain_host = (string) $SETTINGS['otv_subdomain'] . '.' . $domain_host;
+                $domain_host = (string) $SETTINGS['otv_subdomain'].'.'.$domain_host;
             }
-            $url = $domain_scheme.'://'.$domain_host . '/index.php?'.http_build_query($otv_session);
+            $url = $domain_scheme.'://'.$domain_host.'/index.php?'.http_build_query($otv_session);
         } else {
-            $url = $SETTINGS['cpassman_url'] . '/index.php?'.http_build_query($otv_session);
+            $url = $SETTINGS['cpassman_url'].'/index.php?'.http_build_query($otv_session);
         }
 
         echo (string) prepareExchangedData(
@@ -6192,8 +6191,8 @@ 
             'SELECT f.id AS id, f.file AS file, f.name AS name, f.status AS status,
             f.extension AS extension, f.type AS type,
             s.share_key AS share_key
-            FROM ' . prefixTable('files') . ' AS f
-            INNER JOIN ' . prefixTable('sharekeys_files') . ' AS s ON (f.id = s.object_id)
+            FROM ' . prefixTable('files').' AS f
+            INNER JOIN ' . prefixTable('sharekeys_files').' AS s ON (f.id = s.object_id)
             WHERE s.user_id = %i AND s.object_id = %i',
             $session->get('user-id'),
             $inputData['id']
@@ -6214,7 +6213,7 @@ 
         //$fileName = basename($file_info['name'], '.'.$file_info['extension']);
 
         // prepare image info
-        $post_title = basename($file_info['name'], '.' . $file_info['extension']);
+        $post_title = basename($file_info['name'], '.'.$file_info['extension']);
         $post_title = isBase64($post_title) === true ? base64_decode($post_title) : $post_title;
         
         // Get image content
@@ -6241,7 +6240,7 @@ 
         echo (string) prepareExchangedData(
             array(
                 'error' => false,
-                'filename' => $post_title . '.' . $file_info['extension'],
+                'filename' => $post_title.'.'.$file_info['extension'],
                 'file_type' => $file_info['type'],
                 'file_content' => $fileContent,
             ),
@@ -6353,7 +6352,7 @@ 
                     $arbo = $tree->getPath($folder->id, false);
                     $path = '';
                     foreach ($arbo as $elem) {
-                        $path = (empty($path) ? '' : $path . ' / ') . htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES);
+                        $path = (empty($path) ? '' : $path.' / ').htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES);
                     }
 
                     // Build array
@@ -6420,7 +6419,7 @@ 
         if (is_array($foldersArray) === true && $inputData['data'] !== '[null]') {
             $rows = DB::query(
                 'SELECT id, categories
-                FROM ' . prefixTable('nested_tree') . '
+                FROM ' . prefixTable('nested_tree').'
                 WHERE id IN (%l)',
                 implode(',', $foldersArray)
             );
@@ -6438,7 +6437,7 @@ 
             if (count($ids) > 0) {
                 $subfolders = DB::queryFirstColumn(
                     'SELECT title
-                    FROM ' . prefixTable('nested_tree') . '
+                    FROM ' . prefixTable('nested_tree').'
                     WHERE id IN %li',
                     $ids
                 );
@@ -6474,7 +6473,7 @@ 
         // get item info
         $dataItem = DB::queryFirstRow(
             'SELECT *
-            FROM ' . prefixTable('items') . '
+            FROM ' . prefixTable('items').'
             WHERE id=%i',
             $inputData['itemId']
         );
@@ -6486,8 +6485,8 @@ 
             'SELECT l.date as date, l.action as action, l.raison as raison,
                 u.login as login, u.avatar_thumb as avatar_thumb, u.name as name, u.lastname as lastname,
                 l.old_value as old_value
-            FROM ' . prefixTable('log_items') . ' as l
-            INNER JOIN ' . prefixTable('users') . ' as u ON (l.id_user=u.id)
+            FROM ' . prefixTable('log_items').' as l
+            INNER JOIN ' . prefixTable('users').' as u ON (l.id_user=u.id)
             WHERE id_item=%i AND l.action NOT IN (%l)
             ORDER BY date DESC',
             $inputData['itemId'],
@@ -6502,18 +6501,18 @@ 
             
             // imported via API
             if (empty($record['login']) === true) {
-                $record['login'] = $lang->get('imported_via_api') . ' [' . $record['raison'] . ']';
+                $record['login'] = $lang->get('imported_via_api').' ['.$record['raison'].']';
             }
             
             // Prepare avatar
             if (isset($record['avatar_thumb']) && empty($record['avatar_thumb']) === false) {
-                if (file_exists($SETTINGS['cpassman_dir'] . '/includes/avatars/' . $record['avatar_thumb'])) {
-                    $avatar = $SETTINGS['cpassman_url'] . '/includes/avatars/' . $record['avatar_thumb'];
+                if (file_exists($SETTINGS['cpassman_dir'].'/includes/avatars/'.$record['avatar_thumb'])) {
+                    $avatar = $SETTINGS['cpassman_url'].'/includes/avatars/'.$record['avatar_thumb'];
                 } else {
-                    $avatar = $SETTINGS['cpassman_url'] . '/includes/images/photo.jpg';
+                    $avatar = $SETTINGS['cpassman_url'].'/includes/images/photo.jpg';
                 }
             } else {
-                $avatar = $SETTINGS['cpassman_url'] . '/includes/images/photo.jpg';
+                $avatar = $SETTINGS['cpassman_url'].'/includes/images/photo.jpg';
             }
 
             // Prepare action
@@ -6533,7 +6532,7 @@ 
                         $previous_passwords, 
                         [
                             'password' => htmlentities($previous_pwd['string']),
-                            'date' => date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date']),
+                            'date' => date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['date']),
                         ]
                     );
                 }
@@ -6546,19 +6545,19 @@ 
                 $action = $lang->get($reason[0]);
                 if ($reason[0] === 'at_moved') {
                     $tmp = explode(' -> ', $reason[1]);
-                    $detail = $lang->get('from') . ' <span class="font-weight-light">' . $tmp[0] . '</span> ' . $lang->get('to') . ' <span class="font-weight-light">' . $tmp[1] . ' </span>';
+                    $detail = $lang->get('from').' <span class="font-weight-light">'.$tmp[0].'</span> '.$lang->get('to').' <span class="font-weight-light">'.$tmp[1].' </span>';
                 } elseif ($reason[0] === 'at_field') {
                     $tmp = explode(' => ', $reason[1]);
                     if (count($tmp) > 1) {
-                        $detail = '<b>' . trim($tmp[0]) . '</b> | ' . $lang->get('previous_value') .
-                            ': <span class="font-weight-light">' . trim($tmp[1]) . '</span>';
+                        $detail = '<b>'.trim($tmp[0]).'</b> | '.$lang->get('previous_value').
+                            ': <span class="font-weight-light">'.trim($tmp[1]).'</span>';
                     } else {
                         $detail = trim($reason[1]);
                     }
                 } elseif (in_array($reason[0], array('at_restriction', 'at_email', 'at_login', 'at_label', 'at_url', 'at_tag')) === true) {
                     $tmp = explode(' => ', $reason[1]);
                     $detail = empty(trim($tmp[0])) === true ?
-                        $lang->get('no_previous_value') : $lang->get('previous_value') . ': <span class="font-weight-light">' . $tmp[0] . ' </span>';
+                        $lang->get('no_previous_value') : $lang->get('previous_value').': <span class="font-weight-light">'.$tmp[0].' </span>';
                 } elseif ($reason[0] === 'at_automatic_del') {
                     $detail = $lang->get($reason[1]);
                 } elseif ($reason[0] === 'at_anyoneconmodify' || $reason[0] === 'at_otp_status' || $reason[0] === 'at_otp_secret' || $reason[0] === 'at_phone_number') {
@@ -6567,7 +6566,7 @@ 
                     $tmp = explode(':', $reason[1]);
                     $tmp = explode('.', $tmp[0]);
                     $detail = isBase64($tmp[0]) === true ?
-                        base64_decode($tmp[0]) . '.' . $tmp[1] : $tmp[0];
+                        base64_decode($tmp[0]).'.'.$tmp[1] : $tmp[0];
                 } elseif ($reason[0] === 'at_import') {
                     $detail = '';
                 } elseif (in_array($reason[0], array('csv', 'pdf')) === true) {
@@ -6586,8 +6585,8 @@ 
                 array(
                     'avatar' => $avatar,
                     'login' => $record['login'],
-                    'name' => $record['name'] . ' ' . $record['lastname'],
-                    'date' => date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date']),
+                    'name' => $record['name'].' '.$record['lastname'],
+                    'date' => date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['date']),
                     'action' => $action,
                     'detail' => $detail,
                 )
@@ -6675,11 +6674,11 @@ 
 
         // get some info to add to the notification email
         $resp_user = DB::queryFirstRow(
-            'SELECT login FROM ' . prefixTable('users') . ' WHERE id = %i',
+            'SELECT login FROM '.prefixTable('users').' WHERE id = %i',
             $session->get('user-id')
         );
         $resp_folder = DB::queryFirstRow(
-            'SELECT title FROM ' . prefixTable('nested_tree') . ' WHERE id = %i',
+            'SELECT title FROM '.prefixTable('nested_tree').' WHERE id = %i',
             $folder
         );
 
@@ -6688,7 +6687,7 @@ 
         $emailService = new EmailService();
         $rows = DB::query(
             'SELECT email
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE `gestionnaire` = %i AND `email` IS NOT NULL',
             1
         );
@@ -6734,7 +6733,7 @@ 
         // Send email
         $dataItem = DB::queryFirstRow(
             'SELECT label, id_tree
-            FROM ' . prefixTable('items') . '
+            FROM ' . prefixTable('items').'
             WHERE id = %i',
             $inputData['itemId']
         );
@@ -6788,7 +6787,7 @@ 
 
         DB::query(
             'SELECT *
-            FROM ' . prefixTable('notification') . '
+            FROM ' . prefixTable('notification').'
             WHERE item_id = %i AND user_id = %i',
             $inputData['itemId'],
             $session->get('user-id')
@@ -6860,7 +6859,7 @@ 
         // And related logs
         $rows = DB::query(
             'SELECT id, file AS filename
-            FROM ' . prefixTable('files') . '
+            FROM ' . prefixTable('files').'
             WHERE id_item = %i AND confirmed = %i',
             $inputData['itemId'],
             0
@@ -6874,12 +6873,12 @@ 
             );
 
             // Delete file on server
-            unlink($SETTINGS['path_to_upload_folder'] . '/' . TP_FILE_PREFIX . base64_decode($file['filename']));
+            unlink($SETTINGS['path_to_upload_folder'].'/'.TP_FILE_PREFIX.base64_decode($file['filename']));
 
             // Delete related logs
             $logFile = DB::query(
                 'SELECT increment_id, raison
-                FROM ' . prefixTable('log_items') . '
+                FROM ' . prefixTable('log_items').'
                 WHERE id_item = %i AND id_user = %i AND action = %s AND raison LIKE "at_add_file :%"',
                 $inputData['itemId'],
                 $session->get('user-id'),
@@ -6938,7 +6937,7 @@ 
         // Confirm attachments
         $rows = DB::query(
             'SELECT id, file AS filename
-            FROM ' . prefixTable('files') . '
+            FROM ' . prefixTable('files').'
             WHERE id_item = %i AND confirmed = %i',
             $inputData['itemId'],
             0
@@ -7054,7 +7053,7 @@ 
             $successfulDeletions = array();
             $failedDeletions = array();
 
-            foreach( $selectedItemIds as $itemId) {
+            foreach ($selectedItemIds as $itemId) {
                 // Check that user can access this item
                 $granted = accessToItemIsGranted((int) $itemId, $SETTINGS);
                 if ($granted !== true) {
@@ -7065,7 +7064,7 @@ 
                 // Load item data
                 $data = DB::queryFirstRow(
                     'SELECT id_tree, id, label
-                    FROM ' . prefixTable('items') . '
+                    FROM ' . prefixTable('items').'
                     WHERE id = %i',
                     $itemId
                 );
@@ -7148,15 +7147,15 @@ 
         case 'autocomplete_tags':
             // Get a list off all existing TAGS
             $listOfTags = '';
-            $rows = DB::query('SELECT tag FROM ' . prefixTable('tags') . ' WHERE tag LIKE %ss GROUP BY tag', $inputData['getTerm']);
+            $rows = DB::query('SELECT tag FROM '.prefixTable('tags').' WHERE tag LIKE %ss GROUP BY tag', $inputData['getTerm']);
             foreach ($rows as $record) {
                 if (empty($listOfTags)) {
-                    $listOfTags = '"' . $record['tag'] . '"';
+                    $listOfTags = '"'.$record['tag'].'"';
                 } else {
-                    $listOfTags .= ', "' . $record['tag'] . '"';
+                    $listOfTags .= ', "'.$record['tag'].'"';
                 }
             }
-            echo '[' . $listOfTags . ']';
+            echo '['.$listOfTags.']';
             break;
     }
 }
@@ -7172,7 +7171,7 @@ 
 {
     $data = DB::queryFirstRow(
         'SELECT bloquer_creation, bloquer_modification, personal_folder
-        FROM ' . prefixTable('nested_tree') . ' WHERE id = %i',
+        FROM ' . prefixTable('nested_tree').' WHERE id = %i',
         $groupe
     );
     // Check if it's in a personal folder. If yes, then force complexity overhead.
@@ -7292,7 +7291,7 @@ 
     // Get item date
     $itemRestrictedUsersList = DB::queryFirstRow(
         'SELECT restricted_to
-         FROM ' . prefixTable('items') . '
+         FROM ' . prefixTable('items').'
          WHERE id = %i',
         $itemId
     );
@@ -7325,7 +7324,7 @@ 
     $now = time();
     $editionLocks = DB::query(
         'SELECT timestamp, user_id, increment_id
-         FROM ' . prefixTable('items_edition') . '
+         FROM ' . prefixTable('items_edition').'
          WHERE item_id = %i 
          ORDER BY increment_id DESC',
         $itemId
@@ -7371,7 +7370,7 @@ 
 
         // Delete related background tasks if any
         $task = DB::queryFirstRow(
-            'SELECT increment_id FROM ' . prefixTable('background_tasks') . '
+            'SELECT increment_id FROM '.prefixTable('background_tasks').'
              WHERE item_id = %i AND finished_at = ""',
             $itemId
         );
@@ -7384,7 +7383,7 @@ 
         // Check if encryption process is still running
         DB::queryFirstRow(
             'SELECT JSON_EXTRACT(arguments, "$.all_users_except_id") AS all_users_except_id
-             FROM ' . prefixTable('background_tasks') . '
+             FROM ' . prefixTable('background_tasks').'
              WHERE item_id = %i AND finished_at = ""
              ORDER BY increment_id DESC',
             $itemId
@@ -7405,7 +7404,7 @@ 
         }
 
         return [
-            'status' => true,   // Encryption in progress
+            'status' => true, // Encryption in progress
             'delay' => $delay - $elapsed, // Time remaining before the lock expires
         ];
     }
@@ -7450,7 +7449,7 @@ 
 {
     // Check if there's an ongoing background encryption process for the item
     $ongoingProcess = DB::queryFirstRow(
-        'SELECT 1 FROM ' . prefixTable('background_tasks') . ' WHERE item_id = %i AND finished_at = "" LIMIT 1', 
+        'SELECT 1 FROM '.prefixTable('background_tasks').' WHERE item_id = %i AND finished_at = "" LIMIT 1', 
         $itemId
     );
 
@@ -7468,7 +7467,7 @@ 
 function getUserVisibleFolders(int $userId): array
 {
     // Query to retrieve visible folders for the user
-    $data = DB::queryFirstRow('SELECT visible_folders FROM ' . prefixTable('cache_tree') . ' WHERE user_id = %i', $userId);
+    $data = DB::queryFirstRow('SELECT visible_folders FROM '.prefixTable('cache_tree').' WHERE user_id = %i', $userId);
     
     // Decode JSON data into an array; return an empty array if the data is invalid
     return json_decode($data['visible_folders'], true) ?? [];
@@ -7492,7 +7491,7 @@ 
 
     // Query the access rights for the given roles and folder
     $accessTypes = DB::queryFirstColumn(
-        'SELECT DISTINCT type FROM ' . prefixTable('roles_values') . ' WHERE role_id IN %ls AND folder_id = %i', 
+        'SELECT DISTINCT type FROM '.prefixTable('roles_values').' WHERE role_id IN %ls AND folder_id = %i', 
         $roles, 
         $treeId
     );

sources/main.queries.php

Spacing +121 added lines, -121 removed lines

@@ -79,7 +79,7 @@ 
 ) {
     // Not allowed page
     $session->set('system-error_code', ERR_NOT_ALLOWED);
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit;
 }
 
@@ -207,7 +207,7 @@ 
  * @param array $SETTINGS
  * @return string
  */
-function passwordHandler(string $post_type, array|null|string $dataReceived, array $SETTINGS): string
+function passwordHandler(string $post_type, array | null | string $dataReceived, array $SETTINGS): string
 {
     $session = SessionManager::getSession();
     $lang = new Language($session->get('user-language') ?? 'english');
@@ -276,7 +276,7 @@ 
 
             // Get current user hash
             $userHash = DB::queryFirstRow(
-                "SELECT pw FROM " . prefixtable('users') . " WHERE id = %d;",
+                "SELECT pw FROM ".prefixtable('users')." WHERE id = %d;",
                 $session->get('user-id')
             )['pw'];
 
@@ -332,7 +332,7 @@ 
  * @param string $post_key
  * @return string
  */
-function userHandler(string $post_type, array|null|string $dataReceived, array $SETTINGS, string $post_key): string
+function userHandler(string $post_type, array | null | string $dataReceived, array $SETTINGS, string $post_key): string
 {
     $session = SessionManager::getSession();
 
@@ -367,7 +367,7 @@ 
     if (isset($dataReceived['user_id'])) {
         // Get info about user to modify
         $targetUserInfos = DB::queryFirstRow(
-            'SELECT admin, gestionnaire, can_manage_all_users, isAdministratedByRole FROM ' . prefixTable('users') . '
+            'SELECT admin, gestionnaire, can_manage_all_users, isAdministratedByRole FROM '.prefixTable('users').'
             WHERE id = %i',
             $dataReceived['user_id']
         );
@@ -516,7 +516,7 @@ 
         case 'mail_me'://action_mail
             // Get info about user to send email
             $data_user = DB::queryFirstRow(
-                'SELECT admin, gestionnaire, can_manage_all_users, isAdministratedByRole FROM ' . prefixTable('users') . '
+                'SELECT admin, gestionnaire, can_manage_all_users, isAdministratedByRole FROM '.prefixTable('users').'
                 WHERE email = %s',
                 filter_var($dataReceived['receipt'], FILTER_SANITIZE_FULL_SPECIAL_CHARS)
             );
@@ -636,7 +636,7 @@ 
     if (isset($dataReceived['user_id'])) {
         // Get info about user to modify
         $targetUserInfos = DB::queryFirstRow(
-            'SELECT admin, gestionnaire, can_manage_all_users, isAdministratedByRole FROM ' . prefixTable('users') . '
+            'SELECT admin, gestionnaire, can_manage_all_users, isAdministratedByRole FROM '.prefixTable('users').'
             WHERE id = %i',
             $dataReceived['user_id']
         );
@@ -720,7 +720,7 @@ 
 
             // Get current user hash
             $userHash = DB::queryFirstRow(
-                "SELECT pw FROM " . prefixtable('users') . " WHERE id = %d;",
+                "SELECT pw FROM ".prefixtable('users')." WHERE id = %d;",
                 $session->get('user-id')
             )['pw'];
 
@@ -758,7 +758,7 @@ 
 
                 // Get current user hash
                 $userHash = DB::queryFirstRow(
-                    "SELECT pw FROM " . prefixtable('users') . " WHERE id = %d;",
+                    "SELECT pw FROM ".prefixtable('users')." WHERE id = %d;",
                     $session->get('user-id')
                 )['pw'];
 
@@ -803,7 +803,7 @@ 
 
                 // Get current user hash
                 $userHash = DB::queryFirstRow(
-                    "SELECT pw FROM " . prefixtable('users') . " WHERE id = %i;",
+                    "SELECT pw FROM ".prefixtable('users')." WHERE id = %i;",
                     $session->get('user-id')
                 )['pw'];
 
@@ -855,7 +855,7 @@ 
  * @param array $SETTINGS
  * @return string
  */
-function systemHandler(string $post_type, array|null|string $dataReceived, array $SETTINGS): string
+function systemHandler(string $post_type, array | null | string $dataReceived, array $SETTINGS): string
 {
     $session = SessionManager::getSession();
     switch ($post_type) {
@@ -956,7 +956,7 @@ 
                 )
             );
 
-            return '[{"token" : "' . $token . '"}]';
+            return '[{"token" : "'.$token.'"}]';
         
 
         /*
@@ -995,7 +995,7 @@ 
 }
 
 
-function utilsHandler(string $post_type, array|null|string $dataReceived, array $SETTINGS): string
+function utilsHandler(string $post_type, array | null | string $dataReceived, array $SETTINGS): string
 {
     switch ($post_type) {
         /*
@@ -1064,7 +1064,7 @@ 
         array(
             'error' => false,
             'timestamp' => $session->get('user-session_duration'),
-            'max_time_to_add' => intdiv((($maximum_session_expiration_time*60) - ((int) $session->get('user-session_duration') - time())), 60),
+            'max_time_to_add' => intdiv((($maximum_session_expiration_time * 60) - ((int) $session->get('user-session_duration') - time())), 60),
             'max_session_duration' => $maximum_session_expiration_time,
         ),
         'encode'
@@ -1116,7 +1116,7 @@ 
     // get number of items
     DB::queryFirstRow(
         'SELECT increment_id
-        FROM ' . prefixTable('sharekeys_items') .
+        FROM ' . prefixTable('sharekeys_items').
         ' WHERE user_id = %i',
         $userId
     );
@@ -1171,7 +1171,7 @@ 
         // check if expected security level is reached
         $dataUser = DB::queryFirstRow(
             'SELECT *
-            FROM ' . prefixTable('users') . ' WHERE id = %i',
+            FROM ' . prefixTable('users').' WHERE id = %i',
             $post_user_id
         );
 
@@ -1192,8 +1192,8 @@ 
         if (empty($dataUser['fonction_id']) === false) {
             $data = DB::queryFirstRow(
                 'SELECT complexity
-                FROM ' . prefixTable('roles_title') . '
-                WHERE id IN (' . $dataUser['fonction_id'] . ')
+                FROM ' . prefixTable('roles_title').'
+                WHERE id IN (' . $dataUser['fonction_id'].')
                 ORDER BY complexity DESC'
             );
         } else {
@@ -1206,8 +1206,8 @@ 
             return prepareExchangedData(
                 array(
                     'error' => true,
-                    'message' => '<div style="margin:10px 0 10px 15px;">' . $lang->get('complexity_level_not_reached') . '.<br>' .
-                        $lang->get('expected_complexity_level') . ': <b>' . TP_PW_COMPLEXITY[$data['complexity']][1] . '</b></div>',
+                    'message' => '<div style="margin:10px 0 10px 15px;">'.$lang->get('complexity_level_not_reached').'.<br>'.
+                        $lang->get('expected_complexity_level').': <b>'.TP_PW_COMPLEXITY[$data['complexity']][1].'</b></div>',
                 ),
                 'encode'
             );
@@ -1311,14 +1311,14 @@ 
         // Get data about user
         $dataUser = DB::queryFirstRow(
             'SELECT id, email, pw
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE login = %s',
             $post_login
         );
     } else {
         $dataUser = DB::queryFirstRow(
             'SELECT id, login, email, pw
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id = %i',
             $post_id
         );
@@ -1372,7 +1372,7 @@ 
     // Check if token already used
     $dataToken = DB::queryFirstRow(
         'SELECT end_timestamp, reason
-        FROM ' . prefixTable('tokens') . '
+        FROM ' . prefixTable('tokens').'
         WHERE token = %s AND user_id = %i',
         $post_token,
         $dataUser['id']
@@ -1383,11 +1383,11 @@ 
         return prepareExchangedData(
             array(
                 'error' => true,
-                'message' => 'TOKEN already used',//$lang->get('no_email_set'),
+                'message' => 'TOKEN already used', //$lang->get('no_email_set'),
             ),
             'encode'
         );
-    } elseif(DB::count() === 0) {
+    } elseif (DB::count() === 0) {
         // Store token for this action
         DB::insert(
             prefixTable('tokens'),
@@ -1449,7 +1449,7 @@ 
                 'email' => $dataUser['email'],
                 'email_result' => str_replace(
                     '#email#',
-                    '<b>' . obfuscateEmail($dataUser['email']) . '</b>',
+                    '<b>'.obfuscateEmail($dataUser['email']).'</b>',
                     addslashes($lang->get('admin_email_result_ok'))
                 ),
             ),
@@ -1465,7 +1465,7 @@ 
             'email' => $dataUser['email'],
             'email_result' => str_replace(
                 '#email#',
-                '<b>' . obfuscateEmail($dataUser['email']) . '</b>',
+                '<b>'.obfuscateEmail($dataUser['email']).'</b>',
                 addslashes($lang->get('admin_email_result_ok'))
             ),
         ),
@@ -1482,7 +1482,7 @@ 
 
     if (isKeyExistingAndEqual('enable_send_email_on_user_login', 1, $SETTINGS) === true) {
         $row = DB::queryFirstRow(
-            'SELECT valeur FROM ' . prefixTable('misc') . ' WHERE type = %s AND intitule = %s',
+            'SELECT valeur FROM '.prefixTable('misc').' WHERE type = %s AND intitule = %s',
             'cron',
             'sending_emails'
         );
@@ -1490,7 +1490,7 @@ 
         if ((int) (time() - $row['valeur']) >= 300 || (int) $row['valeur'] === 0) {
             $rows = DB::query(
                 'SELECT *
-                FROM ' . prefixTable('emails') .
+                FROM ' . prefixTable('emails').
                 ' WHERE status != %s',
                 'sent'
             );
@@ -1542,8 +1542,8 @@ 
     $arr_html = array();
     $rows = DB::query(
         'SELECT i.id AS id, i.label AS label, i.id_tree AS id_tree, l.date, i.perso AS perso, i.restricted_to AS restricted
-        FROM ' . prefixTable('log_items') . ' AS l
-        RIGHT JOIN ' . prefixTable('items') . ' AS i ON (l.id_item = i.id)
+        FROM ' . prefixTable('log_items').' AS l
+        RIGHT JOIN ' . prefixTable('items').' AS i ON (l.id_item = i.id)
         WHERE l.action = %s AND l.id_user = %i
         ORDER BY l.date DESC
         LIMIT 0, 100',
@@ -1575,7 +1575,7 @@ 
     if (isKeyExistingAndEqual('enable_suggestion', 1, $SETTINGS) === true
         && ((int) $session->get('user-admin') === 1 || (int) $session->get('user-manager') === 1)
     ) {
-        DB::query('SELECT * FROM ' . prefixTable('suggestion'));
+        DB::query('SELECT * FROM '.prefixTable('suggestion'));
         $nb_suggestions_waiting = DB::count();
     }
 
@@ -1610,13 +1610,13 @@ 
             if ($data === 'stat_languages') {
                 $tmp = '';
                 foreach ($stats_data[$data] as $key => $value) {
-                    $tmp .= $tmp === '' ? $key . '-' . $value : ',' . $key . '-' . $value;
+                    $tmp .= $tmp === '' ? $key.'-'.$value : ','.$key.'-'.$value;
                 }
                 $statsToSend[$data] = $tmp;
             } elseif ($data === 'stat_country') {
                 $tmp = '';
                 foreach ($stats_data[$data] as $key => $value) {
-                    $tmp .= $tmp === '' ? $key . '-' . $value : ',' . $key . '-' . $value;
+                    $tmp .= $tmp === '' ? $key.'-'.$value : ','.$key.'-'.$value;
                 }
                 $statsToSend[$data] = $tmp;
             } else {
@@ -1703,7 +1703,7 @@ 
             $url_found = $value;
             if (empty($url_found) === false) {
                 $tmp = parse_url($url_found);
-                $anonym_url = $tmp['scheme'] . '://<anonym_url>' . (isset($tmp['path']) === true ? $tmp['path'] : '');
+                $anonym_url = $tmp['scheme'].'://<anonym_url>'.(isset($tmp['path']) === true ? $tmp['path'] : '');
                 $value = $anonym_url;
             } else {
                 $value = '';
@@ -1733,7 +1733,7 @@ 
     $teampass_errors = '';
     $rows = DB::query(
         'SELECT label, date AS error_date
-        FROM ' . prefixTable('log_system') . "
+        FROM ' . prefixTable('log_system')."
         WHERE `type` LIKE 'error'
         ORDER BY `date` DESC
         LIMIT 0, 10"
@@ -1741,9 +1741,9 @@ 
     if (DB::count() > 0) {
         foreach ($rows as $record) {
             if (empty($teampass_errors) === true) {
-                $teampass_errors = ' * ' . date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['error_date']) . ' - ' . $record['label'];
+                $teampass_errors = ' * '.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['error_date']).' - '.$record['label'];
             } else {
-                $teampass_errors .= ' * ' . date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['error_date']) . ' - ' . $record['label'];
+                $teampass_errors .= ' * '.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['error_date']).' - '.$record['label'];
             }
         }
     }
@@ -1755,7 +1755,7 @@ 
 
     // Now prepare text
     $txt = '### Page on which it happened
-' . $data['current_page'] . '
+' . $data['current_page'].'
 
 ### Steps to reproduce
 1.
@@ -1770,39 +1770,39 @@ 
 Tell us what happens instead
 
 ### Server configuration
-**Operating system**: ' . php_uname() . '
+**Operating system**: ' . php_uname().'
 
-**Web server:** ' . $_SERVER['SERVER_SOFTWARE'] . '
+**Web server:** ' . $_SERVER['SERVER_SOFTWARE'].'
 
-**Database:** ' . ($link === false ? $lang->get('undefined') : mysqli_get_server_info($link)) . '
+**Database:** ' . ($link === false ? $lang->get('undefined') : mysqli_get_server_info($link)).'
 
-**PHP version:** ' . PHP_VERSION . '
+**PHP version:** ' . PHP_VERSION.'
 
-**Teampass version:** ' . TP_VERSION . '.' . TP_VERSION_MINOR . '
+**Teampass version:** ' . TP_VERSION.'.'.TP_VERSION_MINOR.'
 
 **Teampass configuration variables:**
 ```
-' . $list_of_options . '
+' . $list_of_options.'
 ```
 
 **Updated from an older Teampass or fresh install:**
 
 ### Client configuration
 
-**Browser:** ' . $data['browser_name'] . ' - ' . $data['browser_version'] . '
+**Browser:** ' . $data['browser_name'].' - '.$data['browser_version'].'
 
-**Operating system:** ' . $data['os'] . ' - ' . $data['os_archi'] . 'bits
+**Operating system:** ' . $data['os'].' - '.$data['os_archi'].'bits
 
 ### Logs
 
 #### Web server error log
 ```
-' . $err['message'] . ' - ' . $err['file'] . ' (' . $err['line'] . ')
+' . $err['message'].' - '.$err['file'].' ('.$err['line'].')
 ```
 
 #### Teampass 10 last system errors
 ```
-' . $teampass_errors . '
+' . $teampass_errors.'
 ```
 
 #### Log from the web-browser developer console (CTRL + SHIFT + i)
@@ -1844,7 +1844,7 @@ 
         // Check if user exists
         $userInfo = DB::queryFirstRow(
             'SELECT public_key, private_key, pw, auth_type
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id = %i',
             $post_user_id
         );
@@ -1853,9 +1853,9 @@ 
             // Get one item
             $currentUserKey = DB::queryFirstRow(
                 'SELECT object_id, share_key, increment_id
-                FROM ' . prefixTable('sharekeys_items') . ' AS si
-                INNER JOIN ' . prefixTable('items') . ' AS i ON  (i.id = si.object_id)
-                INNER JOIN ' . prefixTable('nested_tree') . ' AS nt ON  (i.id_tree = nt.id)
+                FROM ' . prefixTable('sharekeys_items').' AS si
+                INNER JOIN ' . prefixTable('items').' AS i ON  (i.id = si.object_id)
+                INNER JOIN ' . prefixTable('nested_tree').' AS nt ON  (i.id_tree = nt.id)
                 WHERE user_id = %i AND nt.personal_folder = %i',
                 $post_user_id,
                 0
@@ -1974,7 +1974,7 @@ 
         // Get user info
         $userData = DB::queryFirstRow(
             'SELECT private_key
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id = %i',
             $post_user_id
         );
@@ -2066,7 +2066,7 @@ 
         // Get user info
         $userData = DB::queryFirstRow(
             'SELECT email, auth_type, login
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id = %i',
             $post_user_id
         );
@@ -2164,7 +2164,7 @@ 
         // Get user info
         $userData = DB::queryFirstRow(
             'SELECT email, auth_type, login
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id = %i',
             $userId
         );
@@ -2223,7 +2223,7 @@ 
         // Check if user exists
         DB::queryFirstRow(
             'SELECT *
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id = %i',
             $post_user_id
         );
@@ -2293,7 +2293,7 @@ 
         // Check if user exists
         $userInfo = DB::queryFirstRow(
             'SELECT public_key
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id = %i',
             $post_user_id
         );
@@ -2441,15 +2441,15 @@ 
     // Loop on items
     $rows = DB::query(
         'SELECT id, pw
-        FROM ' . prefixTable('items') . '
+        FROM ' . prefixTable('items').'
         WHERE perso = 0
-        LIMIT ' . $post_start . ', ' . $post_length
+        LIMIT ' . $post_start.', '.$post_length
     );
     foreach ($rows as $record) {
         // Get itemKey from current user
         $currentUserKey = DB::queryFirstRow(
             'SELECT share_key, increment_id
-            FROM ' . prefixTable('sharekeys_items') . '
+            FROM ' . prefixTable('sharekeys_items').'
             WHERE object_id = %i AND user_id = %i',
             $record['id'],
             $session->get('user-id')
@@ -2479,7 +2479,7 @@ 
             if ((int) $post_user_id !== (int) $session->get('user-id')) {
                 $currentUserKey = DB::queryFirstRow(
                     'SELECT increment_id
-                    FROM ' . prefixTable('sharekeys_items') . '
+                    FROM ' . prefixTable('sharekeys_items').'
                     WHERE object_id = %i AND user_id = %i',
                     $record['id'],
                     $post_user_id
@@ -2510,7 +2510,7 @@ 
     // SHould we change step?
     DB::query(
         'SELECT *
-        FROM ' . prefixTable('items') . '
+        FROM ' . prefixTable('items').'
         WHERE perso = 0'
     );
 
@@ -2535,15 +2535,15 @@ 
     // Loop on logs
     $rows = DB::query(
         'SELECT increment_id
-        FROM ' . prefixTable('log_items') . '
+        FROM ' . prefixTable('log_items').'
         WHERE raison LIKE "at_pw :%" AND encryption_type = "teampass_aes"
-        LIMIT ' . $post_start . ', ' . $post_length
+        LIMIT ' . $post_start.', '.$post_length
     );
     foreach ($rows as $record) {
         // Get itemKey from current user
         $currentUserKey = DB::queryFirstRow(
             'SELECT share_key
-            FROM ' . prefixTable('sharekeys_logs') . '
+            FROM ' . prefixTable('sharekeys_logs').'
             WHERE object_id = %i AND user_id = %i',
             $record['increment_id'],
             $session->get('user-id')
@@ -2573,7 +2573,7 @@ 
             if ((int) $post_user_id !== (int) $session->get('user-id')) {
                 $currentUserKey = DB::queryFirstRow(
                     'SELECT increment_id
-                    FROM ' . prefixTable('sharekeys_items') . '
+                    FROM ' . prefixTable('sharekeys_items').'
                     WHERE object_id = %i AND user_id = %i',
                     $record['id'],
                     $post_user_id
@@ -2595,7 +2595,7 @@ 
     // SHould we change step?
     DB::query(
         'SELECT increment_id
-        FROM ' . prefixTable('log_items') . '
+        FROM ' . prefixTable('log_items').'
         WHERE raison LIKE "at_pw :%" AND encryption_type = "teampass_aes"'
     );
 
@@ -2620,15 +2620,15 @@ 
     // Loop on fields
     $rows = DB::query(
         'SELECT id
-        FROM ' . prefixTable('categories_items') . '
+        FROM ' . prefixTable('categories_items').'
         WHERE encryption_type = "teampass_aes"
-        LIMIT ' . $post_start . ', ' . $post_length
+        LIMIT ' . $post_start.', '.$post_length
     );
     foreach ($rows as $record) {
         // Get itemKey from current user
         $currentUserKey = DB::queryFirstRow(
             'SELECT share_key
-            FROM ' . prefixTable('sharekeys_fields') . '
+            FROM ' . prefixTable('sharekeys_fields').'
             WHERE object_id = %i AND user_id = %i',
             $record['id'],
             $session->get('user-id')
@@ -2658,7 +2658,7 @@ 
             if ((int) $post_user_id !== (int) $session->get('user-id')) {
                 $currentUserKey = DB::queryFirstRow(
                     'SELECT increment_id
-                    FROM ' . prefixTable('sharekeys_items') . '
+                    FROM ' . prefixTable('sharekeys_items').'
                     WHERE object_id = %i AND user_id = %i',
                     $record['id'],
                     $post_user_id
@@ -2680,7 +2680,7 @@ 
     // SHould we change step?
     DB::query(
         'SELECT *
-        FROM ' . prefixTable('categories_items') . '
+        FROM ' . prefixTable('categories_items').'
         WHERE encryption_type = "teampass_aes"'
     );
 
@@ -2705,14 +2705,14 @@ 
     // Loop on suggestions
     $rows = DB::query(
         'SELECT id
-        FROM ' . prefixTable('suggestion') . '
-        LIMIT ' . $post_start . ', ' . $post_length
+        FROM ' . prefixTable('suggestion').'
+        LIMIT ' . $post_start.', '.$post_length
     );
     foreach ($rows as $record) {
         // Get itemKey from current user
         $currentUserKey = DB::queryFirstRow(
             'SELECT share_key
-            FROM ' . prefixTable('sharekeys_suggestions') . '
+            FROM ' . prefixTable('sharekeys_suggestions').'
             WHERE object_id = %i AND user_id = %i',
             $record['id'],
             $session->get('user-id')
@@ -2742,7 +2742,7 @@ 
             if ((int) $post_user_id !== (int) $session->get('user-id')) {
                 $currentUserKey = DB::queryFirstRow(
                     'SELECT increment_id
-                    FROM ' . prefixTable('sharekeys_items') . '
+                    FROM ' . prefixTable('sharekeys_items').'
                     WHERE object_id = %i AND user_id = %i',
                     $record['id'],
                     $post_user_id
@@ -2788,15 +2788,15 @@ 
     // Loop on files
     $rows = DB::query(
         'SELECT id
-        FROM ' . prefixTable('files') . '
-        WHERE status = "' . TP_ENCRYPTION_NAME . '"
-        LIMIT ' . $post_start . ', ' . $post_length
+        FROM ' . prefixTable('files').'
+        WHERE status = "' . TP_ENCRYPTION_NAME.'"
+        LIMIT ' . $post_start.', '.$post_length
     ); //aes_encryption
     foreach ($rows as $record) {
         // Get itemKey from current user
         $currentUserKey = DB::queryFirstRow(
             'SELECT share_key
-            FROM ' . prefixTable('sharekeys_files') . '
+            FROM ' . prefixTable('sharekeys_files').'
             WHERE object_id = %i AND user_id = %i',
             $record['id'],
             $session->get('user-id')
@@ -2826,7 +2826,7 @@ 
             if ((int) $post_user_id !== (int) $session->get('user-id')) {
                 $currentUserKey = DB::queryFirstRow(
                     'SELECT increment_id
-                    FROM ' . prefixTable('sharekeys_items') . '
+                    FROM ' . prefixTable('sharekeys_items').'
                     WHERE object_id = %i AND user_id = %i',
                     $record['id'],
                     $post_user_id
@@ -2848,8 +2848,8 @@ 
     // SHould we change step?
     DB::query(
         'SELECT *
-        FROM ' . prefixTable('files') . '
-        WHERE status = "' . TP_ENCRYPTION_NAME . '"'
+        FROM ' . prefixTable('files').'
+        WHERE status = "' . TP_ENCRYPTION_NAME.'"'
     );
 
     $next_start = (int) $post_start + (int) $post_length;
@@ -2882,9 +2882,9 @@ 
     if (count($session->get('user-personal_folders')) > 0) {
         $rows = DB::query(
             'SELECT id, pw
-            FROM ' . prefixTable('items') . '
+            FROM ' . prefixTable('items').'
             WHERE perso = 1 AND id_tree IN %ls AND encryption_type = %s
-            LIMIT ' . $post_start . ', ' . $post_length,
+            LIMIT ' . $post_start.', '.$post_length,
             $session->get('user-personal_folders'),
             "defuse"
         );
@@ -2892,7 +2892,7 @@ 
             // Get itemKey from current user
             $currentUserKey = DB::queryFirstRow(
                 'SELECT share_key, increment_id
-                FROM ' . prefixTable('sharekeys_items') . '
+                FROM ' . prefixTable('sharekeys_items').'
                 WHERE object_id = %i AND user_id = %i',
                 $record['id'],
                 $session->get('user-id')
@@ -2917,7 +2917,7 @@ 
                 if ((int) $post_user_id !== (int) $session->get('user-id')) {
                     $currentUserKey = DB::queryFirstRow(
                         'SELECT increment_id
-                        FROM ' . prefixTable('sharekeys_items') . '
+                        FROM ' . prefixTable('sharekeys_items').'
                         WHERE object_id = %i AND user_id = %i',
                         $record['id'],
                         $post_user_id
@@ -2940,7 +2940,7 @@ 
     // SHould we change step?
     DB::query(
         'SELECT *
-        FROM ' . prefixTable('items') . '
+        FROM ' . prefixTable('items').'
         WHERE perso = 0'
     );
 
@@ -2968,7 +2968,7 @@ 
         // Check if user exists
         $userInfo = DB::queryFirstRow(
             'SELECT public_key, encrypted_psk
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id = %i',
             $post_user_id
         );
@@ -2994,7 +2994,7 @@ 
                 if ($post_counterItemsToTreat === -1) {
                     DB::query(
                         'SELECT id
-                        FROM ' . prefixTable('items') . '
+                        FROM ' . prefixTable('items').'
                         WHERE perso = 1 AND id_tree IN %ls AND encryption_type != %s',
                         $session->get('user-personal_folders'),
                         'teampass_aes'
@@ -3007,7 +3007,7 @@ 
                 // Loop on persoanl items
                 $rows = DB::query(
                     'SELECT id, pw
-                    FROM ' . prefixTable('items') . '
+                    FROM ' . prefixTable('items').'
                     WHERE perso = 1 AND id_tree IN %ls AND encryption_type != %s
                     LIMIT ' . $post_length,
                     $session->get('user-personal_folders'),
@@ -3049,7 +3049,7 @@ 
                     // Loop on files
                     $rows = DB::query(
                         'SELECT id, file
-                        FROM ' . prefixTable('files') . '
+                        FROM ' . prefixTable('files').'
                         WHERE status != %s
                         AND id_item = %i',
                         TP_ENCRYPTION_NAME,
@@ -3060,13 +3060,13 @@ 
                         // Now decrypt the file
                         prepareFileWithDefuse(
                             'decrypt',
-                            $SETTINGS['path_to_upload_folder'] . '/' . $record2['file'],
-                            $SETTINGS['path_to_upload_folder'] . '/' . $record2['file'] . '.delete',
+                            $SETTINGS['path_to_upload_folder'].'/'.$record2['file'],
+                            $SETTINGS['path_to_upload_folder'].'/'.$record2['file'].'.delete',
                             $post_user_psk
                         );
 
                         // Encrypt the file
-                        $encryptedFile = encryptFile($record2['file'] . '.delete', $SETTINGS['path_to_upload_folder']);
+                        $encryptedFile = encryptFile($record2['file'].'.delete', $SETTINGS['path_to_upload_folder']);
 
                         DB::update(
                             prefixTable('files'),
@@ -3087,7 +3087,7 @@ 
                         );
 
                         // Unlink original file
-                        unlink($SETTINGS['path_to_upload_folder'] . '/' . $record2['file']);
+                        unlink($SETTINGS['path_to_upload_folder'].'/'.$record2['file']);
                     }
                 }
 
@@ -3095,7 +3095,7 @@ 
                 $next_start = (int) $post_start + (int) $post_length;
                 DB::query(
                     'SELECT id
-                    FROM ' . prefixTable('items') . '
+                    FROM ' . prefixTable('items').'
                     WHERE perso = 1 AND id_tree IN %ls AND encryption_type != %s',
                     $session->get('user-personal_folders'),
                     'teampass_aes'
@@ -3165,7 +3165,7 @@ 
         // Get user info
         $userData = DB::queryFirstRow(
             'SELECT special, auth_type, is_ready_for_usage, ongoing_process_id, otp_provided, personal_items_migrated
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id = %i',
             $post_user_id
         );
@@ -3212,7 +3212,7 @@ 
         // Get user info
         $userData = DB::queryFirstRow(
             'SELECT auth_type, login, private_key
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id = %i',
             $post_user_id
         );
@@ -3262,7 +3262,7 @@ 
                 return prepareExchangedData(
                     array(
                         'error' => false,
-                        'message' => $lang->get('done'),'',
+                        'message' => $lang->get('done'), '',
                     ),
                     'encode'
                 );
@@ -3311,7 +3311,7 @@ 
         // Get user info
         $userData = DB::queryFirstRow(
             'SELECT u.auth_type, u.login, u.private_key, u.special
-            FROM ' . prefixTable('users') . ' AS u
+            FROM ' . prefixTable('users').' AS u
             WHERE u.id = %i',
             $post_user_id
         );
@@ -3347,7 +3347,7 @@ 
                     return prepareExchangedData(
                         array(
                             'error' => false,
-                            'message' => $lang->get('done'),'',
+                            'message' => $lang->get('done'), '',
                         ),
                         'encode'
                     );
@@ -3368,8 +3368,8 @@ 
                 // Get one itemKey from current user
                 $currentUserKey = DB::queryFirstRow(
                     'SELECT ski.share_key, ski.increment_id
-                    FROM ' . prefixTable('sharekeys_items') . ' AS ski
-                    INNER JOIN ' . prefixTable('items') . ' AS i ON i.id = ski.object_id
+                    FROM ' . prefixTable('sharekeys_items').' AS ski
+                    INNER JOIN ' . prefixTable('items').' AS i ON i.id = ski.object_id
                     WHERE ski.user_id = %i AND ski.share_key != ""
                     ORDER BY RAND()
                     LIMIT 1',
@@ -3436,8 +3436,8 @@ 
                             'process_type' => 'create_user_keys',
                             'arguments' => json_encode([
                                 'new_user_id' => (int) $post_user_id,
-                                'new_user_pwd' => cryption($post_previous_pwd, '','encrypt')['string'],
-                                'new_user_private_key' => cryption($validPreviousKey['private_key'], '','encrypt')['string'],
+                                'new_user_pwd' => cryption($post_previous_pwd, '', 'encrypt')['string'],
+                                'new_user_private_key' => cryption($validPreviousKey['private_key'], '', 'encrypt')['string'],
                                 'send_email' => 0,
                                 'otp_provided_new_value' => 0,
                                 'user_self_change' => 1,
@@ -3506,7 +3506,7 @@ 
             id,
             private_key,
             created_at
-        FROM " . prefixTable('user_private_keys') . "
+        FROM " . prefixTable('user_private_keys')."
         WHERE user_id = %i
         ORDER BY created_at DESC, id DESC",
         $userId
@@ -3528,8 +3528,8 @@ 
             // Select one personal item share_key to test decryption
             $currentUserItemKey = DB::queryFirstRow(
                 'SELECT si.share_key, si.increment_id, i.perso
-                FROM ' . prefixTable('sharekeys_items') . ' AS si
-                INNER JOIN ' . prefixTable('items') . ' AS i ON i.id = si.object_id
+                FROM ' . prefixTable('sharekeys_items').' AS si
+                INNER JOIN ' . prefixTable('items').' AS i ON i.id = si.object_id
                 WHERE si.user_id = %i AND i.perso = 1 AND si.share_key != ""
                 ORDER BY RAND()
                 LIMIT 1',
@@ -3580,7 +3580,7 @@ 
             $session->get('user-id')
         );
         // Return data
-        return '[{"new_value":"' . $session->get('user-session_duration') . '"}]';
+        return '[{"new_value":"'.$session->get('user-session_duration').'"}]';
     }
     
     return '[{"new_value":"expired"}]';
@@ -3630,8 +3630,8 @@ 
 {
     $personalItems = DB::query(
         'SELECT i.id, i.pw, s.share_key, s.increment_id
-        FROM ' . prefixTable('items') . ' i
-        INNER JOIN ' . prefixTable('sharekeys_items') . ' s ON i.id = s.object_id
+        FROM ' . prefixTable('items').' i
+        INNER JOIN ' . prefixTable('sharekeys_items').' s ON i.id = s.object_id
         WHERE i.perso = %i
         AND s.user_id = %i',
         1,
@@ -3686,8 +3686,8 @@ 
     if ($skipPasswordChange === true) {
         // Remove all sharekeys for personal items
         DB::query(
-            'UPDATE ' . prefixTable('sharekeys_items') . ' AS ski
-            INNER JOIN ' . prefixTable('items') . ' AS i ON ski.object_id = i.id
+            'UPDATE '.prefixTable('sharekeys_items').' AS ski
+            INNER JOIN ' . prefixTable('items').' AS i ON ski.object_id = i.id
             SET ski.share_key = ""
             WHERE i.perso = 1
             AND ski.user_id = %i',
@@ -3696,8 +3696,8 @@ 
 
         // Remove all sharekeys for personal files
         DB::query(
-            'UPDATE ' . prefixTable('sharekeys_files') . ' AS skf
-            INNER JOIN ' . prefixTable('items') . ' AS i ON skf.object_id = i.id
+            'UPDATE '.prefixTable('sharekeys_files').' AS skf
+            INNER JOIN ' . prefixTable('items').' AS i ON skf.object_id = i.id
             SET skf.share_key = ""
             WHERE i.perso = 1
             AND skf.user_id = %i',
@@ -3706,8 +3706,8 @@ 
 
         // Remove all sharekeys for personal fields
         DB::query(
-            'UPDATE ' . prefixTable('sharekeys_fields') . ' AS skf
-            INNER JOIN ' . prefixTable('items') . ' AS i ON skf.object_id = i.id
+            'UPDATE '.prefixTable('sharekeys_fields').' AS skf
+            INNER JOIN ' . prefixTable('items').' AS i ON skf.object_id = i.id
             SET skf.share_key = ""
             WHERE i.perso = 1
             AND skf.user_id = %i',
@@ -3751,8 +3751,8 @@ 
                 'process_type' => 'create_user_keys',
                 'arguments' => json_encode([
                     'new_user_id' => (int) $userId,
-                    'new_user_pwd' => cryption($userCurrentPwd, '','encrypt')['string'],
-                    'new_user_private_key' => cryption($validPreviousKey['private_key'], '','encrypt')['string'],
+                    'new_user_pwd' => cryption($userCurrentPwd, '', 'encrypt')['string'],
+                    'new_user_private_key' => cryption($validPreviousKey['private_key'], '', 'encrypt')['string'],
                     'send_email' => 0,
                     'otp_provided_new_value' => 0,
                     'user_self_change' => 1,

sources/utils.queries.php

Spacing +4 added lines, -4 removed lines

@@ -73,7 +73,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;
 }
 
@@ -121,9 +121,9 @@ 
                             i.label as label, i.description as description, i.pw as pw, i.login as login, i.pw_iv as pw_iv,
                             IFNULL(l.date, 0) as date,
                             n.renewal_period as renewal_period
-                        FROM ' . prefixTable('items') . ' as i
-                        INNER JOIN ' . prefixTable('nested_tree') . ' as n ON (i.id_tree = n.id)
-                        LEFT JOIN ' . prefixTable('log_items') . ' as l
+                        FROM ' . prefixTable('items').' as i
+                        INNER JOIN ' . prefixTable('nested_tree').' as n ON (i.id_tree = n.id)
+                        LEFT JOIN ' . prefixTable('log_items').' as l
                             ON (i.id = l.id_item AND (l.action = %s OR (l.action = %s AND l.raison LIKE %s)))
                         WHERE i.inactif = %i
                         AND i.id_tree= %i

sources/tools.queries.php

Spacing +19 added lines, -19 removed lines

@@ -70,7 +70,7 @@ 
 if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('tools') === 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;
 }
 
@@ -335,7 +335,7 @@ 
         // Get TP_USER info
         $userInfo = DB::queryFirstRow(
             'SELECT pw, public_key, private_key, login, name
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id = %i',
             TP_USER_ID
         );
@@ -372,8 +372,8 @@ 
         // Get one itemKey from current user
         $currentUserKey = DB::queryFirstRow(
             'SELECT ski.share_key, ski.increment_id AS increment_id
-            FROM ' . prefixTable('sharekeys_items') . ' AS ski
-            INNER JOIN ' . prefixTable('items') . ' AS i ON i.id = ski.object_id
+            FROM ' . prefixTable('sharekeys_items').' AS ski
+            INNER JOIN ' . prefixTable('items').' AS i ON i.id = ski.object_id
             WHERE ski.user_id = %i AND ski.share_key != ""
             ORDER BY RAND()
             LIMIT 1',
@@ -454,7 +454,7 @@ 
         // Get user info
         $userInfo = DB::queryFirstRow(
             'SELECT public_key, private_key
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id = %i',
             $userId
         );
@@ -477,8 +477,8 @@ 
         // Get one itemKey from current user
         $currentUserKey = DB::queryFirstRow(
             'SELECT ski.share_key, ski.increment_id AS increment_id
-            FROM ' . prefixTable('sharekeys_items') . ' AS ski
-            INNER JOIN ' . prefixTable('items') . ' AS i ON i.id = ski.object_id
+            FROM ' . prefixTable('sharekeys_items').' AS ski
+            INNER JOIN ' . prefixTable('items').' AS i ON i.id = ski.object_id
             WHERE ski.user_id = %i AND ski.share_key != ""
             ORDER BY RAND()
             LIMIT 1',
@@ -516,8 +516,8 @@ 
                 // Get number of users to treat
                 DB::query(
                     'SELECT i.id 
-                    FROM ' . prefixTable('items') . ' AS i
-                    INNER JOIN ' . prefixTable('sharekeys_items') . ' AS si ON i.id = si.object_id
+                    FROM ' . prefixTable('items').' AS i
+                    INNER JOIN ' . prefixTable('sharekeys_items').' AS si ON i.id = si.object_id
                     WHERE i.perso = %i AND si.user_id = %i;',
                     0,
                     $userId
@@ -599,11 +599,11 @@ 
             // Loop on items
             $rows = DB::query(
                 'SELECT si.object_id AS object_id, si.share_key AS share_key, i.pw AS pw, si.increment_id as increment_id
-                FROM ' . prefixTable('sharekeys_items') . ' AS si
-                INNER JOIN ' . prefixTable('items') . ' AS i ON (i.id = si.object_id)
+                FROM ' . prefixTable('sharekeys_items').' AS si
+                INNER JOIN ' . prefixTable('items').' AS i ON (i.id = si.object_id)
                 WHERE si.user_id = %i
                 ORDER BY si.increment_id ASC
-                LIMIT ' . $startIndex . ', ' . $limit,
+                LIMIT ' . $startIndex.', '.$limit,
                 $userId
             );        
             
@@ -627,7 +627,7 @@ 
                     // It will be updated if already exists
                     $currentTPUserKey = DB::queryFirstRow(
                         'SELECT increment_id, user_id, share_key
-                        FROM ' . prefixTable('sharekeys_items') . '
+                        FROM ' . prefixTable('sharekeys_items').'
                         WHERE object_id = %i AND user_id = %i',
                         $record['object_id'],
                         TP_USER_ID
@@ -663,7 +663,7 @@ 
             DB::commit();
         } catch (Exception $e) {
             DB::rollback();
-            error_log("Teampass - Error: Keys treatment: " . $e->getMessage());
+            error_log("Teampass - Error: Keys treatment: ".$e->getMessage());
         }
 
         $nextIndex = (int) $startIndex + (int) $limit;
@@ -719,7 +719,7 @@ 
             // Get PT_USER info
             DB::queryFirstRow(
                 'SELECT operation_code
-                FROM ' . prefixTable('sharekeys_backup') . '
+                FROM ' . prefixTable('sharekeys_backup').'
                 WHERE operation_code = %s',
                 $operationCode
             );
@@ -729,7 +729,7 @@ 
                 // using increment_id_value in order to update the correct record
                 $rows = DB::query(
                     'SELECT *
-                    FROM ' . prefixTable('sharekeys_backup') . '
+                    FROM ' . prefixTable('sharekeys_backup').'
                     WHERE operation_code = %s',
                     $operationCode
                 );
@@ -748,7 +748,7 @@ 
 
                 // Delete all sharekeys for this operation
                 DB::query(
-                    'DELETE FROM ' . prefixTable('sharekeys_backup') . '
+                    'DELETE FROM '.prefixTable('sharekeys_backup').'
                     WHERE operation_code = %i',
                     $operationCode
                 );
@@ -811,7 +811,7 @@ 
             // Get operation info
             DB::query(
                 'SELECT operation_code
-                FROM ' . prefixTable('sharekeys_backup') . '
+                FROM ' . prefixTable('sharekeys_backup').'
                 WHERE operation_code = %s',
                 $operationCode
             );
@@ -820,7 +820,7 @@ 
             if ($nbKeys > 0) {
                 // Delete all sharekeys for this operation
                 DB::query(
-                    'DELETE FROM ' . prefixTable('sharekeys_backup') . '
+                    'DELETE FROM '.prefixTable('sharekeys_backup').'
                     WHERE operation_code = %s',
                     $operationCode
                 );

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, IFNULL(l.date, 0) 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)
-                        LEFT JOIN ' . prefixTable('log_items') . ' as l
+                        FROM ' . prefixTable('items').' as i
+                        INNER JOIN ' . prefixTable('nested_tree').' as n ON (i.id_tree = n.id)
+                        LEFT JOIN ' . prefixTable('log_items').' as l
                             ON (i.id = l.id_item AND (l.action = %s OR (l.action = %s AND l.raison LIKE %s)))
                         WHERE i.inactif = %i
                         AND i.id_tree= %i
@@ -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 @@ 
                         IFNULL(l.date, 0) 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)
-                        LEFT JOIN ' . prefixTable('log_items') . ' as l
+                        FROM ' . prefixTable('items').' as i
+                        INNER JOIN ' . prefixTable('nested_tree').' as n ON (i.id_tree = n.id)
+                        LEFT JOIN ' . prefixTable('log_items').' as l
                             ON (i.id = l.id_item AND (l.action = %s OR (l.action = %s AND l.raison LIKE %s)))
                         WHERE i.inactif = %i
                         AND i.id_tree= %i
@@ -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'
             );

sources/backups.queries.php

Spacing +99 added lines, -99 removed lines

@@ -40,7 +40,7 @@ 
 
 // Load functions
 require_once 'main.functions.php';
-require_once __DIR__ . '/backup.functions.php';
+require_once __DIR__.'/backup.functions.php';
 $session = SessionManager::getSession();
 
 
@@ -105,7 +105,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;
     }
 }
@@ -145,7 +145,7 @@ 
     function tpGetSettingsValue(string $key, string $default = ''): string
     {
         $val = DB::queryFirstField(
-            'SELECT valeur FROM ' . prefixTable('misc') . ' WHERE type=%s AND intitule=%s LIMIT 1',
+            'SELECT valeur FROM '.prefixTable('misc').' WHERE type=%s AND intitule=%s LIMIT 1',
             'settings',
             $key
         );
@@ -159,12 +159,12 @@ 
     function tpUpsertSettingsValue(string $key, string $value): void
     {
         $exists = DB::queryFirstField(
-            'SELECT 1 FROM ' . prefixTable('misc') . ' WHERE type=%s AND intitule=%s LIMIT 1',
+            'SELECT 1 FROM '.prefixTable('misc').' WHERE type=%s AND intitule=%s LIMIT 1',
             'settings',
             $key
         );
 
-        if ((int)$exists === 1) {
+        if ((int) $exists === 1) {
             DB::update(
                 prefixTable('misc'),
                 ['valeur' => $value],
@@ -186,7 +186,7 @@ 
     function tpGetAdminTimezoneName(): string
     {
         $tz = DB::queryFirstField(
-            'SELECT valeur FROM ' . prefixTable('misc') . ' WHERE type=%s AND intitule=%s LIMIT 1',
+            'SELECT valeur FROM '.prefixTable('misc').' WHERE type=%s AND intitule=%s LIMIT 1',
             'admin',
             'timezone'
         );
@@ -241,14 +241,14 @@ 
                 exit;
             }
 
-            $baseFilesDir = (string) ($SETTINGS['path_to_files_folder'] ?? (__DIR__ . '/../files'));
-            $dir = (string) tpGetSettingsValue('bck_scheduled_output_dir', rtrim($baseFilesDir, '/') . '/backups');
-            $fp = rtrim($dir, '/') . '/' . $get_file;
+            $baseFilesDir = (string) ($SETTINGS['path_to_files_folder'] ?? (__DIR__.'/../files'));
+            $dir = (string) tpGetSettingsValue('bck_scheduled_output_dir', rtrim($baseFilesDir, '/').'/backups');
+            $fp = rtrim($dir, '/').'/'.$get_file;
 
             $dirReal = realpath($dir);
             $fpReal = realpath($fp);
 
-            if ($dirReal === false || $fpReal === false || strpos($fpReal, $dirReal . DIRECTORY_SEPARATOR) !== 0 || is_file($fpReal) === false) {
+            if ($dirReal === false || $fpReal === false || strpos($fpReal, $dirReal.DIRECTORY_SEPARATOR) !== 0 || is_file($fpReal) === false) {
                 header('HTTP/1.1 404 Not Found');
                 exit;
             }
@@ -280,13 +280,13 @@ 
 
             header('Content-Description: File Transfer');
             header('Content-Type: application/octet-stream');
-            header('Content-Disposition: attachment; filename="' . $get_file . '"');
+            header('Content-Disposition: attachment; filename="'.$get_file.'"');
             header('Content-Transfer-Encoding: binary');
             header('Expires: 0');
             header('Cache-Control: private, must-revalidate');
             header('Pragma: public');
             if ($size > 0) {
-                header('Content-Length: ' . $size);
+                header('Content-Length: '.$size);
             }
 
             readfile($fpReal);
@@ -324,7 +324,7 @@ 
             // Prepare variables
             $encryptionKey = filter_var($dataReceived['encryptionKey'] ?? '', FILTER_SANITIZE_FULL_SPECIAL_CHARS);
         
-            require_once __DIR__ . '/backup.functions.php';
+            require_once __DIR__.'/backup.functions.php';
 
             $backupResult = tpCreateDatabaseBackup($SETTINGS, $encryptionKey);
 
@@ -358,9 +358,9 @@ 
                 array(
                     'error' => false,
                     'message' => '',
-                    'download' => 'sources/downloadFile.php?name=' . urlencode($filename) .
-                        '&action=backup&file=' . $filename . '&type=sql&key=' . $session->get('key') . '&key_tmp=' .
-                        $session->get('user-key_tmp') . '&pathIsFiles=1',
+                    'download' => 'sources/downloadFile.php?name='.urlencode($filename).
+                        '&action=backup&file='.$filename.'&type=sql&key='.$session->get('key').'&key_tmp='.
+                        $session->get('user-key_tmp').'&pathIsFiles=1',
                 ),
                 'encode'
             );
@@ -370,7 +370,7 @@ 
          * ============================================================ */
 
         case 'scheduled_get_settings':
-            if ($post_key !== $session->get('key') || (int)$session->get('user-admin') !== 1) {
+            if ($post_key !== $session->get('key') || (int) $session->get('user-admin') !== 1) {
                 echo prepareExchangedData(['error' => true, 'message' => 'Not allowed'], 'encode');
                 break;
             }
@@ -401,12 +401,12 @@ 
 
         case 'disk_usage':
             // Provide disk usage information for the storage containing the <files> directory
-            if ($post_key !== $session->get('key') || (int)$session->get('user-admin') !== 1) {
+            if ($post_key !== $session->get('key') || (int) $session->get('user-admin') !== 1) {
                 echo prepareExchangedData(['error' => true, 'message' => 'Not allowed'], 'encode');
                 break;
             }
 
-            $baseFilesDir = (string)($SETTINGS['path_to_files_folder'] ?? (__DIR__ . '/../files'));
+            $baseFilesDir = (string) ($SETTINGS['path_to_files_folder'] ?? (__DIR__.'/../files'));
             $dirReal = realpath($baseFilesDir);
 
             if ($dirReal === false) {
@@ -417,21 +417,21 @@ 
             $total = @disk_total_space($dirReal);
             $free = @disk_free_space($dirReal);
 
-            if ($total === false || $free === false || (float)$total <= 0) {
+            if ($total === false || $free === false || (float) $total <= 0) {
                 echo prepareExchangedData(['error' => true, 'message' => 'Unable to read disk usage'], 'encode');
                 break;
             }
 
-            $used = max(0.0, (float)$total - (float)$free);
-            $pct = round(($used / (float)$total) * 100, 1);
+            $used = max(0.0, (float) $total - (float) $free);
+            $pct = round(($used / (float) $total) * 100, 1);
 
-            $label = tpFormatBytes($used) . ' / ' . tpFormatBytes((float)$total);
+            $label = tpFormatBytes($used).' / '.tpFormatBytes((float) $total);
             $tooltip = sprintf(
                 $lang->get('bck_storage_usage_tooltip'),
                 tpFormatBytes($used),
-                tpFormatBytes((float)$total),
-                (string)$pct,
-                tpFormatBytes((float)$free),
+                tpFormatBytes((float) $total),
+                (string) $pct,
+                tpFormatBytes((float) $free),
                 $dirReal
             );
 
@@ -483,7 +483,7 @@ 
             break;
 
         case 'scheduled_save_settings':
-            if ($post_key !== $session->get('key') || (int)$session->get('user-admin') !== 1) {
+            if ($post_key !== $session->get('key') || (int) $session->get('user-admin') !== 1) {
                 echo prepareExchangedData(['error' => true, 'message' => 'Not allowed'], 'encode');
                 break;
             }
@@ -491,15 +491,15 @@ 
             $dataReceived = prepareExchangedData($post_data, 'decode');
             if (!is_array($dataReceived)) $dataReceived = [];
 
-            $enabled = (int)($dataReceived['enabled'] ?? 0);
+            $enabled = (int) ($dataReceived['enabled'] ?? 0);
             $enabled = ($enabled === 1) ? 1 : 0;
 
-            $frequency = (string)($dataReceived['frequency'] ?? 'daily');
+            $frequency = (string) ($dataReceived['frequency'] ?? 'daily');
             if (!in_array($frequency, ['daily', 'weekly', 'monthly'], true)) {
                 $frequency = 'daily';
             }
 
-            $timeStr = (string)($dataReceived['time'] ?? '02:00');
+            $timeStr = (string) ($dataReceived['time'] ?? '02:00');
             if (!preg_match('/^\d{2}:\d{2}$/', $timeStr)) {
                 $timeStr = '02:00';
             } else {
@@ -509,22 +509,22 @@ 
                 }
             }
 
-            $dow = (int)($dataReceived['dow'] ?? 1);
+            $dow = (int) ($dataReceived['dow'] ?? 1);
             if ($dow < 1 || $dow > 7) $dow = 1;
 
-            $dom = (int)($dataReceived['dom'] ?? 1);
+            $dom = (int) ($dataReceived['dom'] ?? 1);
             if ($dom < 1) $dom = 1;
             if ($dom > 31) $dom = 31;
 
-            $retentionDays = (int)($dataReceived['retention_days'] ?? 30);
+            $retentionDays = (int) ($dataReceived['retention_days'] ?? 30);
             if ($retentionDays < 1) $retentionDays = 1;
             if ($retentionDays > 3650) $retentionDays = 3650;
 
             // Output dir: default to <files>/backups
-            $baseFilesDir = (string)($SETTINGS['path_to_files_folder'] ?? (__DIR__ . '/../files'));
-            $defaultDir = rtrim($baseFilesDir, '/') . '/backups';
+            $baseFilesDir = (string) ($SETTINGS['path_to_files_folder'] ?? (__DIR__.'/../files'));
+            $defaultDir = rtrim($baseFilesDir, '/').'/backups';
 
-            $outputDir = trim((string)($dataReceived['output_dir'] ?? ''));
+            $outputDir = trim((string) ($dataReceived['output_dir'] ?? ''));
             if ($outputDir === '') $outputDir = $defaultDir;
 
             // Safety: prevent path traversal / outside files folder
@@ -537,13 +537,13 @@ 
                 break;
             }
 
-            tpUpsertSettingsValue('bck_scheduled_enabled', (string)$enabled);
+            tpUpsertSettingsValue('bck_scheduled_enabled', (string) $enabled);
             tpUpsertSettingsValue('bck_scheduled_frequency', $frequency);
             tpUpsertSettingsValue('bck_scheduled_time', $timeStr);
-            tpUpsertSettingsValue('bck_scheduled_dow', (string)$dow);
-            tpUpsertSettingsValue('bck_scheduled_dom', (string)$dom);
+            tpUpsertSettingsValue('bck_scheduled_dow', (string) $dow);
+            tpUpsertSettingsValue('bck_scheduled_dom', (string) $dom);
             tpUpsertSettingsValue('bck_scheduled_output_dir', $dirReal);
-            tpUpsertSettingsValue('bck_scheduled_retention_days', (string)$retentionDays);
+            tpUpsertSettingsValue('bck_scheduled_retention_days', (string) $retentionDays);
 
             // Force re-init of next_run_at so handler recomputes cleanly
             tpUpsertSettingsValue('bck_scheduled_next_run_at', '0');
@@ -552,13 +552,13 @@ 
             break;
 
         case 'scheduled_list_backups':
-            if ($post_key !== $session->get('key') || (int)$session->get('user-admin') !== 1) {
+            if ($post_key !== $session->get('key') || (int) $session->get('user-admin') !== 1) {
                 echo prepareExchangedData(['error' => true, 'message' => 'Not allowed'], 'encode');
                 break;
             }
 
-            $baseFilesDir = (string)($SETTINGS['path_to_files_folder'] ?? (__DIR__ . '/../files'));
-            $dir = (string)tpGetSettingsValue('bck_scheduled_output_dir', rtrim($baseFilesDir, '/') . '/backups');
+            $baseFilesDir = (string) ($SETTINGS['path_to_files_folder'] ?? (__DIR__.'/../files'));
+            $dir = (string) tpGetSettingsValue('bck_scheduled_output_dir', rtrim($baseFilesDir, '/').'/backups');
             @mkdir($dir, 0770, true);
             // Build a relative path from files/ root (output_dir can be a subfolder)
             $filesRoot = realpath($baseFilesDir);
@@ -578,15 +578,15 @@ 
 
 
             $files = [];
-            foreach (glob(rtrim($dir, '/') . '/scheduled-*.sql') ?: [] as $fp) {
+            foreach (glob(rtrim($dir, '/').'/scheduled-*.sql') ?: [] as $fp) {
                 $bn = basename($fp);
                 $files[] = [
                     'name' => $bn,
-                    'size_bytes' => (int)@filesize($fp),
-                    'mtime' => (int)@filemtime($fp),
-                    'download' => 'sources/backups.queries.php?type=scheduled_download_backup&file=' . urlencode($bn)
-                        . '&key=' . urlencode((string) $session->get('key'))
-                        . '&key_tmp=' . urlencode($keyTmp),
+                    'size_bytes' => (int) @filesize($fp),
+                    'mtime' => (int) @filemtime($fp),
+                    'download' => 'sources/backups.queries.php?type=scheduled_download_backup&file='.urlencode($bn)
+                        . '&key='.urlencode((string) $session->get('key'))
+                        . '&key_tmp='.urlencode($keyTmp),
                 ];
             }
 
@@ -596,7 +596,7 @@ 
             break;
 
         case 'scheduled_delete_backup':
-            if ($post_key !== $session->get('key') || (int)$session->get('user-admin') !== 1) {
+            if ($post_key !== $session->get('key') || (int) $session->get('user-admin') !== 1) {
                 echo prepareExchangedData(['error' => true, 'message' => 'Not allowed'], 'encode');
                 break;
             }
@@ -604,7 +604,7 @@ 
             $dataReceived = prepareExchangedData($post_data, 'decode');
             if (!is_array($dataReceived)) $dataReceived = [];
 
-            $file = (string)($dataReceived['file'] ?? '');
+            $file = (string) ($dataReceived['file'] ?? '');
             $file = basename($file);
 
             if ($file === '' || strpos($file, 'scheduled-') !== 0 || !str_ends_with($file, '.sql')) {
@@ -612,9 +612,9 @@ 
                 break;
             }
 
-            $baseFilesDir = (string)($SETTINGS['path_to_files_folder'] ?? (__DIR__ . '/../files'));
-            $dir = (string)tpGetSettingsValue('bck_scheduled_output_dir', rtrim($baseFilesDir, '/') . '/backups');
-            $fp = rtrim($dir, '/') . '/' . $file;
+            $baseFilesDir = (string) ($SETTINGS['path_to_files_folder'] ?? (__DIR__.'/../files'));
+            $dir = (string) tpGetSettingsValue('bck_scheduled_output_dir', rtrim($baseFilesDir, '/').'/backups');
+            $fp = rtrim($dir, '/').'/'.$file;
 
 
             if (file_exists($fp) && is_file($fp)) {
@@ -631,7 +631,7 @@ 
             break;
 
         case 'check_connected_users':
-            if ($post_key !== $session->get('key') || (int)$session->get('user-admin') !== 1) {
+            if ($post_key !== $session->get('key') || (int) $session->get('user-admin') !== 1) {
                 echo prepareExchangedData(['error' => true, 'message' => 'Not allowed'], 'encode');
                 break;
             }
@@ -642,7 +642,7 @@ 
             }
 
             $connectedCount = (int) DB::queryFirstField(
-                'SELECT COUNT(*) FROM ' . prefixTable('users') . ' WHERE session_end >= %i AND id != %i',
+                'SELECT COUNT(*) FROM '.prefixTable('users').' WHERE session_end >= %i AND id != %i',
                 time(),
                 $excludeUserId
             );
@@ -651,19 +651,19 @@ 
             break;
 
         case 'scheduled_run_now':
-            if ($post_key !== $session->get('key') || (int)$session->get('user-admin') !== 1) {
+            if ($post_key !== $session->get('key') || (int) $session->get('user-admin') !== 1) {
                 echo prepareExchangedData(['error' => true, 'message' => 'Not allowed'], 'encode');
                 break;
             }
 
             $now = time();
-            $baseFilesDir = (string)($SETTINGS['path_to_files_folder'] ?? (__DIR__ . '/../files'));
-            $dir = (string)tpGetSettingsValue('bck_scheduled_output_dir', rtrim($baseFilesDir, '/') . '/backups');
+            $baseFilesDir = (string) ($SETTINGS['path_to_files_folder'] ?? (__DIR__.'/../files'));
+            $dir = (string) tpGetSettingsValue('bck_scheduled_output_dir', rtrim($baseFilesDir, '/').'/backups');
             @mkdir($dir, 0770, true);
 
             // avoid duplicates
-            $pending = (int)DB::queryFirstField(
-                'SELECT COUNT(*) FROM ' . prefixTable('background_tasks') . '
+            $pending = (int) DB::queryFirstField(
+                'SELECT COUNT(*) FROM '.prefixTable('background_tasks').'
                  WHERE process_type=%s AND is_in_progress IN (0,1)
                    AND (finished_at IS NULL OR finished_at = "" OR finished_at = 0)',
                 'database_backup'
@@ -676,7 +676,7 @@ 
             DB::insert(
                 prefixTable('background_tasks'),
                 [
-                    'created_at' => (string)$now,
+                    'created_at' => (string) $now,
                     'process_type' => 'database_backup',
                     'arguments' => json_encode(['output_dir' => $dir, 'source' => 'scheduler', 'initiator_user_id' => (int) $session->get('user-id')], JSON_UNESCAPED_SLASHES),
                     'is_in_progress' => 0,
@@ -684,7 +684,7 @@ 
                 ]
             );
 
-            tpUpsertSettingsValue('bck_scheduled_last_run_at', (string)$now);
+            tpUpsertSettingsValue('bck_scheduled_last_run_at', (string) $now);
             tpUpsertSettingsValue('bck_scheduled_last_status', 'queued');
             tpUpsertSettingsValue('bck_scheduled_last_message', 'Task enqueued by UI');
 
@@ -693,7 +693,7 @@ 
 
         case 'onthefly_delete_backup':
             // Delete an on-the-fly backup file stored in <files> directory
-            if ($post_key !== $session->get('key') || (int)$session->get('user-admin') !== 1) {
+            if ($post_key !== $session->get('key') || (int) $session->get('user-admin') !== 1) {
                 echo prepareExchangedData(
                     array(
                         'error' => true,
@@ -705,7 +705,7 @@ 
             }
 
             $dataReceived = prepareExchangedData($post_data, 'decode');
-            $fileToDelete = isset($dataReceived['file']) === true ? (string)$dataReceived['file'] : '';
+            $fileToDelete = isset($dataReceived['file']) === true ? (string) $dataReceived['file'] : '';
             $bn = basename($fileToDelete);
 
             // Safety checks
@@ -732,9 +732,9 @@ 
                 break;
             }
 
-            $baseFilesDir = (string)($SETTINGS['path_to_files_folder'] ?? (__DIR__ . '/../files'));
+            $baseFilesDir = (string) ($SETTINGS['path_to_files_folder'] ?? (__DIR__.'/../files'));
             $dir = rtrim($baseFilesDir, '/');
-            $fullPath = $dir . '/' . $bn;
+            $fullPath = $dir.'/'.$bn;
 
             if (file_exists($fullPath) === false) {
                 echo prepareExchangedData(
@@ -773,7 +773,7 @@ 
 
         case 'onthefly_list_backups':
             // List on-the-fly backup files stored directly in <files> directory (not in /backups for scheduled)
-            if ($post_key !== $session->get('key') || (int)$session->get('user-admin') !== 1) {
+            if ($post_key !== $session->get('key') || (int) $session->get('user-admin') !== 1) {
                 echo prepareExchangedData(
                     array(
                         'error' => true,
@@ -784,11 +784,11 @@ 
                 break;
             }
 
-            $baseFilesDir = (string)($SETTINGS['path_to_files_folder'] ?? (__DIR__ . '/../files'));
+            $baseFilesDir = (string) ($SETTINGS['path_to_files_folder'] ?? (__DIR__.'/../files'));
             $dir = rtrim($baseFilesDir, '/');
 
             $files = array();
-            $paths = glob($dir . '/*.sql');
+            $paths = glob($dir.'/*.sql');
             if ($paths === false) {
                 $paths = array();
             }
@@ -813,17 +813,17 @@ 
 
                 $files[] = array(
                     'name' => $bn,
-                    'size_bytes' => (int)@filesize($fp),
-                    'mtime' => (int)@filemtime($fp),
-                    'download' => 'sources/downloadFile.php?name=' . urlencode($bn) .
-                        '&action=backup&file=' . urlencode($bn) .
-                        '&type=sql&key=' . $session->get('key') .
-                        '&key_tmp=' . $session->get('user-key_tmp') .
+                    'size_bytes' => (int) @filesize($fp),
+                    'mtime' => (int) @filemtime($fp),
+                    'download' => 'sources/downloadFile.php?name='.urlencode($bn).
+                        '&action=backup&file='.urlencode($bn).
+                        '&type=sql&key='.$session->get('key').
+                        '&key_tmp='.$session->get('user-key_tmp').
                         '&pathIsFiles=1',
                 );
             }
 
-            usort($files, static function ($a, $b) {
+            usort($files, static function($a, $b) {
                 return ($b['mtime'] ?? 0) <=> ($a['mtime'] ?? 0);
             });
 
@@ -893,7 +893,7 @@ 
             $post_clearFilename = filter_var(($dataReceived['clearFilename'] ?? ''), FILTER_SANITIZE_FULL_SPECIAL_CHARS);
 
             $post_serverScope = filter_var(($dataReceived['serverScope'] ?? ''), FILTER_SANITIZE_FULL_SPECIAL_CHARS);
-            $post_serverFile  = filter_var(($dataReceived['serverFile']  ?? ''), FILTER_SANITIZE_FULL_SPECIAL_CHARS);
+            $post_serverFile  = filter_var(($dataReceived['serverFile'] ?? ''), FILTER_SANITIZE_FULL_SPECIAL_CHARS);
 
             // Scheduled backups must always be decrypted with the instance key (server-side).
             // Ignore any key coming from the UI to avoid mismatches.
@@ -902,7 +902,7 @@ 
             }
             // Ensure all strings we send back through prepareExchangedData() are JSON-safe.
             // This avoids PHP "malformed UTF-8" warnings when restore errors contain binary/latin1 bytes.
-            $tpSafeJsonString = static function ($value): string {
+            $tpSafeJsonString = static function($value): string {
                 if ($value === null) {
                     return '';
                 }
@@ -922,7 +922,7 @@ 
                     $isUtf8 = (@preg_match('//u', $str) === 1);
                 }
                 if ($isUtf8 === false) {
-                    return '[hex]' . bin2hex($str);
+                    return '[hex]'.bin2hex($str);
                 }
 
                 // Strip ASCII control chars that could pollute JSON.
@@ -938,7 +938,7 @@ 
             // Restore session + concurrency lock management.
             // - We keep a token in session to allow chunked restore even while DB is being replaced.
             // - We also block starting a second restore in the same session (double click / 2 tabs).
-            $clearRestoreState = static function ($session): void {
+            $clearRestoreState = static function($session): void {
                             $tmp = (string) ($session->get('restore-temp-file') ?? '');
                             if ($tmp !== '' && file_exists($tmp) === true && strpos(basename($tmp), 'defuse_temp_restore_') === 0 && is_file($tmp)) {
                                 if (is_writable($tmp)) {
@@ -1041,9 +1041,9 @@ 
                 error_log('DEBUG: Offset -> '.$post_offset.'/'.$post_totalSize.' | File -> '.$post_clearFilename);
             }
         
-            include_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+            include_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
         
-            include_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+            include_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
 
             /*
              * Restore workflow
@@ -1080,12 +1080,12 @@ 
 
                     // Scheduled backups are stored in configured output directory
                     if ($post_serverScope === 'scheduled') {
-                        $baseFilesDir = (string) ($SETTINGS['path_to_files_folder'] ?? (__DIR__ . '/../files'));
-                        $dir = (string) tpGetSettingsValue('bck_scheduled_output_dir', rtrim($baseFilesDir, '/') . '/backups');
+                        $baseFilesDir = (string) ($SETTINGS['path_to_files_folder'] ?? (__DIR__.'/../files'));
+                        $dir = (string) tpGetSettingsValue('bck_scheduled_output_dir', rtrim($baseFilesDir, '/').'/backups');
                         $baseDir = rtrim($dir, '/');
                     }
 
-                    $serverPath = $baseDir . '/' . $bn;
+                    $serverPath = $baseDir.'/'.$bn;
 
                     if (file_exists($serverPath) === false) {
                         try {
@@ -1120,7 +1120,7 @@ 
                         );
 
                         try {
-                            $msg = 'dataBase restore started (scope=' . $post_serverScope . ', file=' . $bn . ')';
+                            $msg = 'dataBase restore started (scope='.$post_serverScope.', file='.$bn.')';
                             logEvents(
                                 $SETTINGS,
                                 'admin_action',
@@ -1147,7 +1147,7 @@ 
 
                     // Find filename from DB (misc)
                     $data = DB::queryFirstRow(
-                        'SELECT valeur FROM ' . prefixTable('misc') . ' WHERE increment_id = %i LIMIT 1',
+                        'SELECT valeur FROM '.prefixTable('misc').' WHERE increment_id = %i LIMIT 1',
                         $legacyOperationId
                     );
 
@@ -1172,7 +1172,7 @@ 
                     }
 
                     $bn = safeString($data['valeur']);
-                    $serverPath = rtrim((string) $SETTINGS['path_to_files_folder'], '/') . '/' . $bn;
+                    $serverPath = rtrim((string) $SETTINGS['path_to_files_folder'], '/').'/'.$bn;
 
                     if (file_exists($serverPath) === false) {
                         try {
@@ -1206,7 +1206,7 @@ 
 
                 // Decrypt to a dedicated temp file (unique)
                 $tmpDecrypted = rtrim((string) $SETTINGS['path_to_files_folder'], '/')
-                    . '/defuse_temp_restore_' . (int) $session->get('user-id') . '_' . time() . '_' . $bn;
+                    . '/defuse_temp_restore_'.(int) $session->get('user-id').'_'.time().'_'.$bn;
 
                 // Build the list of keys we can try to decrypt with.
                 // - on-the-fly: uses the key provided by the UI
@@ -1265,7 +1265,7 @@ 
                         array(
                             'error' => true,
                             'error_code' => 'DECRYPT_FAILED',
-                            'message' => 'Unable to decrypt backup: ' . $tpSafeJsonString((string) ($decRet['message'] ?? 'unknown error')),
+                            'message' => 'Unable to decrypt backup: '.$tpSafeJsonString((string) ($decRet['message'] ?? 'unknown error')),
                         ),
                         'encode'
                     );
@@ -1419,7 +1419,7 @@ 
                             } catch (Exception $e) {
                                 $snippet = substr($query, 0, 120);
                                 $snippet = $tpSafeJsonString($snippet);
-                                $errors[] = 'Error executing query: ' . $tpSafeJsonString($e->getMessage()) . ' - Query: ' . $snippet . '...';
+                                $errors[] = 'Error executing query: '.$tpSafeJsonString($e->getMessage()).' - Query: '.$snippet.'...';
                             }
                             $query = '';
                         }
@@ -1445,7 +1445,7 @@ 
                 }
                 // Rollback transaction on any exception
                 DB::rollback();
-                $errors[] = 'Transaction failed: ' . $tpSafeJsonString($e->getMessage());
+                $errors[] = 'Transaction failed: '.$tpSafeJsonString($e->getMessage());
             }
         
             // Calculate the new offset
@@ -1472,7 +1472,7 @@ 
         logEvents(
             $SETTINGS,
             'admin_action',
-            'dataBase restore failed' . ($scope !== '' ? ' (scope=' . $scope . ')' : ''),
+            'dataBase restore failed'.($scope !== '' ? ' (scope='.$scope.')' : ''),
             (string) $session->get('user-id'),
             $session->get('user-login')
         );
@@ -1485,7 +1485,7 @@ 
     echo prepareExchangedData(
         array(
             'error' => true,
-            'message' => 'Errors occurred during import: ' . implode('; ', ($post_serverScope === 'scheduled' ? array_map($tpSafeJsonString, $errors) : $errors)),
+            'message' => 'Errors occurred during import: '.implode('; ', ($post_serverScope === 'scheduled' ? array_map($tpSafeJsonString, $errors) : $errors)),
             'newOffset' => $newOffset,
             'totalSize' => $post_totalSize,
             'clearFilename' => $post_backupFile,
@@ -1566,15 +1566,15 @@ 
     if ($scope !== '' || $fileLabel !== '' || $duration > 0) {
         $parts = array();
         if ($scope !== '') {
-            $parts[] = 'scope=' . $scope;
+            $parts[] = 'scope='.$scope;
         }
         if ($fileLabel !== '') {
-            $parts[] = 'file=' . $fileLabel;
+            $parts[] = 'file='.$fileLabel;
         }
         if ($duration > 0) {
-            $parts[] = 'duration=' . $duration . 's';
+            $parts[] = 'duration='.$duration.'s';
         }
-        $msg .= ' (' . implode(', ', $parts) . ')';
+        $msg .= ' ('.implode(', ', $parts).')';
     }
 
     logEvents(

sources/users.queries.php

Spacing +89 added lines, -89 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)) {
@@ -465,7 +465,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(
@@ -504,7 +504,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(
@@ -519,7 +519,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 
             );        
@@ -536,7 +536,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
             );
@@ -691,7 +691,7 @@ 
                 if ($excludeUserId > 0) {
                     $rows = DB::query(
                         'SELECT id
-                         FROM ' . prefixTable('users') . '
+                         FROM ' . prefixTable('users').'
                          WHERE session_end >= %i AND id != %i',
                         $now,
                         $excludeUserId
@@ -699,7 +699,7 @@ 
                 } else {
                     $rows = DB::query(
                         'SELECT id
-                         FROM ' . prefixTable('users') . '
+                         FROM ' . prefixTable('users').'
                          WHERE session_end >= %i',
                         $now
                     );
@@ -792,7 +792,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')
                 );
@@ -830,7 +830,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']);
                 }
@@ -861,7 +861,7 @@ 
                         array_push(
                             $managedBy,
                             array(
-                                'title' => $lang->get('managers_of') . ' ' . $fonction['title'],
+                                'title' => $lang->get('managers_of').' '.$fonction['title'],
                                 'id' => $fonction['id'],
                                 'selected' => $selected,
                             )
@@ -943,9 +943,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;
@@ -1033,7 +1033,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
             );
@@ -1044,7 +1044,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
                 );
@@ -1067,7 +1067,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'
@@ -1170,7 +1170,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'
@@ -1183,7 +1183,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'
@@ -1277,7 +1277,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(
@@ -1326,7 +1326,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,
@@ -1385,7 +1385,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']));
@@ -1396,8 +1396,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']
@@ -1420,7 +1420,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));
                 }
                 
@@ -1435,7 +1435,7 @@ 
                             // get folder name
                             $row = DB::queryFirstRow(
                                 'SELECT title, nlevel, id
-                                FROM ' . prefixTable('nested_tree') . '
+                                FROM ' . prefixTable('nested_tree').'
                                 WHERE id = %i',
                                 $fld['id']
                             );
@@ -1453,8 +1453,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 = '';
             }
@@ -1508,10 +1508,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,
@@ -1524,10 +1524,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,
@@ -1548,7 +1548,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
                             );
@@ -1562,7 +1562,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']
                 );
@@ -1574,7 +1574,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
                             );
@@ -1591,7 +1591,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
                             );
@@ -1713,7 +1713,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']
             );
@@ -1961,14 +1961,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
@@ -1984,14 +1984,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
                 );
@@ -2111,7 +2111,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(
@@ -2145,7 +2145,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(
@@ -2162,7 +2162,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) {
@@ -2275,7 +2275,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,
@@ -2340,7 +2340,7 @@ 
             // Check if user already exists
             $data = DB::query(
                 'SELECT id
-                FROM ' . prefixTable('users') . '
+                FROM ' . prefixTable('users').'
                 WHERE login = %s',
                 $post_login
             );
@@ -2534,7 +2534,7 @@ 
             // Check if user already exists
             DB::query(
                 'SELECT id
-                FROM ' . prefixTable('users') . '
+                FROM ' . prefixTable('users').'
                 WHERE id = %i',
                 $post_id
             );
@@ -2596,7 +2596,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,
@@ -2641,7 +2641,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
                     );
@@ -2650,7 +2650,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']
                         );
@@ -2759,7 +2759,7 @@ 
             // Check if user already exists
             DB::query(
                 'SELECT id
-                FROM ' . prefixTable('users') . '
+                FROM ' . prefixTable('users').'
                 WHERE id = %i',
                 $post_id
             );
@@ -2825,7 +2825,7 @@ 
             // Search TP_USER in db        
             $userTP = DB::queryFirstRow(
                 'SELECT pw
-                FROM ' . prefixTable('users') . '
+                FROM ' . prefixTable('users').'
                 WHERE id = %i',
                 TP_USER_ID
             );
@@ -2848,7 +2848,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'),
@@ -2955,17 +2955,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++;
                 }
             }
 
@@ -2974,7 +2974,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'
@@ -3107,7 +3107,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(
                 [
@@ -3147,13 +3147,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
@@ -3177,7 +3177,7 @@ 
                 echo prepareExchangedData(
                     [
                         'error' => true,
-                        'message' => $lang->get('error') . ': ' . $e->getMessage(),
+                        'message' => $lang->get('error').': '.$e->getMessage(),
                     ],
                     'encode'
                 );
@@ -3231,10 +3231,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);
@@ -3242,11 +3242,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(
                 [
@@ -3254,7 +3254,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'
@@ -3289,7 +3289,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
             );
             
@@ -3302,12 +3302,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
@@ -3317,7 +3317,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'
                 );
@@ -3350,7 +3350,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]
     );
@@ -3384,7 +3384,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)
@@ -3419,7 +3419,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]
     );
@@ -3458,7 +3458,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"
@@ -3484,7 +3484,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",
@@ -3524,7 +3524,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'
@@ -3546,7 +3546,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'
@@ -3576,7 +3576,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
         );

scripts/background_tasks___worker.php

Spacing +39 added lines, -39 removed lines

@@ -33,7 +33,7 @@ 
 require_once __DIR__.'/traits/UserHandlerTrait.php';
 require_once __DIR__.'/traits/EmailTrait.php';
 require_once __DIR__.'/traits/MigrateUserHandlerTrait.php';
-require_once __DIR__ . '/taskLogger.php';
+require_once __DIR__.'/taskLogger.php';
 
 class TaskWorker {
     use ItemHandlerTrait;
@@ -66,7 +66,7 @@ 
      */
     public function execute() {
         try {
-            if (LOG_TASKS=== true) $this->logger->log('Processing task: ' . print_r($this->taskData, true), 'DEBUG');
+            if (LOG_TASKS === true) $this->logger->log('Processing task: '.print_r($this->taskData, true), 'DEBUG');
             // Dispatch selon le type de processus
             switch ($this->processType) {
                 case 'item_copy':
@@ -114,11 +114,11 @@ 
      */
     private function handleDatabaseBackup(array $taskData): void
     {
-        require_once __DIR__ . '/../sources/backup.functions.php';
+        require_once __DIR__.'/../sources/backup.functions.php';
 
         // Default target dir: <path_to_files_folder>/backups
-        $baseFilesDir = (string)($this->settings['path_to_files_folder'] ?? (__DIR__ . '/../files'));
-        $targetDir = rtrim($baseFilesDir, '/') . '/backups';
+        $baseFilesDir = (string) ($this->settings['path_to_files_folder'] ?? (__DIR__.'/../files'));
+        $targetDir = rtrim($baseFilesDir, '/').'/backups';
 
         // Allow override via task arguments (optional)
         if (!empty($taskData['output_dir']) && is_string($taskData['output_dir'])) {
@@ -127,15 +127,15 @@ 
 
         if (!is_dir($targetDir)) {
             if (!@mkdir($targetDir, 0770, true) && !is_dir($targetDir)) {
-                throw new Exception('Cannot create backup target dir: ' . $targetDir);
+                throw new Exception('Cannot create backup target dir: '.$targetDir);
             }
         }
         if (!is_writable($targetDir)) {
-            throw new Exception('Backup target dir is not writable: ' . $targetDir);
+            throw new Exception('Backup target dir is not writable: '.$targetDir);
         }
 
         // Use stored encryption key (same as UI)
-        $encryptionKey = (string)($this->settings['bck_script_passkey'] ?? '');
+        $encryptionKey = (string) ($this->settings['bck_script_passkey'] ?? '');
         if ($encryptionKey === '') {
             throw new Exception('Missing encryption key (bck_script_passkey).');
         }
@@ -151,13 +151,13 @@ 
 
     if ($excludeUserId > 0) {
         $connectedUsers = DB::query(
-            'SELECT id FROM ' . prefixTable('users') . ' WHERE session_end >= %i AND id != %i',
+            'SELECT id FROM '.prefixTable('users').' WHERE session_end >= %i AND id != %i',
             $now,
             $excludeUserId
         );
     } else {
         $connectedUsers = DB::query(
-            'SELECT id FROM ' . prefixTable('users') . ' WHERE session_end >= %i',
+            'SELECT id FROM '.prefixTable('users').' WHERE session_end >= %i',
             $now
         );
     }
@@ -189,12 +189,12 @@ 
 
         // Store a tiny summary for the task completion "arguments" field (no secrets)
         $this->taskData['backup_file'] = $res['filename'] ?? '';
-        $this->taskData['backup_size_bytes'] = (int)($res['size_bytes'] ?? 0);
-        $this->taskData['backup_encrypted'] = (bool)($res['encrypted'] ?? false);
+        $this->taskData['backup_size_bytes'] = (int) ($res['size_bytes'] ?? 0);
+        $this->taskData['backup_encrypted'] = (bool) ($res['encrypted'] ?? false);
 
         // Retention purge (scheduled backups only)
-        $backupSource = (string)($taskData['source'] ?? '');
-        $backupDir = (string)($taskData['output_dir'] ?? '');   // from task arguments (reliable)
+        $backupSource = (string) ($taskData['source'] ?? '');
+        $backupDir = (string) ($taskData['output_dir'] ?? ''); // from task arguments (reliable)
         if ($backupDir === '') {
             $backupDir = (string) $targetDir;
         }
@@ -203,11 +203,11 @@ 
         $this->taskData['output_dir'] = $backupDir;
 
         if ($backupSource === 'scheduler' && $backupDir !== '') {
-            $days = (int)$this->getMiscSetting('bck_scheduled_retention_days', '30');
+            $days = (int) $this->getMiscSetting('bck_scheduled_retention_days', '30');
             $deleted = $this->purgeOldScheduledBackups($backupDir, $days);
 
-            $this->upsertMiscSetting('bck_scheduled_last_purge_at', (string)time());
-            $this->upsertMiscSetting('bck_scheduled_last_purge_deleted', (string)$deleted);
+            $this->upsertMiscSetting('bck_scheduled_last_purge_at', (string) time());
+            $this->upsertMiscSetting('bck_scheduled_last_purge_deleted', (string) $deleted);
 
             if (LOG_TASKS === true) {
                 $this->logger->log("database_backup: purge retention={$days}d dir={$backupDir} deleted={$deleted}", 'INFO');
@@ -216,12 +216,12 @@ 
 
         // If launched by scheduler, update scheduler status in teampass_misc
         if (!empty($taskData['source']) && $taskData['source'] === 'scheduler') {
-            $this->updateSchedulerState('completed', 'Backup created: ' . ($this->taskData['backup_file'] ?? ''));
+            $this->updateSchedulerState('completed', 'Backup created: '.($this->taskData['backup_file'] ?? ''));
         }
 
         if (LOG_TASKS === true) {
             $this->logger->log(
-                'database_backup: created ' . ($this->taskData['backup_file'] ?? '') . ' (' . $this->taskData['backup_size_bytes'] . ' bytes)',
+                'database_backup: created '.($this->taskData['backup_file'] ?? '').' ('.$this->taskData['backup_size_bytes'].' bytes)',
                 'INFO'
             );
         }
@@ -237,15 +237,15 @@ 
     {
         $this->upsertMiscSetting('bck_scheduled_last_status', $status);
         $this->upsertMiscSetting('bck_scheduled_last_message', mb_substr($message, 0, 500));
-        $this->upsertMiscSetting('bck_scheduled_last_completed_at', (string)time());
+        $this->upsertMiscSetting('bck_scheduled_last_completed_at', (string) time());
     }
 
     private function upsertMiscSetting(string $key, string $value): void
     {
         $table = prefixTable('misc');
 
-        $exists = (int)DB::queryFirstField(
-            'SELECT COUNT(*) FROM ' . $table . ' WHERE type = %s AND intitule = %s',
+        $exists = (int) DB::queryFirstField(
+            'SELECT COUNT(*) FROM '.$table.' WHERE type = %s AND intitule = %s',
             'settings',
             $key
         );
@@ -262,7 +262,7 @@ 
         $table = prefixTable('misc');
 
         $val = DB::queryFirstField(
-            'SELECT valeur FROM ' . $table . ' WHERE type = %s AND intitule = %s LIMIT 1',
+            'SELECT valeur FROM '.$table.' WHERE type = %s AND intitule = %s LIMIT 1',
             'settings',
             $key
         );
@@ -287,7 +287,7 @@ 
         $cutoff = time() - ($retentionDays * 86400);
         $deleted = 0;
 
-        foreach (glob(rtrim($dir, '/') . '/scheduled-*.sql') as $file) {
+        foreach (glob(rtrim($dir, '/').'/scheduled-*.sql') as $file) {
             if (!is_file($file)) {
                 continue;
             }
@@ -309,7 +309,7 @@ 
             'is_in_progress' => -1,
             'finished_at' => time(),
             'status' => 'completed',
-            'error_message' => null,   // <-- on efface toute erreur précédente
+            'error_message' => null, // <-- on efface toute erreur précédente
         ];
 
         // Prepare anonimzation of arguments
@@ -345,7 +345,7 @@ 
             $arguments = '';
         }
 
-        if (LOG_TASKS=== true) $this->logger->log('Process: '.$this->processType.' -- '.print_r($arguments, true), 'DEBUG');
+        if (LOG_TASKS === true) $this->logger->log('Process: '.$this->processType.' -- '.print_r($arguments, true), 'DEBUG');
 
         // Add 'arguments' only if not empty
         if (!empty($arguments)) {
@@ -360,7 +360,7 @@ 
             $this->taskId
         );
 
-        if (LOG_TASKS=== true) $this->logger->log('Finishing task: ' . $this->taskId, 'DEBUG');
+        if (LOG_TASKS === true) $this->logger->log('Finishing task: '.$this->taskId, 'DEBUG');
     }
 
     /**
@@ -383,15 +383,15 @@ 
             'increment_id = %i',
             $this->taskId
         );
-        $this->logger->log('Task failure: ' . $e->getMessage(), 'ERROR');
+        $this->logger->log('Task failure: '.$e->getMessage(), 'ERROR');
     // Purge retention even on failure (safe: only scheduled-*.sql)
-        $backupDir = (string)($this->taskData['output_dir'] ?? '');
+        $backupDir = (string) ($this->taskData['output_dir'] ?? '');
         if ($backupDir !== '' && is_dir($backupDir)) {
-        $days = (int)$this->getMiscSetting('bck_scheduled_retention_days', '30');
+        $days = (int) $this->getMiscSetting('bck_scheduled_retention_days', '30');
         $deleted = $this->purgeOldScheduledBackups($backupDir, $days);
 
-        $this->upsertMiscSetting('bck_scheduled_last_purge_at', (string)time());
-        $this->upsertMiscSetting('bck_scheduled_last_purge_deleted', (string)$deleted);
+        $this->upsertMiscSetting('bck_scheduled_last_purge_at', (string) time());
+        $this->upsertMiscSetting('bck_scheduled_last_purge_deleted', (string) $deleted);
         }
     }
 
@@ -404,16 +404,16 @@ 
      * @return void
      */
     private function processSubTasks($arguments) {
-        if (LOG_TASKS=== true) $this->logger->log('processSubTasks: '.print_r($arguments, true), 'DEBUG');
+        if (LOG_TASKS === true) $this->logger->log('processSubTasks: '.print_r($arguments, true), 'DEBUG');
         // Get all subtasks related to this task
         $subtasks = DB::query(
-            'SELECT * FROM ' . prefixTable('background_subtasks') . ' WHERE task_id = %i AND is_in_progress = 0 ORDER BY `task` ASC',
+            'SELECT * FROM '.prefixTable('background_subtasks').' WHERE task_id = %i AND is_in_progress = 0 ORDER BY `task` ASC',
             $this->taskId
         );
     
         // Check if there are any subtasks to process
         if (empty($subtasks)) {
-            if (LOG_TASKS=== true) $this->logger->log('No subtask was found for task: ' . $this->taskId, 'DEBUG');
+            if (LOG_TASKS === true) $this->logger->log('No subtask was found for task: '.$this->taskId, 'DEBUG');
             return;
         }
     
@@ -423,7 +423,7 @@ 
                 // Get the subtask data
                 $subtaskData = json_decode($subtask['task'], true);
 
-                if (LOG_TASKS=== true) $this->logger->log('Processing subtask: ' . $subtaskData['step'], 'DEBUG');
+                if (LOG_TASKS === true) $this->logger->log('Processing subtask: '.$subtaskData['step'], 'DEBUG');
 
                 // Mark subtask as in progress
                 DB::update(
@@ -475,13 +475,13 @@ 
                     $subtask['increment_id']
                 );
         
-                $this->logger->log('processSubTasks : ' . $e->getMessage(), 'ERROR');
+                $this->logger->log('processSubTasks : '.$e->getMessage(), 'ERROR');
             }
         }
     
         // Are all subtasks completed?
         $remainingSubtasks = DB::queryFirstField(
-            'SELECT COUNT(*) FROM ' . prefixTable('background_subtasks') . ' WHERE task_id = %i AND is_in_progress = 0',
+            'SELECT COUNT(*) FROM '.prefixTable('background_subtasks').' WHERE task_id = %i AND is_in_progress = 0',
             $this->taskId
         );
     
@@ -497,7 +497,7 @@ 
     error_log("Usage: php background_tasks___worker.php <task_id> <process_type> [<task_data>]");
     exit(1);
 }
-$taskId = (int)$argv[1];
+$taskId = (int) $argv[1];
 $processType = $argv[2];
 $taskData = $argv[3] ?? null;
 if ($taskData) {