nilsteampassnet / TeamPass

sources/logs.datatables.php

Spacing +24 added lines, -26 removed lines

@@ -76,7 +76,7 @@ 
 ) {
     // Not allowed page
     $session->set('system-error_code', ERR_NOT_ALLOWED);
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit;
 }
 
@@ -168,7 +168,7 @@ 
     
     // Output
     $sOutput = '{';
-    $sOutput .= '"sEcho": '. $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT) . ', ';
+    $sOutput .= '"sEcho": '.$request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT).', ';
     $sOutput .= '"iTotalRecords": '.$iTotal.', ';
     $sOutput .= '"iTotalDisplayRecords": '.$iTotal.', ';
     $sOutput .= '"aaData": ';
@@ -241,7 +241,7 @@ 
 
     // Output
     $sOutput = '{';
-    $sOutput .= '"sEcho": '. $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT) . ', ';
+    $sOutput .= '"sEcho": '.$request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT).', ';
     $sOutput .= '"iTotalRecords": '.$iTotal.', ';
     $sOutput .= '"iTotalDisplayRecords": '.$iTotal.', ';
     $sOutput .= '"aaData": ';
@@ -314,7 +314,7 @@ 
 
     // Output
     $sOutput = '{';
-    $sOutput .= '"sEcho": '. (int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT) . ', ';
+    $sOutput .= '"sEcho": '.(int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT).', ';
     $sOutput .= '"iTotalRecords": '.$iTotal.', ';
     $sOutput .= '"iTotalDisplayRecords": '.$iTotal.', ';
     $sOutput .= '"aaData": ';
@@ -387,7 +387,7 @@ 
 
     // Output
     $sOutput = '{';
-    $sOutput .= '"sEcho": '. (int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT) . ', ';
+    $sOutput .= '"sEcho": '.(int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT).', ';
     $sOutput .= '"iTotalRecords": '.$iTotal.', ';
     $sOutput .= '"iTotalDisplayRecords": '.$iTotal.', ';
     $sOutput .= '"aaData": [ ';
@@ -490,7 +490,7 @@ 
 
     // Output
     $sOutput = '{';
-    $sOutput .= '"sEcho": '. (int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT) . ', ';
+    $sOutput .= '"sEcho": '.(int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT).', ';
     $sOutput .= '"iTotalRecords": '.$iTotal.', ';
     $sOutput .= '"iTotalDisplayRecords": '.$iTotal.', ';
     $sOutput .= '"aaData": [ ';
@@ -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/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) {

Braces +18 added lines, -6 removed lines

@@ -64,7 +64,9 @@ 
      */
     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 +138,9 @@ 
             $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 +154,9 @@ 
             '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');
+        }
     }
 
     /**
@@ -185,7 +191,9 @@ 
      * @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',
@@ -194,7 +202,9 @@ 
     
         // 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 +214,9 @@ 
                 // 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'] ?? '') {

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

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');
+        }
     }
 }