Gmer4Lfe
ce0b3fb74b
Consolidations (config.php gains 5 shared utilities): - vv_format_uptime() replaces 4 inline uptime-formatting blocks - vv_parse_conf_scalar() replaces vv_arr_scalar/vv_wd_scalar/vv_fb_scalar/vv_media_conf_scalar - vv_known_hosts() replaces vv_arr_known_hosts/vv_fb_known_hosts + inline parser in watchdog - vv_parse_kv_db() replaces inline key=value parsing in snapshot and monitor - vv_local_ip() replaces duplicate in docker_folders.php and inline in docker.php All module-level function names kept as thin aliases so call sites unchanged. Critical bug fixes: - api/system.php: added require_once config.php and POST-only guard (no auth on shutdown) - api/movescript.php + reorderarray.php: use vv_write_conf_raw (atomic) + vv_push_master_conf - api/snapshot.php: share /tmp/vv_cpu_stat.json with vv_cpu_per_core() instead of own state file Correctness: - vv_cpu_per_core() and vv_network_stats(): atomic tmp+rename for state files (concurrent poll safety) - ext_ip curl cache moved from /tmp/vv_ext_ip.cache to vv_cache_read/write (canonical cache dir) - monitor_remote.php + board.php + snapshot.php: all use vv_cache_read/write instead of ad-hoc /tmp files HTTP method guards added to write-only APIs that were missing them: - api/scheduler.php, conf_toggle.php, flag_toggle.php
80 lines
2.7 KiB
PHP
80 lines
2.7 KiB
PHP
<?php
|
|
// Move a script between *_SCRIPTS arrays in master.conf.
|
|
// POST: script (rel path), to_array (var name, or '' to remove from all arrays).
|
|
header('Content-Type: application/json');
|
|
require_once dirname(__DIR__) . '/include/config.php';
|
|
|
|
if ($_SERVER['REQUEST_METHOD'] !== 'POST') {
|
|
echo json_encode(['ok' => false, 'error' => 'POST only']);
|
|
exit;
|
|
}
|
|
|
|
$script = trim($_POST['script'] ?? '');
|
|
$toArray = trim($_POST['to_array'] ?? '');
|
|
|
|
if (!$script || str_contains($script, '..') || !preg_match('/^[A-Za-z0-9_.\-\/]+\.sh$/', $script)) {
|
|
echo json_encode(['ok' => false, 'error' => 'Invalid script']);
|
|
exit;
|
|
}
|
|
if ($toArray && !preg_match('/^[A-Z_]+_SCRIPTS$/', $toArray)) {
|
|
echo json_encode(['ok' => false, 'error' => 'Invalid array name']);
|
|
exit;
|
|
}
|
|
|
|
$confPath = CONF_DIR . '/master.conf';
|
|
if (!file_exists($confPath)) {
|
|
echo json_encode(['ok' => false, 'error' => 'master.conf not found']);
|
|
exit;
|
|
}
|
|
|
|
$lines = file($confPath, FILE_KEEP_BLANK_LINES);
|
|
if (!$lines) {
|
|
echo json_encode(['ok' => false, 'error' => 'Could not read master.conf']);
|
|
exit;
|
|
}
|
|
|
|
$scriptEsc = preg_quote($script, '/');
|
|
$removedLine = null;
|
|
$inArray = false;
|
|
|
|
// Step 1: find and remove the script line from whatever array it is currently in.
|
|
$newLines = [];
|
|
foreach ($lines as $line) {
|
|
if (preg_match('/^\s*[A-Z_]+_SCRIPTS\s*=\s*\(/', $line)) $inArray = true;
|
|
if ($inArray && preg_match('/^\s*\)\s*(?:#.*)?$/', $line) && !str_contains($line, '(')) $inArray = false;
|
|
if ($inArray && preg_match('/^\s*(?:#\s*)?"' . $scriptEsc . '(?:\s[^"]*)?"/', $line)) {
|
|
$removedLine = ' "' . $script . '"' . "\n"; // normalise indentation when re-inserting
|
|
continue; // drop from current location
|
|
}
|
|
$newLines[] = $line;
|
|
}
|
|
|
|
// Step 2: insert into target array (if specified).
|
|
if ($toArray) {
|
|
$resultLines = [];
|
|
$inTarget = false;
|
|
$inserted = false;
|
|
foreach ($newLines as $line) {
|
|
if (preg_match('/^\s*' . preg_quote($toArray, '/') . '\s*=\s*\(/', $line)) $inTarget = true;
|
|
if ($inTarget && !$inserted && preg_match('/^\s*\)\s*(?:#.*)?$/', $line) && !str_contains($line, '(')) {
|
|
$resultLines[] = $removedLine ?? (' "' . $script . '"' . "\n");
|
|
$inTarget = false;
|
|
$inserted = true;
|
|
}
|
|
$resultLines[] = $line;
|
|
}
|
|
if (!$inserted) {
|
|
echo json_encode(['ok' => false, 'error' => 'Target array "' . $toArray . '" not found in master.conf']);
|
|
exit;
|
|
}
|
|
$newLines = $resultLines;
|
|
}
|
|
|
|
if (!vv_write_conf_raw('master.conf', implode('', $newLines))) {
|
|
echo json_encode(['ok' => false, 'error' => 'Write failed']);
|
|
exit;
|
|
}
|
|
|
|
vv_push_master_conf();
|
|
echo json_encode(['ok' => true]);
|