module
This commit is contained in:
@@ -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>
|
||||
|
||||
Reference in New Issue
Block a user