nilsteampassnet / TeamPass

scripts/background_tasks___functions.php

Spacing +7 added lines, -7 removed lines

@@ -108,8 +108,8 @@ 
     // Delete subtasks linked to old finished tasks (avoid orphans)
     DB::query(
         'DELETE s
-         FROM ' . prefixTable('background_subtasks') . ' s
-         INNER JOIN ' . prefixTable('background_tasks') . ' t ON t.increment_id = s.task_id
+         FROM ' . prefixTable('background_subtasks').' s
+         INNER JOIN ' . prefixTable('background_tasks').' t ON t.increment_id = s.task_id
          WHERE t.finished_at > 0
            AND t.finished_at < %i',
         $threshold
@@ -145,11 +145,11 @@ 
 function provideLog(string $message, array $SETTINGS)
 {
     if (defined('LOG_TO_SERVER') && LOG_TO_SERVER === true) {
-        error_log((string) date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], time()) . ' - '.$message);
+        error_log((string) date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], time()).' - '.$message);
     }
 }
 
-function performVisibleFoldersHtmlUpdate (int $user_id)
+function performVisibleFoldersHtmlUpdate(int $user_id)
 {
     $html = [];
 
@@ -159,7 +159,7 @@ 
 
     // get current folders visible for user
     $cache_tree = DB::queryFirstRow(
-        'SELECT increment_id, data FROM ' . prefixTable('cache_tree') . ' WHERE user_id = %i',
+        'SELECT increment_id, data FROM '.prefixTable('cache_tree').' WHERE user_id = %i',
         $user_id
     );
     $folders = json_decode($cache_tree['data'], true);
@@ -175,7 +175,7 @@ 
 
         // get folder info
         $folder = 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',
             $idFolder
         );
 
@@ -210,7 +210,7 @@ 
 function subTaskStatus($taskId)
 {
     $subTasks = DB::query(
-        'SELECT * FROM ' . prefixTable('background_subtasks') . ' WHERE task_id = %i',
+        'SELECT * FROM '.prefixTable('background_subtasks').' WHERE task_id = %i',
         $taskId
     );
 

scripts/background_tasks___handler.php

Spacing +23 added lines, -23 removed lines

@@ -30,7 +30,7 @@ 
 use TeampassClasses\ConfigManager\ConfigManager;
 
 require_once __DIR__.'/../sources/main.functions.php';
-require_once __DIR__ . '/taskLogger.php';
+require_once __DIR__.'/taskLogger.php';
 
 class BackgroundTasksHandler {
     private $settings;
@@ -72,7 +72,7 @@ 
     public function processBackgroundTasks() {
         // Prevent multiple concurrent executions
         if (!$this->acquireProcessLock()) {
-            if (LOG_TASKS=== true) $this->logger->log('Process already running', 'INFO');
+            if (LOG_TASKS === true) $this->logger->log('Process already running', 'INFO');
             return false;
         }
 
@@ -81,7 +81,7 @@ 
             $this->processTaskBatches();
             $this->performMaintenanceTasks();
         } catch (Exception $e) {
-            if (LOG_TASKS=== true) $this->logger->log('Task processing error: ' . $e->getMessage(), 'ERROR');
+            if (LOG_TASKS === true) $this->logger->log('Task processing error: '.$e->getMessage(), 'ERROR');
         } finally {
             $this->releaseProcessLock();
         }
@@ -100,7 +100,7 @@ 
             return false;
         }
         
-        fwrite($fp, (string)getmypid());
+        fwrite($fp, (string) getmypid());
         return true;
     }
 
@@ -120,7 +120,7 @@ 
     private function cleanupStaleTasks() {
         // Mark tasks as failed if they've been running too long
         DB::query(
-            'UPDATE ' . prefixTable('background_tasks') . ' 
+            'UPDATE '.prefixTable('background_tasks').' 
             SET is_in_progress = -1, 
                 finished_at = %i, 
                 status = "failed",
@@ -133,8 +133,8 @@ 
 
         // Remove very old failed tasks
         DB::query(
-            'DELETE t, st FROM ' . prefixTable('background_tasks') . ' t
-            INNER JOIN ' . prefixTable('background_subtasks') . ' st ON (t.increment_id = st.task_id)
+            'DELETE t, st FROM '.prefixTable('background_tasks').' t
+            INNER JOIN ' . prefixTable('background_subtasks').' st ON (t.increment_id = st.task_id)
             WHERE t.finished_at > 0
               AND t.finished_at < %i
               AND t.status = %s',
@@ -152,7 +152,7 @@ 
         
         // Check if the maximum number of parallel tasks is reached
         if ($runningTasks >= $this->maxParallelTasks) {
-            if (LOG_TASKS=== true) $this->logger->log('Wait ... '.$runningTasks.' out of '.$this->maxParallelTasks.' are already running ', 'INFO');
+            if (LOG_TASKS === true) $this->logger->log('Wait ... '.$runningTasks.' out of '.$this->maxParallelTasks.' are already running ', 'INFO');
             return;
         }
 
@@ -161,7 +161,7 @@ 
         // Fetch next batch of tasks
         $tasks = DB::query(
             'SELECT increment_id, process_type, arguments 
-            FROM ' . prefixTable('background_tasks') . '
+            FROM ' . prefixTable('background_tasks').'
             WHERE is_in_progress = 0 
             AND (finished_at IS NULL OR finished_at = "")
             ORDER BY increment_id ASC
@@ -170,7 +170,7 @@ 
         );
 
         foreach ($tasks as $task) {
-            if (LOG_TASKS=== true) $this->logger->log('Launching '.$task['increment_id'], 'INFO');
+            if (LOG_TASKS === true) $this->logger->log('Launching '.$task['increment_id'], 'INFO');
             $this->processIndividualTask($task);
         }
     }
@@ -181,7 +181,7 @@ 
      * @param array $task The task to process.
      */
     private function processIndividualTask(array $task) {
-        if (LOG_TASKS=== true)  $this->logger->log('Starting task: ' . print_r($task, true), 'INFO');
+        if (LOG_TASKS === true)  $this->logger->log('Starting task: '.print_r($task, true), 'INFO');
 
         // Store progress in the database        
         DB::update(
@@ -199,19 +199,19 @@ 
         // Prepare process
         $process = new Process([
             PHP_BINARY,
-            __DIR__ . '/background_tasks___worker.php',
+            __DIR__.'/background_tasks___worker.php',
             $task['increment_id'],
             $task['process_type'],
             $task['arguments']
         ]);
 
         // Launch process
-        try{
+        try {
             $process->setTimeout($this->maxExecutionTime);
             $process->mustRun();
 
         } catch (Exception $e) {
-            if (LOG_TASKS=== true) $this->logger->log('Error launching task: ' . $e->getMessage(), 'ERROR');
+            if (LOG_TASKS === true) $this->logger->log('Error launching task: '.$e->getMessage(), 'ERROR');
             DB::update(
                 prefixTable('background_tasks'),
                 [
@@ -233,7 +233,7 @@ 
     private function countRunningTasks(): int {
         return DB::queryFirstField(
             'SELECT COUNT(*) 
-            FROM ' . prefixTable('background_tasks') . ' 
+            FROM ' . prefixTable('background_tasks').' 
             WHERE is_in_progress = 1'
         );
     }
@@ -254,10 +254,10 @@ 
      */
     private function cleanMultipleItemsEdition() {
         DB::query(
-            'DELETE i1 FROM ' . prefixTable('items_edition') . ' i1
+            'DELETE i1 FROM '.prefixTable('items_edition').' i1
             JOIN (
                 SELECT user_id, item_id, MIN(timestamp) AS oldest_timestamp
-                FROM ' . prefixTable('items_edition') . '
+                FROM ' . prefixTable('items_edition').'
                 GROUP BY user_id, item_id
             ) i2 ON i1.user_id = i2.user_id AND i1.item_id = i2.item_id
             WHERE i1.timestamp > i2.oldest_timestamp'
@@ -270,7 +270,7 @@ 
      */
     private function handleItemTokensExpiration() {
         DB::query(
-            'DELETE FROM ' . prefixTable('items_edition') . '
+            'DELETE FROM '.prefixTable('items_edition').'
             WHERE timestamp < %i',
             time() - ($this->settings['delay_item_edition'] * 60 ?: EDITION_LOCK_PERIOD)
         );
@@ -287,7 +287,7 @@ 
         // 1. Get all finished tasks older than the cutoff timestamp
         //    and that are not in progress
         $tasks = DB::query(
-            'SELECT increment_id FROM ' . prefixTable('background_tasks') . '
+            'SELECT increment_id FROM '.prefixTable('background_tasks').'
             WHERE status = %s AND is_in_progress = %i AND finished_at < %i',
             'completed',
             -1,
@@ -302,19 +302,19 @@ 
     
         // 2. Delete all subtasks related to these tasks
         DB::query(
-            'DELETE FROM ' . prefixTable('background_subtasks') . '
+            'DELETE FROM '.prefixTable('background_subtasks').'
             WHERE task_id IN %ls',
             $taskIds
         );
     
         // 3. Delete the tasks themselves
         DB::query(
-            'DELETE FROM ' . prefixTable('background_tasks') . '
+            'DELETE FROM '.prefixTable('background_tasks').'
             WHERE increment_id IN %ls',
             $taskIds
         );
     
-        if (LOG_TASKS=== true) $this->logger->log('Old finished tasks cleaned: ' . count($taskIds), 'INFO');
+        if (LOG_TASKS === true) $this->logger->log('Old finished tasks cleaned: '.count($taskIds), 'INFO');
     }
 }
 
@@ -328,5 +328,5 @@ 
     $tasksHandler = new BackgroundTasksHandler($settings);
     $tasksHandler->processBackgroundTasks();
 } catch (Exception $e) {
-    error_log('Teampass Background Tasks Error: ' . $e->getMessage());
+    error_log('Teampass Background Tasks Error: '.$e->getMessage());
 }

pages/api.js.php

Spacing +2 added lines, -2 removed lines

@@ -72,7 +72,7 @@ 
 if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('api') === 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;
 }
 ?>
@@ -672,7 +672,7 @@ 
                             // error
                             toastr.remove();
                             toastr.error(
-                                '<?php echo $lang->get('server_answer_error') . '<br />' . $lang->get('server_returned_data') . ':<br />'; ?>' + data.error,
+                                '<?php echo $lang->get('server_answer_error').'<br />'.$lang->get('server_returned_data').':<br />'; ?>' + data.error,
                                 '', {
                                     closeButton: true,
                                     positionClass: 'toast-bottom-right'

pages/api.php

Spacing +26 added lines, -26 removed lines

@@ -69,7 +69,7 @@ 
 if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('api') === 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;
 }
 
@@ -98,7 +98,7 @@ 
 
     // Ensure protocol exists for parse_url to work correctly
     if (strpos($url, 'http') !== 0 && strpos($url, '//') !== 0) {
-        $url = 'http://' . $url;
+        $url = 'http://'.$url;
     }
 
     $parsedUrl = parse_url($url);
@@ -198,7 +198,7 @@ 
                                     <?php
                                     $rowsKeys = DB::query(
                                         'SELECT *
-                                        FROM ' . prefixTable('api') . '
+                                        FROM ' . prefixTable('api').'
                                         WHERE type = %s
                                         ORDER BY timestamp ASC',
                                         'key'
@@ -221,15 +221,15 @@ 
                                             <?php
                                             foreach ($rowsKeys as $key) {
                                                 echo '
-                                                    <tr data-id="' . $key['increment_id'] . '">
-                                                    <td width="50px"><i class="fas fa-trash infotip pointer delete-api-key" title="' . $lang->get('del_button') . '"></i></td>
-                                                    <td><span class="edit-api-key pointer">' . $key['label'] . '</span></td>
-                                                    <td>' . $key['value']. '</td>   
-                                                    <td><i class="fas '.((int) $key['enabled'] === 1 ? 'fa-toggle-on text-info' : 'fa-toggle-off').' mr-1 text-center pointer api-clickme-action" data-field="enabled" data-increment-id="' . $key['increment_id'] . '"></i></td>
-                                                    <td><i class="fas '.((int) $key['allowed_to_create'] === 1 ? 'fa-toggle-on text-info' : 'fa-toggle-off').' mr-1 text-center pointer api-clickme-action" data-field="allowed_to_create" data-increment-id="' . $key['increment_id'] . '"></i></td>
-                                                    <td><i class="fas '.((int) $key['allowed_to_read'] === 1 ? 'fa-toggle-on text-info' : 'fa-toggle-off').' mr-1 text-center pointer api-clickme-action" data-field="allowed_to_read" data-increment-id="' . $key['increment_id'] . '"></i></td>
-                                                    <td><i class="fas '.((int) $key['allowed_to_update'] === 1 ? 'fa-toggle-on text-info' : 'fa-toggle-off').' mr-1 text-center pointer api-clickme-action" data-field="allowed_to_update" data-increment-id="' . $key['increment_id'] . '"></i></td>
-                                                    <td><i class="fas '.((int) $key['allowed_to_delete'] === 1 ? 'fa-toggle-on text-info' : 'fa-toggle-off').' mr-1 text-center pointer api-clickme-action" data-field="allowed_to_delete" data-increment-id="' . $key['increment_id'] . '"></i></td>                   
+                                                    <tr data-id="' . $key['increment_id'].'">
+                                                    <td width="50px"><i class="fas fa-trash infotip pointer delete-api-key" title="' . $lang->get('del_button').'"></i></td>
+                                                    <td><span class="edit-api-key pointer">' . $key['label'].'</span></td>
+                                                    <td>' . $key['value'].'</td>   
+                                                    <td><i class="fas '.((int) $key['enabled'] === 1 ? 'fa-toggle-on text-info' : 'fa-toggle-off').' mr-1 text-center pointer api-clickme-action" data-field="enabled" data-increment-id="'.$key['increment_id'].'"></i></td>
+                                                    <td><i class="fas '.((int) $key['allowed_to_create'] === 1 ? 'fa-toggle-on text-info' : 'fa-toggle-off').' mr-1 text-center pointer api-clickme-action" data-field="allowed_to_create" data-increment-id="'.$key['increment_id'].'"></i></td>
+                                                    <td><i class="fas '.((int) $key['allowed_to_read'] === 1 ? 'fa-toggle-on text-info' : 'fa-toggle-off').' mr-1 text-center pointer api-clickme-action" data-field="allowed_to_read" data-increment-id="'.$key['increment_id'].'"></i></td>
+                                                    <td><i class="fas '.((int) $key['allowed_to_update'] === 1 ? 'fa-toggle-on text-info' : 'fa-toggle-off').' mr-1 text-center pointer api-clickme-action" data-field="allowed_to_update" data-increment-id="'.$key['increment_id'].'"></i></td>
+                                                    <td><i class="fas '.((int) $key['allowed_to_delete'] === 1 ? 'fa-toggle-on text-info' : 'fa-toggle-off').' mr-1 text-center pointer api-clickme-action" data-field="allowed_to_delete" data-increment-id="'.$key['increment_id'].'"></i></td>                   
                                                 </tr>';
                                             } ?>
                                         </tbody>
@@ -264,7 +264,7 @@ 
                                 <div class="col-12 mt-4" id="table-api-ip">
                                     <?php
                                     $rowsIps = DB::query(
-                                                'SELECT increment_id, label, timestamp value FROM ' . prefixTable('api') . '
+                                                'SELECT increment_id, label, timestamp value FROM '.prefixTable('api').'
                                                 WHERE type = %s
                                                 ORDER BY timestamp ASC',
                                                 'ip'
@@ -282,10 +282,10 @@ 
                                             <?php
                                             foreach ($rowsIps as $ip) {
                                                 echo '
-                                                <tr data-id="' . $ip['increment_id'] . '">
-                                                    <td width="50px"><i class="fas fa-trash infotip pointer delete-api-ip" title="' . $lang->get('del_button') . '"></i></td>
-                                                    <td><span class="edit-api-ip pointer" data-field="label">' . $ip['label'] . '</span></td>
-                                                    <td><span class="edit-api-ip pointer" data-field="value">' . $ip['value'] . '</span></td>
+                                                <tr data-id="' . $ip['increment_id'].'">
+                                                    <td width="50px"><i class="fas fa-trash infotip pointer delete-api-ip" title="' . $lang->get('del_button').'"></i></td>
+                                                    <td><span class="edit-api-ip pointer" data-field="label">' . $ip['label'].'</span></td>
+                                                    <td><span class="edit-api-ip pointer" data-field="value">' . $ip['value'].'</span></td>
                                                 </tr>';
                                             } ?>
                                         </tbody>
@@ -329,8 +329,8 @@ 
                                     <?php
                                     $rowsKeys = DB::query(
                                         'SELECT a.*, u.name, u.lastname, u.login
-                                        FROM ' . prefixTable('api') . ' AS a
-                                        INNER JOIN ' . prefixTable('users') . ' AS u ON a.user_id = u.id
+                                        FROM ' . prefixTable('api').' AS a
+                                        INNER JOIN ' . prefixTable('users').' AS u ON a.user_id = u.id
                                         WHERE a.type = %s AND u.disabled = %i AND u.deleted_at IS NULL AND u.id NOT IN %li AND u.admin = %i
                                         ORDER BY u.login ASC',
                                         'user',
@@ -354,13 +354,13 @@ 
                                             <?php
                                             foreach ($rowsKeys as $key) {
                                                 echo '
-                                                    <tr data-id="' . $key['increment_id'] . '">
-                                                    <td>' . $key['name'] . ' ' . $key['lastname'] . ' (<i>'.$key['login'].'</i>)</td>
-                                                    <td><i class="fas '.((int) $key['enabled'] === 1 ? 'fa-toggle-on text-info' : 'fa-toggle-off').' mr-1 text-center pointer api-clickme-action" data-field="enabled" data-increment-id="' . $key['increment_id'] . '"></i></td>
-                                                    <td><i class="fas '.((int) $key['allowed_to_create'] === 1 ? 'fa-toggle-on text-info' : 'fa-toggle-off').' mr-1 text-center pointer api-clickme-action" data-field="allowed_to_create" data-increment-id="' . $key['increment_id'] . '"></i></td>
-                                                    <td><i class="fas '.((int) $key['allowed_to_read'] === 1 ? 'fa-toggle-on text-info' : 'fa-toggle-off').' mr-1 text-center pointer api-clickme-action" data-field="allowed_to_read" data-increment-id="' . $key['increment_id'] . '"></i></td>
-                                                    <td><i class="fas '.((int) $key['allowed_to_update'] === 1 ? 'fa-toggle-on text-info' : 'fa-toggle-off').' mr-1 text-center pointer api-clickme-action" data-field="allowed_to_update" data-increment-id="' . $key['increment_id'] . '"></i></td>
-                                                    <td><i class="fas '.((int) $key['allowed_to_delete'] === 1 ? 'fa-toggle-on text-info' : 'fa-toggle-off').' mr-1 text-center pointer api-clickme-action" data-field="allowed_to_delete" data-increment-id="' . $key['increment_id'] . '"></i></td>
+                                                    <tr data-id="' . $key['increment_id'].'">
+                                                    <td>' . $key['name'].' '.$key['lastname'].' (<i>'.$key['login'].'</i>)</td>
+                                                    <td><i class="fas '.((int) $key['enabled'] === 1 ? 'fa-toggle-on text-info' : 'fa-toggle-off').' mr-1 text-center pointer api-clickme-action" data-field="enabled" data-increment-id="'.$key['increment_id'].'"></i></td>
+                                                    <td><i class="fas '.((int) $key['allowed_to_create'] === 1 ? 'fa-toggle-on text-info' : 'fa-toggle-off').' mr-1 text-center pointer api-clickme-action" data-field="allowed_to_create" data-increment-id="'.$key['increment_id'].'"></i></td>
+                                                    <td><i class="fas '.((int) $key['allowed_to_read'] === 1 ? 'fa-toggle-on text-info' : 'fa-toggle-off').' mr-1 text-center pointer api-clickme-action" data-field="allowed_to_read" data-increment-id="'.$key['increment_id'].'"></i></td>
+                                                    <td><i class="fas '.((int) $key['allowed_to_update'] === 1 ? 'fa-toggle-on text-info' : 'fa-toggle-off').' mr-1 text-center pointer api-clickme-action" data-field="allowed_to_update" data-increment-id="'.$key['increment_id'].'"></i></td>
+                                                    <td><i class="fas '.((int) $key['allowed_to_delete'] === 1 ? 'fa-toggle-on text-info' : 'fa-toggle-off').' mr-1 text-center pointer api-clickme-action" data-field="allowed_to_delete" data-increment-id="'.$key['increment_id'].'"></i></td>
                                                 </tr>';
                                             } ?>
                                         </tbody>

sources/main.functions.php

Spacing +224 added lines, -226 removed lines

@@ -99,19 +99,19 @@ 
             $text = Crypto::decrypt($message, $key);
         }
     } catch (CryptoException\WrongKeyOrModifiedCiphertextException $ex) {
-        error_log('TEAMPASS-Error-Wrong key or modified ciphertext: ' . $ex->getMessage());
+        error_log('TEAMPASS-Error-Wrong key or modified ciphertext: '.$ex->getMessage());
         $err = 'wrong_key_or_modified_ciphertext';
     } catch (CryptoException\BadFormatException $ex) {
-        error_log('TEAMPASS-Error-Bad format exception: ' . $ex->getMessage());
+        error_log('TEAMPASS-Error-Bad format exception: '.$ex->getMessage());
         $err = 'bad_format';
     } catch (CryptoException\EnvironmentIsBrokenException $ex) {
-        error_log('TEAMPASS-Error-Environment: ' . $ex->getMessage());
+        error_log('TEAMPASS-Error-Environment: '.$ex->getMessage());
         $err = 'environment_error';
     } catch (CryptoException\IOException $ex) {
-        error_log('TEAMPASS-Error-IO: ' . $ex->getMessage());
+        error_log('TEAMPASS-Error-IO: '.$ex->getMessage());
         $err = 'io_error';
     } catch (Exception $ex) {
-        error_log('TEAMPASS-Error-Unexpected exception: ' . $ex->getMessage());
+        error_log('TEAMPASS-Error-Unexpected exception: '.$ex->getMessage());
         $err = 'unexpected_error';
     }
 
@@ -196,7 +196,7 @@ 
  */
 function trimElement($chaine, string $element): string
 {
-    if (! empty($chaine)) {
+    if (!empty($chaine)) {
         if (is_array($chaine) === true) {
             $chaine = implode(';', $chaine);
         }
@@ -244,8 +244,8 @@ 
  */
 function db_error_handler(array $params): void
 {
-    echo 'Error: ' . $params['error'] . "<br>\n";
-    echo 'Query: ' . $params['query'] . "<br>\n";
+    echo 'Error: '.$params['error']."<br>\n";
+    echo 'Query: '.$params['query']."<br>\n";
     throw new Exception('Error - Query', 1);
 }
 
@@ -319,7 +319,7 @@ 
     $session->set('user-forbiden_personal_folders', []);
     
     // Get list of Folders
-    $rows = DB::query('SELECT id FROM ' . prefixTable('nested_tree') . ' WHERE personal_folder = %i', 0);
+    $rows = DB::query('SELECT id FROM '.prefixTable('nested_tree').' WHERE personal_folder = %i', 0);
     foreach ($rows as $record) {
         array_push($groupesVisibles, $record['id']);
     }
@@ -328,20 +328,20 @@ 
     // get complete list of ROLES
     $tmp = array_filter(explode(';', $idFonctions !== null ? $idFonctions : ''));
     $rows = DB::query(
-        'SELECT * FROM ' . prefixTable('roles_title') . '
+        'SELECT * FROM '.prefixTable('roles_title').'
         ORDER BY title ASC'
     );
     foreach ($rows as $record) {
-        if (! empty($record['id']) && ! in_array($record['id'], $tmp)) {
+        if (!empty($record['id']) && !in_array($record['id'], $tmp)) {
             array_push($tmp, $record['id']);
         }
     }
     $session->set('user-roles', implode(';', $tmp));
     $session->set('user-admin', 1);
     // Check if admin has created Folders and Roles
-    DB::query('SELECT * FROM ' . prefixTable('nested_tree') . '');
+    DB::query('SELECT * FROM '.prefixTable('nested_tree').'');
     $session->set('user-nb_folders', DB::count());
-    DB::query('SELECT * FROM ' . prefixTable('roles_title'));
+    DB::query('SELECT * FROM '.prefixTable('roles_title'));
     $session->set('user-nb_roles', DB::count());
 
     return true;
@@ -424,7 +424,7 @@ 
     // Does this user is allowed to see other items
     $inc = 0;
     $rows = DB::query(
-        'SELECT id, id_tree FROM ' . prefixTable('items') . '
+        'SELECT id, id_tree FROM '.prefixTable('items').'
             WHERE restricted_to LIKE %ss AND inactif = %s'.
             (count($allowedFolders) > 0 ? ' AND id_tree NOT IN ('.implode(',', $allowedFolders).')' : ''),
         $globalsUserId,
@@ -441,8 +441,8 @@ 
     // Check for the users roles if some specific rights exist on items
     $rows = DB::query(
         'SELECT i.id_tree, r.item_id
-        FROM ' . prefixTable('items') . ' as i
-        INNER JOIN ' . prefixTable('restriction_to_roles') . ' as r ON (r.item_id=i.id)
+        FROM ' . prefixTable('items').' as i
+        INNER JOIN ' . prefixTable('restriction_to_roles').' as r ON (r.item_id=i.id)
         WHERE i.id_tree <> "" '.
         (count($userRoles) > 0 ? 'AND r.role_id IN %li ' : '').
         'ORDER BY i.id_tree ASC',
@@ -486,18 +486,18 @@ 
     $session->set('system-list_restricted_folders_for_items', $restrictedFoldersForItems);
     $session->set('user-forbiden_personal_folders', $noAccessPersonalFolders);
     // Folders and Roles numbers
-    DB::queryFirstRow('SELECT id FROM ' . prefixTable('nested_tree') . '');
-    DB::queryFirstRow('SELECT id FROM ' . prefixTable('nested_tree') . '');
+    DB::queryFirstRow('SELECT id FROM '.prefixTable('nested_tree').'');
+    DB::queryFirstRow('SELECT id FROM '.prefixTable('nested_tree').'');
     $session->set('user-nb_folders', DB::count());
-    DB::queryFirstRow('SELECT id FROM ' . prefixTable('roles_title'));
-    DB::queryFirstRow('SELECT id FROM ' . prefixTable('roles_title'));
+    DB::queryFirstRow('SELECT id FROM '.prefixTable('roles_title'));
+    DB::queryFirstRow('SELECT id FROM '.prefixTable('roles_title'));
     $session->set('user-nb_roles', DB::count());
     // check if change proposals on User's items
     if (isset($SETTINGS['enable_suggestion']) === true && (int) $SETTINGS['enable_suggestion'] === 1) {
         $countNewItems = DB::query(
             'SELECT COUNT(*)
-            FROM ' . prefixTable('items_change') . ' AS c
-            LEFT JOIN ' . prefixTable('log_items') . ' AS i ON (c.item_id = i.id_item)
+            FROM ' . prefixTable('items_change').' AS c
+            LEFT JOIN ' . prefixTable('log_items').' AS i ON (c.item_id = i.id_item)
             WHERE i.action = %s AND i.id_user = %i',
             'at_creation',
             $globalsUserId
@@ -524,7 +524,7 @@ 
 {
     $rows = DB::query(
         'SELECT *
-        FROM ' . prefixTable('roles_values') . '
+        FROM ' . prefixTable('roles_values').'
         WHERE type IN %ls'.(count($userRoles) > 0 ? ' AND role_id IN %li' : ''),
         ['W', 'ND', 'NE', 'NDNE', 'R'],
         $userRoles,
@@ -591,7 +591,7 @@ 
     ) {
         $persoFld = DB::queryFirstRow(
             'SELECT id
-            FROM ' . prefixTable('nested_tree') . '
+            FROM ' . prefixTable('nested_tree').'
             WHERE title = %s AND personal_folder = %i'.
             (count($allowedFolders) > 0 ? ' AND id NOT IN ('.implode(',', $allowedFolders).')' : ''),
             $globalsUserId,
@@ -624,7 +624,7 @@ 
     }
     $persoFlds = DB::query(
         'SELECT id
-        FROM ' . prefixTable('nested_tree') . '
+        FROM ' . prefixTable('nested_tree').'
         WHERE %l',
         $where
     );
@@ -692,12 +692,12 @@ 
     //Load Tree
     $tree = new NestedTree(prefixTable('nested_tree'), 'id', 'parent_id', 'title');
     // truncate table
-    DB::query('TRUNCATE TABLE ' . prefixTable('cache'));
+    DB::query('TRUNCATE TABLE '.prefixTable('cache'));
     // reload date
     $rows = DB::query(
         'SELECT *
-        FROM ' . prefixTable('items') . ' as i
-        INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id)
+        FROM ' . prefixTable('items').' as i
+        INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id)
         AND l.action = %s
         AND i.inactif = %i',
         'at_creation',
@@ -709,18 +709,18 @@ 
             $tags = '';
             $itemTags = DB::query(
                 'SELECT tag
-                FROM ' . prefixTable('tags') . '
+                FROM ' . prefixTable('tags').'
                 WHERE item_id = %i AND tag != ""',
                 $record['id']
             );
             foreach ($itemTags as $itemTag) {
-                $tags .= $itemTag['tag'] . ' ';
+                $tags .= $itemTag['tag'].' ';
             }
 
             // Get renewal period
             $resNT = DB::queryFirstRow(
                 'SELECT renewal_period
-                FROM ' . prefixTable('nested_tree') . '
+                FROM ' . prefixTable('nested_tree').'
                 WHERE id = %i',
                 $record['id_tree']
             );
@@ -733,7 +733,7 @@ 
                     // Is this a User id?
                     $user = DB::queryFirstRow(
                         'SELECT login
-                        FROM ' . prefixTable('users') . '
+                        FROM ' . prefixTable('users').'
                         WHERE id = %i',
                         $elem->title
                     );
@@ -751,11 +751,11 @@ 
                     'id' => $record['id'],
                     'label' => $record['label'],
                     'description' => $record['description'] ?? '',
-                    'url' => isset($record['url']) && ! empty($record['url']) ? $record['url'] : '0',
+                    'url' => isset($record['url']) && !empty($record['url']) ? $record['url'] : '0',
                     'tags' => $tags,
                     'id_tree' => $record['id_tree'],
                     'perso' => $record['perso'],
-                    'restricted_to' => isset($record['restricted_to']) && ! empty($record['restricted_to']) ? $record['restricted_to'] : '0',
+                    'restricted_to' => isset($record['restricted_to']) && !empty($record['restricted_to']) ? $record['restricted_to'] : '0',
                     'login' => $record['login'] ?? '',
                     'folder' => implode(' » ', $folder),
                     'author' => $record['id_user'],
@@ -784,7 +784,7 @@ 
     // get new value from db
     $data = DB::queryFirstRow(
         'SELECT label, description, id_tree, perso, restricted_to, login, url
-        FROM ' . prefixTable('items') . '
+        FROM ' . prefixTable('items').'
         WHERE id=%i',
         $ident
     );
@@ -792,12 +792,12 @@ 
     $tags = '';
     $itemTags = DB::query(
         'SELECT tag
-            FROM ' . prefixTable('tags') . '
+            FROM ' . prefixTable('tags').'
             WHERE item_id = %i AND tag != ""',
         $ident
     );
     foreach ($itemTags as $itemTag) {
-        $tags .= $itemTag['tag'] . ' ';
+        $tags .= $itemTag['tag'].' ';
     }
     // form id_tree to full foldername
     $folder = [];
@@ -808,7 +808,7 @@ 
             // Is this a User id?
             $user = DB::queryFirstRow(
                 'SELECT id, login
-                FROM ' . prefixTable('users') . '
+                FROM ' . prefixTable('users').'
                 WHERE id = %i',
                 $elem->title
             );
@@ -826,10 +826,10 @@ 
             'label' => $data['label'],
             'description' => $data['description'],
             'tags' => $tags,
-            'url' => isset($data['url']) && ! empty($data['url']) ? $data['url'] : '0',
+            'url' => isset($data['url']) && !empty($data['url']) ? $data['url'] : '0',
             'id_tree' => $data['id_tree'],
             'perso' => $data['perso'],
-            'restricted_to' => isset($data['restricted_to']) && ! empty($data['restricted_to']) ? $data['restricted_to'] : '0',
+            'restricted_to' => isset($data['restricted_to']) && !empty($data['restricted_to']) ? $data['restricted_to'] : '0',
             'login' => $data['login'] ?? '',
             'folder' => implode(' » ', $folder),
             'author' => $session->get('user-id'),
@@ -859,8 +859,8 @@ 
     // get new value from db
     $data = DB::queryFirstRow(
         'SELECT i.label, i.description, i.id_tree as id_tree, i.perso, i.restricted_to, i.id, i.login, i.url, l.date
-        FROM ' . prefixTable('items') . ' as i
-        INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id)
+        FROM ' . prefixTable('items').' as i
+        INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id)
         WHERE i.id = %i
         AND l.action = %s',
         $ident,
@@ -870,12 +870,12 @@ 
     $tags = '';
     $itemTags = DB::query(
         'SELECT tag
-            FROM ' . prefixTable('tags') . '
+            FROM ' . prefixTable('tags').'
             WHERE item_id = %i AND tag != ""',
         $ident
     );
     foreach ($itemTags as $itemTag) {
-        $tags .= $itemTag['tag'] . ' ';
+        $tags .= $itemTag['tag'].' ';
     }
     // form id_tree to full foldername
     $folder = [];
@@ -886,7 +886,7 @@ 
             // Is this a User id?
             $user = DB::queryFirstRow(
                 'SELECT id, login
-                FROM ' . prefixTable('users') . '
+                FROM ' . prefixTable('users').'
                 WHERE id = %i',
                 $elem->title
             );
@@ -905,7 +905,7 @@ 
             'label' => $data['label'],
             'description' => $data['description'],
             'tags' => empty($tags) === false ? $tags : 'None',
-            'url' => isset($data['url']) && ! empty($data['url']) ? $data['url'] : '0',
+            'url' => isset($data['url']) && !empty($data['url']) ? $data['url'] : '0',
             'id_tree' => $data['id_tree'],
             'perso' => isset($data['perso']) && empty($data['perso']) === false && $data['perso'] !== 'None' ? $data['perso'] : '0',
             'restricted_to' => isset($data['restricted_to']) && empty($data['restricted_to']) === false ? $data['restricted_to'] : '0',
@@ -927,53 +927,53 @@ 
 function getStatisticsData(array $SETTINGS): array
 {
     DB::query(
-        'SELECT id FROM ' . prefixTable('nested_tree') . ' WHERE personal_folder = %i',
+        'SELECT id FROM '.prefixTable('nested_tree').' WHERE personal_folder = %i',
         0
     );
     $counter_folders = DB::count();
     DB::query(
-        'SELECT id FROM ' . prefixTable('nested_tree') . ' WHERE personal_folder = %i',
+        'SELECT id FROM '.prefixTable('nested_tree').' WHERE personal_folder = %i',
         1
     );
     $counter_folders_perso = DB::count();
     DB::query(
-        'SELECT id FROM ' . prefixTable('items') . ' WHERE perso = %i',
+        'SELECT id FROM '.prefixTable('items').' WHERE perso = %i',
         0
     );
     $counter_items = DB::count();
         DB::query(
-        'SELECT id FROM ' . prefixTable('items') . ' WHERE perso = %i',
+        'SELECT id FROM '.prefixTable('items').' WHERE perso = %i',
         1
     );
     $counter_items_perso = DB::count();
         DB::query(
-        'SELECT id FROM ' . prefixTable('users') . ' WHERE login NOT IN (%s, %s, %s)',
+        'SELECT id FROM '.prefixTable('users').' WHERE login NOT IN (%s, %s, %s)',
         'OTV', 'TP', 'API'
     );
     $counter_users = DB::count();
         DB::query(
-        'SELECT id FROM ' . prefixTable('users') . ' WHERE admin = %i',
+        'SELECT id FROM '.prefixTable('users').' WHERE admin = %i',
         1
     );
     $admins = DB::count();
     DB::query(
-        'SELECT id FROM ' . prefixTable('users') . ' WHERE gestionnaire = %i',
+        'SELECT id FROM '.prefixTable('users').' WHERE gestionnaire = %i',
         1
     );
     $managers = DB::count();
     DB::query(
-        'SELECT id FROM ' . prefixTable('users') . ' WHERE read_only = %i',
+        'SELECT id FROM '.prefixTable('users').' WHERE read_only = %i',
         1
     );
     $readOnly = DB::count();
     // list the languages
     $usedLang = [];
     $tp_languages = DB::query(
-        'SELECT name FROM ' . prefixTable('languages')
+        'SELECT name FROM '.prefixTable('languages')
     );
     foreach ($tp_languages as $tp_language) {
         DB::query(
-            'SELECT * FROM ' . prefixTable('users') . ' WHERE user_language = %s',
+            'SELECT * FROM '.prefixTable('users').' WHERE user_language = %s',
             $tp_language['name']
         );
         $usedLang[$tp_language['name']] = round((DB::count() * 100 / $counter_users), 0);
@@ -982,12 +982,12 @@ 
     // get list of ips
     $usedIp = [];
     $tp_ips = DB::query(
-        'SELECT user_ip FROM ' . prefixTable('users')
+        'SELECT user_ip FROM '.prefixTable('users')
     );
     foreach ($tp_ips as $ip) {
         if (array_key_exists($ip['user_ip'], $usedIp)) {
             $usedIp[$ip['user_ip']] += $usedIp[$ip['user_ip']];
-        } elseif (! empty($ip['user_ip']) && $ip['user_ip'] !== 'none') {
+        } elseif (!empty($ip['user_ip']) && $ip['user_ip'] !== 'none') {
             $usedIp[$ip['user_ip']] = 1;
         }
     }
@@ -1082,7 +1082,7 @@ 
         <table width="600" cellpadding="0" cellspacing="0" border="0" class="container" bgcolor="#ffffff" style="border-spacing: 0; border-bottom: 1px solid #e0e0e0; box-shadow: 0 0 3px #ddd; color: #434343; font-family: Helvetica, Verdana, sans-serif;">
         <tr><td class="container-padding" bgcolor="#ffffff" style="border-collapse: collapse; border-left: 1px solid #e0e0e0; background-color: #ffffff; padding-left: 30px; padding-right: 30px;">
         <br><div style="float:right;">' .
-        $textMail .
+        $textMail.
         '<br><br></td></tr></table>
     </td></tr></table>
     <br></body></html>';
@@ -1163,7 +1163,7 @@ 
 {
     array_walk_recursive(
         $array,
-        static function (&$item): void {
+        static function(&$item): void {
             if (mb_detect_encoding((string) $item, 'utf-8', true) === false) {
                 $item = mb_convert_encoding($item, 'ISO-8859-1', 'UTF-8');
             }
@@ -1274,7 +1274,7 @@ 
  */
 function prefixTable(string $table): string
 {
-    $safeTable = htmlspecialchars(DB_PREFIX . $table);
+    $safeTable = htmlspecialchars(DB_PREFIX.$table);
     return $safeTable;
 }
 
@@ -1391,7 +1391,7 @@ 
 function send_syslog($message, $host, $port, $component = 'teampass'): void
 {
     $sock = socket_create(AF_INET, SOCK_DGRAM, SOL_UDP);
-    $syslog_message = '<123>' . date('M d H:i:s ') . $component . ': ' . $message;
+    $syslog_message = '<123>'.date('M d H:i:s ').$component.': '.$message;
     socket_sendto($sock, (string) $syslog_message, strlen($syslog_message), 0, (string) $host, (int) $port);
     socket_close($sock);
 }
@@ -1438,14 +1438,14 @@ 
     if (isset($SETTINGS['syslog_enable']) === true && (int) $SETTINGS['syslog_enable'] === 1) {
         if ($type === 'user_mngt') {
             send_syslog(
-                'action=' . str_replace('at_', '', $label) . ' attribute=user user=' . $who . ' userid="' . $login . '" change="' . $field_1 . '" ',
+                'action='.str_replace('at_', '', $label).' attribute=user user='.$who.' userid="'.$login.'" change="'.$field_1.'" ',
                 $SETTINGS['syslog_host'],
                 $SETTINGS['syslog_port'],
                 'teampass'
             );
         } else {
             send_syslog(
-                'action=' . $type . ' attribute=' . $label . ' user=' . $who . ' userid="' . $login . '" ',
+                'action='.$type.' attribute='.$label.' user='.$who.' userid="'.$login.'" ',
                 $SETTINGS['syslog_host'],
                 $SETTINGS['syslog_port'],
                 'teampass'
@@ -1520,7 +1520,7 @@ 
         if (empty($item_label) === true) {
             $dataItem = DB::queryFirstRow(
                 'SELECT id, id_tree, label
-                FROM ' . prefixTable('items') . '
+                FROM ' . prefixTable('items').'
                 WHERE id = %i',
                 $item_id
             );
@@ -1528,11 +1528,11 @@ 
         }
 
         send_syslog(
-            'action=' . str_replace('at_', '', $action) .
-                ' attribute=' . str_replace('at_', '', $attribute[0]) .
-                ' itemno=' . $item_id .
-                ' user=' . (is_null($login) === true ? '' : addslashes((string) $login)) .
-                ' itemname="' . addslashes($item_label) . '"',
+            'action='.str_replace('at_', '', $action).
+                ' attribute='.str_replace('at_', '', $attribute[0]).
+                ' itemno='.$item_id.
+                ' user='.(is_null($login) === true ? '' : addslashes((string) $login)).
+                ' itemname="'.addslashes($item_label).'"',
             $SETTINGS['syslog_host'],
             $SETTINGS['syslog_port'],
             'teampass'
@@ -1563,8 +1563,8 @@ 
     // send email to user that what to be notified
     $notification = DB::queryFirstField(
         'SELECT email
-        FROM ' . prefixTable('notification') . ' AS n
-        INNER JOIN ' . prefixTable('users') . ' AS u ON (n.user_id = u.id)
+        FROM ' . prefixTable('notification').' AS n
+        INNER JOIN ' . prefixTable('users').' AS u ON (n.user_id = u.id)
         WHERE n.item_id = %i AND n.user_id != %i',
         $item_id,
         $globalsUserId
@@ -1575,7 +1575,7 @@ 
         // Get list of changes
         $htmlChanges = '<ul>';
         foreach ($changes as $change) {
-            $htmlChanges .= '<li>' . $change . '</li>';
+            $htmlChanges .= '<li>'.$change.'</li>';
         }
         $htmlChanges .= '</ul>';
         // send email
@@ -1612,15 +1612,15 @@ 
     $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($label) === false) {
-        return empty($path) === true ? addslashes($label) : addslashes($label) . ' (' . $path . ')';
+        return empty($path) === true ? addslashes($label) : addslashes($label).' ('.$path.')';
     }
     return empty($path) === true ? '' : $path;
 }
@@ -1676,7 +1676,7 @@ 
 {
     // Perform a copy if the file exists
     if (file_exists($configFilePath)) {
-        $backupFilePath = $configFilePath . '.' . date('Y_m_d_His', time());
+        $backupFilePath = $configFilePath.'.'.date('Y_m_d_His', time());
         if (!copy($configFilePath, $backupFilePath)) {
             return "ERROR: Could not copy file '$configFilePath'";
         }
@@ -1684,10 +1684,10 @@ 
 
     // Regenerate the config file
     $data = ["<?php\n", "global \$SETTINGS;\n", "\$SETTINGS = array (\n"];
-    $rows = DB::query('SELECT * FROM ' . prefixTable('misc') . ' WHERE type=%s', 'admin');
+    $rows = DB::query('SELECT * FROM '.prefixTable('misc').' WHERE type=%s', 'admin');
     foreach ($rows as $record) {
         $value = getEncryptedValue($record['valeur'], $record['is_encrypted']);
-        $data[] = "    '{$record['intitule']}' => '". htmlspecialchars_decode($value, ENT_COMPAT) . "',\n";
+        $data[] = "    '{$record['intitule']}' => '".htmlspecialchars_decode($value, ENT_COMPAT)."',\n";
     }
     $data[] = ");\n";
     $data = array_unique($data);
@@ -1732,7 +1732,7 @@ 
 {
     global $SETTINGS;
     /* LOAD CPASSMAN SETTINGS */
-    if (! isset($SETTINGS['loaded']) || $SETTINGS['loaded'] !== 1) {
+    if (!isset($SETTINGS['loaded']) || $SETTINGS['loaded'] !== 1) {
         $SETTINGS = [];
         $SETTINGS['duplicate_folder'] = 0;
         //by default, this is set to 0;
@@ -1742,7 +1742,7 @@ 
         //by default, this value is set to 5;
         $settings = [];
         $rows = DB::query(
-            'SELECT * FROM ' . prefixTable('misc') . ' WHERE type=%s_type OR type=%s_type2',
+            'SELECT * FROM '.prefixTable('misc').' WHERE type=%s_type OR type=%s_type2',
             [
                 'type' => 'admin',
                 'type2' => 'settings',
@@ -1774,7 +1774,7 @@ 
     $source_cf = [];
     $rows = DB::query(
         'SELECT id_category
-            FROM ' . prefixTable('categories_folders') . '
+            FROM ' . prefixTable('categories_folders').'
             WHERE id_folder = %i',
         $source_id
     );
@@ -1785,7 +1785,7 @@ 
     $target_cf = [];
     $rows = DB::query(
         'SELECT id_category
-            FROM ' . prefixTable('categories_folders') . '
+            FROM ' . prefixTable('categories_folders').'
             WHERE id_folder = %i',
         $target_id
     );
@@ -1880,10 +1880,10 @@ 
     } catch (CryptoException\WrongKeyOrModifiedCiphertextException $ex) {
         $err = 'wrong_key';
     } catch (CryptoException\EnvironmentIsBrokenException $ex) {
-        error_log('TEAMPASS-Error-Environment: ' . $ex->getMessage());
+        error_log('TEAMPASS-Error-Environment: '.$ex->getMessage());
         $err = 'environment_error';
     } catch (CryptoException\IOException $ex) {
-        error_log('TEAMPASS-Error-General: ' . $ex->getMessage());
+        error_log('TEAMPASS-Error-General: '.$ex->getMessage());
         $err = 'general_error';
     }
 
@@ -1915,10 +1915,10 @@ 
     } catch (CryptoException\WrongKeyOrModifiedCiphertextException $ex) {
         $err = 'wrong_key';
     } catch (CryptoException\EnvironmentIsBrokenException $ex) {
-        error_log('TEAMPASS-Error-Environment: ' . $ex->getMessage());
+        error_log('TEAMPASS-Error-Environment: '.$ex->getMessage());
         $err = 'environment_error';
     } catch (CryptoException\IOException $ex) {
-        error_log('TEAMPASS-Error-General: ' . $ex->getMessage());
+        error_log('TEAMPASS-Error-General: '.$ex->getMessage());
         $err = 'general_error';
     }
 
@@ -2004,7 +2004,7 @@ 
 ) {
     // Check if the path exists
     $path = basename($path);
-    if (! file_exists($path)) {
+    if (!file_exists($path)) {
         return false;
     }
 
@@ -2057,7 +2057,7 @@ 
     // Load item data
     $data = DB::queryFirstRow(
         'SELECT id_tree
-        FROM ' . prefixTable('items') . '
+        FROM ' . prefixTable('items').'
         WHERE id = %i',
         $item_id
     );
@@ -2120,7 +2120,7 @@ 
         }
         $host .= substr(explode(".", $email[1])[0], -1, 1);
     }
-    $email = $name . "@" . $host . "." . explode(".", $email[1])[1];
+    $email = $name."@".$host.".".explode(".", $email[1])[1];
     return $email;
 }
 
@@ -2151,11 +2151,11 @@ 
 function formatSizeUnits(int $bytes): string
 {
     if ($bytes >= 1073741824) {
-        $bytes = number_format($bytes / 1073741824, 2) . ' GB';
+        $bytes = number_format($bytes / 1073741824, 2).' GB';
     } elseif ($bytes >= 1048576) {
-        $bytes = number_format($bytes / 1048576, 2) . ' MB';
+        $bytes = number_format($bytes / 1048576, 2).' MB';
     } elseif ($bytes >= 1024) {
-        $bytes = number_format($bytes / 1024, 2) . ' KB';
+        $bytes = number_format($bytes / 1024, 2).' KB';
     } elseif ($bytes > 1) {
         $bytes .= ' bytes';
     } elseif ($bytes === 1) {
@@ -2322,7 +2322,7 @@ 
  */
 function generateKeyIntegrityHash(string $userSeed, string $publicKey, string $serverSecret): string
 {
-    return hash_hmac('sha256', $userSeed . $publicKey, $serverSecret);
+    return hash_hmac('sha256', $userSeed.$publicKey, $serverSecret);
 }
 
 /**
@@ -2397,7 +2397,7 @@ 
                 'security_alert',
                 'key_integrity_check_failed',
                 (string) $userInfo['id'],
-                'User: ' . $userInfo['login']
+                'User: '.$userInfo['login']
             );
             return [
                 'success' => false,
@@ -2444,7 +2444,7 @@ 
             'user_connection',
             'auto_reencryption_success',
             (string) $userInfo['id'],
-            'User: ' . $userInfo['login']
+            'User: '.$userInfo['login']
         );
 
         // Store in session for immediate use
@@ -2463,12 +2463,12 @@ 
             'security_alert',
             'auto_reencryption_failed',
             (string) $userInfo['id'],
-            'User: ' . $userInfo['login'] . ' - Error: ' . $e->getMessage()
+            'User: '.$userInfo['login'].' - Error: '.$e->getMessage()
         );
 
         return [
             'success' => false,
-            'error' => 'decryption_failed: ' . $e->getMessage(),
+            'error' => 'decryption_failed: '.$e->getMessage(),
             'private_key_clear' => '',
         ];
     }
@@ -2539,7 +2539,7 @@ 
         'security_alert',
         'auto_reencryption_critical_failure',
         (string) $userId,
-        'User: ' . $userInfo['login'] . ' - disabled due to key recovery failure'
+        'User: '.$userInfo['login'].' - disabled due to key recovery failure'
     );
 
     return false;
@@ -2697,7 +2697,7 @@ 
     $cipher->enableContinuousBuffer();
 
     // Encrypt the file content
-    $filePath = filter_var($fileInPath . '/' . $fileInName, FILTER_SANITIZE_URL);
+    $filePath = filter_var($fileInPath.'/'.$fileInName, FILTER_SANITIZE_URL);
     $fileContent = file_get_contents($filePath);
     $plaintext = $fileContent;
     $ciphertext = $cipher->encrypt($plaintext);
@@ -2705,9 +2705,9 @@ 
     // Save new file
     // deepcode ignore InsecureHash: is simply used to get a unique name
     $hash = uniqid('', true);
-    $fileOut = $fileInPath . '/' . TP_FILE_PREFIX . $hash;
+    $fileOut = $fileInPath.'/'.TP_FILE_PREFIX.$hash;
     file_put_contents($fileOut, $ciphertext);
-    unlink($fileInPath . '/' . $fileInName);
+    unlink($fileInPath.'/'.$fileInName);
     return [
         'fileHash' => base64_encode($hash),
         'objectKey' => base64_encode($objectKey),
@@ -2723,9 +2723,9 @@ 
  *
  * @return string|array
  */
-function decryptFile(string $fileName, string $filePath, string $key): string|array
+function decryptFile(string $fileName, string $filePath, string $key): string | array
 {
-    if (! defined('FILE_BUFFER_SIZE')) {
+    if (!defined('FILE_BUFFER_SIZE')) {
         define('FILE_BUFFER_SIZE', 128 * 1024);
     }
     
@@ -2742,7 +2742,7 @@ 
     $cipher->enableContinuousBuffer();
     $cipher->disablePadding();
     // Get file content
-    $safeFilePath = realpath($filePath . '/' . TP_FILE_PREFIX . $safeFileName);
+    $safeFilePath = realpath($filePath.'/'.TP_FILE_PREFIX.$safeFileName);
     if ($safeFilePath !== false && file_exists($safeFilePath)) {
         $ciphertext = file_get_contents(filter_var($safeFilePath, FILTER_SANITIZE_URL));
     } else {
@@ -2838,7 +2838,7 @@ 
     }
     $users = DB::query(
         'SELECT id, public_key
-        FROM ' . prefixTable('users') . '
+        FROM ' . prefixTable('users').'
         WHERE id NOT IN %li
         AND public_key != ""',
         $user_ids
@@ -2847,7 +2847,7 @@ 
         // Insert in DB the new object key for this item by user
         if (count($objectKeyArray) === 0) {
             if (WIP === true) {
-                error_log('TEAMPASS Debug - storeUsersShareKey case1 - ' . $object_name . ' - ' . $post_object_id . ' - ' . $user['id']);
+                error_log('TEAMPASS Debug - storeUsersShareKey case1 - '.$object_name.' - '.$post_object_id.' - '.$user['id']);
             }
             
             insertOrUpdateSharekey(
@@ -2859,7 +2859,7 @@ 
         } else {
             foreach ($objectKeyArray as $object) {
                 if (WIP === true) {
-                    error_log('TEAMPASS Debug - storeUsersShareKey case2 - ' . $object_name . ' - ' . $object['objectId'] . ' - ' . $user['id']);
+                    error_log('TEAMPASS Debug - storeUsersShareKey case2 - '.$object_name.' - '.$object['objectId'].' - '.$user['id']);
                 }
                 
                 insertOrUpdateSharekey(
@@ -2891,7 +2891,7 @@ 
 ): bool {
     try {
         DB::query(
-            'INSERT INTO ' . $tableName . ' 
+            'INSERT INTO '.$tableName.' 
             (object_id, user_id, share_key) 
             VALUES (%i, %i, %s)
             ON DUPLICATE KEY UPDATE share_key = VALUES(share_key)',
@@ -2901,7 +2901,7 @@ 
         );
         return true;
     } catch (Exception $e) {
-        error_log('TEAMPASS Error - insertOrUpdateSharekey: ' . $e->getMessage());
+        error_log('TEAMPASS Error - insertOrUpdateSharekey: '.$e->getMessage());
         return false;
     }
 }
@@ -2916,7 +2916,7 @@ 
 function isBase64(string $str): bool
 {
     $str = (string) trim($str);
-    if (! isset($str[0])) {
+    if (!isset($str[0])) {
         return false;
     }
 
@@ -2990,7 +2990,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
         echo 'An error occurred.';
@@ -3007,7 +3007,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
         echo 'An error occurred.';
@@ -3043,7 +3043,7 @@ 
     // expect if personal item
     DB::delete(
         prefixTable('sharekeys_items'),
-        'user_id = %i',// AND object_id NOT IN (SELECT i.id FROM ' . prefixTable('items') . ' AS i WHERE i.perso = 1)'',
+        'user_id = %i', // AND object_id NOT IN (SELECT i.id FROM ' . prefixTable('items') . ' AS i WHERE i.perso = 1)'',
         $userId
     );
     // Remove all item sharekeys files
@@ -3067,7 +3067,7 @@ 
     // Remove all item sharekeys suggestions
     DB::delete(
         prefixTable('sharekeys_suggestions'),
-        'user_id = %i',// AND object_id NOT IN (SELECT i.id FROM ' . prefixTable('items') . ' AS i WHERE i.perso = 1)',
+        'user_id = %i', // AND object_id NOT IN (SELECT i.id FROM ' . prefixTable('items') . ' AS i WHERE i.perso = 1)',
         $userId
     );
     return false;
@@ -3088,7 +3088,7 @@ 
         foreach (DateTimeZone::listIdentifiers() as $timezone) {
             $now->setTimezone(new DateTimeZone($timezone));
             $offsets[] = $offset = $now->getOffset();
-            $timezones[$timezone] = '(' . format_GMT_offset($offset) . ') ' . format_timezone_name($timezone);
+            $timezones[$timezone] = '('.format_GMT_offset($offset).') '.format_timezone_name($timezone);
         }
 
         array_multisort($offsets, $timezones);
@@ -3108,7 +3108,7 @@ 
 {
     $hours = intval($offset / 3600);
     $minutes = abs(intval($offset % 3600 / 60));
-    return 'GMT' . ($offset ? sprintf('%+03d:%02d', $hours, $minutes) : '');
+    return 'GMT'.($offset ? sprintf('%+03d:%02d', $hours, $minutes) : '');
 }
 
 /**
@@ -3207,8 +3207,7 @@ 
 {
     if (isset($array[$key]) === true
         && (is_int($value) === true ?
-            (int) $array[$key] === $value :
-            (string) $array[$key] === $value)
+            (int) $array[$key] === $value : (string) $array[$key] === $value)
     ) {
         return true;
     }
@@ -3230,8 +3229,7 @@ 
 {
     if (isset($var) === false
         || (is_int($value) === true ?
-            (int) $var === $value :
-            (string) $var === $value)
+            (int) $var === $value : (string) $var === $value)
     ) {
         return true;
     }
@@ -3282,7 +3280,7 @@ 
  */
 function isSetArrayOfValues(array $arrayOfValues): bool
 {
-    foreach($arrayOfValues as $value) {
+    foreach ($arrayOfValues as $value) {
         if (isset($value) === false) {
             return false;
         }
@@ -3304,7 +3302,7 @@ 
     /*PHP8 - integer|string*/$value
 ) : bool
 {
-    foreach($arrayOfVars as $variable) {
+    foreach ($arrayOfVars as $variable) {
         if ($variable !== $value) {
             return false;
         }
@@ -3324,7 +3322,7 @@ 
     /*PHP8 - integer|string*/$value
 ) : bool
 {
-    foreach($arrayOfVars as $variable) {
+    foreach ($arrayOfVars as $variable) {
         if ($variable === $value) {
             return true;
         }
@@ -3338,7 +3336,7 @@ 
  * @param string|int|null $value
  * @return boolean
  */
-function isValueSetNullEmpty(string|int|null $value) : bool
+function isValueSetNullEmpty(string | int | null $value) : bool
 {
     if (is_null($value) === true || empty($value) === true) {
         return true;
@@ -3393,7 +3391,7 @@ 
  * @param array     $filters
  * @return array|string
  */
-function dataSanitizer(array $data, array $filters): array|string
+function dataSanitizer(array $data, array $filters): array | string
 {
     // Load Sanitizer library
     $sanitizer = new Sanitizer($data, $filters);
@@ -3422,7 +3420,7 @@ 
     // Exists ?
     $userCacheId = DB::queryFirstRow(
         'SELECT increment_id
-        FROM ' . prefixTable('cache_tree') . '
+        FROM ' . prefixTable('cache_tree').'
         WHERE user_id = %i',
         $user_id
     );
@@ -3473,7 +3471,7 @@ 
  */
 function pourcentage(float $nombre, float $total, float $pourcentage): float
 { 
-    $resultat = ($nombre/$total) * $pourcentage;
+    $resultat = ($nombre / $total) * $pourcentage;
     return round($resultat);
 }
 
@@ -3503,7 +3501,7 @@ 
 
     // Get last folder update
     $lastFolderChange = DB::queryFirstRow(
-        'SELECT valeur FROM ' . prefixTable('misc') . '
+        'SELECT valeur FROM '.prefixTable('misc').'
         WHERE type = %s AND intitule = %s',
         'timestamp',
         'last_folder_change'
@@ -3524,7 +3522,7 @@ 
     // Does this user has a tree cache
     $userCacheTree = DB::queryFirstRow(
         'SELECT '.$fieldName.'
-        FROM ' . prefixTable('cache_tree') . '
+        FROM ' . prefixTable('cache_tree').'
         WHERE user_id = %i',
         $session->get('user-id')
     );
@@ -3562,7 +3560,7 @@ 
     if (count($folderIds) === 0) {
         $folderIds = DB::queryFirstColumn(
             'SELECT id
-            FROM ' . prefixTable('nested_tree') . '
+            FROM ' . prefixTable('nested_tree').'
             WHERE personal_folder=%i',
             0
         );
@@ -3579,8 +3577,8 @@ 
         $rows_tmp = DB::query(
             'SELECT c.id, c.title, c.level, c.type, c.masked, c.order, c.encrypted_data, c.role_visibility, c.is_mandatory,
             f.id_category AS category_id
-            FROM ' . prefixTable('categories_folders') . ' AS f
-            INNER JOIN ' . prefixTable('categories') . ' AS c ON (f.id_category = c.parent_id)
+            FROM ' . prefixTable('categories_folders').' AS f
+            INNER JOIN ' . prefixTable('categories').' AS c ON (f.id_category = c.parent_id)
             WHERE id_folder=%i',
             $folder
         );
@@ -3606,7 +3604,7 @@ 
         $valTemp = '';
         $data = DB::queryFirstRow(
             'SELECT valeur
-            FROM ' . prefixTable('misc') . '
+            FROM ' . prefixTable('misc').'
             WHERE type = %s AND intitule=%i',
             'complex',
             $folder
@@ -3623,14 +3621,14 @@ 
         $valTemp = '';
         $rows_tmp = 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',
             $folder
         );
         foreach ($rows_tmp as $record) {
-            $valTemp .= (empty($valTemp) === true ? '' : ' - ') . $record['title'];
+            $valTemp .= (empty($valTemp) === true ? '' : ' - ').$record['title'];
         }
         $arr_data['visibilityRoles'] = $valTemp;
 
@@ -3664,8 +3662,8 @@ 
         $rows = DB::query(
             'SELECT u.id,
             GROUP_CONCAT(ur.role_id ORDER BY ur.role_id SEPARATOR ";") AS fonction_id
-            FROM ' . prefixTable('users') . ' AS u
-            INNER JOIN ' . prefixTable('users_roles') . ' AS ur 
+            FROM ' . prefixTable('users').' AS u
+            INNER JOIN ' . prefixTable('users_roles').' AS ur 
                 ON ur.user_id = u.id AND ur.source = "manual"
             WHERE u.id != %i AND u.admin = 0
             GROUP BY u.id',
@@ -3699,7 +3697,7 @@ 
 
     $val = DB::queryFirstRow(
         'SELECT *
-        FROM ' . prefixTable('users') . '
+        FROM ' . prefixTable('users').'
         WHERE id = %i',
         $userId
     );
@@ -3715,12 +3713,12 @@ 
 function upgradeRequired(): bool
 {
     // Get settings.php
-    include_once __DIR__. '/../includes/config/settings.php';
+    include_once __DIR__.'/../includes/config/settings.php';
 
     // Get timestamp in DB
     $val = DB::queryFirstRow(
         'SELECT valeur
-        FROM ' . prefixTable('misc') . '
+        FROM ' . prefixTable('misc').'
         WHERE type = %s AND intitule = %s',
         'admin',
         'upgrade_timestamp'
@@ -3773,7 +3771,7 @@ 
     // prepapre background tasks for item keys generation        
     $userTP = DB::queryFirstRow(
         'SELECT pw, public_key, private_key
-        FROM ' . prefixTable('users') . '
+        FROM ' . prefixTable('users').'
         WHERE id = %i',
         TP_USER_ID
     );
@@ -3834,7 +3832,7 @@ 
     }
 
     // Generate new keys
-    if ($user_self_change === true && empty($recovery_public_key) === false && empty($recovery_private_key) === false){
+    if ($user_self_change === true && empty($recovery_public_key) === false && empty($recovery_private_key) === false) {
         $userKeys = [
             'public_key' => $recovery_public_key,
             'private_key_clear' => $recovery_private_key,
@@ -3885,8 +3883,8 @@ 
             'process_type' => 'create_user_keys',
             'arguments' => json_encode([
                 'new_user_id' => (int) $userId,
-                'new_user_pwd' => cryption($passwordClear, '','encrypt')['string'],
-                'new_user_code' => cryption(empty($encryptionKey) === true ? uniqidReal(20) : $encryptionKey, '','encrypt')['string'],
+                'new_user_pwd' => cryption($passwordClear, '', 'encrypt')['string'],
+                'new_user_code' => cryption(empty($encryptionKey) === true ? uniqidReal(20) : $encryptionKey, '', 'encrypt')['string'],
                 'owner_id' => (int) TP_USER_ID,
                 'creator_pwd' => $userTP['pw'],
                 'send_email' => $sendEmailToUser === true ? 1 : 0,
@@ -3958,19 +3956,19 @@ 
 
     // Prepare the subtask queries
     $queries = [
-        'step20' => 'SELECT * FROM ' . prefixTable('items'),
+        'step20' => 'SELECT * FROM '.prefixTable('items'),
 
-        'step30' => 'SELECT * FROM ' . prefixTable('log_items') . 
+        'step30' => 'SELECT * FROM '.prefixTable('log_items'). 
                     ' WHERE raison LIKE "at_pw :%" AND encryption_type = "teampass_aes"',
 
-        'step40' => 'SELECT * FROM ' . prefixTable('categories_items') . 
+        'step40' => 'SELECT * FROM '.prefixTable('categories_items'). 
                     ' WHERE encryption_type = "teampass_aes"',
 
-        'step50' => 'SELECT * FROM ' . prefixTable('suggestion'),
+        'step50' => 'SELECT * FROM '.prefixTable('suggestion'),
 
-        'step60' => 'SELECT * FROM ' . prefixTable('files') . ' AS f
-                        INNER JOIN ' . prefixTable('items') . ' AS i ON i.id = f.id_item
-                        WHERE f.status = "' . TP_ENCRYPTION_NAME . '"'
+        'step60' => 'SELECT * FROM '.prefixTable('files').' AS f
+                        INNER JOIN ' . prefixTable('items').' AS i ON i.id = f.id_item
+                        WHERE f.status = "' . TP_ENCRYPTION_NAME.'"'
     ];
 
     // Perform loop on $queries to create sub-tasks
@@ -4160,7 +4158,7 @@ 
  */
 function createTaskForItem(
     string $processType,
-    string|array $taskName,
+    string | array $taskName,
     int $itemId,
     int $userId,
     string $objectKey,
@@ -4184,7 +4182,7 @@ 
                 'object_key' => $objectKey,
                 'author' => (int) $userId,
             ]),
-            'item_id' => (int) $parentId !== -1 ?  $parentId : null,
+            'item_id' => (int) $parentId !== -1 ? $parentId : null,
         )
     );
     $processId = DB::insertId();
@@ -4194,7 +4192,7 @@ 
     if (is_array($taskName) === false) {
         $taskName = [$taskName];
     }
-    foreach($taskName as $task) {
+    foreach ($taskName as $task) {
         if (WIP === true) error_log('createTaskForItem - task: '.$task);
         switch ($task) {
             case 'item_password':
@@ -4291,7 +4289,7 @@ 
  * @param integer $user_id
  * @return void
  */
-function purgeUnnecessaryKeys(bool $allUsers = true, int $user_id=0)
+function purgeUnnecessaryKeys(bool $allUsers = true, int $user_id = 0)
 {
     if ($allUsers === true) {
         // Load class DB
@@ -4301,7 +4299,7 @@ 
 
         $users = DB::query(
             'SELECT id
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id NOT IN ('.OTV_USER_ID.', '.TP_USER_ID.', '.SSH_USER_ID.', '.API_USER_ID.')
             ORDER BY login ASC'
         );
@@ -4319,7 +4317,7 @@ 
  * @param integer $user_id
  * @return void
  */
-function purgeUnnecessaryKeysForUser(int $user_id=0)
+function purgeUnnecessaryKeysForUser(int $user_id = 0)
 {
     if ($user_id === 0) {
         return;
@@ -4330,8 +4328,8 @@ 
 
     $personalItems = DB::queryFirstColumn(
         'SELECT id
-        FROM ' . prefixTable('items') . ' AS i
-        INNER JOIN ' . prefixTable('log_items') . ' AS li ON li.id_item = i.id
+        FROM ' . prefixTable('items').' AS i
+        INNER JOIN ' . prefixTable('log_items').' AS li ON li.id_item = i.id
         WHERE i.perso = 1 AND li.action = "at_creation" AND li.id_user IN (%i, '.TP_USER_ID.')',
         $user_id
     );
@@ -4341,28 +4339,28 @@ 
             prefixTable('sharekeys_items'),
             'object_id IN %li AND user_id NOT IN %ls',
             $personalItems,
-            [$user_id, TP_USER_ID, API_USER_ID, OTV_USER_ID,SSH_USER_ID]
+            [$user_id, TP_USER_ID, API_USER_ID, OTV_USER_ID, SSH_USER_ID]
         );
         // Files keys
         DB::delete(
             prefixTable('sharekeys_files'),
             'object_id IN %li AND user_id NOT IN %ls',
             $personalItems,
-            [$user_id, TP_USER_ID, API_USER_ID, OTV_USER_ID,SSH_USER_ID]
+            [$user_id, TP_USER_ID, API_USER_ID, OTV_USER_ID, SSH_USER_ID]
         );
         // Fields keys
         DB::delete(
             prefixTable('sharekeys_fields'),
             'object_id IN %li AND user_id NOT IN %ls',
             $personalItems,
-            [$user_id, TP_USER_ID, API_USER_ID, OTV_USER_ID,SSH_USER_ID]
+            [$user_id, TP_USER_ID, API_USER_ID, OTV_USER_ID, SSH_USER_ID]
         );
         // Logs keys
         DB::delete(
             prefixTable('sharekeys_logs'),
             'object_id IN %li AND user_id NOT IN %ls',
             $personalItems,
-            [$user_id, TP_USER_ID, API_USER_ID, OTV_USER_ID,SSH_USER_ID]
+            [$user_id, TP_USER_ID, API_USER_ID, OTV_USER_ID, SSH_USER_ID]
         );
     }
 }
@@ -4380,7 +4378,7 @@ 
     // Check if user exists
     $userInfo = DB::queryFirstRow(
         'SELECT login
-        FROM ' . prefixTable('users') . '
+        FROM ' . prefixTable('users').'
         WHERE id = %i',
         $userId
     );
@@ -4389,7 +4387,7 @@ 
         $now = (int) time();
         // Prepare file content
         $export_value = file_get_contents(__DIR__."/../includes/core/teampass_ascii.txt")."\n".
-            "Generation date: ".date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], $now)."\n\n".
+            "Generation date: ".date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], $now)."\n\n".
             "RECOVERY KEYS - Not to be shared - To be store safely\n\n".
             "Public Key:\n".$session->get('user-public_key')."\n\n".
             "Private Key:\n".$session->get('user-private_key')."\n\n";
@@ -4412,7 +4410,7 @@ 
         return prepareExchangedData(
             array(
                 'error' => false,
-                'datetime' => date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], $now),
+                'datetime' => date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], $now),
                 'timestamp' => $now,
                 'content' => base64_encode($export_value),
                 'login' => $userInfo['login'],
@@ -4438,8 +4436,8 @@ 
  */
 function loadClasses(string $className = ''): void
 {
-    require_once __DIR__. '/../includes/config/include.php';
-    require_once __DIR__. '/../includes/config/settings.php';
+    require_once __DIR__.'/../includes/config/include.php';
+    require_once __DIR__.'/../includes/config/settings.php';
     require_once __DIR__.'/../vendor/autoload.php';
 
     if (defined('DB_PASSWD_CLEAR') === false) {
@@ -4652,7 +4650,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'];
 
@@ -4700,11 +4698,11 @@ 
         }
         
         // Alternative: serialize ou json selon le contexte
-        return get_class($value) . (method_exists($value, 'getId') ? '#' . $value->getId() : '');
+        return get_class($value).(method_exists($value, 'getId') ? '#'.$value->getId() : '');
     }
     
     if (is_resource($value)) {
-        return 'Resource#' . get_resource_id($value) . ' of type ' . get_resource_type($value);
+        return 'Resource#'.get_resource_id($value).' of type '.get_resource_type($value);
     }
     
     // Cas par défaut
@@ -4724,7 +4722,7 @@ 
     // Refuse access if user does not exist and/or is admin
     $user = DB::queryFirstRow(
         'SELECT admin
-        FROM ' . prefixTable('users') . '
+        FROM ' . prefixTable('users').'
         WHERE id = %i',
         $userId
     );
@@ -4735,8 +4733,8 @@ 
     // Get file info
     $file = DB::queryFirstRow(
         'SELECT f.id_item, i.id_tree
-        FROM ' . prefixTable('files') . ' as f
-        INNER JOIN ' . prefixTable('items') . ' AS i ON i.id = f.id_item
+        FROM ' . prefixTable('files').' as f
+        INNER JOIN ' . prefixTable('items').' AS i ON i.id = f.id_item
         WHERE f.id = %i',
         $fileId
     );
@@ -4745,7 +4743,7 @@ 
     }
 
     // Check if user has access to the item
-    include_once __DIR__. '/items.queries.php';
+    include_once __DIR__.'/items.queries.php';
     $itemAccess = getCurrentAccessRights(
         (int) filter_var($userId, FILTER_SANITIZE_NUMBER_INT),
         (int) filter_var($file['id_item'], FILTER_SANITIZE_NUMBER_INT),
@@ -4778,7 +4776,7 @@ 
     // Refuse access if user does not exist and/or is not admin
     $user = DB::queryFirstRow(
         'SELECT admin
-        FROM ' . prefixTable('users') . '
+        FROM ' . prefixTable('users').'
         WHERE id = %i',
         $userId
     );
@@ -4789,7 +4787,7 @@ 
     // Ensure that user has performed the backup
     DB::queryFirstRow(
         'SELECT f.id
-        FROM ' . prefixTable('log_system') . ' as f
+        FROM ' . prefixTable('log_system').' as f
         WHERE f.type = %s AND f.label = %s AND f.qui = %i AND f.field_1 = %s',
         'admin_action',
         'dataBase backup',
@@ -4816,7 +4814,7 @@ 
     // Refuse access if user does not exist and/or is admin
     $user = DB::queryFirstRow(
         'SELECT admin
-        FROM ' . prefixTable('users') . '
+        FROM ' . prefixTable('users').'
         WHERE id = %i',
         $userId
     );
@@ -4827,7 +4825,7 @@ 
     // Get item info
     $item = DB::queryFirstRow(
         'SELECT i.perso, i.id_tree
-        FROM ' . prefixTable('items') . ' as i
+        FROM ' . prefixTable('items').' as i
         WHERE i.id = %i',
         $itemId
     );
@@ -4838,7 +4836,7 @@ 
     // Get item owner
     $itemOwner = DB::queryFirstRow(
         'SELECT li.id_user
-        FROM ' . prefixTable('log_items') . ' as li
+        FROM ' . prefixTable('log_items').' as li
         WHERE li.id_item = %i AND li.action = %s',
         $itemId,
         'at_creation'
@@ -4852,25 +4850,25 @@ 
         prefixTable('sharekeys_items'),
         'object_id = %i AND user_id NOT IN %ls',
         $itemId,
-        [$userId, TP_USER_ID, API_USER_ID, OTV_USER_ID,SSH_USER_ID]
+        [$userId, TP_USER_ID, API_USER_ID, OTV_USER_ID, SSH_USER_ID]
     );
     DB::delete(
         prefixTable('sharekeys_files'),
         'object_id IN (SELECT id FROM '.prefixTable('files').' WHERE id_item = %i) AND user_id NOT IN %ls',
         $itemId,
-        [$userId, TP_USER_ID, API_USER_ID, OTV_USER_ID,SSH_USER_ID]
+        [$userId, TP_USER_ID, API_USER_ID, OTV_USER_ID, SSH_USER_ID]
     );
     DB::delete(
         prefixTable('sharekeys_fields'),
         'object_id IN (SELECT id FROM '.prefixTable('fields').' WHERE id_item = %i) AND user_id NOT IN %ls',
         $itemId,
-        [$userId, TP_USER_ID, API_USER_ID, OTV_USER_ID,SSH_USER_ID]
+        [$userId, TP_USER_ID, API_USER_ID, OTV_USER_ID, SSH_USER_ID]
     );
     DB::delete(
         prefixTable('sharekeys_logs'),
         'object_id IN (SELECT id FROM '.prefixTable('log_items').' WHERE id_item = %i) AND user_id NOT IN %ls',
         $itemId,
-        [$userId, TP_USER_ID, API_USER_ID, OTV_USER_ID,SSH_USER_ID]
+        [$userId, TP_USER_ID, API_USER_ID, OTV_USER_ID, SSH_USER_ID]
     );
 
     return true;
@@ -4942,7 +4940,7 @@ 
     
     // 2. Check if user actually has personal items to migrate
     $personalFolderId = DB::queryFirstField(
-        "SELECT id FROM ".prefixTable('nested_tree') ."
+        "SELECT id FROM ".prefixTable('nested_tree')."
          WHERE personal_folder = 1 
          AND title = %s",
         $userId
@@ -5022,8 +5020,8 @@ 
             'process_type' => 'migrate_user_personal_items',
             'arguments' => json_encode([
                 'user_id' => (int) $userId,
-                'user_pwd' => cryption($passwordClear, '','encrypt')['string'],
-                'user_private_key' => cryption($privateKeyDecrypted, '','encrypt')['string'],
+                'user_pwd' => cryption($passwordClear, '', 'encrypt')['string'],
+                'user_private_key' => cryption($privateKeyDecrypted, '', 'encrypt')['string'],
                 'personal_folders_ids' => $personalFolderIds,
             ]),
             'is_in_progress' => 0,
@@ -5052,19 +5050,19 @@ 
 {
     // Prepare the subtask queries
     $queries = [
-        'user-personal-items-migration-step10' => 'SELECT * FROM ' . prefixTable('items'),
+        'user-personal-items-migration-step10' => 'SELECT * FROM '.prefixTable('items'),
 
-        'user-personal-items-migration-step20' => 'SELECT * FROM ' . prefixTable('log_items') . 
+        'user-personal-items-migration-step20' => 'SELECT * FROM '.prefixTable('log_items'). 
                     ' WHERE raison LIKE "at_pw :%" AND encryption_type = "teampass_aes"',
 
-        'user-personal-items-migration-step30' => 'SELECT * FROM ' . prefixTable('categories_items') . 
+        'user-personal-items-migration-step30' => 'SELECT * FROM '.prefixTable('categories_items'). 
                     ' WHERE encryption_type = "teampass_aes"',
 
-        'user-personal-items-migration-step40' => 'SELECT * FROM ' . prefixTable('suggestion'),
+        'user-personal-items-migration-step40' => 'SELECT * FROM '.prefixTable('suggestion'),
 
-        'user-personal-items-migration-step50' => 'SELECT * FROM ' . prefixTable('files') . ' AS f
-                        INNER JOIN ' . prefixTable('items') . ' AS i ON i.id = f.id_item
-                        WHERE f.status = "' . TP_ENCRYPTION_NAME . '"'
+        'user-personal-items-migration-step50' => 'SELECT * FROM '.prefixTable('files').' AS f
+                        INNER JOIN ' . prefixTable('items').' AS i ON i.id = f.id_item
+                        WHERE f.status = "' . TP_ENCRYPTION_NAME.'"'
     ];
 
     // Perform loop on $queries to create sub-tasks
@@ -5097,7 +5095,7 @@ 
 {
     // 1. Insert or update the item with current timestamp
     DB::query(
-        'INSERT INTO ' . prefixTable('users_latest_items') . ' (user_id, item_id, accessed_at)
+        'INSERT INTO '.prefixTable('users_latest_items').' (user_id, item_id, accessed_at)
         VALUES (%i, %i, NOW())
         ON DUPLICATE KEY UPDATE accessed_at = NOW()',
         $userId,
@@ -5106,12 +5104,12 @@ 
     
     // 2. Keep only the 20 most recent items (delete older ones)
     DB::query(
-        'DELETE FROM ' . prefixTable('users_latest_items') . '
+        'DELETE FROM '.prefixTable('users_latest_items').'
         WHERE user_id = %i
         AND increment_id NOT IN (
             SELECT increment_id FROM (
                 SELECT increment_id 
-                FROM ' . prefixTable('users_latest_items') . '
+                FROM ' . prefixTable('users_latest_items').'
                 WHERE user_id = %i
                 ORDER BY accessed_at DESC
                 LIMIT 20
@@ -5154,14 +5152,14 @@ 
          GROUP_CONCAT(DISTINCT CASE WHEN ur.source = "ad" THEN ur.role_id END ORDER BY ur.role_id SEPARATOR ";") AS roles_from_ad_groups,
          GROUP_CONCAT(DISTINCT uf.item_id ORDER BY uf.created_at SEPARATOR ";") AS favourites,
          GROUP_CONCAT(DISTINCT ul.item_id ORDER BY ul.accessed_at DESC SEPARATOR ";") AS latest_items
-        FROM ' . prefixTable('users') . ' AS u
-        LEFT JOIN ' . prefixTable('api') . ' AS a ON (u.id = a.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)
-        LEFT JOIN ' . prefixTable('users_roles') . ' AS ur ON (u.id = ur.user_id)
-        LEFT JOIN ' . prefixTable('users_favorites') . ' AS uf ON (u.id = uf.user_id)
-        LEFT JOIN ' . prefixTable('users_latest_items') . ' AS ul ON (u.id = ul.user_id)
-        WHERE ' . $whereClause . '
+        FROM ' . prefixTable('users').' AS u
+        LEFT JOIN ' . prefixTable('api').' AS a ON (u.id = a.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)
+        LEFT JOIN ' . prefixTable('users_roles').' AS ur ON (u.id = ur.user_id)
+        LEFT JOIN ' . prefixTable('users_favorites').' AS uf ON (u.id = uf.user_id)
+        LEFT JOIN ' . prefixTable('users_latest_items').' AS ul ON (u.id = ul.user_id)
+        WHERE ' . $whereClause.'
         GROUP BY u.id',
         $whereParam
     );
@@ -5191,7 +5189,7 @@ 
 function addUserGroup(int $userId, int $groupId): void
 {
     DB::query(
-        'INSERT IGNORE INTO ' . prefixTable('users_groups') . ' (user_id, group_id)
+        'INSERT IGNORE INTO '.prefixTable('users_groups').' (user_id, group_id)
         VALUES (%i, %i)',
         $userId,
         $groupId
@@ -5204,7 +5202,7 @@ 
 function removeUserGroup(int $userId, int $groupId): void
 {
     DB::query(
-        'DELETE FROM ' . prefixTable('users_groups') . '
+        'DELETE FROM '.prefixTable('users_groups').'
         WHERE user_id = %i AND group_id = %i',
         $userId,
         $groupId
@@ -5221,7 +5219,7 @@ 
 {
     // Delete all existing groups
     DB::query(
-        'DELETE FROM ' . prefixTable('users_groups') . ' WHERE user_id = %i',
+        'DELETE FROM '.prefixTable('users_groups').' WHERE user_id = %i',
         $userId
     );
     
@@ -5241,7 +5239,7 @@ 
 function getUserGroups(int $userId): array
 {
     $result = DB::query(
-        'SELECT group_id FROM ' . prefixTable('users_groups') . ' 
+        'SELECT group_id FROM '.prefixTable('users_groups').' 
         WHERE user_id = %i ORDER BY group_id',
         $userId
     );
@@ -5258,7 +5256,7 @@ 
 function addUserForbiddenGroup(int $userId, int $groupId): void
 {
     DB::query(
-        'INSERT IGNORE INTO ' . prefixTable('users_groups_forbidden') . ' (user_id, group_id)
+        'INSERT IGNORE INTO '.prefixTable('users_groups_forbidden').' (user_id, group_id)
         VALUES (%i, %i)',
         $userId,
         $groupId
@@ -5271,7 +5269,7 @@ 
 function removeUserForbiddenGroup(int $userId, int $groupId): void
 {
     DB::query(
-        'DELETE FROM ' . prefixTable('users_groups_forbidden') . '
+        'DELETE FROM '.prefixTable('users_groups_forbidden').'
         WHERE user_id = %i AND group_id = %i',
         $userId,
         $groupId
@@ -5284,7 +5282,7 @@ 
 function setUserForbiddenGroups(int $userId, array $groupIds): void
 {
     DB::query(
-        'DELETE FROM ' . prefixTable('users_groups_forbidden') . ' WHERE user_id = %i',
+        'DELETE FROM '.prefixTable('users_groups_forbidden').' WHERE user_id = %i',
         $userId
     );
     
@@ -5301,7 +5299,7 @@ 
 function getUserForbiddenGroups(int $userId): array
 {
     $result = DB::query(
-        'SELECT group_id FROM ' . prefixTable('users_groups_forbidden') . ' 
+        'SELECT group_id FROM '.prefixTable('users_groups_forbidden').' 
         WHERE user_id = %i ORDER BY group_id',
         $userId
     );
@@ -5320,7 +5318,7 @@ 
 function addUserRole(int $userId, int $roleId, string $source = 'manual'): void
 {
     DB::query(
-        'INSERT IGNORE INTO ' . prefixTable('users_roles') . ' (user_id, role_id, source)
+        'INSERT IGNORE INTO '.prefixTable('users_roles').' (user_id, role_id, source)
         VALUES (%i, %i, %s)',
         $userId,
         $roleId,
@@ -5334,7 +5332,7 @@ 
 function removeUserRole(int $userId, int $roleId, string $source = 'manual'): void
 {
     DB::query(
-        'DELETE FROM ' . prefixTable('users_roles') . '
+        'DELETE FROM '.prefixTable('users_roles').'
         WHERE user_id = %i AND role_id = %i AND source = %s',
         $userId,
         $roleId,
@@ -5348,7 +5346,7 @@ 
 function removeUserRolesBySource(int $userId, string $source): void
 {
     DB::query(
-        'DELETE FROM ' . prefixTable('users_roles') . '
+        'DELETE FROM '.prefixTable('users_roles').'
         WHERE user_id = %i AND source = %s',
         $userId,
         $source
@@ -5382,14 +5380,14 @@ 
 {
     if ($source !== null) {
         $result = DB::query(
-            'SELECT role_id FROM ' . prefixTable('users_roles') . ' 
+            'SELECT role_id FROM '.prefixTable('users_roles').' 
             WHERE user_id = %i AND source = %s ORDER BY role_id',
             $userId,
             $source
         );
     } else {
         $result = DB::query(
-            'SELECT role_id FROM ' . prefixTable('users_roles') . ' 
+            'SELECT role_id FROM '.prefixTable('users_roles').' 
             WHERE user_id = %i ORDER BY role_id',
             $userId
         );
@@ -5407,7 +5405,7 @@ 
 function addUserFavorite(int $userId, int $itemId): void
 {
     DB::query(
-        'INSERT IGNORE INTO ' . prefixTable('users_favorites') . ' (user_id, item_id)
+        'INSERT IGNORE INTO '.prefixTable('users_favorites').' (user_id, item_id)
         VALUES (%i, %i)',
         $userId,
         $itemId
@@ -5420,7 +5418,7 @@ 
 function removeUserFavorite(int $userId, int $itemId): void
 {
     DB::query(
-        'DELETE FROM ' . prefixTable('users_favorites') . '
+        'DELETE FROM '.prefixTable('users_favorites').'
         WHERE user_id = %i AND item_id = %i',
         $userId,
         $itemId
@@ -5433,7 +5431,7 @@ 
 function toggleUserFavorite(int $userId, int $itemId): bool
 {
     $exists = DB::queryFirstRow(
-        'SELECT increment_id FROM ' . prefixTable('users_favorites') . '
+        'SELECT increment_id FROM '.prefixTable('users_favorites').'
         WHERE user_id = %i AND item_id = %i',
         $userId,
         $itemId
@@ -5454,7 +5452,7 @@ 
 function setUserFavorites(int $userId, array $itemIds): void
 {
     DB::query(
-        'DELETE FROM ' . prefixTable('users_favorites') . ' WHERE user_id = %i',
+        'DELETE FROM '.prefixTable('users_favorites').' WHERE user_id = %i',
         $userId
     );
     
@@ -5471,7 +5469,7 @@ 
 function getUserFavorites(int $userId): array
 {
     $result = DB::query(
-        'SELECT item_id FROM ' . prefixTable('users_favorites') . ' 
+        'SELECT item_id FROM '.prefixTable('users_favorites').' 
         WHERE user_id = %i ORDER BY created_at DESC',
         $userId
     );
@@ -5484,7 +5482,7 @@ 
 function isUserFavorite(int $userId, int $itemId): bool
 {
     $result = DB::queryFirstRow(
-        'SELECT increment_id FROM ' . prefixTable('users_favorites') . '
+        'SELECT increment_id FROM '.prefixTable('users_favorites').'
         WHERE user_id = %i AND item_id = %i',
         $userId,
         $itemId

sources/main.queries.php

Spacing +122 added lines, -122 removed lines

@@ -79,7 +79,7 @@ 
 ) {
     // Not allowed page
     $session->set('system-error_code', ERR_NOT_ALLOWED);
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit;
 }
 
@@ -207,7 +207,7 @@ 
  * @param array $SETTINGS
  * @return string
  */
-function passwordHandler(string $post_type, array|null|string $dataReceived, array $SETTINGS): string
+function passwordHandler(string $post_type, array | null | string $dataReceived, array $SETTINGS): string
 {
     $session = SessionManager::getSession();
     $lang = new Language($session->get('user-language') ?? 'english');
@@ -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, l.id_user
-                    FROM ' . prefixTable('sharekeys_items') . ' AS ski
-                    INNER JOIN ' . prefixTable('log_items') . ' AS l ON ski.object_id = l.id_item
+                    FROM ' . prefixTable('sharekeys_items').' AS ski
+                    INNER JOIN ' . prefixTable('log_items').' AS l ON ski.object_id = l.id_item
                     WHERE ski.user_id = %i
                     ORDER BY RAND()
                     LIMIT 1',
@@ -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,9 +3528,9 @@ 
             // Select one personal item share_key to test decryption
             $currentUserItemKey = DB::queryFirstRow(
                 'SELECT si.share_key, si.increment_id, l.id_user, i.perso
-                FROM ' . prefixTable('sharekeys_items') . ' AS si
-                INNER JOIN ' . prefixTable('log_items') . ' AS l ON si.object_id = l.id_item
-                INNER JOIN ' . prefixTable('items') . ' AS i ON i.id = l.id_item
+                FROM ' . prefixTable('sharekeys_items').' AS si
+                INNER JOIN ' . prefixTable('log_items').' AS l ON si.object_id = l.id_item
+                INNER JOIN ' . prefixTable('items').' AS i ON i.id = l.id_item
                 WHERE si.user_id = %i AND i.perso = 1 AND si.share_key != ""
                 ORDER BY RAND()
                 LIMIT 1',
@@ -3581,7 +3581,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"}]';
@@ -3631,8 +3631,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,
@@ -3687,8 +3687,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',
@@ -3697,8 +3697,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',
@@ -3707,8 +3707,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',
@@ -3752,8 +3752,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,

api/inc/jwt_utils.php

Spacing +7 added lines, -7 removed lines

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

api/Controller/Api/ItemController.php

Spacing +25 added lines, -25 removed lines

@@ -40,11 +40,11 @@ 
      */
     private function getUserPrivateKey(array $userData): ?string
     {
-        include_once API_ROOT_PATH . '/inc/jwt_utils.php';
+        include_once API_ROOT_PATH.'/inc/jwt_utils.php';
 
         // Verify session_key exists in JWT payload
         if (!isset($userData['session_key']) || empty($userData['session_key'])) {
-            error_log('getUserPrivateKey: Missing session_key in JWT token for user ID ' . $userData['id']);
+            error_log('getUserPrivateKey: Missing session_key in JWT token for user ID '.$userData['id']);
             return null;
         }
 
@@ -88,7 +88,7 @@ 
             // SQL where clause with folders list
             if (isset($arrQueryStringParams['folders']) === true) {
                 // convert the folders to an array
-                $arrQueryStringParams['folders'] = explode(',', str_replace( array('[',']') , ''  , $arrQueryStringParams['folders']));
+                $arrQueryStringParams['folders'] = explode(',', str_replace(array('[', ']'), '', $arrQueryStringParams['folders']));
 
                 // ensure to only use the intersection
                 $foldersList = implode(',', array_intersect($arrQueryStringParams['folders'], $userData['folders_list']));
@@ -243,7 +243,7 @@ 
                             (string) $arrQueryStringParams['description'] ?? '',
                             (string) $arrQueryStringParams['login'],
                             (string) $arrQueryStringParams['email'] ?? '',
-                            (string) $arrQueryStringParams['url'] ?? '' ,
+                            (string) $arrQueryStringParams['url'] ?? '',
                             (string) $arrQueryStringParams['tags'] ?? '',
                             (int) $arrQueryStringParams['anyone_can_modify'] ?? 0,
                             (string) $arrQueryStringParams['icon'] ?? '',
@@ -257,7 +257,7 @@ 
                 } else {
                     // Gérer le cas où les paramètres ne sont pas un tableau
                     $strErrorDesc = 'Data not consistent';
-                    $strErrorHeader = 'Expected array, received ' . gettype($arrQueryStringParams);
+                    $strErrorHeader = 'Expected array, received '.gettype($arrQueryStringParams);
                 }
             }
         } else {
@@ -309,11 +309,11 @@ 
             // SQL where clause with item id
             if (isset($arrQueryStringParams['id']) === true) {
                 // build sql where clause by ID
-                $sqlExtra .= ' AND i.id = '.$arrQueryStringParams['id'] . $sql_constraint;
+                $sqlExtra .= ' AND i.id = '.$arrQueryStringParams['id'].$sql_constraint;
             } else if (isset($arrQueryStringParams['label']) === true) {
                 // build sql where clause by LABEL
-                $sqlExtra .= ' AND i.label '.(isset($arrQueryStringParams['like']) === true && (int) $arrQueryStringParams['like'] === 1 ? ' LIKE "%'.$arrQueryStringParams['label'].'%"' : ' = '.$arrQueryStringParams['label']) . $sql_constraint;
-                $sqlLimit = isset($arrQueryStringParams['limit']) === true && (int) $arrQueryStringParams['limit'] > 0 ? $arrQueryStringParams['limit'] : 50;   // let's limit to 50 by default
+                $sqlExtra .= ' AND i.label '.(isset($arrQueryStringParams['like']) === true && (int) $arrQueryStringParams['like'] === 1 ? ' LIKE "%'.$arrQueryStringParams['label'].'%"' : ' = '.$arrQueryStringParams['label']).$sql_constraint;
+                $sqlLimit = isset($arrQueryStringParams['limit']) === true && (int) $arrQueryStringParams['limit'] > 0 ? $arrQueryStringParams['limit'] : 50; // let's limit to 50 by default
             } else if (isset($arrQueryStringParams['description']) === true) {
                 // build sql where clause by DESCRIPTION
                 $sqlExtra .= ' AND i.description '.(isset($arrQueryStringParams['like']) === true && (int) $arrQueryStringParams['like'] === 1 ? ' LIKE '.$arrQueryStringParams['description'] : ' = '.$arrQueryStringParams['description']).$sql_constraint;
@@ -396,9 +396,9 @@ 
             }*/
 
             // Build SQL constraint for accessible folders
-            $sql_constraint = ' AND (i.id_tree IN (' . $userData['folders_list'] . ')';
+            $sql_constraint = ' AND (i.id_tree IN ('.$userData['folders_list'].')';
             if (!empty($userData['restricted_items_list'])) {
-                $sql_constraint .= ' OR i.id IN (' . $userData['restricted_items_list'] . ')';
+                $sql_constraint .= ' OR i.id IN ('.$userData['restricted_items_list'].')';
             }
             $sql_constraint .= ')';
 
@@ -416,9 +416,9 @@ 
                     $rows = DB::query(
                         "SELECT i.id, i.label, i.login, i.url, i.id_tree, 
                                 CASE WHEN o.enabled = 1 THEN 1 ELSE 0 END AS has_otp
-                        FROM " . prefixTable('items') . " AS i
-                        LEFT JOIN " . prefixTable('items_otp') . " AS o ON (o.item_id = i.id)
-                        WHERE i.url LIKE %s" . $sql_constraint . "
+                        FROM " . prefixTable('items')." AS i
+                        LEFT JOIN " . prefixTable('items_otp')." AS o ON (o.item_id = i.id)
+                        WHERE i.url LIKE %s" . $sql_constraint."
                             AND i.deleted_at IS NULL
                         ORDER BY i.label ASC",
                         "%".$searchUrl."%"
@@ -429,7 +429,7 @@ 
                         // Get user's sharekey for this item
                         $shareKey = DB::queryfirstrow(
                             'SELECT share_key
-                            FROM ' . prefixTable('sharekeys_items') . '
+                            FROM ' . prefixTable('sharekeys_items').'
                             WHERE user_id = %i AND object_id = %i',
                             $userData['id'],
                             $row['id']
@@ -462,7 +462,7 @@ 
                     }
                 }
             } catch (Error $e) {
-                $strErrorDesc = $e->getMessage() . '. Something went wrong! Please contact support.';
+                $strErrorDesc = $e->getMessage().'. Something went wrong! Please contact support.';
                 $strErrorHeader = 'HTTP/1.1 500 Internal Server Error';
             }
         } else {
@@ -522,7 +522,7 @@ 
 
                 // Load item basic info to check folder access
                 $itemInfo = DB::queryFirstRow(
-                    'SELECT id_tree FROM ' . prefixTable('items') . ' WHERE id = %i',
+                    'SELECT id_tree FROM '.prefixTable('items').' WHERE id = %i',
                     $itemId
                 );
 
@@ -546,7 +546,7 @@ 
                     } else {
                         // Load OTP data
                         $otpData = DB::queryFirstRow(
-                            'SELECT secret, enabled FROM ' . prefixTable('items_otp') . ' WHERE item_id = %i',
+                            'SELECT secret, enabled FROM '.prefixTable('items_otp').' WHERE item_id = %i',
                             $itemId
                         );
 
@@ -577,7 +577,7 @@ 
                                         'item_id' => $itemId
                                     ]);
                                 } catch (\RuntimeException $e) {
-                                    $strErrorDesc = 'Failed to generate OTP code: ' . $e->getMessage();
+                                    $strErrorDesc = 'Failed to generate OTP code: '.$e->getMessage();
                                     $strErrorHeader = 'HTTP/1.1 500 Internal Server Error';
                                 }
                             } else {
@@ -588,7 +588,7 @@ 
                     }
                 }
             } catch (\Error $e) {
-                $strErrorDesc = $e->getMessage() . '. Something went wrong! Please contact support.';
+                $strErrorDesc = $e->getMessage().'. Something went wrong! Please contact support.';
                 $strErrorHeader = 'HTTP/1.1 500 Internal Server Error';
             }
         } else {
@@ -653,7 +653,7 @@ 
                         try {
                             // Load item info to check access rights
                             $itemInfo = DB::queryFirstRow(
-                                'SELECT id, id_tree, label FROM ' . prefixTable('items') . ' WHERE id = %i',
+                                'SELECT id, id_tree, label FROM '.prefixTable('items').' WHERE id = %i',
                                 $itemId
                             );
 
@@ -714,13 +714,13 @@ 
                                 }
                             }
                         } catch (Error $e) {
-                            $strErrorDesc = $e->getMessage() . '. Something went wrong! Please contact support.';
+                            $strErrorDesc = $e->getMessage().'. Something went wrong! Please contact support.';
                             $strErrorHeader = 'HTTP/1.1 500 Internal Server Error';
                         }
                     }
                 } else {
                     $strErrorDesc = 'Data not consistent';
-                    $strErrorHeader = 'HTTP/1.1 400 Bad Request - Expected array, received ' . gettype($arrQueryStringParams);
+                    $strErrorHeader = 'HTTP/1.1 400 Bad Request - Expected array, received '.gettype($arrQueryStringParams);
                 }
             }
         } else {
@@ -778,7 +778,7 @@ 
                         try {
                             // Load item info to check access rights
                             $itemInfo = DB::queryFirstRow(
-                                'SELECT id, id_tree, label FROM ' . prefixTable('items') . ' WHERE id = %i',
+                                'SELECT id, id_tree, label FROM '.prefixTable('items').' WHERE id = %i',
                                 $itemId
                             );
 
@@ -816,13 +816,13 @@ 
                                 }
                             }
                         } catch (Error $e) {
-                            $strErrorDesc = $e->getMessage() . '. Something went wrong! Please contact support.';
+                            $strErrorDesc = $e->getMessage().'. Something went wrong! Please contact support.';
                             $strErrorHeader = 'HTTP/1.1 500 Internal Server Error';
                         }
                     }
                 } else {
                     $strErrorDesc = 'Data not consistent';
-                    $strErrorHeader = 'HTTP/1.1 400 Bad Request - Expected array, received ' . gettype($arrQueryStringParams);
+                    $strErrorHeader = 'HTTP/1.1 400 Bad Request - Expected array, received '.gettype($arrQueryStringParams);
                 }
             }
         } else {

api/Controller/Api/MiscController.php

Spacing +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
         $strErrorDesc = $responseData = $strErrorHeader = '';
 
         if (strtoupper($requestMethod) === 'POST') {
-            require API_ROOT_PATH . "/Model/MiscModel.php";
+            require API_ROOT_PATH."/Model/MiscModel.php";
             $miscModel = new MiscModel();
             $extensionSettings = $miscModel->getBrowserExtensionSettings();
             if ($extensionSettings !== null) {