nilsteampassnet / TeamPass

sources/backup.functions.php

Spacing +21 added lines, -21 removed lines

@@ -55,7 +55,7 @@ 
     function tpCreateDatabaseBackup(array $SETTINGS, string $encryptionKey = '', array $options = []): array
     {
         // Ensure required dependencies are loaded
-        $mainFunctionsPath = __DIR__ . '/main.functions.php';
+        $mainFunctionsPath = __DIR__.'/main.functions.php';
         if (!function_exists('GenerateCryptKey') && is_file($mainFunctionsPath)) {
             require_once $mainFunctionsPath;
         }
@@ -64,9 +64,9 @@ 
         }
 
         $outputDir = $options['output_dir'] ?? ($SETTINGS['path_to_files_folder'] ?? '');
-        $prefix = (string)($options['filename_prefix'] ?? '');
-        $chunkRows = (int)($options['chunk_rows'] ?? 1000);
-        $flushEvery = (int)($options['flush_every_inserts'] ?? 200);
+        $prefix = (string) ($options['filename_prefix'] ?? '');
+        $chunkRows = (int) ($options['chunk_rows'] ?? 1000);
+        $flushEvery = (int) ($options['flush_every_inserts'] ?? 200);
         $includeTables = $options['include_tables'] ?? [];
         $excludeTables = $options['exclude_tables'] ?? [];
 
@@ -77,7 +77,7 @@ 
                 'filepath' => '',
                 'encrypted' => false,
                 'size_bytes' => 0,
-                'message' => 'Backup folder is not writable or not found: ' . $outputDir,
+                'message' => 'Backup folder is not writable or not found: '.$outputDir,
             ];
         }
 
@@ -86,8 +86,8 @@ 
             ? GenerateCryptKey(20, false, true, true, false, true)
             : bin2hex(random_bytes(10));
 
-        $filename = $prefix . time() . '-' . $token . '.sql';
-        $filepath = rtrim($outputDir, '/') . '/' . $filename;
+        $filename = $prefix.time().'-'.$token.'.sql';
+        $filepath = rtrim($outputDir, '/').'/'.$filename;
 
         $handle = @fopen($filepath, 'w+');
         if ($handle === false) {
@@ -97,7 +97,7 @@ 
                 'filepath' => $filepath,
                 'encrypted' => false,
                 'size_bytes' => 0,
-                'message' => 'Could not create backup file: ' . $filepath,
+                'message' => 'Could not create backup file: '.$filepath,
             ];
         }
 
@@ -130,22 +130,22 @@ 
                 }
 
                 // Write drop and creation
-                fwrite($handle, 'DROP TABLE IF EXISTS `' . $tableName . "`;\n");
+                fwrite($handle, 'DROP TABLE IF EXISTS `'.$tableName."`;\n");
 
-                $row2 = DB::queryFirstRow('SHOW CREATE TABLE `' . $tableName . '`');
+                $row2 = DB::queryFirstRow('SHOW CREATE TABLE `'.$tableName.'`');
                 if (!is_array($row2) || empty($row2['Create Table'])) {
                     // Skip table if structure cannot be fetched
                     fwrite($handle, "\n");
                     continue;
                 }
 
-                fwrite($handle, $row2['Create Table'] . ";\n\n");
+                fwrite($handle, $row2['Create Table'].";\n\n");
 
                 // Process table data in chunks to reduce memory usage
                 $offset = 0;
                 while (true) {
                     $rows = DB::query(
-                        'SELECT * FROM `' . $tableName . '` LIMIT %i OFFSET %i',
+                        'SELECT * FROM `'.$tableName.'` LIMIT %i OFFSET %i',
                         $chunkRows,
                         $offset
                     );
@@ -174,10 +174,10 @@ 
 
                             // Escape and keep newlines
                             $value = addslashes(preg_replace("/\n/", '\\n', $value));
-                            $values[] = '"' . $value . '"';
+                            $values[] = '"'.$value.'"';
                         }
 
-                        $insertQuery = 'INSERT INTO `' . $tableName . '` VALUES(' . implode(',', $values) . ");\n";
+                        $insertQuery = 'INSERT INTO `'.$tableName.'` VALUES('.implode(',', $values).");\n";
                         fwrite($handle, $insertQuery);
 
                         $insertCount++;
@@ -203,7 +203,7 @@ 
                 'filepath' => $filepath,
                 'encrypted' => false,
                 'size_bytes' => 0,
-                'message' => 'Backup failed: ' . $e->getMessage(),
+                'message' => 'Backup failed: '.$e->getMessage(),
             ];
         }
 
@@ -212,7 +212,7 @@ 
         // Encrypt the file if key provided
         $encrypted = false;
         if ($encryptionKey !== '') {
-            $tmpPath = rtrim($outputDir, '/') . '/defuse_temp_' . $filename;
+            $tmpPath = rtrim($outputDir, '/').'/defuse_temp_'.$filename;
 
             if (!function_exists('prepareFileWithDefuse')) {
                 @unlink($filepath);
@@ -238,7 +238,7 @@ 
                     'filepath' => $filepath,
                     'encrypted' => false,
                     'size_bytes' => 0,
-                    'message' => 'Encryption failed: ' . (is_string($ret) ? $ret : 'unknown error'),
+                    'message' => 'Encryption failed: '.(is_string($ret) ? $ret : 'unknown error'),
                 ];
             }
 
@@ -307,7 +307,7 @@ 
 
         if ($isUtf8 === false) {
             // ASCII safe fallback
-            return '[hex]' . bin2hex($str);
+            return '[hex]'.bin2hex($str);
         }
 
         // Strip ASCII control chars
@@ -346,7 +346,7 @@ 
 
             if (is_array($ret)) {
                 $hasError = !empty($ret['error']);
-                $msg = tpSafeUtf8String((string)($ret['message'] ?? $ret['details'] ?? $ret['error'] ?? ''));
+                $msg = tpSafeUtf8String((string) ($ret['message'] ?? $ret['details'] ?? $ret['error'] ?? ''));
                 return ['success' => !$hasError, 'message' => $msg];
             }
 
@@ -376,7 +376,7 @@ 
     ): array {
         $lastMsg = '';
         foreach ($candidateKeys as $k) {
-            $k = (string)$k;
+            $k = (string) $k;
             if ($k === '') {
                 continue;
             }
@@ -390,7 +390,7 @@ 
             if (!empty($r['success'])) {
                 return ['success' => true, 'message' => '', 'key_used' => $k];
             }
-            $lastMsg = tpSafeUtf8String((string)($r['message'] ?? ''));
+            $lastMsg = tpSafeUtf8String((string) ($r['message'] ?? ''));
         }
 
         return ['success' => false, 'message' => ($lastMsg !== '' ? $lastMsg : 'Unable to decrypt')];

sources/backups.queries.php

Spacing +97 added lines, -97 removed lines

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

Braces +24 added lines, -8 removed lines

@@ -465,7 +465,9 @@ 
             }
 
             $dataReceived = prepareExchangedData($post_data, 'decode');
-            if (!is_array($dataReceived)) $dataReceived = [];
+            if (!is_array($dataReceived)) {
+                $dataReceived = [];
+            }
 
             $enabled = (int)($dataReceived['enabled'] ?? 0);
             $enabled = ($enabled === 1) ? 1 : 0;
@@ -486,22 +488,34 @@ 
             }
 
             $dow = (int)($dataReceived['dow'] ?? 1);
-            if ($dow < 1 || $dow > 7) $dow = 1;
+            if ($dow < 1 || $dow > 7) {
+                $dow = 1;
+            }
 
             $dom = (int)($dataReceived['dom'] ?? 1);
-            if ($dom < 1) $dom = 1;
-            if ($dom > 31) $dom = 31;
+            if ($dom < 1) {
+                $dom = 1;
+            }
+            if ($dom > 31) {
+                $dom = 31;
+            }
 
             $retentionDays = (int)($dataReceived['retention_days'] ?? 30);
-            if ($retentionDays < 1) $retentionDays = 1;
-            if ($retentionDays > 3650) $retentionDays = 3650;
+            if ($retentionDays < 1) {
+                $retentionDays = 1;
+            }
+            if ($retentionDays > 3650) {
+                $retentionDays = 3650;
+            }
 
             // Output dir: default to <files>/backups
             $baseFilesDir = (string)($SETTINGS['path_to_files_folder'] ?? (__DIR__ . '/../files'));
             $defaultDir = rtrim($baseFilesDir, '/') . '/backups';
 
             $outputDir = trim((string)($dataReceived['output_dir'] ?? ''));
-            if ($outputDir === '') $outputDir = $defaultDir;
+            if ($outputDir === '') {
+                $outputDir = $defaultDir;
+            }
 
             // Safety: prevent path traversal / outside files folder
             @mkdir($outputDir, 0770, true);
@@ -578,7 +592,9 @@ 
             }
 
             $dataReceived = prepareExchangedData($post_data, 'decode');
-            if (!is_array($dataReceived)) $dataReceived = [];
+            if (!is_array($dataReceived)) {
+                $dataReceived = [];
+            }
 
             $file = (string)($dataReceived['file'] ?? '');
             $file = basename($file);

scripts/background_tasks___handler.php

Spacing +58 added lines, -58 removed lines

@@ -30,7 +30,7 @@ 
 use TeampassClasses\ConfigManager\ConfigManager;
 
 require_once __DIR__.'/../sources/main.functions.php';
-require_once __DIR__ . '/taskLogger.php';
+require_once __DIR__.'/taskLogger.php';
 
 class BackgroundTasksHandler {
     private $settings;
@@ -72,17 +72,17 @@ 
     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;
         }
 
         try {
             $this->cleanupStaleTasks();
-            $this->handleScheduledDatabaseBackup();   // <--- NEW
+            $this->handleScheduledDatabaseBackup(); // <--- NEW
             $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();
         }
@@ -92,7 +92,7 @@ 
      */
     private function handleScheduledDatabaseBackup(): void
     {
-        $enabled = (int)$this->getSettingValue('bck_scheduled_enabled', '0');
+        $enabled = (int) $this->getSettingValue('bck_scheduled_enabled', '0');
         if ($enabled !== 1) {
             return;
         }
@@ -100,19 +100,19 @@ 
         $now = time();
 
         // Output dir
-        $outputDir = (string)$this->getSettingValue('bck_scheduled_output_dir', '');
+        $outputDir = (string) $this->getSettingValue('bck_scheduled_output_dir', '');
         if ($outputDir === '') {
-            $baseFilesDir = (string)($this->settings['path_to_files_folder'] ?? (__DIR__ . '/../files'));
-            $outputDir = rtrim($baseFilesDir, '/') . '/backups';
+            $baseFilesDir = (string) ($this->settings['path_to_files_folder'] ?? (__DIR__.'/../files'));
+            $outputDir = rtrim($baseFilesDir, '/').'/backups';
             $this->upsertSettingValue('bck_scheduled_output_dir', $outputDir);
         }
 
         // next_run_at
-        $nextRunAt = (int)$this->getSettingValue('bck_scheduled_next_run_at', '0');
+        $nextRunAt = (int) $this->getSettingValue('bck_scheduled_next_run_at', '0');
         if ($nextRunAt <= 0) {
             $nextRunAt = $this->computeNextBackupRunAt($now);
-            $this->upsertSettingValue('bck_scheduled_next_run_at', (string)$nextRunAt);
-            if (LOG_TASKS === true) $this->logger->log('backup scheduler initialized next_run_at=' . $nextRunAt, 'INFO');
+            $this->upsertSettingValue('bck_scheduled_next_run_at', (string) $nextRunAt);
+            if (LOG_TASKS === true) $this->logger->log('backup scheduler initialized next_run_at='.$nextRunAt, 'INFO');
             return;
         }
 
@@ -121,9 +121,9 @@ 
         }
 
         // Avoid duplicates: if a database_backup task is already pending or running, skip.
-        $pending = (int)DB::queryFirstField(
+        $pending = (int) DB::queryFirstField(
             'SELECT COUNT(*)
-            FROM ' . prefixTable('background_tasks') . '
+            FROM ' . prefixTable('background_tasks').'
             WHERE process_type = %s
             AND is_in_progress IN (0,1)
             AND (finished_at IS NULL OR finished_at = "" OR finished_at = 0)',
@@ -139,7 +139,7 @@ 
         DB::insert(
             prefixTable('background_tasks'),
             [
-                'created_at' => (string)$now,
+                'created_at' => (string) $now,
                 'process_type' => 'database_backup',
                 'arguments' => json_encode(
                     [
@@ -153,15 +153,15 @@ 
             ]
         );
 
-    $this->upsertSettingValue('bck_scheduled_last_run_at', (string)$now);
+    $this->upsertSettingValue('bck_scheduled_last_run_at', (string) $now);
     $this->upsertSettingValue('bck_scheduled_last_status', 'queued');
     $this->upsertSettingValue('bck_scheduled_last_message', 'Task enqueued by scheduler');
 
         // Compute next run
         $newNext = $this->computeNextBackupRunAt($now + 60);
-        $this->upsertSettingValue('bck_scheduled_next_run_at', (string)$newNext);
+        $this->upsertSettingValue('bck_scheduled_next_run_at', (string) $newNext);
 
-        if (LOG_TASKS === true) $this->logger->log('backup scheduler: enqueued database_backup, next_run_at=' . $newNext, 'INFO');
+        if (LOG_TASKS === true) $this->logger->log('backup scheduler: enqueued database_backup, next_run_at='.$newNext, 'INFO');
     }
 
     /**
@@ -176,7 +176,7 @@ 
 {
     // TeamPass stores timezone in teampass_misc: type='admin', intitule='timezone'
     $tz = DB::queryFirstField(
-        'SELECT valeur FROM ' . prefixTable('misc') . ' WHERE type = %s AND intitule = %s LIMIT 1',
+        'SELECT valeur FROM '.prefixTable('misc').' WHERE type = %s AND intitule = %s LIMIT 1',
         'admin',
         'timezone'
     );
@@ -194,44 +194,44 @@ 
             $tz = new DateTimeZone('UTC');
         }
 
-        $freq = (string)$this->getSettingValue('bck_scheduled_frequency', 'daily');
-        $timeStr = (string)$this->getSettingValue('bck_scheduled_time', '02:00');
+        $freq = (string) $this->getSettingValue('bck_scheduled_frequency', 'daily');
+        $timeStr = (string) $this->getSettingValue('bck_scheduled_time', '02:00');
 
         if (!preg_match('/^\d{2}:\d{2}$/', $timeStr)) {
             $timeStr = '02:00';
         }
         [$hh, $mm] = array_map('intval', explode(':', $timeStr));
 
-        $now = (new DateTimeImmutable('@' . $fromTs))->setTimezone($tz);
+        $now = (new DateTimeImmutable('@'.$fromTs))->setTimezone($tz);
         $candidate = $now->setTime($hh, $mm, 0);
 
         if ($freq === 'weekly') {
-            $targetDow = (int)$this->getSettingValue('bck_scheduled_dow', '1'); // ISO 1..7
+            $targetDow = (int) $this->getSettingValue('bck_scheduled_dow', '1'); // ISO 1..7
             if ($targetDow < 1 || $targetDow > 7) $targetDow = 1;
 
-            $currentDow = (int)$candidate->format('N');
+            $currentDow = (int) $candidate->format('N');
             $delta = ($targetDow - $currentDow + 7) % 7;
             if ($delta === 0 && $candidate <= $now) {
                 $delta = 7;
             }
-            $candidate = $candidate->modify('+' . $delta . ' days');
+            $candidate = $candidate->modify('+'.$delta.' days');
 
         } elseif ($freq === 'monthly') {
-            $dom = (int)$this->getSettingValue('bck_scheduled_dom', '1');
+            $dom = (int) $this->getSettingValue('bck_scheduled_dom', '1');
             if ($dom < 1) $dom = 1;
             if ($dom > 31) $dom = 31;
 
-            $year = (int)$now->format('Y');
-            $month = (int)$now->format('m');
-            $daysInMonth = (int)$now->format('t');
+            $year = (int) $now->format('Y');
+            $month = (int) $now->format('m');
+            $daysInMonth = (int) $now->format('t');
             $day = min($dom, $daysInMonth);
 
             $candidate = $now->setDate($year, $month, $day)->setTime($hh, $mm, 0);
             if ($candidate <= $now) {
                 $nextMonth = $now->modify('first day of next month');
-                $year2 = (int)$nextMonth->format('Y');
-                $month2 = (int)$nextMonth->format('m');
-                $daysInMonth2 = (int)$nextMonth->format('t');
+                $year2 = (int) $nextMonth->format('Y');
+                $month2 = (int) $nextMonth->format('m');
+                $daysInMonth2 = (int) $nextMonth->format('t');
                 $day2 = min($dom, $daysInMonth2);
 
                 $candidate = $nextMonth->setDate($year2, $month2, $day2)->setTime($hh, $mm, 0);
@@ -256,7 +256,7 @@ 
 
         // Schéma TeamPass classique: misc(type, intitule, valeur)
         $val = DB::queryFirstField(
-            'SELECT valeur FROM ' . $table . ' WHERE type = %s AND intitule = %s LIMIT 1',
+            'SELECT valeur FROM '.$table.' WHERE type = %s AND intitule = %s LIMIT 1',
             'settings',
             $key
         );
@@ -265,7 +265,7 @@ 
             return $default;
         }
 
-        return (string)$val;
+        return (string) $val;
     }
 
     /**
@@ -275,8 +275,8 @@ 
     {
         $table = prefixTable('misc');
 
-        $exists = (int)DB::queryFirstField(
-            'SELECT COUNT(*) FROM ' . $table . ' WHERE type = %s AND intitule = %s',
+        $exists = (int) DB::queryFirstField(
+            'SELECT COUNT(*) FROM '.$table.' WHERE type = %s AND intitule = %s',
             'settings',
             $key
         );
@@ -304,7 +304,7 @@ 
             return false;
         }
         
-        fwrite($fp, (string)getmypid());
+        fwrite($fp, (string) getmypid());
         return true;
     }
 
@@ -324,7 +324,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",
@@ -337,8 +337,8 @@ 
 
         // Remove very old failed tasks
         DB::query(
-            'DELETE t, st FROM ' . prefixTable('background_tasks') . ' t
-            INNER JOIN ' . prefixTable('background_subtasks') . ' st ON (t.increment_id = st.task_id)
+            'DELETE t, st FROM '.prefixTable('background_tasks').' t
+            INNER JOIN ' . prefixTable('background_subtasks').' st ON (t.increment_id = st.task_id)
             WHERE t.finished_at > 0
               AND t.finished_at < %i
               AND t.status = %s',
@@ -356,7 +356,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;
         }
 
@@ -365,7 +365,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
@@ -374,7 +374,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);
         }
     }
@@ -385,7 +385,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(
@@ -404,7 +404,7 @@ 
         $cmd = sprintf(
             '%s %s %d %s %s',
             escapeshellarg(PHP_BINARY),
-            escapeshellarg(__DIR__ . '/background_tasks___worker.php'),
+            escapeshellarg(__DIR__.'/background_tasks___worker.php'),
             (int) $task['increment_id'],
             escapeshellarg((string) $task['process_type']),
             escapeshellarg((string) $task['arguments'])
@@ -422,7 +422,7 @@ 
             $msg = $e->getMessage();
             $last = error_get_last();
             if (is_array($last)) {
-                $msg .= ' | last_error=' . json_encode($last);
+                $msg .= ' | last_error='.json_encode($last);
             }
 
             if (strpos($msg, 'Unable to launch a new process') !== false) {
@@ -430,18 +430,18 @@ 
                 $rc = 0;
 
                 // fallback run (blocking)
-                exec($cmd . ' 2>&1', $out, $rc);
+                exec($cmd.' 2>&1', $out, $rc);
 
                 if ($rc === 0) {
                     // Worker ran successfully and updated the DB itself
-                    if (LOG_TASKS === true) $this->logger->log('Fallback exec succeeded for task ' . $task['increment_id'], 'INFO');
+                    if (LOG_TASKS === true) $this->logger->log('Fallback exec succeeded for task '.$task['increment_id'], 'INFO');
                     return;
                 }
 
-                $msg .= ' | fallback_exit=' . $rc . ' | fallback_out=' . implode("\n", array_slice($out, -30));
+                $msg .= ' | fallback_exit='.$rc.' | fallback_out='.implode("\n", array_slice($out, -30));
             }
 
-            if (LOG_TASKS=== true) $this->logger->log('Error launching task: ' . $msg, 'ERROR');
+            if (LOG_TASKS === true) $this->logger->log('Error launching task: '.$msg, 'ERROR');
 
             DB::update(
                 prefixTable('background_tasks'),
@@ -464,7 +464,7 @@ 
     private function countRunningTasks(): int {
         return DB::queryFirstField(
             'SELECT COUNT(*) 
-            FROM ' . prefixTable('background_tasks') . ' 
+            FROM ' . prefixTable('background_tasks').' 
             WHERE is_in_progress = 1'
         );
     }
@@ -485,10 +485,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'
@@ -501,7 +501,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)
         );
@@ -518,7 +518,7 @@ 
         // 1. Get all finished tasks older than the cutoff timestamp
         //    and that are not in progress
         $tasks = DB::query(
-            'SELECT increment_id FROM ' . prefixTable('background_tasks') . '
+            'SELECT increment_id FROM '.prefixTable('background_tasks').'
             WHERE status = %s AND is_in_progress = %i AND finished_at < %i',
             'completed',
             -1,
@@ -533,19 +533,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');
     }
 }
 
@@ -559,5 +559,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());
 }

Braces +42 added lines, -14 removed lines

@@ -72,7 +72,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;
         }
 
@@ -82,7 +84,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();
         }
@@ -112,7 +116,9 @@ 
         if ($nextRunAt <= 0) {
             $nextRunAt = $this->computeNextBackupRunAt($now);
             $this->upsertSettingValue('bck_scheduled_next_run_at', (string)$nextRunAt);
-            if (LOG_TASKS === true) $this->logger->log('backup scheduler initialized next_run_at=' . $nextRunAt, 'INFO');
+            if (LOG_TASKS === true) {
+                $this->logger->log('backup scheduler initialized next_run_at=' . $nextRunAt, 'INFO');
+            }
             return;
         }
 
@@ -131,7 +137,9 @@ 
         );
 
         if ($pending > 0) {
-            if (LOG_TASKS === true) $this->logger->log('backup scheduler: a database_backup task is already pending/running', 'INFO');
+            if (LOG_TASKS === true) {
+                $this->logger->log('backup scheduler: a database_backup task is already pending/running', 'INFO');
+            }
             return;
         }
 
@@ -161,7 +169,9 @@ 
         $newNext = $this->computeNextBackupRunAt($now + 60);
         $this->upsertSettingValue('bck_scheduled_next_run_at', (string)$newNext);
 
-        if (LOG_TASKS === true) $this->logger->log('backup scheduler: enqueued database_backup, next_run_at=' . $newNext, 'INFO');
+        if (LOG_TASKS === true) {
+            $this->logger->log('backup scheduler: enqueued database_backup, next_run_at=' . $newNext, 'INFO');
+        }
     }
 
     /**
@@ -207,7 +217,9 @@ 
 
         if ($freq === 'weekly') {
             $targetDow = (int)$this->getSettingValue('bck_scheduled_dow', '1'); // ISO 1..7
-            if ($targetDow < 1 || $targetDow > 7) $targetDow = 1;
+            if ($targetDow < 1 || $targetDow > 7) {
+                $targetDow = 1;
+            }
 
             $currentDow = (int)$candidate->format('N');
             $delta = ($targetDow - $currentDow + 7) % 7;
@@ -218,8 +230,12 @@ 
 
         } elseif ($freq === 'monthly') {
             $dom = (int)$this->getSettingValue('bck_scheduled_dom', '1');
-            if ($dom < 1) $dom = 1;
-            if ($dom > 31) $dom = 31;
+            if ($dom < 1) {
+                $dom = 1;
+            }
+            if ($dom > 31) {
+                $dom = 31;
+            }
 
             $year = (int)$now->format('Y');
             $month = (int)$now->format('m');
@@ -356,7 +372,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;
         }
 
@@ -374,7 +392,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);
         }
     }
@@ -385,7 +405,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(
@@ -434,14 +456,18 @@ 
 
                 if ($rc === 0) {
                     // Worker ran successfully and updated the DB itself
-                    if (LOG_TASKS === true) $this->logger->log('Fallback exec succeeded for task ' . $task['increment_id'], 'INFO');
+                    if (LOG_TASKS === true) {
+                        $this->logger->log('Fallback exec succeeded for task ' . $task['increment_id'], 'INFO');
+                    }
                     return;
                 }
 
                 $msg .= ' | fallback_exit=' . $rc . ' | fallback_out=' . implode("\n", array_slice($out, -30));
             }
 
-            if (LOG_TASKS=== true) $this->logger->log('Error launching task: ' . $msg, 'ERROR');
+            if (LOG_TASKS=== true) {
+                $this->logger->log('Error launching task: ' . $msg, 'ERROR');
+            }
 
             DB::update(
                 prefixTable('background_tasks'),
@@ -545,7 +571,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');
+        }
     }
 }
 

scripts/background_tasks___worker.php

Spacing +38 added lines, -38 removed lines

@@ -33,7 +33,7 @@ 
 require_once __DIR__.'/traits/UserHandlerTrait.php';
 require_once __DIR__.'/traits/EmailTrait.php';
 require_once __DIR__.'/traits/MigrateUserHandlerTrait.php';
-require_once __DIR__ . '/taskLogger.php';
+require_once __DIR__.'/taskLogger.php';
 
 class TaskWorker {
     use ItemHandlerTrait;
@@ -66,7 +66,7 @@ 
      */
     public function execute() {
         try {
-            if (LOG_TASKS=== true) $this->logger->log('Processing task: ' . print_r($this->taskData, true), 'DEBUG');
+            if (LOG_TASKS === true) $this->logger->log('Processing task: '.print_r($this->taskData, true), 'DEBUG');
             // Dispatch selon le type de processus
             switch ($this->processType) {
                 case 'item_copy':
@@ -114,11 +114,11 @@ 
      */
     private function handleDatabaseBackup(array $taskData): void
     {
-        require_once __DIR__ . '/../sources/backup.functions.php';
+        require_once __DIR__.'/../sources/backup.functions.php';
 
         // Default target dir: <path_to_files_folder>/backups
-        $baseFilesDir = (string)($this->settings['path_to_files_folder'] ?? (__DIR__ . '/../files'));
-        $targetDir = rtrim($baseFilesDir, '/') . '/backups';
+        $baseFilesDir = (string) ($this->settings['path_to_files_folder'] ?? (__DIR__.'/../files'));
+        $targetDir = rtrim($baseFilesDir, '/').'/backups';
 
         // Allow override via task arguments (optional)
         if (!empty($taskData['output_dir']) && is_string($taskData['output_dir'])) {
@@ -127,15 +127,15 @@ 
 
         if (!is_dir($targetDir)) {
             if (!@mkdir($targetDir, 0770, true) && !is_dir($targetDir)) {
-                throw new Exception('Cannot create backup target dir: ' . $targetDir);
+                throw new Exception('Cannot create backup target dir: '.$targetDir);
             }
         }
         if (!is_writable($targetDir)) {
-            throw new Exception('Backup target dir is not writable: ' . $targetDir);
+            throw new Exception('Backup target dir is not writable: '.$targetDir);
         }
 
         // Use stored encryption key (same as UI)
-        $encryptionKey = (string)($this->settings['bck_script_passkey'] ?? '');
+        $encryptionKey = (string) ($this->settings['bck_script_passkey'] ?? '');
         if ($encryptionKey === '') {
             throw new Exception('Missing encryption key (bck_script_passkey).');
         }
@@ -151,25 +151,25 @@ 
 
         // Store a tiny summary for the task completion "arguments" field (no secrets)
         $this->taskData['backup_file'] = $res['filename'] ?? '';
-        $this->taskData['backup_size_bytes'] = (int)($res['size_bytes'] ?? 0);
-        $this->taskData['backup_encrypted'] = (bool)($res['encrypted'] ?? false);
+        $this->taskData['backup_size_bytes'] = (int) ($res['size_bytes'] ?? 0);
+        $this->taskData['backup_encrypted'] = (bool) ($res['encrypted'] ?? false);
 
         // Retention purge (scheduled backups only)
-        $backupSource = (string)($taskData['source'] ?? '');
-        $backupDir = (string)($taskData['output_dir'] ?? '');   // from task arguments (reliable)
+        $backupSource = (string) ($taskData['source'] ?? '');
+        $backupDir = (string) ($taskData['output_dir'] ?? ''); // from task arguments (reliable)
         if ($backupDir === '') {
-            $backupDir = (string)($targetDir ?? '');            // fallback if you have it
+            $backupDir = (string) ($targetDir ?? ''); // fallback if you have it
         }
 
         // keep for debug/trace
         $this->taskData['output_dir'] = $backupDir;
 
         if ($backupSource === 'scheduler' && $backupDir !== '') {
-            $days = (int)$this->getMiscSetting('bck_scheduled_retention_days', '30');
+            $days = (int) $this->getMiscSetting('bck_scheduled_retention_days', '30');
             $deleted = $this->purgeOldScheduledBackups($backupDir, $days);
 
-            $this->upsertMiscSetting('bck_scheduled_last_purge_at', (string)time());
-            $this->upsertMiscSetting('bck_scheduled_last_purge_deleted', (string)$deleted);
+            $this->upsertMiscSetting('bck_scheduled_last_purge_at', (string) time());
+            $this->upsertMiscSetting('bck_scheduled_last_purge_deleted', (string) $deleted);
 
             if (LOG_TASKS === true) {
                 $this->logger->log("database_backup: purge retention={$days}d dir={$backupDir} deleted={$deleted}", 'INFO');
@@ -178,12 +178,12 @@ 
 
         // If launched by scheduler, update scheduler status in teampass_misc
         if (!empty($taskData['source']) && $taskData['source'] === 'scheduler') {
-            $this->updateSchedulerState('completed', 'Backup created: ' . ($this->taskData['backup_file'] ?? ''));
+            $this->updateSchedulerState('completed', 'Backup created: '.($this->taskData['backup_file'] ?? ''));
         }
 
         if (LOG_TASKS === true) {
             $this->logger->log(
-                'database_backup: created ' . ($this->taskData['backup_file'] ?? '') . ' (' . $this->taskData['backup_size_bytes'] . ' bytes)',
+                'database_backup: created '.($this->taskData['backup_file'] ?? '').' ('.$this->taskData['backup_size_bytes'].' bytes)',
                 'INFO'
             );
         }
@@ -199,15 +199,15 @@ 
     {
         $this->upsertMiscSetting('bck_scheduled_last_status', $status);
         $this->upsertMiscSetting('bck_scheduled_last_message', mb_substr($message, 0, 500));
-        $this->upsertMiscSetting('bck_scheduled_last_completed_at', (string)time());
+        $this->upsertMiscSetting('bck_scheduled_last_completed_at', (string) time());
     }
 
     private function upsertMiscSetting(string $key, string $value): void
     {
         $table = prefixTable('misc');
 
-        $exists = (int)DB::queryFirstField(
-            'SELECT COUNT(*) FROM ' . $table . ' WHERE type = %s AND intitule = %s',
+        $exists = (int) DB::queryFirstField(
+            'SELECT COUNT(*) FROM '.$table.' WHERE type = %s AND intitule = %s',
             'settings',
             $key
         );
@@ -224,7 +224,7 @@ 
         $table = prefixTable('misc');
 
         $val = DB::queryFirstField(
-            'SELECT valeur FROM ' . $table . ' WHERE type = %s AND intitule = %s LIMIT 1',
+            'SELECT valeur FROM '.$table.' WHERE type = %s AND intitule = %s LIMIT 1',
             'settings',
             $key
         );
@@ -249,7 +249,7 @@ 
         $cutoff = time() - ($retentionDays * 86400);
         $deleted = 0;
 
-        foreach (glob(rtrim($dir, '/') . '/scheduled-*.sql') as $file) {
+        foreach (glob(rtrim($dir, '/').'/scheduled-*.sql') as $file) {
             if (!is_file($file)) {
                 continue;
             }
@@ -271,7 +271,7 @@ 
             'is_in_progress' => -1,
             'finished_at' => time(),
             'status' => 'completed',
-            'error_message' => null,   // <-- on efface toute erreur précédente
+            'error_message' => null, // <-- on efface toute erreur précédente
         ];
 
         // Prepare anonimzation of arguments
@@ -307,7 +307,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)) {
@@ -322,7 +322,7 @@ 
             $this->taskId
         );
 
-        if (LOG_TASKS=== true) $this->logger->log('Finishing task: ' . $this->taskId, 'DEBUG');
+        if (LOG_TASKS === true) $this->logger->log('Finishing task: '.$this->taskId, 'DEBUG');
     }
 
     /**
@@ -345,15 +345,15 @@ 
             'increment_id = %i',
             $this->taskId
         );
-        $this->logger->log('Task failure: ' . $e->getMessage(), 'ERROR');
+        $this->logger->log('Task failure: '.$e->getMessage(), 'ERROR');
     // Purge retention even on failure (safe: only scheduled-*.sql)
-        $backupDir = (string)($this->taskData['output_dir'] ?? '');
+        $backupDir = (string) ($this->taskData['output_dir'] ?? '');
         if ($backupDir !== '' && is_dir($backupDir)) {
-        $days = (int)$this->getMiscSetting('bck_scheduled_retention_days', '30');
+        $days = (int) $this->getMiscSetting('bck_scheduled_retention_days', '30');
         $deleted = $this->purgeOldScheduledBackups($backupDir, $days);
 
-        $this->upsertMiscSetting('bck_scheduled_last_purge_at', (string)time());
-        $this->upsertMiscSetting('bck_scheduled_last_purge_deleted', (string)$deleted);
+        $this->upsertMiscSetting('bck_scheduled_last_purge_at', (string) time());
+        $this->upsertMiscSetting('bck_scheduled_last_purge_deleted', (string) $deleted);
         }
     }
 
@@ -366,16 +366,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;
         }
     
@@ -385,7 +385,7 @@ 
                 // Get the subtask data
                 $subtaskData = json_decode($subtask['task'], true);
 
-                if (LOG_TASKS=== true) $this->logger->log('Processing subtask: ' . $subtaskData['step'], 'DEBUG');
+                if (LOG_TASKS === true) $this->logger->log('Processing subtask: '.$subtaskData['step'], 'DEBUG');
 
                 // Mark subtask as in progress
                 DB::update(
@@ -437,13 +437,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
         );
     
@@ -459,7 +459,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

@@ -66,7 +66,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':
@@ -307,7 +309,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)) {
@@ -322,7 +326,9 @@ 
             $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');
+        }
     }
 
     /**
@@ -366,7 +372,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',
@@ -375,7 +383,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;
         }
     
@@ -385,7 +395,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');
+                }
 
                 // Mark subtask as in progress
                 DB::update(

pages/backups.php

Spacing +4 added lines, -4 removed lines

@@ -69,7 +69,7 @@ 
 if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('backups') === 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;
 }
 
@@ -196,7 +196,7 @@ 
                                             </div>
                                             <div class="alert alert-info ml-2 mt-3 mr-2 hidden" id="onthefly-restore-progress">
                                                 <h5><i class="icon fa fa-info mr-2"></i><?php echo $lang->get('in_progress'); ?></h5>
-                                                <i class="mr-2 fas fa-rocket"></i><?php echo $lang->get('restore_in_progress');?> <b><span id="onthefly-restore-progress-text">0</span>%</b>
+                                                <i class="mr-2 fas fa-rocket"></i><?php echo $lang->get('restore_in_progress'); ?> <b><span id="onthefly-restore-progress-text">0</span>%</b>
                                             </div>
                                             <div class="row mt-3 hidden" id="onthefly-restore-finished"></div>
                                             <div class="row mt-3">
@@ -241,7 +241,7 @@ 
                             <div class="tab-pane fade" id="scheduled" role="tabpanel" aria-labelledby="scheduled-tab">
 <div class="alert alert-info mt-3" id="scheduled-restore-info" style="display:none;">
                                     <i class="fas fa-info-circle"></i>
-                                    <?php echo sprintf($lang->get('bck_restore_scheduled_info'), '<b>' . $lang->get('on_the_fly') . '</b>', '<b>' . $lang->get('bck_instance_encryption_key') . '</b>'); ?>
+                                    <?php echo sprintf($lang->get('bck_restore_scheduled_info'), '<b>'.$lang->get('on_the_fly').'</b>', '<b>'.$lang->get('bck_instance_encryption_key').'</b>'); ?>
                                 </div>
                                 <div class="row">
                                     <div class="col-12 col-lg-6">
@@ -337,7 +337,7 @@ 
                                             <div class="alert alert-info py-2 px-3 mb-3">
                                                 <button type="button" class="btn btn-link p-0 tp-copy-instance-key" data-toggle="tooltip" title="<?php echo $lang->get('bck_instance_key_copy_tooltip'); ?>" aria-label="<?php echo $lang->get('bck_instance_key_copy_tooltip'); ?>"><i class="fas fa-info-circle"></i></button>
                                                 <?php
-                                                echo $lang->get('bck_scheduled_note_encrypted');?>
+                                                echo $lang->get('bck_scheduled_note_encrypted'); ?>
                                             </div>
 
                                                 <div class="table-responsive">

pages/backups.js.php

Spacing +3 added lines, -3 removed lines

@@ -71,7 +71,7 @@ 
 if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('backups') === 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;
 }
 ?>
@@ -566,7 +566,7 @@ 
                             tpProgressToast.hide();
                             toastr.remove();
                             toastr.error(
-                                '<?php echo addslashes($lang->get('server_answer_error') . '<br />' . $lang->get('server_returned_data') . ':<br />'); ?>' + data.error,
+                                '<?php echo addslashes($lang->get('server_answer_error').'<br />'.$lang->get('server_returned_data').':<br />'); ?>' + data.error,
                                 '<?php echo addslashes($lang->get('error')); ?>', {
                                     timeOut: 5000,
                                     progressBar: true
@@ -944,7 +944,7 @@ 
 // PREPARE UPLOADER with plupload
 <?php
 $maxFileSize = (strrpos($SETTINGS['upload_maxfilesize'], 'mb') === false)
-    ? $SETTINGS['upload_maxfilesize'] . 'mb'
+    ? $SETTINGS['upload_maxfilesize'].'mb'
     : $SETTINGS['upload_maxfilesize'];
 ?>