module

modules/pi_control/pages/asset.php

@@ -0,0 +1,30 @@
+<?php
+$file = (string)($_GET['file'] ?? '');
+$base = realpath(__DIR__ . '/../assets');
+$map = [
+    'pi_control.css' => $base . '/pi_control.css',
+    'console.js' => $base . '/console.js',
+];
+
+if (!isset($map[$file])) {
+    http_response_code(404);
+    exit('Not found');
+}
+
+$path = $map[$file];
+if (!$base || !is_file($path) || !str_starts_with($path, $base)) {
+    http_response_code(404);
+    exit('Not found');
+}
+
+$ext = pathinfo($path, PATHINFO_EXTENSION);
+if ($ext === 'css') {
+    header('Content-Type: text/css; charset=utf-8');
+} elseif ($ext === 'js') {
+    header('Content-Type: application/javascript; charset=utf-8');
+} else {
+    header('Content-Type: application/octet-stream');
+}
+
+readfile($path);
+exit;

modules/pi_control/pages/commands.php

@@ -2,6 +2,10 @@
 $pdo = module_fn('pi_control', 'pdo');
 module_fn('pi_control', 'ensure_schema');
 $table = fn(string $name) => module_fn('pi_control', 'table', $name);
+$assets = app()->assets();
+if ($assets) {
+    $assets->addStyle('/module/pi_control/asset?file=pi_control.css');
+}
 
 $notice = null;
 $error = null;

modules/pi_control/pages/console.php

@@ -14,7 +14,8 @@ $terminalHostLabel = null;
 $settings = modules()->settings('pi_control');
 $assets = app()->assets();
 if ($assets) {
-    $assets->addScript('/assets/js/pi_control_console.js', 'footer', true);
+    $assets->addStyle('/module/pi_control/asset?file=pi_control.css');
+    $assets->addScript('/module/pi_control/asset?file=console.js', 'footer', true);
 }
 $ttydUrl = trim((string)($settings['ttyd_url'] ?? '/ttyd'));
 $defaultProvider = 'ttyd';
@@ -105,22 +106,20 @@ if (isset($_GET['open_console_json'])) {
             $token = bin2hex(random_bytes(24));
             $terminalToken = $token;
             $stmt = $pdo->prepare(
-                'INSERT INTO ' . $table('sessions') . ' (token, host_id, provider, created_by, expires_at)
-                 VALUES (:token, :host_id, :provider, :created_by, ' . $expiresSql . ')'
+                'INSERT INTO ' . $table('sessions') . ' (token, host_id, provider, command_text, created_by, expires_at)
+                 VALUES (:token, :host_id, :provider, :command_text, :created_by, ' . $expiresSql . ')'
             );
+            $commandToRun = $presetCommand !== '' ? $presetCommand : $rawCommand;
             $stmt->execute([
                 'token' => $token,
                 'host_id' => $hostId,
                 'provider' => 'ttyd',
+                'command_text' => $commandToRun !== '' ? $commandToRun : null,
                 'created_by' => auth_display_name() ?: null,
             ]);
 
             $sep = str_contains($ttydUrl, '?') ? '&' : '?';
             $terminalUrl = rtrim($ttydUrl, '/') . '/' . $sep . 'arg=' . rawurlencode($token);
-            $commandToRun = $presetCommand !== '' ? $presetCommand : $rawCommand;
-            if ($commandToRun !== '') {
-                $terminalUrl .= '&arg=' . rawurlencode(base64_encode($commandToRun));
-            }
             foreach ($hosts as $h) {
                 if ((int)$h['id'] === $hostId) {
                     $terminalHostLabel = (string)($h['name'] ?? $h['host']);
@@ -281,7 +280,7 @@ $runs = $pdo->query(
           <textarea name="terminal_command_text" rows="2" placeholder="Optional: Befehl direkt ausführen"></textarea>
         </label>
         <div style="display:flex; gap:10px; flex-wrap:wrap;">
-          <button class="cta-button" type="button" data-open-console>Konsole öffnen</button>
+          <button class="cta-button" type="button" data-open-console>Neue Konsole öffnen</button>
           <button class="nav-link" type="button" data-run-command>Im Hintergrund ausführen</button>
           <button class="nav-link" type="button" data-send-active>In aktiver Konsole ausführen</button>
         </div>

modules/pi_control/pages/hosts.php

@@ -2,6 +2,10 @@
 $pdo = module_fn('pi_control', 'pdo');
 module_fn('pi_control', 'ensure_schema');
 $table = fn(string $name) => module_fn('pi_control', 'table', $name);
+$assets = app()->assets();
+if ($assets) {
+    $assets->addStyle('/module/pi_control/asset?file=pi_control.css');
+}
 
 $notice = null;
 $error = null;

modules/pi_control/pages/terminal_info.php

@@ -59,6 +59,12 @@ if (!$host) {
 $pdo->prepare('UPDATE ' . $table('sessions') . ' SET last_used_at = ' . $nowSql . ' WHERE id = :id')
     ->execute(['id' => (int)$session['id']]);
 
+$commandText = (string)($session['command_text'] ?? '');
+if ($commandText !== '') {
+    $pdo->prepare('UPDATE ' . $table('sessions') . ' SET command_text = NULL WHERE id = :id')
+        ->execute(['id' => (int)$session['id']]);
+}
+
 echo json_encode([
     'ok' => true,
     'host' => [
@@ -70,5 +76,6 @@ echo json_encode([
         'key_path' => (string)($host['key_path'] ?? ''),
         'password' => (string)($host['password'] ?? ''),
     ],
+    'command' => $commandText,
 ]);
 exit;