nilsteampassnet / TeamPass

scripts/background_tasks___worker.php

Spacing +12 added lines, -12 removed lines

@@ -32,7 +32,7 @@ 
 require_once __DIR__.'/traits/ItemHandlerTrait.php';
 require_once __DIR__.'/traits/UserHandlerTrait.php';
 require_once __DIR__.'/traits/EmailTrait.php';
-require_once __DIR__ . '/taskLogger.php';
+require_once __DIR__.'/taskLogger.php';
 
 class TaskWorker {
     use ItemHandlerTrait;
@@ -64,7 +64,7 @@ 
      */
     public function execute() {
         try {
-            if (LOG_TASKS=== true) $this->logger->log('Processing task: ' . print_r($this->taskData, true), 'DEBUG');
+            if (LOG_TASKS === true) $this->logger->log('Processing task: '.print_r($this->taskData, true), 'DEBUG');
             // Dispatch selon le type de processus
             switch ($this->processType) {
                 case 'item_copy':
@@ -136,7 +136,7 @@ 
             $arguments = '';
         }
 
-        if (LOG_TASKS=== true) $this->logger->log('Process: '.$this->processType.' -- '.print_r($arguments, true), 'DEBUG');
+        if (LOG_TASKS === true) $this->logger->log('Process: '.$this->processType.' -- '.print_r($arguments, true), 'DEBUG');
 
         // Add 'arguments' only if not empty
         if (!empty($arguments)) {
@@ -150,7 +150,7 @@ 
             'increment_id = %i',
             $this->taskId
         );
-        if (LOG_TASKS=== true) $this->logger->log('Finishing task: ' . $this->taskId, 'DEBUG');
+        if (LOG_TASKS === true) $this->logger->log('Finishing task: '.$this->taskId, 'DEBUG');
     }
 
     /**
@@ -173,7 +173,7 @@ 
             'increment_id = %i',
             $this->taskId
         );
-        $this->logger->log('Task failure: ' . $e->getMessage(), 'ERROR');
+        $this->logger->log('Task failure: '.$e->getMessage(), 'ERROR');
     }
 
     /**
@@ -185,16 +185,16 @@ 
      * @return void
      */
     private function processSubTasks($arguments) {
-        if (LOG_TASKS=== true) $this->logger->log('processSubTasks: '.print_r($arguments, true), 'DEBUG');
+        if (LOG_TASKS === true) $this->logger->log('processSubTasks: '.print_r($arguments, true), 'DEBUG');
         // Get all subtasks related to this task
         $subtasks = DB::query(
-            'SELECT * FROM ' . prefixTable('background_subtasks') . ' WHERE task_id = %i AND is_in_progress = 0 ORDER BY `task` ASC',
+            'SELECT * FROM '.prefixTable('background_subtasks').' WHERE task_id = %i AND is_in_progress = 0 ORDER BY `task` ASC',
             $this->taskId
         );
     
         // Check if there are any subtasks to process
         if (empty($subtasks)) {
-            if (LOG_TASKS=== true) $this->logger->log('No subtask was found for task: ' . $this->taskId, 'DEBUG');
+            if (LOG_TASKS === true) $this->logger->log('No subtask was found for task: '.$this->taskId, 'DEBUG');
             return;
         }
     
@@ -204,7 +204,7 @@ 
                 // Get the subtask data
                 $subtaskData = json_decode($subtask['task'], true);
 
-                if (LOG_TASKS=== true) $this->logger->log('Processing subtask: ' . $subtaskData['step'], 'DEBUG');
+                if (LOG_TASKS === true) $this->logger->log('Processing subtask: '.$subtaskData['step'], 'DEBUG');
 
                 // Process the subtask based on its type
                 switch ($subtaskData['step'] ?? '') {
@@ -248,13 +248,13 @@ 
                     $subtask['increment_id']
                 );
         
-                $this->logger->log('processSubTasks : ' . $e->getMessage(), 'ERROR');
+                $this->logger->log('processSubTasks : '.$e->getMessage(), 'ERROR');
             }
         }
     
         // Are all subtasks completed?
         $remainingSubtasks = DB::queryFirstField(
-            'SELECT COUNT(*) FROM ' . prefixTable('background_subtasks') . ' WHERE task_id = %i AND is_in_progress = 0',
+            'SELECT COUNT(*) FROM '.prefixTable('background_subtasks').' WHERE task_id = %i AND is_in_progress = 0',
             $this->taskId
         );
     
@@ -270,7 +270,7 @@ 
     error_log("Usage: php background_tasks___worker.php <task_id> <process_type> [<task_data>]");
     exit(1);
 }
-$taskId = (int)$argv[1];
+$taskId = (int) $argv[1];
 $processType = $argv[2];
 $taskData = $argv[3] ?? null;
 if ($taskData) {

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;
@@ -55,7 +55,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;
         }
 
@@ -64,7 +64,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();
         }
@@ -83,7 +83,7 @@ 
             return false;
         }
         
-        fwrite($fp, (string)getmypid());
+        fwrite($fp, (string) getmypid());
         return true;
     }
 
@@ -101,7 +101,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"
@@ -113,8 +113,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 > %i 
             AND t.status = %s',
             time() - $this->maxTimeBeforeRemoval,
@@ -131,7 +131,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;
         }
 
@@ -140,7 +140,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
@@ -149,7 +149,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);
         }
     }
@@ -160,7 +160,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(
@@ -177,18 +177,18 @@ 
         // 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->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'),
                 [
@@ -209,7 +209,7 @@ 
     private function countRunningTasks(): int {
         return DB::queryFirstField(
             'SELECT COUNT(*) 
-            FROM ' . prefixTable('background_tasks') . ' 
+            FROM ' . prefixTable('background_tasks').' 
             WHERE is_in_progress = 1'
         );
     }
@@ -230,10 +230,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'
@@ -246,7 +246,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)
         );
@@ -263,7 +263,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 < %s',
             'completed',
             -1,
@@ -278,19 +278,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');
     }
 }
 
@@ -304,5 +304,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());
 }
\ No newline at end of file

sources/main.queries.php

Spacing +105 added lines, -105 removed lines

@@ -81,7 +81,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;
 }
 
@@ -269,7 +269,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'];
 
@@ -324,7 +324,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();
 
@@ -359,7 +359,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']
         );
@@ -508,7 +508,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)
             );
@@ -621,7 +621,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']
         );
@@ -700,7 +700,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'];
 
@@ -738,7 +738,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'];
 
@@ -782,7 +782,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'];
 
@@ -826,7 +826,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) {
@@ -927,7 +927,7 @@ 
                 )
             );
 
-            return '[{"token" : "' . $token . '"}]';
+            return '[{"token" : "'.$token.'"}]';
 
         /*
         * Default case
@@ -943,7 +943,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) {
         /*
@@ -1012,7 +1012,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'
@@ -1064,7 +1064,7 @@ 
     // get number of items
     DB::queryFirstRow(
         'SELECT increment_id
-        FROM ' . prefixTable('sharekeys_items') .
+        FROM ' . prefixTable('sharekeys_items').
         ' WHERE user_id = %i',
         $userId
     );
@@ -1119,7 +1119,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
         );
 
@@ -1140,8 +1140,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 {
@@ -1154,8 +1154,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'
             );
@@ -1259,14 +1259,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
         );
@@ -1320,7 +1320,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']
@@ -1331,11 +1331,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'),
@@ -1397,7 +1397,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'))
                 ),
             ),
@@ -1413,7 +1413,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'))
             ),
         ),
@@ -1430,7 +1430,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'
         );
@@ -1438,7 +1438,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'
             );
@@ -1490,8 +1490,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',
@@ -1523,7 +1523,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();
     }
 
@@ -1558,13 +1558,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 {
@@ -1651,7 +1651,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 = '';
@@ -1681,7 +1681,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"
@@ -1689,9 +1689,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'];
             }
         }
     }
@@ -1703,7 +1703,7 @@ 
 
     // Now prepare text
     $txt = '### Page on which it happened
-' . $data['current_page'] . '
+' . $data['current_page'].'
 
 ### Steps to reproduce
 1.
@@ -1718,39 +1718,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)
@@ -1790,7 +1790,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
         );
@@ -1799,9 +1799,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
@@ -1895,7 +1895,7 @@ 
         // Get user info
         $userData = DB::queryFirstRow(
             'SELECT private_key
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id = %i',
             $post_user_id
         );
@@ -1976,7 +1976,7 @@ 
         // Get user info
         $userData = DB::queryFirstRow(
             'SELECT email, auth_type, login
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id = %i',
             $post_user_id
         );
@@ -2074,7 +2074,7 @@ 
         // Get user info
         $userData = DB::queryFirstRow(
             'SELECT email, auth_type, login
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id = %i',
             $post_user_id
         );
@@ -2140,7 +2140,7 @@ 
         // Check if user exists
         DB::queryFirstRow(
             'SELECT *
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id = %i',
             $post_user_id
         );
@@ -2210,7 +2210,7 @@ 
         // Check if user exists
         $userInfo = DB::queryFirstRow(
             'SELECT public_key
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id = %i',
             $post_user_id
         );
@@ -2358,15 +2358,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')
@@ -2398,7 +2398,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
@@ -2431,7 +2431,7 @@ 
     // SHould we change step?
     DB::query(
         'SELECT *
-        FROM ' . prefixTable('items') . '
+        FROM ' . prefixTable('items').'
         WHERE perso = 0'
     );
 
@@ -2456,15 +2456,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')
@@ -2496,7 +2496,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
@@ -2518,7 +2518,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"'
     );
 
@@ -2543,15 +2543,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')
@@ -2583,7 +2583,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
@@ -2605,7 +2605,7 @@ 
     // SHould we change step?
     DB::query(
         'SELECT *
-        FROM ' . prefixTable('categories_items') . '
+        FROM ' . prefixTable('categories_items').'
         WHERE encryption_type = "teampass_aes"'
     );
 
@@ -2630,14 +2630,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')
@@ -2669,7 +2669,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
@@ -2715,15 +2715,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')
@@ -2755,7 +2755,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
@@ -2777,8 +2777,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;
@@ -2811,9 +2811,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"
         );
@@ -2821,7 +2821,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')
@@ -2848,7 +2848,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
@@ -2871,7 +2871,7 @@ 
     // SHould we change step?
     DB::query(
         'SELECT *
-        FROM ' . prefixTable('items') . '
+        FROM ' . prefixTable('items').'
         WHERE perso = 0'
     );
 
@@ -2899,7 +2899,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
         );
@@ -2925,7 +2925,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'
@@ -2938,7 +2938,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'),
@@ -2982,7 +2982,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,
@@ -2993,13 +2993,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'),
@@ -3022,7 +3022,7 @@ 
                         );
 
                         // Unlink original file
-                        unlink($SETTINGS['path_to_upload_folder'] . '/' . $record2['file']);
+                        unlink($SETTINGS['path_to_upload_folder'].'/'.$record2['file']);
                     }
                 }
 
@@ -3030,7 +3030,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'
@@ -3100,7 +3100,7 @@ 
         // Get user info
         $userData = DB::queryFirstRow(
             'SELECT special, auth_type, is_ready_for_usage, ongoing_process_id, otp_provided, keys_recovery_time
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id = %i',
             $post_user_id
         );
@@ -3147,7 +3147,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
         );
@@ -3197,7 +3197,7 @@ 
                 return prepareExchangedData(
                     array(
                         'error' => false,
-                        'message' => $lang->get('done'),'',
+                        'message' => $lang->get('done'), '',
                     ),
                     'encode'
                 );
@@ -3245,7 +3245,7 @@ 
         // Get user info
         $userData = DB::queryFirstRow(
             'SELECT auth_type, login, private_key, special
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id = %i',
             $post_user_id
         );
@@ -3279,7 +3279,7 @@ 
                 return prepareExchangedData(
                     array(
                         'error' => false,
-                        'message' => $lang->get('done'),'',
+                        'message' => $lang->get('done'), '',
                     ),
                     'encode'
                 );
@@ -3301,8 +3301,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',
@@ -3392,7 +3392,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"}]';

pages/profile.php

Spacing +31 added lines, -31 removed lines

@@ -68,7 +68,7 @@ 
 if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('profile') === false) {
     // Not allowed page
     $session->set('system-error_code', ERR_NOT_ALLOWED);
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit;
 }
 
@@ -101,49 +101,49 @@ 
 $zones = timezone_list();
 // prepare list of languages
 $languages = DB::query(
-    'SELECT label, name FROM ' . prefixTable('languages') . ' ORDER BY label ASC'
+    'SELECT label, name FROM '.prefixTable('languages').' ORDER BY label ASC'
 );
 
 // Do some stats
 $userItemsNumber = DB::queryFirstField(
     'SELECT COUNT(id_item) as count
-    FROM ' . prefixTable('log_items') . '
+    FROM ' . prefixTable('log_items').'
     WHERE action = "at_creation" AND  id_user = %i',
     $session->get('user-id')
 );
 
 $userModificationNumber = DB::queryFirstField(
     'SELECT COUNT(id_item) as count
-    FROM ' . prefixTable('log_items') . '
+    FROM ' . prefixTable('log_items').'
     WHERE action = "at_modification" AND  id_user = %i',
     $session->get('user-id')
 );
 
 $userSeenItemsNumber = DB::queryFirstField(
     'SELECT COUNT(id_item) as count
-    FROM ' . prefixTable('log_items') . '
+    FROM ' . prefixTable('log_items').'
     WHERE action = "at_shown" AND  id_user = %i',
     $session->get('user-id')
 );
 
 $userSeenPasswordsNumber = DB::queryFirstField(
     'SELECT COUNT(id_item)
-    FROM ' . prefixTable('log_items') . '
+    FROM ' . prefixTable('log_items').'
     WHERE action = "at_password_shown" AND  id_user = %i',
     $session->get('user-id')
 );
 
 $userInfo = DB::queryFirstRow(
     'SELECT avatar, last_pw_change
-    FROM ' . prefixTable('users') . ' 
+    FROM ' . prefixTable('users').' 
     WHERE id = %i',
     $session->get('user-id')
 );
 
 if (empty($userInfo['avatar']) === true) {
-    $avatar = $SETTINGS['cpassman_url'] . '/includes/images/photo.jpg';
+    $avatar = $SETTINGS['cpassman_url'].'/includes/images/photo.jpg';
 } else {
-    $avatar = $SETTINGS['cpassman_url'] . '/includes/avatars/' . $userInfo['avatar'];
+    $avatar = $SETTINGS['cpassman_url'].'/includes/avatars/'.$userInfo['avatar'];
 }
 
 // Get Groups name
@@ -151,7 +151,7 @@ 
 foreach ($session->get('user-roles_array') as $role) {
     $tmp = DB::queryFirstRow(
         'SELECT title 
-        FROM ' . prefixTable('roles_title') . ' 
+        FROM ' . prefixTable('roles_title').' 
         WHERE id = %i',
         $role
     );
@@ -197,7 +197,7 @@ 
                         <h3 id="profile-username" class="text-center">
                             <?php
                             if (null !== $session->get('user-name') && empty($session->get('user-name')) === false) {
-                                echo $session->get('user-name') . ' ' . $session->get('user-lastname');
+                                echo $session->get('user-name').' '.$session->get('user-lastname');
                             } else {
                                 echo $session->get('user-login');
                             }
@@ -265,7 +265,7 @@ 
                                             } else {
                                                 echo date('d/m/Y', (int) $session->get('user-last_connection'));
                                             }
-                                            echo ' ' . $lang->get('at') . ' ';
+                                            echo ' '.$lang->get('at').' ';
                                             if (isset($SETTINGS['time_format']) === true) {
                                                 echo date($SETTINGS['time_format'], (int) $session->get('user-last_connection'));
                                             } else {
@@ -275,7 +275,7 @@ 
                                         </a>
                                     </li>
                                     <?php
-                                    if (null !== $session->get('user-last_pw_change') && ! empty($session->get('user-last_pw_change') === true)) {
+                                    if (null !== $session->get('user-last_pw_change') && !empty($session->get('user-last_pw_change') === true)) {
                                         // Handle last password change string
                                         if ($session->has('user-last_pw_change') && null !== $session->get('user-last_pw_change')) {
                                             if (isset($SETTINGS['date_format']) === true) {
@@ -295,12 +295,12 @@ 
                                         ) {
                                             $numDaysBeforePwExpiration = '';
                                         } else {
-                                            $numDaysBeforePwExpiration = $lang['index_pw_expiration'] . ' ' . $session->get('user-num_days_before_exp') . ' ' . $lang['days'] . '.';
+                                            $numDaysBeforePwExpiration = $lang['index_pw_expiration'].' '.$session->get('user-num_days_before_exp').' '.$lang['days'].'.';
                                         }
                                         echo '
                                     <li class="list-group-item">
-                                        <b><i class="fas fa-calendar-alt fa-fw fa-lg mr-2"></i>' . $lang->get('index_last_pw_change') . '</b>
-                                        <a class="float-right">' . $last_pw_change . ' ' . $numDaysBeforePwExpiration . '</a>
+                                        <b><i class="fas fa-calendar-alt fa-fw fa-lg mr-2"></i>' . $lang->get('index_last_pw_change').'</b>
+                                        <a class="float-right">' . $last_pw_change.' '.$numDaysBeforePwExpiration.'</a>
                                     </li>';
                                     }
                                     ?>
@@ -320,7 +320,7 @@ 
                                     if (isset($SETTINGS['api']) === true && (int) $SETTINGS['api'] === 1) {
                                         echo '
                                     <li class="list-group-item">
-                                        <b><i class="fas fa-paper-plane fa-fw fa-lg mr-2"></i>' . $lang->get('user_profile_api_key') . '</b>
+                                        <b><i class="fas fa-paper-plane fa-fw fa-lg mr-2"></i>' . $lang->get('user_profile_api_key').'</b>
                                         <button class="btn btn-sm btn-primary float-right" id="copy-api-key"><i class="fa-regular fa-copy  pointer"></i></button>
                                         <a class="float-right mr-2" id="profile-user-api-token">',
                                             null !== $session->get('user-api_key') ? $session->get('user-api_key') : '',
@@ -338,12 +338,12 @@ 
                                         <?php
                                         $rows = DB::query(
                                             'SELECT label AS labelAction, date, null
-                                                    FROM ' . prefixTable('log_system') . '
+                                                    FROM ' . prefixTable('log_system').'
                                                     WHERE qui = %i
                                                     UNION
                                                     SELECT l.action, l.date, i.label AS itemLabel
-                                                    FROM ' . prefixTable('log_items') . ' AS l
-                                                    INNER JOIN ' . prefixTable('items') . ' AS i ON (l.id_item = i.id)
+                                                    FROM ' . prefixTable('log_items').' AS l
+                                                    INNER JOIN ' . prefixTable('items').' AS i ON (l.id_item = i.id)
                                                     WHERE l.id_user = %i AND l.action IN ("at_access")
                                                     ORDER BY date DESC
                                                     LIMIT 0, 40',
@@ -357,9 +357,9 @@ 
                                                 $text = $lang->get($record['labelAction']);
                                             }
                                             if (empty($record['NULL']) === false) {
-                                                $text .= ' ' . $lang->get('for') . ' <span class="font-weight-light">' . addslashes($record['NULL']) . '</span>';
+                                                $text .= ' '.$lang->get('for').' <span class="font-weight-light">'.addslashes($record['NULL']).'</span>';
                                             }
-                                            echo '<li class="list-group-item">' . date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date']) . ' - ' . $text . '</li>';
+                                            echo '<li class="list-group-item">'.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['date']).' - '.$text.'</li>';
                                         }
                                         ?>
                                     </ul>
@@ -393,13 +393,13 @@ 
                                 <?php endif; /* disable_user_edit_profile */
                                 if (($SETTINGS['disable_user_edit_timezone'] ?? '0') === '0') : ?>
                                     <div class="form-group">
-                                        <label class="col-sm-10 control-label"><?php echo $lang->get('timezone_selection');?></label>
+                                        <label class="col-sm-10 control-label"><?php echo $lang->get('timezone_selection'); ?></label>
                                         <div class="col-sm-10">
                                             <select class="form-control" id="profile-user-timezone">
                                                 <?php foreach ($zones as $key => $zone): ?>
                                                     <option value="<?php echo $key; ?>"<?php 
                                                         if ($session->has('user-timezone'))
-                                                            if($session->get('user-timezone') === $key)
+                                                            if ($session->get('user-timezone') === $key)
                                                                 echo ' selected';
                                                             elseif ($session->get('user-timezone') === 'not_defined')
                                                                 if (isset($SETTINGS['timezone']) && $SETTINGS['timezone'] === $key)
@@ -417,10 +417,10 @@ 
                                             <select class="form-control" id="profile-user-language">
                                                 <?php
                                                     foreach ($languages as $language) {
-                                                        echo '<option value="' . $language['name'] . '"',
+                                                        echo '<option value="'.$language['name'].'"',
                                                         strtolower($session->get('user-language')) === strtolower($language['name']) ?
                                                         ' selected="selected"' : '',
-                                                    '>' . $language['label'] . '</option>';
+                                                    '>'.$language['label'].'</option>';
                                                     }
                                                 ?>
                                             </select>
@@ -433,11 +433,11 @@ 
                                         <div class="col-sm-10">
                                             <select class="form-control" id="profile-user-treeloadstrategy">
                                                 
-                                                <option value="sequential" <?php echo $session->has('user-tree_load_strategy') && $session->get('user-tree_load_strategy') && null !== $session->get('user-tree_load_strategy') && $session->get('user-tree_load_strategy') === 'sequential' ? ' selected' : '';?>>
+                                                <option value="sequential" <?php echo $session->has('user-tree_load_strategy') && $session->get('user-tree_load_strategy') && null !== $session->get('user-tree_load_strategy') && $session->get('user-tree_load_strategy') === 'sequential' ? ' selected' : ''; ?>>
                                                     <?php echo $lang->get('sequential'); ?>
                                                 </option>
                                                 
-                                                <option value="full" <?php echo $session->has('user-tree_load_strategy') && $session->get('user-tree_load_strategy') && null !== $session->get('user-tree_load_strategy') && $session->get('user-tree_load_strategy') === 'full' ? ' selected' : '';?>>
+                                                <option value="full" <?php echo $session->has('user-tree_load_strategy') && $session->get('user-tree_load_strategy') && null !== $session->get('user-tree_load_strategy') && $session->get('user-tree_load_strategy') === 'full' ? ' selected' : ''; ?>>
                                                     <?php echo $lang->get('full'); ?>
                                                 </option>
                                             </select>
@@ -450,11 +450,11 @@ 
                                         <div class="col-sm-10">
                                             <select class="form-control" id="profile-user-split_view_mode">
                                                 
-                                                <option value="0" <?php echo $session->has('user-split_view_mode') && $session->get('user-split_view_mode') && null !== $session->get('user-split_view_mode') && $session->get('user-split_view_mode') === 0 ? 'selected' : '';?>>
+                                                <option value="0" <?php echo $session->has('user-split_view_mode') && $session->get('user-split_view_mode') && null !== $session->get('user-split_view_mode') && $session->get('user-split_view_mode') === 0 ? 'selected' : ''; ?>>
                                                     <?php echo $lang->get('no'); ?>
                                                 </option>
                                                 
-                                                <option value="1" <?php echo $session->has('user-split_view_mode') && $session->get('user-split_view_mode') && null !== $session->get('user-split_view_mode') && (int) $session->get('user-split_view_mode') === 1 ? 'selected' : '';?>>
+                                                <option value="1" <?php echo $session->has('user-split_view_mode') && $session->get('user-split_view_mode') && null !== $session->get('user-split_view_mode') && (int) $session->get('user-split_view_mode') === 1 ? 'selected' : ''; ?>>
                                                     <?php echo $lang->get('yes'); ?>
                                                 </option>
                                             </select>
@@ -472,7 +472,7 @@ 
                                                 <?php 
                                                 }
                                                 if (isset($SETTINGS['api']) === true && (int) $SETTINGS['api'] === 1) {
-                                                    echo '<button type="button" class="btn btn-warning float-right" id="profile-button-api_token">' . $lang->get('generate_api_token') . '</button>';
+                                                    echo '<button type="button" class="btn btn-warning float-right" id="profile-button-api_token">'.$lang->get('generate_api_token').'</button>';
                                                 }
                                                 ?>
                                                 <div id="profile-avatar-file-container" class="hidden"></div>

pages/options.php

Spacing +6 added lines, -6 removed lines

@@ -69,7 +69,7 @@ 
 if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('options') === 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;
 }
 
@@ -322,7 +322,7 @@ 
                                     // get list of all timezones
                                     foreach ($zones as $key => $zone) {
                                         echo '
-                                <option value="' . $key . '"', isset($SETTINGS['timezone']) === true && $SETTINGS['timezone'] === $key ? ' selected' : '', '>' . $zone . '</option>';
+                                <option value="' . $key.'"', isset($SETTINGS['timezone']) === true && $SETTINGS['timezone'] === $key ? ' selected' : '', '>'.$zone.'</option>';
                                     }
                                     ?>
                                 </select>
@@ -374,7 +374,7 @@ 
                                     $languagesList = $languagesList ?? [];
                                     foreach ($languagesList as $teampassLang) {
                                         echo '
-                                <option value="' . $teampassLang . '"', isset($SETTINGS['default_language']) === true && $SETTINGS['default_language'] === $teampassLang ? ' selected' : '', '>' . $teampassLang . '</option>';
+                                <option value="' . $teampassLang.'"', isset($SETTINGS['default_language']) === true && $SETTINGS['default_language'] === $teampassLang ? ' selected' : '', '>'.$teampassLang.'</option>';
                                     }
                                     ?>
                                 </select>
@@ -471,7 +471,7 @@ 
                                 <?php
                                 foreach (TP_PW_COMPLEXITY as $complex) {
                                     echo '
-                                <option value="' . $complex[0] . '"', isset($SETTINGS['personal_saltkey_security_level']) === true && $SETTINGS['personal_saltkey_security_level'] === $complex[0] ? ' selected' : '', '>' . $complex[1] . '</option>';
+                                <option value="' . $complex[0].'"', isset($SETTINGS['personal_saltkey_security_level']) === true && $SETTINGS['personal_saltkey_security_level'] === $complex[0] ? ' selected' : '', '>'.$complex[1].'</option>';
                                 }
                                 ?>
                             </select>
@@ -848,7 +848,7 @@ 
                                         $roles = getRolesTitles();
                                         foreach ($roles as $role) {
                                             echo '
-                                    <option value="' . htmlspecialchars($role['id']) . '"', in_array($role['id'], $arrRolesToPrint) === true ? ' selected' : '', '>' . htmlspecialchars(addslashes($role['title'])) . '</option>';
+                                    <option value="' . htmlspecialchars($role['id']).'"', in_array($role['id'], $arrRolesToPrint) === true ? ' selected' : '', '>'.htmlspecialchars(addslashes($role['title'])).'</option>';
                                         }
                                     }
                                     ?>
@@ -1075,7 +1075,7 @@ 
                                     <?php
                                     foreach (TP_PW_COMPLEXITY as $complex) {
                                         echo '
-                                <option value="' . $complex[0] . '"', isset($SETTINGS['offline_key_level']) === true && $SETTINGS['offline_key_level'] === $complex[0] ? ' selected' : '', '>' . $complex[1] . '</option>';
+                                <option value="' . $complex[0].'"', isset($SETTINGS['offline_key_level']) === true && $SETTINGS['offline_key_level'] === $complex[0] ? ' selected' : '', '>'.$complex[1].'</option>';
                                     }
                                     ?>
                                 </select>

pages/favourites.php

Spacing +4 added lines, -4 removed lines

@@ -72,7 +72,7 @@ 
     || (isset($session_user_admin) && (int) $session_user_admin === 1)) {
     // Not allowed page
     $session->set('system-error_code', ERR_NOT_ALLOWED);
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit;
 }
 
@@ -125,12 +125,12 @@ 
                             if (empty($fav) === false) {
                                 $data = DB::queryFirstRow(
                                     'SELECT i.label, i.description, i.id, i.id_tree, t.title
-                                    FROM ' . prefixTable('items') . ' as i
-                                    INNER JOIN ' . prefixTable('nested_tree') . ' as t ON (t.id = i.id_tree)
+                                    FROM ' . prefixTable('items').' as i
+                                    INNER JOIN ' . prefixTable('nested_tree').' as t ON (t.id = i.id_tree)
                                     WHERE i.id = %i',
                                     $fav
                                 );
-                                if (! empty($data['label'])) {
+                                if (!empty($data['label'])) {
                                     ?>
                                     <tr>
                                         <td>

includes/core/login.oauth2.php

Spacing +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
 use TeampassClasses\SessionManager\SessionManager;
 use TeampassClasses\ConfigManager\ConfigManager;
 
-require_once __DIR__. '/../../includes/config/include.php';
+require_once __DIR__.'/../../includes/config/include.php';
 require_once __DIR__.'/../../sources/main.functions.php';
 
 // init

sources/upload.attachments.php

Spacing +20 added lines, -20 removed lines

@@ -74,7 +74,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;
 }
 
@@ -107,7 +107,7 @@ 
 $post_isNewItem = $request->request->filter('isNewItem', null, FILTER_SANITIZE_NUMBER_INT);
 $post_randomId = $request->request->filter('randomId', null, FILTER_SANITIZE_NUMBER_INT);
 $post_isPersonal = $request->request->filter('isPersonal', null, FILTER_SANITIZE_NUMBER_INT);
-$post_fileSize= $request->request->filter('file_size', null, FILTER_SANITIZE_NUMBER_INT);
+$post_fileSize = $request->request->filter('file_size', null, FILTER_SANITIZE_NUMBER_INT);
 $chunk = $request->request->filter('chunk', 0, FILTER_SANITIZE_NUMBER_INT);
 $chunks = $request->request->filter('chunks', 0, FILTER_SANITIZE_NUMBER_INT);
 $fileName = $request->request->filter('name', '', FILTER_SANITIZE_FULL_SPECIAL_CHARS);
@@ -122,10 +122,10 @@ 
     $unit = strtoupper(substr(trim($POST_MAX_SIZE), -1)); // Assurez-vous de bien gérer les espaces éventuels
     $units = ['G' => 1073741824, 'M' => 1048576, 'K' => 1024];
     $multiplier = $units[$unit] ?? 1; // Vérifie si l'unité est dans le tableau, sinon 1
-    $maxSize = (int)$POST_MAX_SIZE * $multiplier;
+    $maxSize = (int) $POST_MAX_SIZE * $multiplier;
     
     // CHeck if the POST is too big
-    if (!empty($_SERVER['CONTENT_LENGTH']) && (int)$_SERVER['CONTENT_LENGTH'] > $maxSize && $maxSize > 0) {
+    if (!empty($_SERVER['CONTENT_LENGTH']) && (int) $_SERVER['CONTENT_LENGTH'] > $maxSize && $maxSize > 0) {
         handleAttachmentError('POST exceeded maximum allowed size.', 111, 413);
     }
 
@@ -134,7 +134,7 @@ 
         handleAttachmentError('File exceeds the maximum allowed size', 120, 413);
         die();
     }
-    if (WIP === true) error_log('POST_MAX_SIZE: ' . $POST_MAX_SIZE." - CONTENT_LENGTH: ".$_SERVER['CONTENT_LENGTH']." - UNIT: ".$unit." - MAX: ".$maxSize." - MULTIPLIER: ".$multiplier." - FILE_SIZE: ".$post_fileSize);
+    if (WIP === true) error_log('POST_MAX_SIZE: '.$POST_MAX_SIZE." - CONTENT_LENGTH: ".$_SERVER['CONTENT_LENGTH']." - UNIT: ".$unit." - MAX: ".$maxSize." - MULTIPLIER: ".$multiplier." - FILE_SIZE: ".$post_fileSize);
     
     // delete expired tokens
     DB::delete(prefixTable('tokens'), 'end_timestamp < %i', time());
@@ -185,7 +185,7 @@ 
         // check if token is expired
         $data = DB::queryFirstRow(
             'SELECT end_timestamp
-            FROM ' . prefixTable('tokens') . '
+            FROM ' . prefixTable('tokens').'
             WHERE user_id = %i AND token = %s',
             $session->get('user-id'),
             $post_user_token
@@ -218,7 +218,7 @@ 
 
 // HTTP headers for no cache etc
 header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
-header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
+header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
 header('Cache-Control: no-store, no-cache, must-revalidate');
 header('Cache-Control: post-check=0, pre-check=0', false);
 
@@ -256,7 +256,7 @@ 
 // Validate file name (for our purposes we'll just remove invalid characters)
 $file_name = preg_replace('[^A-Za-z0-9]', '', strtolower(basename($_FILES['file']['name'])));
 if (strlen($file_name) == 0 || strlen($file_name) > $MAX_FILENAME_LENGTH) {
-    handleAttachmentError('Invalid file name: ' . $file_name . '.', 114);
+    handleAttachmentError('Invalid file name: '.$file_name.'.', 114);
 }
 
 // Validate file extension
@@ -266,8 +266,8 @@ 
         $ext,
         explode(
             ',',
-            $SETTINGS['upload_docext'] . ',' . $SETTINGS['upload_imagesext'] .
-                ',' . $SETTINGS['upload_pkgext'] . ',' . $SETTINGS['upload_otherext']
+            $SETTINGS['upload_docext'].','.$SETTINGS['upload_imagesext'].
+                ','.$SETTINGS['upload_pkgext'].','.$SETTINGS['upload_otherext']
         )
     ) === false
 ) {
@@ -279,24 +279,24 @@ 
 
 // Clean the fileName for security reasons
 $fileInfo = pathinfo($fileName);
-$fileName = base64_encode($fileInfo['filename']) . '.' . $fileInfo['extension'];
+$fileName = base64_encode($fileInfo['filename']).'.'.$fileInfo['extension'];
 $fileFullSize = 0;
 
 // Make sure the fileName is unique but only if chunking is disabled
-if ($chunks < 2 && file_exists($targetDir . DIRECTORY_SEPARATOR . $fileName)) {
+if ($chunks < 2 && file_exists($targetDir.DIRECTORY_SEPARATOR.$fileName)) {
     $ext = strrpos($fileName, '.');
     $fileNameA = substr($fileName, 0, $ext);
     $fileNameB = substr($fileName, $ext);
 
     $count = 1;
-    while (file_exists($targetDir . DIRECTORY_SEPARATOR . $fileNameA . '_' . $count . $fileNameB)) {
+    while (file_exists($targetDir.DIRECTORY_SEPARATOR.$fileNameA.'_'.$count.$fileNameB)) {
         ++$count;
     }
 
-    $fileName = $fileNameA . '_' . $count . $fileNameB;
+    $fileName = $fileNameA.'_'.$count.$fileNameB;
 }
 
-$filePath = $targetDir . DIRECTORY_SEPARATOR . $fileName;
+$filePath = $targetDir.DIRECTORY_SEPARATOR.$fileName;
 
 // Create target dir
 if (file_exists($targetDir) === false) {
@@ -310,7 +310,7 @@ 
 // Remove old temp files
 if ($cleanupTargetDir && is_dir($targetDir) && ($dir = opendir($targetDir))) {
     while (($file = readdir($dir)) !== false) {
-        $tmpfilePath = $targetDir . DIRECTORY_SEPARATOR . $file;
+        $tmpfilePath = $targetDir.DIRECTORY_SEPARATOR.$file;
 
         // Remove temp file if it is older than the max age and is not the current file
         if (
@@ -429,8 +429,8 @@ 
         // This is a public object
         $users = DB::query(
             'SELECT id, public_key
-            FROM ' . prefixTable('users') . '
-            WHERE id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '")
+            FROM ' . prefixTable('users').'
+            WHERE id NOT IN ("' . OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'")
             AND public_key != ""'
         );
         foreach ($users as $user) {
@@ -464,14 +464,14 @@ 
                 'date' => time(),
                 'id_user' => $session->get('user-id'),
                 'action' => 'at_modification',
-                'raison' => 'at_add_file : ' . $fileName . ':' . $newID,
+                'raison' => 'at_add_file : '.$fileName.':'.$newID,
             )
         );
     }
 }
 
 // Return JSON-RPC response
-die('{"jsonrpc" : "2.0", "result" : null, "id" : "' . $newID . '"}');
+die('{"jsonrpc" : "2.0", "result" : null, "id" : "'.$newID.'"}');
 
 /**
  * Handle errors and kill script.

sources/roles.queries.php

Spacing +5 added lines, -5 removed lines

@@ -76,7 +76,7 @@ 
 ) {
     // Not allowed page
     $session->set('system-error_code', ERR_NOT_ALLOWED);
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit;
 }
 
@@ -461,7 +461,7 @@ 
                         );
 
                         // add new role to user
-                        $tmp = $data_tmp['fonction_id'] . (substr($data_tmp['fonction_id'], -1) == ';' ? $role_id : ';' . $role_id);
+                        $tmp = $data_tmp['fonction_id'].(substr($data_tmp['fonction_id'], -1) == ';' ? $role_id : ';'.$role_id);
                         $session->set('user-roles', str_replace(';;', ';', $tmp));
 
                         // store in DB
@@ -649,7 +649,7 @@ 
                         $groupsData = $openLdapExtra->getADGroups($ldapConnection, $SETTINGS);
                         break;
                     default:
-                        throw new Exception("Unsupported LDAP type: " . $SETTINGS['ldap_type']);
+                        throw new Exception("Unsupported LDAP type: ".$SETTINGS['ldap_type']);
                 }
             } catch (Exception $e) {
                 if (defined('LOG_TO_SERVER') && LOG_TO_SERVER === true) {
@@ -669,7 +669,7 @@ 
             } else {
                 // Handle successful retrieval of groups
                 // exists in Teampass
-                foreach($groupsData['userGroups'] as $key => $group) {
+                foreach ($groupsData['userGroups'] as $key => $group) {
                     $role_detail = DB::queryFirstRow(
                         'SELECT a.increment_id as increment_id, a.role_id as role_id, r.title as title
                         FROM '.prefixTable('ldap_groups_roles').' AS a
@@ -694,7 +694,7 @@ 
             
             // Get all groups in Teampass
             $teampassRoles = array();
-            $rows = DB::query('SELECT id,title FROM ' . prefixTable('roles_title'));
+            $rows = DB::query('SELECT id,title FROM '.prefixTable('roles_title'));
             foreach ($rows as $record) {
                 array_push(
                     $teampassRoles,