nilsteampassnet / TeamPass

scripts/restore.php

Indentation +23 added lines, -23 removed lines

@@ -282,10 +282,10 @@ 
         );
     }
 } catch (Throwable $e) {
-	// Ensure any in-place progress bar line is terminated before printing errors
-	if ($interactive) {
-	    @fwrite(STDERR, PHP_EOL);
-	}
+    // Ensure any in-place progress bar line is terminated before printing errors
+    if ($interactive) {
+        @fwrite(STDERR, PHP_EOL);
+    }
     $log('WARN', 'Unable to check web sessions: ' . $e->getMessage());
 }
 
@@ -598,25 +598,25 @@ 
         }
 
 
-	    // Progress (single-line bar on STDERR to avoid flooding the terminal)
-	    if ($totalSize > 0) {
-	        $pct = (int) floor(($newOffset / $totalSize) * 100);
-	        if ($pct > 100) {
-	            $pct = 100;
-	        }
-	        tpCliProgressBar($pct, $totalExecuted, $interactive);
-
-	        // Log progress in file every 10%
-	        static $lastLoggedPct = -1;
-	        if ($pct !== $lastLoggedPct && ($pct % 10 === 0 || $pct === 100)) {
-	            $lastLoggedPct = $pct;
-	            @file_put_contents(
-	                $logFile,
-	                '[' . date('c') . '][INFO] Progress: ' . $pct . '% (statements executed: ' . $totalExecuted . ')' . PHP_EOL,
-	                FILE_APPEND
-	            );
-	        }
-	    }
+        // Progress (single-line bar on STDERR to avoid flooding the terminal)
+        if ($totalSize > 0) {
+            $pct = (int) floor(($newOffset / $totalSize) * 100);
+            if ($pct > 100) {
+                $pct = 100;
+            }
+            tpCliProgressBar($pct, $totalExecuted, $interactive);
+
+            // Log progress in file every 10%
+            static $lastLoggedPct = -1;
+            if ($pct !== $lastLoggedPct && ($pct % 10 === 0 || $pct === 100)) {
+                $lastLoggedPct = $pct;
+                @file_put_contents(
+                    $logFile,
+                    '[' . date('c') . '][INFO] Progress: ' . $pct . '% (statements executed: ' . $totalExecuted . ')' . PHP_EOL,
+                    FILE_APPEND
+                );
+            }
+        }
 
         if (!empty($errors)) {
             throw new RuntimeException('SQL restore failed: ' . implode(' | ', $errors));

Spacing +46 added lines, -46 removed lines

@@ -31,19 +31,19 @@ 
 
 use TeampassClasses\ConfigManager\ConfigManager;
 
-require_once __DIR__ . '/../sources/main.functions.php';
-require_once __DIR__ . '/../sources/backup.functions.php';
+require_once __DIR__.'/../sources/main.functions.php';
+require_once __DIR__.'/../sources/backup.functions.php';
 
 loadClasses('DB');
 
 function tpCliOut(string $msg): void
 {
-    fwrite(STDOUT, $msg . PHP_EOL);
+    fwrite(STDOUT, $msg.PHP_EOL);
 }
 
 function tpCliErr(string $msg): void
 {
-    fwrite(STDERR, $msg . PHP_EOL);
+    fwrite(STDERR, $msg.PHP_EOL);
 }
 
 function tpCliHelp(): void
@@ -81,7 +81,7 @@ 
 
     if (!$interactive) {
         if ($pct !== $lastPct && ($pct % 5 === 0 || $pct === 100)) {
-            fwrite(STDERR, 'Progress: ' . $pct . '% (statements executed: ' . $totalExecuted . ')' . PHP_EOL);
+            fwrite(STDERR, 'Progress: '.$pct.'% (statements executed: '.$totalExecuted.')'.PHP_EOL);
             $lastPct = $pct;
         }
         return;
@@ -97,11 +97,11 @@ 
 
     $width = 30;
     $filled = (int) round(($pct / 100) * $width);
-    $bar = str_repeat('#', $filled) . str_repeat('-', $width - $filled);
+    $bar = str_repeat('#', $filled).str_repeat('-', $width - $filled);
     $msg = sprintf("\r[%s] %3d%% | statements: %d", $bar, $pct, $totalExecuted);
 
     $pad = max(0, $lastLen - strlen($msg));
-    fwrite(STDERR, $msg . str_repeat(' ', $pad));
+    fwrite(STDERR, $msg.str_repeat(' ', $pad));
     $lastLen = strlen($msg);
 
     if ($pct === 100) {
@@ -133,14 +133,14 @@ 
 
 // Logging
 $filesDir = rtrim((string) ($SETTINGS['path_to_files_folder'] ?? sys_get_temp_dir()), '/');
-$logDir = $filesDir . '/restore_cli_logs';
+$logDir = $filesDir.'/restore_cli_logs';
 if (!is_dir($logDir)) {
     @mkdir($logDir, 0700, true);
 }
-$logFile = $logDir . '/restore_' . date('Ymd_His') . '.log';
+$logFile = $logDir.'/restore_'.date('Ymd_His').'.log';
 
-$log = function (string $level, string $message) use ($logFile): void {
-    $line = '[' . date('c') . '][' . $level . '] ' . $message . PHP_EOL;
+$log = function(string $level, string $message) use ($logFile): void {
+    $line = '['.date('c').']['.$level.'] '.$message.PHP_EOL;
     @file_put_contents($logFile, $line, FILE_APPEND);
     if ($level === 'ERROR') {
         tpCliErr($message);
@@ -154,8 +154,8 @@ 
 $lockFile = '';
 $lockHandle = false;
 $lockCandidates = [
-    $filesDir . '/restore_cli.lock',
-    rtrim((string) sys_get_temp_dir(), '/\\') . '/teampass_restore_cli_' . substr(md5($filesDir), 0, 12) . '.lock',
+    $filesDir.'/restore_cli.lock',
+    rtrim((string) sys_get_temp_dir(), '/\\').'/teampass_restore_cli_'.substr(md5($filesDir), 0, 12).'.lock',
 ];
 
 foreach ($lockCandidates as $candidate) {
@@ -168,17 +168,17 @@ 
 }
 
 if ($lockHandle === false) {
-    $log('ERROR', 'Unable to open any lock file. Tried: ' . implode(', ', $lockCandidates));
+    $log('ERROR', 'Unable to open any lock file. Tried: '.implode(', ', $lockCandidates));
     exit(20);
 }
 
 if (!flock($lockHandle, LOCK_EX | LOCK_NB)) {
-    $log('ERROR', 'Another restore seems to be in progress (lock: ' . $lockFile . ').');
+    $log('ERROR', 'Another restore seems to be in progress (lock: '.$lockFile.').');
     exit(20);
 }
 
 @ftruncate($lockHandle, 0);
-@fwrite($lockHandle, (string) getmypid() . ' ' . date('c') . PHP_EOL);
+@fwrite($lockHandle, (string) getmypid().' '.date('c').PHP_EOL);
 
 // Normalize file path
 $realFile = realpath($file);
@@ -187,7 +187,7 @@ 
 }
 
 if (!is_file($file)) {
-    $log('ERROR', 'Backup file not found: ' . $file);
+    $log('ERROR', 'Backup file not found: '.$file);
     exit(3);
 }
 
@@ -213,7 +213,7 @@ 
 $payloadFilePath = (string) (($payload['file']['path'] ?? ''));
 
 if ($status !== 'pending') {
-    $log('ERROR', 'Authorization token is not pending (status=' . $status . ').');
+    $log('ERROR', 'Authorization token is not pending (status='.$status.').');
     exit(31);
 }
 
@@ -236,8 +236,8 @@ 
 
 if ($cmp1 === '' || $cmp1 !== $cmp2) {
     $log('ERROR', 'Authorization token does not match the provided --file path.');
-    $log('ERROR', 'Expected: ' . $payloadFilePath);
-    $log('ERROR', 'Provided: ' . $file);
+    $log('ERROR', 'Expected: '.$payloadFilePath);
+    $log('ERROR', 'Provided: '.$file);
     exit(33);
 }
 
@@ -255,9 +255,9 @@ 
             'id = %i',
             $initiatorId
         );
-        $log('INFO', 'Disconnected restore initiator (user id=' . $initiatorId . ').');
+        $log('INFO', 'Disconnected restore initiator (user id='.$initiatorId.').');
     } catch (Throwable $e) {
-        $log('WARN', 'Unable to disconnect restore initiator: ' . $e->getMessage());
+        $log('WARN', 'Unable to disconnect restore initiator: '.$e->getMessage());
     }
 }
 
@@ -268,7 +268,7 @@ 
     if ($initiatorId > 0) {
         $webUsers = DB::query(
             'SELECT id, login, name, lastname, session_end
-             FROM ' . prefixTable('users') . '
+             FROM ' . prefixTable('users').'
              WHERE session_end >= %i AND id != %i',
             $now,
             $initiatorId
@@ -276,7 +276,7 @@ 
     } else {
         $webUsers = DB::query(
             'SELECT id, login, name, lastname, session_end
-             FROM ' . prefixTable('users') . '
+             FROM ' . prefixTable('users').'
              WHERE session_end >= %i',
             $now
         );
@@ -286,7 +286,7 @@ 
 	if ($interactive) {
 	    @fwrite(STDERR, PHP_EOL);
 	}
-    $log('WARN', 'Unable to check web sessions: ' . $e->getMessage());
+    $log('WARN', 'Unable to check web sessions: '.$e->getMessage());
 }
 
 try {
@@ -301,10 +301,10 @@ 
 
     $apiUsers = DB::query(
         'SELECT u.id, u.login, u.name, u.lastname, api_conn.last_api_date AS last_api
-         FROM ' . prefixTable('users') . ' u
+         FROM ' . prefixTable('users').' u
          INNER JOIN (
             SELECT qui, MAX(date) AS last_api_date
-            FROM ' . prefixTable('log_system') . '
+            FROM ' . prefixTable('log_system').'
             WHERE type = %s AND label = %s AND date >= %i
             GROUP BY qui
          ) api_conn ON api_conn.qui = u.id',
@@ -314,19 +314,19 @@ 
     );
 } catch (Throwable $e) {
     // Optional: ignore API checks if unavailable
-    $log('WARN', 'Unable to check API activity: ' . $e->getMessage());
+    $log('WARN', 'Unable to check API activity: '.$e->getMessage());
 }
 
 // Enforce disconnect policy for web sessions
 if (!empty($webUsers) && $forceDisconnect === false) {
     $log('ERROR', 'Active web sessions detected. Re-run with --force-disconnect or disconnect users first.');
     foreach ($webUsers as $u) {
-        $log('ERROR', 'WEB user connected: ' . ($u['login'] ?? '') . ' (' . ($u['name'] ?? '') . ' ' . ($u['lastname'] ?? '') . ')');
+        $log('ERROR', 'WEB user connected: '.($u['login'] ?? '').' ('.($u['name'] ?? '').' '.($u['lastname'] ?? '').')');
     }
     if (!empty($apiUsers)) {
         $log('WARN', 'API activity detected as well (best-effort detection):');
         foreach ($apiUsers as $u) {
-            $log('WARN', 'API activity: ' . ($u['login'] ?? '') . ' (' . ($u['name'] ?? '') . ' ' . ($u['lastname'] ?? '') . ')');
+            $log('WARN', 'API activity: '.($u['login'] ?? '').' ('.($u['name'] ?? '').' '.($u['lastname'] ?? '').')');
         }
     }
     // IMPORTANT: keep token pending so the operator can retry after disconnecting users.
@@ -351,7 +351,7 @@ 
             $now
         );
     } catch (Throwable $e) {
-        $log('WARN', 'Failed to force-disconnect web users: ' . $e->getMessage());
+        $log('WARN', 'Failed to force-disconnect web users: '.$e->getMessage());
     }
 }
 
@@ -363,7 +363,7 @@ 
 if (!empty($apiUsers)) {
     $log('WARN', 'API activity detected (best-effort): those sessions may not be revocable. Proceeding.');
     foreach ($apiUsers as $u) {
-        $log('WARN', 'API activity: ' . ($u['login'] ?? '') . ' (' . ($u['name'] ?? '') . ' ' . ($u['lastname'] ?? '') . ')');
+        $log('WARN', 'API activity: '.($u['login'] ?? '').' ('.($u['name'] ?? '').' '.($u['lastname'] ?? '').')');
     }
 }
 
@@ -415,12 +415,12 @@ 
             );
         }
     } catch (Throwable $e2) {
-        $log('WARN', 'Unable to enable maintenance mode: ' . $e2->getMessage());
+        $log('WARN', 'Unable to enable maintenance mode: '.$e2->getMessage());
     }
 }
 
-$log('INFO', 'Starting restore from: ' . $file);
-$log('INFO', 'Log file: ' . $logFile);
+$log('INFO', 'Starting restore from: '.$file);
+$log('INFO', 'Log file: '.$logFile);
 
 // Build decryption keys to try
 $keysToTry = [];
@@ -441,7 +441,7 @@ 
         }
     }
 } catch (Throwable $e) {
-    $log('WARN', 'Unable to decrypt stored secrets: ' . $e->getMessage());
+    $log('WARN', 'Unable to decrypt stored secrets: '.$e->getMessage());
 }
 
 // Instance key (scheduled backups)
@@ -460,10 +460,10 @@ 
         }
     }
 } catch (Throwable $e) {
-    $log('WARN', 'Unable to decrypt instance backup key: ' . $e->getMessage());
+    $log('WARN', 'Unable to decrypt instance backup key: '.$e->getMessage());
 }
 
-$keysToTry = array_values(array_unique(array_filter($keysToTry, function ($v) { return $v !== ''; })));
+$keysToTry = array_values(array_unique(array_filter($keysToTry, function($v) { return $v !== ''; })));
 
 // Decrypt backup file to temp SQL
 // IMPORTANT: do NOT use tempnam() here. It creates the file and can break Defuse file decrypt.
@@ -474,12 +474,12 @@ 
     $tmpRand = uniqid('', true);
 }
 
-$tmpSql = rtrim((string) sys_get_temp_dir(), '/\\') . '/defuse_temp_restore_' . getmypid() . '_' . time() . '_' . $tmpRand . '.sql';
+$tmpSql = rtrim((string) sys_get_temp_dir(), '/\\').'/defuse_temp_restore_'.getmypid().'_'.time().'_'.$tmpRand.'.sql';
 
 $dec = tpDefuseDecryptWithCandidates($file, $tmpSql, $keysToTry, $SETTINGS);
 if (empty($dec['success'])) {
     @unlink($tmpSql);
-    $log('ERROR', 'Decrypt failed: ' . (string) ($dec['message'] ?? ''));
+    $log('ERROR', 'Decrypt failed: '.(string) ($dec['message'] ?? ''));
     $payload['status'] = 'failed';
     $payload['finished_at'] = time();
     $payload['error'] = 'decrypt_failed';
@@ -560,7 +560,7 @@ 
                         $totalExecuted++;
                     } catch (Throwable $e) {
                         $errors[] = $e->getMessage();
-                        $log('ERROR', 'SQL error: ' . $e->getMessage());
+                        $log('ERROR', 'SQL error: '.$e->getMessage());
                         // Stop early on first error
                         break;
                     }
@@ -582,7 +582,7 @@ 
             }
             DB::rollback();
             $errors[] = $e->getMessage();
-            $log('ERROR', 'Restore chunk failed: ' . $e->getMessage());
+            $log('ERROR', 'Restore chunk failed: '.$e->getMessage());
         } finally {
             try {
                 DB::query("SET FOREIGN_KEY_CHECKS = 1");
@@ -612,14 +612,14 @@ 
 	            $lastLoggedPct = $pct;
 	            @file_put_contents(
 	                $logFile,
-	                '[' . date('c') . '][INFO] Progress: ' . $pct . '% (statements executed: ' . $totalExecuted . ')' . PHP_EOL,
+	                '['.date('c').'][INFO] Progress: '.$pct.'% (statements executed: '.$totalExecuted.')'.PHP_EOL,
 	                FILE_APPEND
 	            );
 	        }
 	    }
 
         if (!empty($errors)) {
-            throw new RuntimeException('SQL restore failed: ' . implode(' | ', $errors));
+            throw new RuntimeException('SQL restore failed: '.implode(' | ', $errors));
         }
 
         // End conditions
@@ -631,7 +631,7 @@ 
         $offset = $newOffset;
     }
 
-    $log('INFO', 'SQL import completed. Total statements executed: ' . $totalExecuted);
+    $log('INFO', 'SQL import completed. Total statements executed: '.$totalExecuted);
 
     $payload['status'] = 'success';
     $payload['finished_at'] = time();
@@ -644,7 +644,7 @@ 
     $payload['error'] = $e->getMessage();
     tpRestoreAuthorizationUpdatePayload($authId, $payload);
 
-    $log('ERROR', 'Restore failed: ' . $e->getMessage());
+    $log('ERROR', 'Restore failed: '.$e->getMessage());
     $exitCode = 50;
 } finally {
     if (is_resource($handle)) {

Braces +6 added lines, -2 removed lines

@@ -432,12 +432,16 @@
         if (!empty($secrets['encryptionKey'])) {
             $tmp = cryption((string) $secrets['encryptionKey'], '', 'decrypt', $SETTINGS);
             $k = isset($tmp['string']) ? (string) $tmp['string'] : '';
-            if ($k !== '') $keysToTry[] = $k;
+            if ($k !== '') {
+                $keysToTry[] = $k;
+            }
         }
         if (!empty($secrets['overrideKey'])) {
             $tmp = cryption((string) $secrets['overrideKey'], '', 'decrypt', $SETTINGS);
             $k = isset($tmp['string']) ? (string) $tmp['string'] : '';
-            if ($k !== '') $keysToTry[] = $k;
+            if ($k !== '') {
+                $keysToTry[] = $k;
+            }
         }
     }
 } catch (Throwable $e) {

sources/backups.queries.php

Indentation +63 added lines, -63 removed lines

@@ -1328,66 +1328,66 @@ 
 
                     $tpRoot = (string) ($SETTINGS['cpassman_dir'] ?? '');
 
-					// Build a command adapted to the OS and (when possible) running as the same OS user as the web server.
-					// This avoids common permission issues on files/ and keeps behavior consistent.
-					$osFamily = defined('PHP_OS_FAMILY') ? (string) PHP_OS_FAMILY : (string) PHP_OS;
-					$isWindows = (stripos($osFamily, 'Windows') !== false);
-					$webUser = '';
-					if (!$isWindows && function_exists('posix_getpwuid') && function_exists('posix_geteuid')) {
-						$pw = @posix_getpwuid(@posix_geteuid());
-						if (is_array($pw) && !empty($pw['name'])) {
-							$webUser = (string) $pw['name'];
-						}
-					}
-
-					$scriptRel = $isWindows ? 'scripts\\restore.php' : 'scripts/restore.php';
-					$filePathForCmd = $isWindows ? str_replace('/', '\\', $resolvedPath) : $resolvedPath;
-					$rootForCmd = $isWindows ? str_replace('/', '\\', rtrim($tpRoot, '/\\')) : rtrim($tpRoot, '/');
-
-					$sudoPrefix = '';
-					if (!$isWindows && $webUser !== '') {
-						$sudoPrefix = 'sudo -u ' . escapeshellarg($webUser) . ' ';
-					}
-
-					$cmdNoCd = $sudoPrefix . 'php ' . $scriptRel
-						. ' --file ' . escapeshellarg($filePathForCmd)
-						. ' --auth-token ' . escapeshellarg($token);
-					$cmdNoCdForce = $cmdNoCd . ' --force-disconnect';
-
-					$cmd = $cmdNoCd;
-					$cmdForce = $cmdNoCdForce;
-					if ($tpRoot !== '') {
-						if ($isWindows) {
-							$cmd = 'cd /d ' . escapeshellarg($rootForCmd) . ' && ' . $cmdNoCd;
-							$cmdForce = 'cd /d ' . escapeshellarg($rootForCmd) . ' && ' . $cmdNoCdForce;
-						} else {
-							$cmd = 'cd ' . escapeshellarg($rootForCmd) . ' && ' . $cmdNoCd;
-							$cmdForce = 'cd ' . escapeshellarg($rootForCmd) . ' && ' . $cmdNoCdForce;
-						}
-					}
-
-					// Provide multiple variants to cover the most common OS families and privilege models.
-					$variants = [];
-					$variants[] = [
-						'label' => $isWindows ? 'Windows (CMD/Powershell)' : 'Recommended',
-						'command' => $cmd,
-					];
-					$variants[] = [
-						'label' => $isWindows ? 'Force disconnect (--force-disconnect)' : 'Force disconnect (--force-disconnect)',
-						'command' => $cmdForce,
-					];
-					if (!$isWindows && $webUser !== '') {
-						$cmdNoSudo = 'php scripts/restore.php'
-							. ' --file ' . escapeshellarg($resolvedPath)
-							. ' --auth-token ' . escapeshellarg($token);
-						$cmdNoSudoCd = ($tpRoot !== '')
-							? ('cd ' . escapeshellarg($rootForCmd) . ' && ' . $cmdNoSudo)
-							: $cmdNoSudo;
-						$variants[] = [
-							'label' => 'Alternative (no sudo) - run as ' . $webUser,
-							'command' => $cmdNoSudoCd,
-						];
-					}
+                    // Build a command adapted to the OS and (when possible) running as the same OS user as the web server.
+                    // This avoids common permission issues on files/ and keeps behavior consistent.
+                    $osFamily = defined('PHP_OS_FAMILY') ? (string) PHP_OS_FAMILY : (string) PHP_OS;
+                    $isWindows = (stripos($osFamily, 'Windows') !== false);
+                    $webUser = '';
+                    if (!$isWindows && function_exists('posix_getpwuid') && function_exists('posix_geteuid')) {
+                        $pw = @posix_getpwuid(@posix_geteuid());
+                        if (is_array($pw) && !empty($pw['name'])) {
+                            $webUser = (string) $pw['name'];
+                        }
+                    }
+
+                    $scriptRel = $isWindows ? 'scripts\\restore.php' : 'scripts/restore.php';
+                    $filePathForCmd = $isWindows ? str_replace('/', '\\', $resolvedPath) : $resolvedPath;
+                    $rootForCmd = $isWindows ? str_replace('/', '\\', rtrim($tpRoot, '/\\')) : rtrim($tpRoot, '/');
+
+                    $sudoPrefix = '';
+                    if (!$isWindows && $webUser !== '') {
+                        $sudoPrefix = 'sudo -u ' . escapeshellarg($webUser) . ' ';
+                    }
+
+                    $cmdNoCd = $sudoPrefix . 'php ' . $scriptRel
+                        . ' --file ' . escapeshellarg($filePathForCmd)
+                        . ' --auth-token ' . escapeshellarg($token);
+                    $cmdNoCdForce = $cmdNoCd . ' --force-disconnect';
+
+                    $cmd = $cmdNoCd;
+                    $cmdForce = $cmdNoCdForce;
+                    if ($tpRoot !== '') {
+                        if ($isWindows) {
+                            $cmd = 'cd /d ' . escapeshellarg($rootForCmd) . ' && ' . $cmdNoCd;
+                            $cmdForce = 'cd /d ' . escapeshellarg($rootForCmd) . ' && ' . $cmdNoCdForce;
+                        } else {
+                            $cmd = 'cd ' . escapeshellarg($rootForCmd) . ' && ' . $cmdNoCd;
+                            $cmdForce = 'cd ' . escapeshellarg($rootForCmd) . ' && ' . $cmdNoCdForce;
+                        }
+                    }
+
+                    // Provide multiple variants to cover the most common OS families and privilege models.
+                    $variants = [];
+                    $variants[] = [
+                        'label' => $isWindows ? 'Windows (CMD/Powershell)' : 'Recommended',
+                        'command' => $cmd,
+                    ];
+                    $variants[] = [
+                        'label' => $isWindows ? 'Force disconnect (--force-disconnect)' : 'Force disconnect (--force-disconnect)',
+                        'command' => $cmdForce,
+                    ];
+                    if (!$isWindows && $webUser !== '') {
+                        $cmdNoSudo = 'php scripts/restore.php'
+                            . ' --file ' . escapeshellarg($resolvedPath)
+                            . ' --auth-token ' . escapeshellarg($token);
+                        $cmdNoSudoCd = ($tpRoot !== '')
+                            ? ('cd ' . escapeshellarg($rootForCmd) . ' && ' . $cmdNoSudo)
+                            : $cmdNoSudo;
+                        $variants[] = [
+                            'label' => 'Alternative (no sudo) - run as ' . $webUser,
+                            'command' => $cmdNoSudoCd,
+                        ];
+                    }
 
                     echo prepareExchangedData(
                         [
@@ -1399,9 +1399,9 @@ 
                             'command' => $cmd,
                             'command_force_disconnect' => $cmdForce,
                             'command_no_cd' => $cmdNoCd,
-							'command_variants' => $variants,
-							'os_family' => $osFamily,
-							'web_user' => $webUser,
+                            'command_variants' => $variants,
+                            'os_family' => $osFamily,
+                            'web_user' => $webUser,
                             'resolved_path' => $resolvedPath,
                         ],
                         'encode'

Spacing +144 added lines, -144 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'
         );
@@ -223,7 +223,7 @@ 
         if ($v !== '') return $v;
     }
     if (defined('TP_VERSION') && defined('TP_VERSION_MINOR')) {
-        return (string) TP_VERSION . '.' . (string) TP_VERSION_MINOR;
+        return (string) TP_VERSION.'.'.(string) TP_VERSION_MINOR;
     }
     return '';
 }
@@ -262,7 +262,7 @@ 
     if ($operationId > 0) {
         // Uploaded restore file (temp_file in 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',
             $operationId
         );
         $val = isset($data['valeur']) ? (string) $data['valeur'] : '';
@@ -281,8 +281,8 @@ 
         }
 
         $bn = basename($val);
-        $baseDir = rtrim((string) ($SETTINGS['path_to_files_folder'] ?? (__DIR__ . '/../files')), '/');
-        $targetPath = $baseDir . '/' . $bn;
+        $baseDir = rtrim((string) ($SETTINGS['path_to_files_folder'] ?? (__DIR__.'/../files')), '/');
+        $targetPath = $baseDir.'/'.$bn;
 
         if (function_exists('tpParseSchemaLevelFromBackupFilename')) {
             $backupSchema = (string) tpParseSchemaLevelFromBackupFilename($bn);
@@ -306,13 +306,13 @@ 
             ];
         }
 
-        $baseDir = rtrim((string) ($SETTINGS['path_to_files_folder'] ?? (__DIR__ . '/../files')), '/');
+        $baseDir = rtrim((string) ($SETTINGS['path_to_files_folder'] ?? (__DIR__.'/../files')), '/');
         if ($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, '/');
         }
-        $targetPath = $baseDir . '/' . $bn;
+        $targetPath = $baseDir.'/'.$bn;
 
         if (function_exists('tpGetBackupTpFilesVersionFromMeta')) {
             $v = (string) tpGetBackupTpFilesVersionFromMeta($targetPath);
@@ -455,14 +455,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;
             }
@@ -494,13 +494,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);
@@ -538,7 +538,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);
 
@@ -557,7 +557,7 @@ 
 // Write metadata sidecar (<backup>.meta.json) for fast listings / migration safety
 try {
     if (function_exists('tpWriteBackupMetadata') && !empty($backupResult['filepath'])) {
-        tpWriteBackupMetadata((string)$backupResult['filepath'], '', '', ['source' => 'onthefly']);
+        tpWriteBackupMetadata((string) $backupResult['filepath'], '', '', ['source' => 'onthefly']);
     }
 } catch (Throwable $ignored) {
     // best effort
@@ -580,9 +580,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'
             );
@@ -592,7 +592,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;
             }
@@ -626,12 +626,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) {
@@ -642,21 +642,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
             );
 
@@ -708,7 +708,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;
             }
@@ -716,26 +716,26 @@ 
             $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;
 
 
-            $emailReportEnabled = (int)($dataReceived['email_report_enabled'] ?? 0);
+            $emailReportEnabled = (int) ($dataReceived['email_report_enabled'] ?? 0);
             $emailReportEnabled = ($emailReportEnabled === 1) ? 1 : 0;
 
-            $emailReportOnlyFailures = (int)($dataReceived['email_report_only_failures'] ?? 0);
+            $emailReportOnlyFailures = (int) ($dataReceived['email_report_only_failures'] ?? 0);
             $emailReportOnlyFailures = ($emailReportOnlyFailures === 1) ? 1 : 0;
 
             if ($emailReportEnabled === 0) {
                 $emailReportOnlyFailures = 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 {
@@ -745,22 +745,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
@@ -773,15 +773,15 @@ 
                 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_email_report_enabled', (string)$emailReportEnabled);
-            tpUpsertSettingsValue('bck_scheduled_email_report_only_failures', (string)$emailReportOnlyFailures);
+            tpUpsertSettingsValue('bck_scheduled_retention_days', (string) $retentionDays);
+            tpUpsertSettingsValue('bck_scheduled_email_report_enabled', (string) $emailReportEnabled);
+            tpUpsertSettingsValue('bck_scheduled_email_report_only_failures', (string) $emailReportOnlyFailures);
 
 
             // Force re-init of next_run_at so handler recomputes cleanly
@@ -791,13 +791,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);
@@ -817,16 +817,16 @@ 
 
 
             $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),
-                    'tp_files_version' => (function_exists('tpGetBackupTpFilesVersionFromMeta') ? ((($v = (string)tpGetBackupTpFilesVersionFromMeta($fp)) !== '') ? $v : null) : null),
-                    '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),
+                    'tp_files_version' => (function_exists('tpGetBackupTpFilesVersionFromMeta') ? ((($v = (string) tpGetBackupTpFilesVersionFromMeta($fp)) !== '') ? $v : null) : null),
+                    'download' => 'sources/backups.queries.php?type=scheduled_download_backup&file='.urlencode($bn)
+                        . '&key='.urlencode((string) $session->get('key'))
+                        . '&key_tmp='.urlencode($keyTmp),
                 ];
             }
 
@@ -836,7 +836,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;
             }
@@ -844,7 +844,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')) {
@@ -852,9 +852,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;
 
             /**
              * Delete a file and its associated metadata.
@@ -869,30 +869,30 @@ 
 
             // Check permissions
             if (is_writable($fp) === false) {
-                $errorMessage = "File is not writable, cannot delete: " . $fp;
-                if (WIP === true) error_log("TeamPass - " . $errorMessage);
+                $errorMessage = "File is not writable, cannot delete: ".$fp;
+                if (WIP === true) error_log("TeamPass - ".$errorMessage);
                 echo prepareExchangedData(['error' => true, 'message' => $errorMessage], 'encode');
                 break;
             }
 
             // Attempt deletion
             if (unlink($fp) === false) {
-                $errorMessage = "Failed to delete file: " . $fp;
-                if (WIP === true) error_log("TeamPass - " . $errorMessage);
+                $errorMessage = "Failed to delete file: ".$fp;
+                if (WIP === true) error_log("TeamPass - ".$errorMessage);
                 echo prepareExchangedData(['error' => true, 'message' => $errorMessage], 'encode');
                 break;
             }
 
             // Cleanup metadata (silent fail for sidecar is acceptable)
-            if (file_exists($fp . '.meta.json')) {
-                @unlink($fp . '.meta.json');
+            if (file_exists($fp.'.meta.json')) {
+                @unlink($fp.'.meta.json');
             }
 
             echo prepareExchangedData(['error' => false], 'encode');
             break;
 
         case 'check_connected_users':
-            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;
             }
@@ -903,7 +903,7 @@ 
             }
 
             $connectedCount = (int) DB::queryFirstField(
-                'SELECT COUNT(*) FROM ' . prefixTable('users') . ' WHERE session_end >= %i AND id != %i',
+                'SELECT COUNT(*) FROM '.prefixTable('users').' WHERE session_end >= %i AND id != %i',
                 time(),
                 $excludeUserId
             );
@@ -912,19 +912,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'
@@ -937,7 +937,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', 'initiator_user_id' => (int) $session->get('user-id')], JSON_UNESCAPED_SLASHES),
                     'is_in_progress' => 0,
@@ -945,7 +945,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');
 
@@ -954,7 +954,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,
@@ -966,7 +966,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
@@ -993,9 +993,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(
@@ -1012,7 +1012,7 @@ 
             $ok = @unlink($fullPath);
 
             // Also remove metadata sidecar if present
-            @unlink($fullPath . '.meta.json');
+            @unlink($fullPath.'.meta.json');
 
             if ($ok !== true) {
                 echo prepareExchangedData(
@@ -1037,7 +1037,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,
@@ -1048,11 +1048,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();
             }
@@ -1077,18 +1077,18 @@ 
 
                 $files[] = array(
                     'name' => $bn,
-                    'size_bytes' => (int)@filesize($fp),
-                    'mtime' => (int)@filemtime($fp),
-                    'tp_files_version' => (function_exists('tpGetBackupTpFilesVersionFromMeta') ? ((($v = (string)tpGetBackupTpFilesVersionFromMeta($fp)) !== '') ? $v : null) : null),
-                    '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),
+                    'tp_files_version' => (function_exists('tpGetBackupTpFilesVersionFromMeta') ? ((($v = (string) tpGetBackupTpFilesVersionFromMeta($fp)) !== '') ? $v : null) : null),
+                    '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);
             });
 
@@ -1102,7 +1102,7 @@ 
             );
             break;
         case 'preflight_restore_compatibility':
-            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;
             }
@@ -1113,8 +1113,8 @@ 
             }
 
             $serverScope = (string) ($dataReceived['serverScope'] ?? '');
-            $serverFile  = (string) ($dataReceived['serverFile']  ?? '');
-            $operationId = (int)    ($dataReceived['operation_id'] ?? 0);
+            $serverFile  = (string) ($dataReceived['serverFile'] ?? '');
+            $operationId = (int) ($dataReceived['operation_id'] ?? 0);
 
             $chk = tpCheckRestoreCompatibility($SETTINGS, $serverScope, $serverFile, $operationId);
 
@@ -1153,8 +1153,8 @@ 
                     }
 
                     $serverScope = (string) ($dataReceived['serverScope'] ?? '');
-                    $serverFile  = (string) ($dataReceived['serverFile']  ?? '');
-                    $operationId = (int)    ($dataReceived['operation_id'] ?? 0);
+                    $serverFile  = (string) ($dataReceived['serverFile'] ?? '');
+                    $operationId = (int) ($dataReceived['operation_id'] ?? 0);
 
                     $encryptionKey = (string) ($dataReceived['encryptionKey'] ?? '');
                     $overrideKey   = (string) ($dataReceived['overrideKey'] ?? '');
@@ -1242,7 +1242,7 @@ 
                         }
                     }
 
-                    $keysToTry = array_values(array_unique(array_filter($keysToTry, function ($v) {
+                    $keysToTry = array_values(array_unique(array_filter($keysToTry, function($v) {
                         return $v !== '';
                     })));
 
@@ -1266,8 +1266,8 @@ 
                         $tmpRand = uniqid('', true);
                     }
 
-                    $tmpDecryptedSql = rtrim((string) sys_get_temp_dir(), DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR
-                        . 'defuse_temp_restore_' . (int) ($session->get('user-id') ?? 0) . '_' . time() . '_' . $tmpRand . '.sql';
+                    $tmpDecryptedSql = rtrim((string) sys_get_temp_dir(), DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR
+                        . 'defuse_temp_restore_'.(int) ($session->get('user-id') ?? 0).'_'.time().'_'.$tmpRand.'.sql';
 
                     // Try to decrypt with the available keys
                     $decRet = tpDefuseDecryptWithCandidates($resolvedPath, $tmpDecryptedSql, $keysToTry, $SETTINGS);
@@ -1346,23 +1346,23 @@ 
 
 					$sudoPrefix = '';
 					if (!$isWindows && $webUser !== '') {
-						$sudoPrefix = 'sudo -u ' . escapeshellarg($webUser) . ' ';
+						$sudoPrefix = 'sudo -u '.escapeshellarg($webUser).' ';
 					}
 
-					$cmdNoCd = $sudoPrefix . 'php ' . $scriptRel
-						. ' --file ' . escapeshellarg($filePathForCmd)
-						. ' --auth-token ' . escapeshellarg($token);
-					$cmdNoCdForce = $cmdNoCd . ' --force-disconnect';
+					$cmdNoCd = $sudoPrefix.'php '.$scriptRel
+						. ' --file '.escapeshellarg($filePathForCmd)
+						. ' --auth-token '.escapeshellarg($token);
+					$cmdNoCdForce = $cmdNoCd.' --force-disconnect';
 
 					$cmd = $cmdNoCd;
 					$cmdForce = $cmdNoCdForce;
 					if ($tpRoot !== '') {
 						if ($isWindows) {
-							$cmd = 'cd /d ' . escapeshellarg($rootForCmd) . ' && ' . $cmdNoCd;
-							$cmdForce = 'cd /d ' . escapeshellarg($rootForCmd) . ' && ' . $cmdNoCdForce;
+							$cmd = 'cd /d '.escapeshellarg($rootForCmd).' && '.$cmdNoCd;
+							$cmdForce = 'cd /d '.escapeshellarg($rootForCmd).' && '.$cmdNoCdForce;
 						} else {
-							$cmd = 'cd ' . escapeshellarg($rootForCmd) . ' && ' . $cmdNoCd;
-							$cmdForce = 'cd ' . escapeshellarg($rootForCmd) . ' && ' . $cmdNoCdForce;
+							$cmd = 'cd '.escapeshellarg($rootForCmd).' && '.$cmdNoCd;
+							$cmdForce = 'cd '.escapeshellarg($rootForCmd).' && '.$cmdNoCdForce;
 						}
 					}
 
@@ -1378,13 +1378,13 @@ 
 					];
 					if (!$isWindows && $webUser !== '') {
 						$cmdNoSudo = 'php scripts/restore.php'
-							. ' --file ' . escapeshellarg($resolvedPath)
-							. ' --auth-token ' . escapeshellarg($token);
+							. ' --file '.escapeshellarg($resolvedPath)
+							. ' --auth-token '.escapeshellarg($token);
 						$cmdNoSudoCd = ($tpRoot !== '')
-							? ('cd ' . escapeshellarg($rootForCmd) . ' && ' . $cmdNoSudo)
+							? ('cd '.escapeshellarg($rootForCmd).' && '.$cmdNoSudo)
 							: $cmdNoSudo;
 						$variants[] = [
-							'label' => 'Alternative (no sudo) - run as ' . $webUser,
+							'label' => 'Alternative (no sudo) - run as '.$webUser,
 							'command' => $cmdNoSudoCd,
 						];
 					}
@@ -1448,8 +1448,8 @@ 
             $earlyOffset = (int) ($dataEarly['offset'] ?? 0);
             $earlyClear = (string) ($dataEarly['clearFilename'] ?? '');
             $earlyServerScope = (string) ($dataEarly['serverScope'] ?? '');
-            $earlyServerFile  = (string) ($dataEarly['serverFile']  ?? '');
-            $earlyBackupFile  = (string) ($dataEarly['backupFile']  ?? '');
+            $earlyServerFile  = (string) ($dataEarly['serverFile'] ?? '');
+            $earlyBackupFile  = (string) ($dataEarly['backupFile'] ?? '');
             $earlyOperationId = (int) ($dataEarly['operation_id'] ?? 0);
 
             // If restore is starting (first chunk), enforce schema compatibility.
@@ -1509,7 +1509,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.
@@ -1518,7 +1518,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 '';
                 }
@@ -1538,7 +1538,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.
@@ -1554,7 +1554,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 && is_file($tmp)) {
                     if (is_writable($tmp)) {
@@ -1657,9 +1657,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
@@ -1696,12 +1696,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 {
@@ -1736,7 +1736,7 @@ 
                         );
 
                         try {
-                            $msg = 'dataBase restore started (scope=' . $post_serverScope . ', file=' . $bn . ')';
+                            $msg = 'dataBase restore started (scope='.$post_serverScope.', file='.$bn.')';
                             logEvents(
                                 $SETTINGS,
                                 'admin_action',
@@ -1763,7 +1763,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
                     );
 
@@ -1788,7 +1788,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 {
@@ -1822,7 +1822,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
@@ -1897,7 +1897,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'
                     );
@@ -2051,7 +2051,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 = '';
                         }
@@ -2077,7 +2077,7 @@ 
                 }
                 // Rollback transaction on any exception
                 DB::rollback();
-                $errors[] = 'Transaction failed: ' . $tpSafeJsonString($e->getMessage());
+                $errors[] = 'Transaction failed: '.$tpSafeJsonString($e->getMessage());
             }
         
             // Calculate the new offset
@@ -2104,7 +2104,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')
                     );
@@ -2117,7 +2117,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,
@@ -2198,15 +2198,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 +39 added lines, -13 removed lines

@@ -220,7 +220,9 @@ 
 {
     if (function_exists('tpGetTpFilesVersion')) {
         $v = (string) tpGetTpFilesVersion();
-        if ($v !== '') return $v;
+        if ($v !== '') {
+            return $v;
+        }
     }
     if (defined('TP_VERSION') && defined('TP_VERSION_MINOR')) {
         return (string) TP_VERSION . '.' . (string) TP_VERSION_MINOR;
@@ -235,7 +237,9 @@ 
     }
     if (defined('UPGRADE_MIN_DATE')) {
         $v = (string) UPGRADE_MIN_DATE;
-        if ($v !== '' && preg_match('/^\d+$/', $v) === 1) return $v;
+        if ($v !== '' && preg_match('/^\d+$/', $v) === 1) {
+            return $v;
+        }
     }
     return '';
 }
@@ -714,7 +718,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;
@@ -746,22 +752,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);
@@ -842,7 +860,9 @@ 
             }
 
             $dataReceived = prepareExchangedData($post_data, 'decode');
-            if (!is_array($dataReceived)) $dataReceived = [];
+            if (!is_array($dataReceived)) {
+                $dataReceived = [];
+            }
 
             $file = (string)($dataReceived['file'] ?? '');
             $file = basename($file);
@@ -870,7 +890,9 @@ 
             // Check permissions
             if (is_writable($fp) === false) {
                 $errorMessage = "File is not writable, cannot delete: " . $fp;
-                if (WIP === true) error_log("TeamPass - " . $errorMessage);
+                if (WIP === true) {
+                    error_log("TeamPass - " . $errorMessage);
+                }
                 echo prepareExchangedData(['error' => true, 'message' => $errorMessage], 'encode');
                 break;
             }
@@ -878,7 +900,9 @@ 
             // Attempt deletion
             if (unlink($fp) === false) {
                 $errorMessage = "Failed to delete file: " . $fp;
-                if (WIP === true) error_log("TeamPass - " . $errorMessage);
+                if (WIP === true) {
+                    error_log("TeamPass - " . $errorMessage);
+                }
                 echo prepareExchangedData(['error' => true, 'message' => $errorMessage], 'encode');
                 break;
             }
@@ -1443,7 +1467,9 @@ 
 
 // Compatibility check (schema-level) BEFORE maintenance/lock and any destructive action
             $dataEarly = prepareExchangedData($post_data, 'decode');
-            if (!is_array($dataEarly)) $dataEarly = [];
+            if (!is_array($dataEarly)) {
+                $dataEarly = [];
+            }
 
             $earlyOffset = (int) ($dataEarly['offset'] ?? 0);
             $earlyClear = (string) ($dataEarly['clearFilename'] ?? '');

sources/backup.functions.php

Spacing +25 added lines, -25 removed lines

@@ -54,7 +54,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') || !function_exists('prefixTable')) && is_file($mainFunctionsPath)) {
             require_once $mainFunctionsPath;
         }
@@ -73,7 +73,7 @@ 
             {
                 try {
                     $row = DB::queryFirstRow(
-                        'SELECT valeur FROM ' . prefixTable('misc') . ' WHERE intitule=%s AND type=%s',
+                        'SELECT valeur FROM '.prefixTable('misc').' WHERE intitule=%s AND type=%s',
                         'maintenance_mode',
                         'admin'
                     );
@@ -125,9 +125,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'] ?? [];
 
@@ -138,7 +138,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,
             ];
         }
 
@@ -155,9 +155,9 @@ 
 if ($schemaLevel !== '' && preg_match('/^\d+$/', $schemaLevel) !== 1) {
     $schemaLevel = '';
 }
-$schemaSuffix = ($schemaLevel !== '') ? ('-sl' . $schemaLevel) : '';
-$filename = $prefix . time() . '-' . $token . $schemaSuffix . '.sql';
-        $filepath = rtrim($outputDir, '/') . '/' . $filename;
+$schemaSuffix = ($schemaLevel !== '') ? ('-sl'.$schemaLevel) : '';
+$filename = $prefix.time().'-'.$token.$schemaSuffix.'.sql';
+        $filepath = rtrim($outputDir, '/').'/'.$filename;
 
         $handle = @fopen($filepath, 'w+');
         if ($handle === false) {
@@ -167,7 +167,7 @@ 
                 'filepath' => $filepath,
                 'encrypted' => false,
                 'size_bytes' => 0,
-                'message' => 'Could not create backup file: ' . $filepath,
+                'message' => 'Could not create backup file: '.$filepath,
             ];
         }
 
@@ -200,22 +200,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
                     );
@@ -244,10 +244,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++;
@@ -268,7 +268,7 @@ 
                 fclose($handle);
             }
 
-            $errorMessage = 'Backup failed: ' . $e->getMessage();
+            $errorMessage = 'Backup failed: '.$e->getMessage();
 
             // Suppression sécurisée sans @
             if (file_exists($filepath)) {
@@ -293,7 +293,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')) {
                 if (file_exists($filepath)) {
@@ -324,7 +324,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'),
                 ];
             }
 
@@ -406,7 +406,7 @@ 
 
         if ($isUtf8 === false) {
             // ASCII safe fallback
-            return '[hex]' . bin2hex($str);
+            return '[hex]'.bin2hex($str);
         }
 
         // Strip ASCII control chars
@@ -463,7 +463,7 @@ 
     ): array {
         $lastMsg = '';
         foreach ($candidateKeys as $k) {
-            $k = (string)$k;
+            $k = (string) $k;
             if ($k === '') {
                 continue;
             }
@@ -477,7 +477,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')];
@@ -493,7 +493,7 @@ 
     function tpGetTpFilesVersion(): string
     {
         if (defined('TP_VERSION') && defined('TP_VERSION_MINOR')) {
-            return (string) TP_VERSION . '.' . (string) TP_VERSION_MINOR;
+            return (string) TP_VERSION.'.'.(string) TP_VERSION_MINOR;
         }
         return '';
     }
@@ -515,7 +515,7 @@ 
 if (function_exists('tpGetBackupMetadataPath') === false) {
     function tpGetBackupMetadataPath(string $backupFilePath): string
     {
-        return $backupFilePath . '.meta.json';
+        return $backupFilePath.'.meta.json';
     }
 }
 
@@ -738,7 +738,7 @@ 
     function tpRestoreAuthorizationFetchByHash(string $tokenHash): array
     {
         $row = DB::queryFirstRow(
-            'SELECT increment_id, valeur FROM ' . prefixTable('misc') . ' WHERE type = %s AND intitule = %s LIMIT 1',
+            'SELECT increment_id, valeur FROM '.prefixTable('misc').' WHERE type = %s AND intitule = %s LIMIT 1',
             'restore_authorization_cli',
             $tokenHash
         );