nilsteampassnet / TeamPass

scripts/background_tasks___do_calculation.php

Spacing +4 added lines, -4 removed lines

@@ -72,7 +72,7 @@ 
     // get count of Items in this folder
     $get = DB::queryFirstRow(
         'SELECT count(*) as num_results
-        FROM ' . prefixTable('items') . '
+        FROM ' . prefixTable('items').'
         WHERE inactif = %i AND id_tree = %i',
         0,
         $child->id
@@ -81,14 +81,14 @@ 
     $ret[$child->id]['id'] = $child->id;
 
     // get number of subfolders
-    $nodeDescendants =$tree->getDescendants($child->id, false, false, true);
+    $nodeDescendants = $tree->getDescendants($child->id, false, false, true);
     $ret[$child->id]['subfoldersCount'] = count($nodeDescendants);
 
     // get items number in subfolders
     if (count($nodeDescendants) > 0) {
         $get = DB::queryFirstRow(
             'SELECT count(*) as num_results
-            FROM ' . prefixTable('items') . '
+            FROM ' . prefixTable('items').'
             WHERE inactif = %i AND id_tree IN (%l)',
             0,
             implode(',', $nodeDescendants)
@@ -139,7 +139,7 @@ 
     // Get item key
     $itemKey = DB::queryFirstRow(
         'SELECT share_key
-        FROM ' . prefixTable('sharekeys_items') . '
+        FROM ' . prefixTable('sharekeys_items').'
         WHERE user_id = %i AND object_id = %i',
         TP_USER_ID,
         $item['itemId']

sources/logs.datatables.php

Spacing +24 added lines, -26 removed lines

@@ -76,7 +76,7 @@ 
 ) {
     // Not allowed page
     $session->set('system-error_code', ERR_NOT_ALLOWED);
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit;
 }
 
@@ -168,7 +168,7 @@ 
     
     // Output
     $sOutput = '{';
-    $sOutput .= '"sEcho": '. $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT) . ', ';
+    $sOutput .= '"sEcho": '.$request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT).', ';
     $sOutput .= '"iTotalRecords": '.$iTotal.', ';
     $sOutput .= '"iTotalDisplayRecords": '.$iTotal.', ';
     $sOutput .= '"aaData": ';
@@ -241,7 +241,7 @@ 
 
     // Output
     $sOutput = '{';
-    $sOutput .= '"sEcho": '. $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT) . ', ';
+    $sOutput .= '"sEcho": '.$request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT).', ';
     $sOutput .= '"iTotalRecords": '.$iTotal.', ';
     $sOutput .= '"iTotalDisplayRecords": '.$iTotal.', ';
     $sOutput .= '"aaData": ';
@@ -314,7 +314,7 @@ 
 
     // Output
     $sOutput = '{';
-    $sOutput .= '"sEcho": '. (int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT) . ', ';
+    $sOutput .= '"sEcho": '.(int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT).', ';
     $sOutput .= '"iTotalRecords": '.$iTotal.', ';
     $sOutput .= '"iTotalDisplayRecords": '.$iTotal.', ';
     $sOutput .= '"aaData": ';
@@ -387,7 +387,7 @@ 
 
     // Output
     $sOutput = '{';
-    $sOutput .= '"sEcho": '. (int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT) . ', ';
+    $sOutput .= '"sEcho": '.(int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT).', ';
     $sOutput .= '"iTotalRecords": '.$iTotal.', ';
     $sOutput .= '"iTotalDisplayRecords": '.$iTotal.', ';
     $sOutput .= '"aaData": [ ';
@@ -490,7 +490,7 @@ 
 
     // Output
     $sOutput = '{';
-    $sOutput .= '"sEcho": '. (int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT) . ', ';
+    $sOutput .= '"sEcho": '.(int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT).', ';
     $sOutput .= '"iTotalRecords": '.$iTotal.', ';
     $sOutput .= '"iTotalDisplayRecords": '.$iTotal.', ';
     $sOutput .= '"aaData": [ ';
@@ -572,7 +572,7 @@ 
         $iTotal = 0;
     }
     $sOutput = '{';
-    $sOutput .= '"sEcho": '. (int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT) . ', ';
+    $sOutput .= '"sEcho": '.(int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT).', ';
     $sOutput .= '"iTotalRecords": '.$iTotal.', ';
     $sOutput .= '"iTotalDisplayRecords": '.$iTotal.', ';
     $sOutput .= '"aaData": ';
@@ -648,7 +648,7 @@ 
 
     // Output
     $sOutput = '{';
-    $sOutput .= '"sEcho": '. (int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT) . ', ';
+    $sOutput .= '"sEcho": '.(int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT).', ';
     $sOutput .= '"iTotalRecords": '.$iTotal.', ';
     $sOutput .= '"iTotalDisplayRecords": '.$iTotal.', ';
     $sOutput .= '"aaData": ';
@@ -717,7 +717,7 @@ 
 
     // Output
     $sOutput = '{';
-    $sOutput .= '"sEcho": '. (int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT) . ', ';
+    $sOutput .= '"sEcho": '.(int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT).', ';
     $sOutput .= '"iTotalRecords": '.$iTotal.', ';
     $sOutput .= '"iTotalDisplayRecords": '.$iTotal.', ';
     $sOutput .= '"aaData": ';
@@ -790,7 +790,7 @@ 
 
     // Output
     $sOutput = '{';
-    $sOutput .= '"sEcho": '. (int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT) . ', ';
+    $sOutput .= '"sEcho": '.(int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT).', ';
     $sOutput .= '"iTotalRecords": '.$iTotal.', ';
     $sOutput .= '"iTotalDisplayRecords": '.$iTotal.', ';
     $sOutput .= '"aaData": ';
@@ -867,7 +867,7 @@ 
             FROM '.prefixTable('background_tasks').' AS p 
             LEFT JOIN '.prefixTable('users').' AS u ON %l
             WHERE %l ORDER BY %l %l LIMIT %i, %i';
-    $params = ['u.id = json_extract(p.arguments, "$[0]")',$sWhere, $orderColumn, $orderDirection, $sLimitStart, $sLimitLength];
+    $params = ['u.id = json_extract(p.arguments, "$[0]")', $sWhere, $orderColumn, $orderDirection, $sLimitStart, $sLimitLength];
 
     // Get the records
     $rows = DB::query($sql, ...$params);
@@ -875,7 +875,7 @@ 
 
     // Output
     $sOutput = '{';
-    $sOutput .= '"sEcho": '. (int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT) . ', ';
+    $sOutput .= '"sEcho": '.(int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT).', ';
     $sOutput .= '"iTotalRecords": '.$iTotal.', ';
     $sOutput .= '"iTotalDisplayRecords": '.$iTotal.', ';
     $sOutput .= '"aaData": ';
@@ -890,7 +890,7 @@ 
         //col1
         $sOutput .= '"<span data-done=\"'.$record['is_in_progress'].'\" data-type=\"'.$record['process_type'].'\" data-process-id=\"'.$record['increment_id'].'\"></span>", ';
         //col2
-        $sOutput .= '"'.date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['created_at']).'", ';
+        $sOutput .= '"'.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['created_at']).'", ';
         //col3
         //$sOutput .= '"'.($record['updated_at'] === '' ? '-' : date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['updated_at'])).'", ';
         $sOutput .= '"<div class=\"progress mt-2\"><div class=\"progress-bar\" style=\"width: '.$subtaskProgress.'\">'.$subtaskProgress.'</div></div>", ';
@@ -900,7 +900,7 @@ 
         // col5
         if (in_array($record['process_type'], array('create_user_keys', 'item_copy')) === true) {
             $data_user = DB::queryFirstRow(
-                'SELECT name, lastname FROM ' . prefixTable('users') . '
+                'SELECT name, lastname FROM '.prefixTable('users').'
                 WHERE id = %i',
                 json_decode($record['arguments'], true)['new_user_id']
             );
@@ -956,7 +956,7 @@ 
     FROM '.prefixTable('background_tasks').' AS p 
     LEFT JOIN '.prefixTable('users').' AS u ON %l
     WHERE %l ORDER BY %l %l LIMIT %i, %i';
-    $params = ['u.id = json_extract(p.arguments, "$[0]")',$sWhere, $orderColumn, $orderDirection, $sLimitStart, $sLimitLength];
+    $params = ['u.id = json_extract(p.arguments, "$[0]")', $sWhere, $orderColumn, $orderDirection, $sLimitStart, $sLimitLength];
 
     // Get the records
     $rows = DB::query($sql, ...$params);
@@ -964,7 +964,7 @@ 
 
     // Output
     $sOutput = '{';
-    $sOutput .= '"sEcho": '. (int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT) . ', ';
+    $sOutput .= '"sEcho": '.(int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT).', ';
     $sOutput .= '"iTotalRecords": '.$iTotal.', ';
     $sOutput .= '"iTotalDisplayRecords": '.$iTotal.', ';
     $sOutput .= '"aaData": ';
@@ -980,13 +980,12 @@ 
         //col1
         $sOutput .= '"'.(is_null($record['error_message']) ? '' : addslashes($record['error_message'])).'", ';
         //col2
-        $sOutput .= '"'.date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['created_at']).'", ';
+        $sOutput .= '"'.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['created_at']).'", ';
         //col3
         $sOutput .= is_null($record['started_at']) === false ?
-            ('"'.date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['started_at']).'", ') :
-                ('"'.date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['created_at']).'", ');
+            ('"'.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['started_at']).'", ') : ('"'.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['created_at']).'", ');
         //col4
-        $sOutput .= '"'.date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['finished_at']).'", '; 
+        $sOutput .= '"'.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['finished_at']).'", '; 
         // col7
         $sOutput .= '"'.gmdate('H:i:s', (int) $record['finished_at'] - (is_null($record['started_at']) === false ? (int) $record['started_at'] : (int) $record['created_at'])).'",';
         //col5
@@ -1009,11 +1008,10 @@ 
         // col6
         $arguments = json_decode($record['arguments'], true);
         $newUserId = array_key_exists('new_user_id', $arguments) ? 
-            $arguments['new_user_id'] : 
-            (array_key_exists('user_id', $arguments) ? $arguments['user_id'] : null);
+            $arguments['new_user_id'] : (array_key_exists('user_id', $arguments) ? $arguments['user_id'] : null);
         if ($record['process_type'] === 'create_user_keys' && is_null($newUserId) === false && empty($newUserId) === false) {
             $data_user = DB::queryFirstRow(
-                'SELECT name, lastname, login FROM ' . prefixTable('users') . '
+                'SELECT name, lastname, login FROM '.prefixTable('users').'
                 WHERE id = %i',
                 $newUserId
             );
@@ -1029,7 +1027,7 @@ 
         } elseif ($record['process_type'] === 'user_build_cache_tree') {
             $user = json_decode($record['arguments'], true)['user_id'];
             $data_user = DB::queryFirstRow(
-                'SELECT name, lastname, login FROM ' . prefixTable('users') . '
+                'SELECT name, lastname, login FROM '.prefixTable('users').'
                 WHERE id = %i',
                 $user
             );
@@ -1063,7 +1061,7 @@ 
 {
     $subtasks = DB::query(
         'SELECT *
-        FROM ' . prefixTable('background_subtasks') . '
+        FROM ' . prefixTable('background_subtasks').'
         WHERE task_id = %i',
         $id
     );
@@ -1079,5 +1077,5 @@ 
         $i++;
     }
 
-    return ($finished_nb !== 0 ? pourcentage($finished_nb, $nb, 100) : 0) .'%';
+    return ($finished_nb !== 0 ? pourcentage($finished_nb, $nb, 100) : 0).'%';
 }
\ No newline at end of file

scripts/taskLogger.php

Spacing +2 added lines, -2 removed lines

@@ -47,8 +47,8 @@
      */
     public function log(string $message, string $level = 'INFO') {
         if (!empty($this->settings['enable_tasks_log'])) {
-            $formattedMessage = date($this->settings['date_format'] . ' ' . $this->settings['time_format']) . 
-                                " - [$level] $message" . PHP_EOL;
+            $formattedMessage = date($this->settings['date_format'].' '.$this->settings['time_format']). 
+                                " - [$level] $message".PHP_EOL;
 
             if (!empty($this->logFile)) {
                 // WWrite to the specified log file

scripts/background_tasks___handler.php

Braces +21 added lines, -7 removed lines

@@ -55,7 +55,9 @@ 
     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 +66,9 @@ 
             $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();
         }
@@ -131,7 +135,9 @@ 
         
         // 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;
         }
 
@@ -149,7 +155,9 @@ 
         );
 
         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 +168,9 @@ 
      * @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(
@@ -188,7 +198,9 @@ 
             $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'),
                 [
@@ -290,7 +302,9 @@ 
             $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');
+        }
     }
 }
 

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",
@@ -114,8 +114,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,
@@ -132,7 +132,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;
         }
 
@@ -141,7 +141,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
@@ -150,7 +150,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);
         }
     }
@@ -161,7 +161,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(
@@ -179,19 +179,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'),
                 [
@@ -213,7 +213,7 @@ 
     private function countRunningTasks(): int {
         return DB::queryFirstField(
             'SELECT COUNT(*) 
-            FROM ' . prefixTable('background_tasks') . ' 
+            FROM ' . prefixTable('background_tasks').' 
             WHERE is_in_progress = 1'
         );
     }
@@ -234,10 +234,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'
@@ -250,7 +250,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)
         );
@@ -267,7 +267,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,
@@ -282,19 +282,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');
     }
 }
 
@@ -308,5 +308,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

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

Braces +3 added lines, -1 removed lines

@@ -134,7 +134,9 @@
         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());

Spacing +21 added lines, -21 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
@@ -269,8 +269,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
     ) {
@@ -283,24 +283,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) {
@@ -314,7 +314,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 (
@@ -416,7 +416,7 @@ 
         prefixTable('files'),
         array(
             'id_item' => $post_itemId,
-            'name' => 'b64:' . $fileName,   // add "b64:" prefix to indicate that the file name is base64 encoded
+            'name' => 'b64:'.$fileName, // add "b64:" prefix to indicate that the file name is base64 encoded
             'size' => $post_fileSize,
             'extension' => $fileInfo['extension'],
             'type' => $_FILES['file']['type'],
@@ -433,8 +433,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) {
@@ -468,14 +468,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,

sources/tree.php

Spacing +19 added lines, -19 removed lines

@@ -64,7 +64,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;
 }
 
@@ -125,7 +125,7 @@ 
 );
 
 $lastFolderChange = DB::queryFirstRow(
-    'SELECT valeur FROM ' . prefixTable('misc') . '
+    'SELECT valeur FROM '.prefixTable('misc').'
     WHERE type = %s AND intitule = %s',
     'timestamp',
     'last_folder_change'
@@ -346,7 +346,7 @@ 
         $nbItemsInSubfolders = (int) $node->nb_items_in_subfolders;
         $nbItemsInFolder = (int) $node->nb_items_in_folder;
         $nbSubfolders = (int) $node->nb_subfolders;
-        break;  // Get out as soon as we find a valid node.
+        break; // Get out as soon as we find a valid node.
     }
     
     if ($displayThisNode === true) {
@@ -458,7 +458,7 @@ 
         foreach ($currentNode->children as $child) {
             recursiveTree(
                 (int) $child,
-                $tree->getNode($child),// get node info for this child
+                $tree->getNode($child), // get node info for this child
                 /** @scrutinizer ignore-type */ $tree,
                 $listFoldersLimitedKeys,
                 $listRestrictedFoldersForItemsKeys,
@@ -505,7 +505,7 @@ 
     $lang = new Language($session->get('user-language') ?? 'english');
 
     // prepare json return for current node
-    $parent = $currentNode->parent_id === '0' ? '#' : 'li_' . $currentNode->parent_id;
+    $parent = $currentNode->parent_id === '0' ? '#' : 'li_'.$currentNode->parent_id;
 
     // handle displaying
     if (isKeyExistingAndEqual('show_only_accessible_folders', 1, $SETTINGS) === true) {
@@ -522,17 +522,17 @@ 
         array_push(
             $ret_json,
             array(
-                'id' => 'li_' . $nodeId,
+                'id' => 'li_'.$nodeId,
                 'parent' => $last_visible_parent === -1 ? $parent : $last_visible_parent,
                 'text' => '<i class="'.$currentNode->fa_icon.' tree-folder mr-2" data-folder="'.$currentNode->fa_icon.'"  data-folder-selected="'.$currentNode->fa_icon_selected.'"></i>'.$text.htmlspecialchars($currentNode->title).$nodeData['html'],
                 'li_attr' => array(
                     'class' => 'jstreeopen',
-                    'title' => 'ID [' . $nodeId . '] ' . $nodeData['title'],
+                    'title' => 'ID ['.$nodeId.'] '.$nodeData['title'],
                 ),
                 'a_attr' => array(
-                    'id' => 'fld_' . $nodeId,
+                    'id' => 'fld_'.$nodeId,
                     'class' => $nodeData['folderClass'],
-                    'onclick' => 'ListerItems(' . $nodeId . ', ' . $nodeData['restricted'] . ', 0, 1)',
+                    'onclick' => 'ListerItems('.$nodeId.', '.$nodeData['restricted'].', 0, 1)',
                     'data-title' => htmlspecialchars($currentNode->title),
                 ),
                 'is_pf' => in_array($nodeId, $inputData['personalFolders']) === true ? 1 : 0,
@@ -548,12 +548,12 @@ 
         array_push(
             $ret_json,
             array(
-                'id' => 'li_' . $nodeId,
+                'id' => 'li_'.$nodeId,
                 'parent' => $last_visible_parent === -1 ? $parent : $last_visible_parent,
                 'text' => '<i class="'.$currentNode->fa_icon.' tree-folder mr-2" data-folder="'.$currentNode->fa_icon.'"  data-folder-selected="'.$currentNode->fa_icon_selected.'"></i>'.'<i class="fas fa-times fa-xs text-danger mr-1 ml-1"></i>'.$text.htmlspecialchars($currentNode->title).$nodeData['html'],
                 'li_attr' => array(
                     'class' => '',
-                    'title' => 'ID [' . $nodeId . '] ' . $lang->get('no_access'),
+                    'title' => 'ID ['.$nodeId.'] '.$lang->get('no_access'),
                 ),
             )
         );
@@ -613,7 +613,7 @@ 
         if (in_array($nodeId, $session_read_only_folders) === true) {
             return [
                 'html' => '<i class="far fa-eye fa-xs mr-1 ml-1"></i>'.
-                    ($tree_counters === 1 ? '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_' . $nodeId . '">' . $nbItemsInFolder .'/'.$nbItemsInSubfolders .'/'.$nbSubfolders. '</span>'  : ''),
+                    ($tree_counters === 1 ? '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_'.$nodeId.'">'.$nbItemsInFolder.'/'.$nbItemsInSubfolders.'/'.$nbSubfolders.'</span>' : ''),
                 'title' => $lang->get('read_only_account'),
                 'restricted' => 1,
                 'folderClass' => 'folder_not_droppable',
@@ -628,7 +628,7 @@ 
         ) {
             return [
                 'html' => '<i class="far fa-eye fa-xs mr-1"></i>'.
-                    ($tree_counters === 1 ? '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_' . $nodeId . '">' . $nbItemsInFolder .'/'.$nbItemsInSubfolders .'/'.$nbSubfolders. '</span>'  : ''),
+                    ($tree_counters === 1 ? '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_'.$nodeId.'">'.$nbItemsInFolder.'/'.$nbItemsInSubfolders.'/'.$nbSubfolders.'</span>' : ''),
                 'title' => $lang->get('read_only_account'),
                 'restricted' => 0,
                 'folderClass' => 'folder',
@@ -639,7 +639,7 @@ 
         }
         
         return [
-            'html' => ($tree_counters === 1 ? '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_' . $nodeId . '">' . $nbItemsInFolder .'/'.$nbItemsInSubfolders .'/'.$nbSubfolders. '</span>'  : ''),
+            'html' => ($tree_counters === 1 ? '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_'.$nodeId.'">'.$nbItemsInFolder.'/'.$nbItemsInSubfolders.'/'.$nbSubfolders.'</span>' : ''),
             'title' => '',
             'restricted' => 0,
             'folderClass' => 'folder',
@@ -650,8 +650,8 @@ 
 
     } elseif (in_array($nodeId, $listFoldersLimitedKeys) === true) {
         return [
-            'html' => ($session_user_read_only === true ? '<i class="far fa-eye fa-xs mr-1"></i>' : '') .
-                ($tree_counters === 1 ? '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_' . $nodeId . '">' . count($session_list_folders_limited[$nodeId]) . '</span>' : ''),
+            'html' => ($session_user_read_only === true ? '<i class="far fa-eye fa-xs mr-1"></i>' : '').
+                ($tree_counters === 1 ? '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_'.$nodeId.'">'.count($session_list_folders_limited[$nodeId]).'</span>' : ''),
             'title' => '',
             'restricted' => 1,
             'folderClass' => 'folder',
@@ -662,8 +662,8 @@ 
 
     } elseif (in_array($nodeId, $listRestrictedFoldersForItemsKeys) === true) {
         return [
-            'html' => $session_user_read_only === true ? '<i class="far fa-eye fa-xs mr-1"></i>' : '' .
-                '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_' . $nodeId . '">' . count($session_list_restricted_folders_for_items[$nodeId]) . '</span>',
+            'html' => $session_user_read_only === true ? '<i class="far fa-eye fa-xs mr-1"></i>' : ''.
+                '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_'.$nodeId.'">'.count($session_list_restricted_folders_for_items[$nodeId]).'</span>',
             'title' => '',
             'restricted' => 1,
             'folderClass' => 'folder',
@@ -773,7 +773,7 @@ 
     // Does this user has a tree cache
     $userCacheTree = DB::queryFirstRow(
         'SELECT data
-        FROM ' . prefixTable('cache_tree') . '
+        FROM ' . prefixTable('cache_tree').'
         WHERE user_id = %i',
         $userId
     );