From cbf899b94b06d7777d1b4f82fb4ebc3cb10a1354 Mon Sep 17 00:00:00 2001 From: Claw Date: Tue, 17 Nov 2026 21:00:47 +0100 Subject: [PATCH] 0.7.0: after_action setting (stay on page with job status vs jump to log), settings UI --- bin/vmm-lib.php | 42 ++++++++++++++++++++++++++++++++++++++ gui/ext/vmmngr/vmmngr.conf | 3 ++- gui/vmmngr.php | 11 +++++++++- gui/vmmngr_config.php | 40 ++++++++++++++++++++++++++++++++++++ gui/vmmngr_vm.php | 17 +++++++++++++-- version.txt | 2 +- 6 files changed, 110 insertions(+), 5 deletions(-) diff --git a/bin/vmm-lib.php b/bin/vmm-lib.php index 483458e..2959ce6 100644 --- a/bin/vmm-lib.php +++ b/bin/vmm-lib.php @@ -33,6 +33,7 @@ function vmm_config(): array 'default_bridge' => '', 'enable' => true, 'job_timeout' => 900, + 'after_action' => 'stay', // stay | log 'vm_dir_cache' => '', ]; if (!is_file(VMM_CONF)) { @@ -651,6 +652,47 @@ function vmm_job_log(string $id, int $maxBytes = 65536): string return "... (truncated)\n" . $data; } +/** + * Where to go after an action created a job: the job log, or back to the page + * the action came from (default, keeps the dashboard in view). + */ +function vmm_after_job_target(string $jobId, string $back): string +{ + $conf = vmm_config(); + if (($conf['after_action'] ?? 'stay') === 'log') { + return 'vmmngr_jobs.php?id=' . urlencode($jobId); + } + $sep = str_contains($back, '?') ? '&' : '?'; + return $back . $sep . 'job=' . urlencode($jobId); +} + +function vmm_job_status_html(string $id): string +{ + $job = vmm_job_get($id); + if ($job === null) { + return ''; + } + $state = (string)$job['state']; + $cls = $state === 'failed' ? 'vmm-err' : 'vmm-ok'; + return sprintf( + '
' + . 'Job %s · %s %s · %s · %s
', + htmlspecialchars($id, ENT_QUOTES), + htmlspecialchars((string)$job['verb'], ENT_QUOTES), + htmlspecialchars((string)$job['vm'], ENT_QUOTES), + $cls, + htmlspecialchars($state . ($job['rc'] !== null ? ' (rc ' . $job['rc'] . ')' : ''), ENT_QUOTES), + urlencode($id), + gettext('Log') + ); +} + +function vmm_job_running(string $id): bool +{ + $job = vmm_job_get($id); + return $job !== null && in_array($job['state'], ['queued', 'running'], true); +} + function vmm_job_new(string $verb, string $name, array $argv = [], int $timeout = 0): array { vmm_ensure_state_dirs(); diff --git a/gui/ext/vmmngr/vmmngr.conf b/gui/ext/vmmngr/vmmngr.conf index ae56749..a4916c9 100644 --- a/gui/ext/vmmngr/vmmngr.conf +++ b/gui/ext/vmmngr/vmmngr.conf @@ -1,11 +1,12 @@ { "appname": "VM Manager", - "version": "0.6.1", + "version": "0.7.0", "rootfolder": "/mnt/Daten/extensions/vmmngr", "vm_source": "auto", "bridges": ["ix0bridge"], "default_bridge": "ix0bridge", "enable": true, "job_timeout": 900, + "after_action": "stay", "ram_budget_pct": 85 } diff --git a/gui/vmmngr.php b/gui/vmmngr.php index d446bd6..8fe7c8d 100644 --- a/gui/vmmngr.php +++ b/gui/vmmngr.php @@ -18,10 +18,15 @@ if (strtoupper((string)($_SERVER['REQUEST_METHOD'] ?? '')) === 'POST' && isset($ exit; } $job = vmm_job_new($verb, $vmName); - header('Location: vmmngr_jobs.php?id=' . urlencode((string)$job['id'])); + header('Location: ' . vmm_after_job_target((string)$job['id'], 'vmmngr.php')); exit; } +$activeJob = (string)($_GET['job'] ?? ''); +if ($activeJob !== '' && vmm_job_running($activeJob)) { + header('Refresh: 3'); +} + $conf = vmm_config(); $vmprov = vmm_resolve('vm'); $vms = $vmprov['available'] ? vmm_list() : []; @@ -46,6 +51,10 @@ vmm_nav('dashboard');
+ + + + diff --git a/gui/vmmngr_config.php b/gui/vmmngr_config.php index 1899e60..43dee82 100644 --- a/gui/vmmngr_config.php +++ b/gui/vmmngr_config.php @@ -6,6 +6,16 @@ require_once 'vmmngr-boot.inc'; require_once 'vmmngr-config-lib.inc'; +if (strtoupper((string)($_SERVER['REQUEST_METHOD'] ?? '')) === 'POST' && ($_POST['act'] ?? '') === 'save_settings') { + $conf = vmm_config(); + $conf['after_action'] = ($_POST['after_action'] ?? 'stay') === 'log' ? 'log' : 'stay'; + $conf['vm_source'] = in_array($_POST['vm_source'] ?? '', ['auto', 'system', 'bundle'], true) ? $_POST['vm_source'] : 'auto'; + vmm_save_config($conf); + $_SESSION['vmmngr_error'] = gettext('Settings saved.'); + header('Location: vmmngr_config.php'); + exit; +} + if (strtoupper((string)($_SERVER['REQUEST_METHOD'] ?? '')) === 'POST' && ($_POST['act'] ?? '') === 'register') { $added = vmm_register_boot(); $_SESSION['vmmngr_error'] = $added === [] @@ -30,6 +40,36 @@ vmm_nav('config'); ?> + + + + + + + + + + + + + + +
+ + +
vm_source + +
+ +
+ diff --git a/gui/vmmngr_vm.php b/gui/vmmngr_vm.php index 6a3f87d..777c218 100644 --- a/gui/vmmngr_vm.php +++ b/gui/vmmngr_vm.php @@ -83,7 +83,7 @@ if (strtoupper((string)($_SERVER['REQUEST_METHOD'] ?? '')) === 'POST' && isset($ exit; } $job = vmm_job_new('start', $name); - header('Location: vmmngr_jobs.php?id=' . urlencode((string)$job['id'])); + header('Location: ' . vmm_after_job_target((string)$job['id'], 'vmmngr_vm.php?name=' . urlencode($name))); exit; } $check = vmm_action_check($verb, $vmName, (string)($_POST['confirm'] ?? '')); @@ -93,7 +93,7 @@ if (strtoupper((string)($_SERVER['REQUEST_METHOD'] ?? '')) === 'POST' && isset($ exit; } $job = vmm_job_new($verb, $vmName); - header('Location: vmmngr_jobs.php?id=' . urlencode((string)$job['id'])); + header('Location: ' . vmm_after_job_target((string)$job['id'], 'vmmngr_vm.php?name=' . urlencode($name))); exit; } @@ -103,6 +103,11 @@ if (vmm_vm_state($name) === 'absent') { exit; } +$activeJob = (string)($_GET['job'] ?? ''); +if ($activeJob !== '' && vmm_job_running($activeJob)) { + header('Refresh: 3'); +} + $info = vmm_info($name); $pgtitle = [gettext('Extensions'), gettext('VM Manager'), $name]; $jobs = vmm_job_list(10, $name); @@ -114,6 +119,14 @@ vmm_nav('dashboard');
+ + + + + + + + diff --git a/version.txt b/version.txt index ee6cdce..faef31a 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -0.6.1 +0.7.0