' . h($e->getMessage()) . '
', 'Fehler beim Start');
exit;
}
-$appPage = (string)($_GET['page'] ?? 'login'); // login|register
-$appAction = (string)($_GET['auth'] ?? '');
-if ($appAction === 'logout') {
+// App-Logout
+if ((string)($_GET['auth'] ?? '') === 'logout') {
adminer_app_logout();
header('Location: /adminer', true, 302);
exit;
}
-// Handle app login
+$appPage = (string)($_GET['page'] ?? 'login');
$appError = null;
+$appRegError = null;
+$appRegOk = null;
+
+// Login POST
if ($_SERVER['REQUEST_METHOD'] === 'POST' && (string)($_POST['action'] ?? '') === 'app_login') {
- $u = (string)($_POST['username'] ?? '');
- $p = (string)($_POST['password'] ?? '');
- $res = adminer_app_try_login($u, $p);
+ $res = adminer_app_try_login((string)($_POST['username'] ?? ''), (string)($_POST['password'] ?? ''));
if (!empty($res['ok'])) {
header('Location: /adminer', true, 302);
exit;
}
$appError = (string)($res['error'] ?? 'Login fehlgeschlagen.');
- $appPage = 'login';
+ $appPage = 'login';
}
-// Handle registration
-$appRegError = null;
-$appRegOk = null;
+// Register POST
if ($_SERVER['REQUEST_METHOD'] === 'POST' && (string)($_POST['action'] ?? '') === 'app_register') {
- $u = (string)($_POST['username'] ?? '');
- $p1 = (string)($_POST['password'] ?? '');
- $p2 = (string)($_POST['password2'] ?? '');
-
- $res = adminer_app_try_register($u, $p1, $p2);
+ $res = adminer_app_try_register(
+ (string)($_POST['username'] ?? ''),
+ (string)($_POST['password'] ?? ''),
+ (string)($_POST['password2'] ?? '')
+ );
if (!empty($res['ok'])) {
- // Auto-login after register
- $loginRes = adminer_app_try_login($u, $p1);
- if (!empty($loginRes['ok'])) {
+ $lr = adminer_app_try_login((string)($_POST['username'] ?? ''), (string)($_POST['password'] ?? ''));
+ if (!empty($lr['ok'])) {
header('Location: /adminer', true, 302);
exit;
}
- $appRegOk = 'Registrierung erfolgreich. Bitte einloggen.';
- $appPage = 'login';
+ $appRegOk = 'Konto erstellt! Bitte einloggen.';
+ $appPage = 'login';
} else {
$appRegError = (string)($res['error'] ?? 'Registrierung fehlgeschlagen.');
- $appPage = 'register';
+ $appPage = 'register';
}
}
+// ── LOGIN / REGISTER SEITE ────────────────────────────────────────────────
if (!adminer_app_is_logged_in()) {
- $canRegister = adminer_app_allow_register();
+ $canReg = adminer_app_allow_register();
+ $isReg = ($appPage === 'register');
- $body = '';
+ $body = '
';
// Tabs
- $body .= '
';
+ $body .= '
';
- if ($appRegOk) {
- $body .= '
' . h($appRegOk) . '
';
- }
+ $body .= '
';
- if ($appPage === 'register') {
- if (!$canRegister) {
- $body .= '
Registrierung ist deaktiviert.
';
- } else {
- if ($appRegError) $body .= '
' . h($appRegError) . '
';
+ if ($appRegOk) $body .= '
' . h($appRegOk) . '
';
+ if ($appError) $body .= '
' . h($appError) . '
';
+ if ($appRegError)$body .= '
' . h($appRegError) . '
';
- $body .= '
Registrieren
';
- $body .= '
';
-
- $body .= '
Dein Account wird in FabianWebsite.adminer_users gespeichert.
';
- }
+ if ($isReg && $canReg) {
+ // ── Registrierungsformular ──────────────────────────────────────
+ $body .= '
';
+ $body .= '
Bereits ein Konto? Login
';
} else {
- if ($appError) $body .= '
' . h($appError) . '
';
-
- $body .= '
Login
';
+ // ── Login-Formular ──────────────────────────────────────────────
$body .= '
';
-
- if ($canRegister) {
- $body .= '
';
- }
+ if ($canReg) $body .= '
Noch kein Konto? Registrieren
';
}
+ $body .= '
';
$body .= '
';
- admin_layout('DB-Verwaltung', $body);
+ admin_layout('DB-Verwaltung', $body, $isReg ? 'Neues Konto erstellen' : 'Bitte einloggen');
exit;
}
+// ── DB-VERBINDUNGS-LOGIN ──────────────────────────────────────────────────
require_once __DIR__ . '/auth.php';
-
admin_session_start();
-$action = (string)($_GET['a'] ?? '');
-if ($action === 'logout') {
+if ((string)($_GET['a'] ?? '') === 'logout') {
admin_logout();
header('Location: /adminer', true, 302);
exit;
}
-// ── DB-Auswahl (Step 1) ───────────────────────────────────────────────────
-// Wir speichern Host/Port/User/Pass kurz in der Session, um die DB-Liste zu holen.
-if (!isset($_SESSION['db_admin_select'])) {
- $_SESSION['db_admin_select'] = [];
-}
+if (!isset($_SESSION['db_admin_select'])) $_SESSION['db_admin_select'] = [];
$selectError = null;
-$selectMsg = null;
+$selectMsg = null;
+// Probe: Datenbanken laden
if ($_SERVER['REQUEST_METHOD'] === 'POST' && (string)($_POST['action'] ?? '') === 'probe') {
$host = trim((string)($_POST['host'] ?? ''));
$port = (int)($_POST['port'] ?? 3306);
@@ -145,269 +131,240 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST' && (string)($_POST['action'] ?? '') ==
$selectError = 'Bitte Host, Port und Benutzer angeben.';
} else {
try {
- $dsn = sprintf('mysql:host=%s;port=%d;charset=utf8mb4', $host, $port);
- $pdo = new PDO($dsn, $user, $pass, [
+ $pdo = new PDO(sprintf('mysql:host=%s;port=%d;charset=utf8mb4', $host, $port), $user, $pass, [
PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION,
PDO::ATTR_DEFAULT_FETCH_MODE => PDO::FETCH_ASSOC,
]);
$dbs = $pdo->query('SHOW DATABASES')->fetchAll(PDO::FETCH_COLUMN, 0);
-
- $_SESSION['db_admin_select'] = [
- 'host' => $host,
- 'port' => $port,
- 'user' => $user,
- 'pass' => $pass,
- 'dbs' => $dbs,
- ];
- $selectMsg = 'Datenbanken geladen.';
+ $_SESSION['db_admin_select'] = compact('host', 'port', 'user', 'pass', 'dbs');
+ $selectMsg = 'Datenbanken geladen – bitte unten eine auswählen.';
} catch (Throwable $e) {
- $selectError = 'Konnte Datenbanken nicht laden: ' . $e->getMessage();
+ $selectError = 'Fehler: ' . $e->getMessage();
}
}
}
-// Login (Step 2)
-$error = null;
+// DB-Login
+$dbError = null;
if ($_SERVER['REQUEST_METHOD'] === 'POST' && (string)($_POST['action'] ?? '') === 'login') {
- $host = trim((string)($_POST['host'] ?? ''));
- $port = (int)($_POST['port'] ?? 3306);
- $user = trim((string)($_POST['user'] ?? ''));
- $pass = (string)($_POST['pass'] ?? '');
- $db = trim((string)($_POST['db'] ?? ''));
-
- $res = admin_try_login($host, $port, $user, $pass, $db);
+ $res = admin_try_login(
+ trim((string)($_POST['host'] ?? '')),
+ (int)($_POST['port'] ?? 3306),
+ trim((string)($_POST['user'] ?? '')),
+ (string)($_POST['pass'] ?? ''),
+ trim((string)($_POST['db'] ?? ''))
+ );
if ($res['ok']) {
header('Location: /adminer', true, 302);
exit;
}
- $error = (string)($res['error'] ?? 'Login fehlgeschlagen.');
+ $dbError = (string)($res['error'] ?? 'Login fehlgeschlagen.');
}
-$defaults = admin_default_creds();
+$defaults = admin_default_creds();
$selectState = is_array($_SESSION['db_admin_select']) ? $_SESSION['db_admin_select'] : [];
+$prefHost = isset($selectState['host']) ? (string)$selectState['host'] : (string)$defaults['host'];
+$prefPort = isset($selectState['port']) ? (int)$selectState['port'] : (int)$defaults['port'];
+$prefUser = isset($selectState['user']) ? (string)$selectState['user'] : (string)$defaults['user'];
+$prefPass = isset($selectState['pass']) ? (string)$selectState['pass'] : '';
+$dbList = isset($selectState['dbs']) && is_array($selectState['dbs']) ? $selectState['dbs'] : [];
-// UI when not logged in
if (!admin_is_logged_in()) {
- $prefHost = isset($selectState['host']) ? (string)$selectState['host'] : (string)$defaults['host'];
- $prefPort = isset($selectState['port']) ? (int)$selectState['port'] : (int)$defaults['port'];
- $prefUser = isset($selectState['user']) ? (string)$selectState['user'] : (string)$defaults['user'];
- $prefPass = isset($selectState['pass']) ? (string)$selectState['pass'] : '';
+ $body = '
';
- $dbList = isset($selectState['dbs']) && is_array($selectState['dbs']) ? $selectState['dbs'] : [];
+ if ($selectMsg) $body .= '
' . h($selectMsg) . '
';
+ if ($selectError)$body .= '
' . h($selectError) . '
';
+ if ($dbError) $body .= '
' . h($dbError) . '
';
- $body = "
DB-Verwaltung
Mini-Admin";
- $body .= "
";
- $body .= "
Zuerst Verbindungsdaten prüfen (ohne DB), dann bekommst du eine Datenbank-Auswahl. Defaults kommen aus .env.
";
+ // Step 1
+ $body .= '
1 · Server verbinden
';
+ $body .= '
';
- if ($selectMsg) $body .= '
' . h($selectMsg) . '
';
- if ($selectError) $body .= '
' . h($selectError) . '
';
- if ($error) $body .= '
' . h($error) . '
';
+ $body .= '
';
- // Step 1: Probe
- $body .= "
1) Verbindung testen & Datenbanken laden
";
- $body .= "
";
-
- // Step 2: Login
- $body .= "
";
- $body .= "
2) Login in Datenbank
";
-
- $body .= "
';
- $body .= "
";
+ $body .= '
';
- admin_layout('DB-Verwaltung', $body);
+ admin_layout('DB-Verwaltung', $body, 'Datenbankverbindung');
exit;
}
-// Logged-in area
+// ── DB-VERWALTUNG (eingeloggt) ────────────────────────────────────────────
try {
- $pdo = admin_pdo();
-
- $table = (string)($_GET['t'] ?? '');
- $page = max(1, (int)($_GET['p'] ?? 1));
- $limit = 50;
+ $pdo = admin_pdo();
+ $table = (string)($_GET['t'] ?? '');
+ $page = max(1, (int)($_GET['p'] ?? 1));
+ $limit = 50;
$offset = ($page - 1) * $limit;
- $msg = null;
+ $msg = null;
$queryResultHtml = '';
+ // SQL Query ausführen
if ($_SERVER['REQUEST_METHOD'] === 'POST' && (string)($_POST['action'] ?? '') === 'query') {
$sql = trim((string)($_POST['sql'] ?? ''));
if ($sql !== '') {
- // Allow multiple statements? No. Keep minimal & safer.
if (preg_match('/;\s*\S/', $sql)) {
- $msg = ['type' => 'err', 'text' => 'Bitte nur ein Statement ohne zusätzliche Semikolons ausführen.'];
+ $msg = ['ok' => false, 'text' => 'Nur ein Statement ausführen (kein zweites Semikolon).'];
} else {
try {
$stmt = $pdo->query($sql);
if ($stmt instanceof PDOStatement) {
$rows = $stmt->fetchAll();
- $queryResultHtml .= '
Ergebnis
';
- $queryResultHtml .= admin_render_table($rows);
- $msg = ['type' => 'ok', 'text' => 'Query ausgeführt.'];
+ $queryResultHtml = '
Ergebnis
' . admin_render_table($rows);
+ $msg = ['ok' => true, 'text' => 'Query ausgeführt (' . count($rows) . ' Zeilen).'];
} else {
- $msg = ['type' => 'ok', 'text' => 'Statement ausgeführt.'];
+ $msg = ['ok' => true, 'text' => 'Statement ausgeführt.'];
}
} catch (Throwable $e) {
- $msg = ['type' => 'err', 'text' => 'Fehler: ' . $e->getMessage()];
+ $msg = ['ok' => false, 'text' => $e->getMessage()];
}
}
}
}
- // Build left nav tables
$tables = $pdo->query('SHOW TABLES')->fetchAll(PDO::FETCH_NUM);
- $body = '
'
- . '
'
- . '
'
- . '
App-Logout'
- . '
DB-Logout'
+ // ── TOP BAR ──────────────────────────────────────────────────────────
+ $dbName = (string)($_SESSION['db_admin']['db'] ?? '');
+ $uname = (string)($_SESSION['adminer_app']['username'] ?? '');
+
+ $body = '
'
+ . '
'
+ . '' . h($dbName) . ''
+ . ($uname ? '' . h($uname) . '' : '')
+ . '
'
+ . '
'
. '
';
- $body .= '
';
-
- $body .= '
'
- . '
Tabellen
'
- . '
Klick zum Anzeigen
';
+ // ── GRID: TABELLENLISTE + CONTENT ─────────────────────────────────────
+ $body .= '
';
+ // Linke Spalte: Tabellenliste
+ $body .= '
';
+ $body .= '
Tabellen
';
if (empty($tables)) {
- $body .= '
Keine Tabellen gefunden.
';
+ $body .= '
Keine Tabellen gefunden.
';
} else {
- $body .= '
';
+ $body .= '';
foreach ($tables as $row) {
- $tname = (string)$row[0];
- $active = ($tname === $table) ? 'active' : '';
- $body .= '- ' . h($tname) . '
';
+ $tn = (string)$row[0];
+ $cls = ($tn === $table) ? 'active' : '';
+ $body .= '- ' . h($tn) . '
';
}
$body .= '
';
}
$body .= '
';
- $body .= '
';
+ // Rechte Spalte: Browse + Query
+ $body .= '
';
+ // Notices
if ($msg) {
- $cls = $msg['type'] === 'ok' ? 'notice ok' : 'notice err';
- $body .= '
' . h($msg['text']) . '
';
+ $cls = $msg['ok'] ? 'notice-ok' : 'notice-err';
+ $body .= '
' . h($msg['text']) . '
';
}
- // Browse table
+ // Browse
if ($table !== '') {
- // naive identifier quoting for MySQL
if (!preg_match('/^[A-Za-z0-9_]+$/', $table)) {
- $body .= '
Ungültiger Tabellenname.
';
+ $body .= '
Ungültiger Tabellenname.
';
} else {
- $body .= '
Tabelle: ' . h($table) . '
';
$stmt = $pdo->query('SELECT * FROM `' . $table . '` LIMIT ' . (int)$limit . ' OFFSET ' . (int)$offset);
$rows = $stmt->fetchAll();
- $body .= admin_render_table($rows);
- $body .= '
';
- if ($page > 1) {
- $body .= '
← Zurück';
- }
- $body .= '
Weiter →';
+ $body .= '
';
+ $body .= '
' . h($table) . '
';
+ $body .= admin_render_table($rows);
+ $body .= '';
$body .= '';
}
-
- $body .= '
';
}
- // Query box
- $body .= '
SQL Query
';
+ // SQL Query Box
+ $body .= '
';
+ $body .= '
SQL Query
';
$body .= '
';
-
$body .= $queryResultHtml;
+ $body .= '
';
- $body .= '
'; // card
- $body .= '
'; // grid
+ $body .= '
'; // right col
+ $body .= '
'; // admin-grid
+
+ admin_layout('DB-Verwaltung', $body, h($dbName));
- admin_layout('DB-Verwaltung', $body);
} catch (Throwable $e) {
- // Session invalid, force re-login
admin_logout();
- admin_layout('DB-Verwaltung', '
DB-Verwaltung
');
+ admin_layout('DB-Verwaltung',
+ '
' . h($e->getMessage()) . '
'
+ . '
Zurück zum Login
',
+ 'Fehler'
+ );
}
function admin_render_table(array $rows): string
{
- if (empty($rows)) {
- return '
(keine Zeilen)
';
- }
+ if (empty($rows)) return '
(keine Zeilen)
';
$cols = array_keys((array)$rows[0]);
- $html = '
';
- foreach ($cols as $c) {
- $html .= '| ' . h((string)$c) . ' | ';
- }
+ $html = '';
+ foreach ($cols as $c) $html .= '| ' . h((string)$c) . ' | ';
$html .= '
';
-
foreach ($rows as $r) {
$html .= '';
foreach ($cols as $c) {
$v = $r[$c] ?? null;
- if ($v === null) {
- $cell = 'NULL';
- } else {
- $s = (string)$v;
- $cell = strlen($s) > 500 ? h(substr($s, 0, 500)) . '…' : h($s);
- }
+ $cell = $v === null
+ ? 'NULL'
+ : (strlen((string)$v) > 300 ? h(substr((string)$v, 0, 300)) . '…' : h((string)$v));
$html .= '| ' . $cell . ' | ';
}
$html .= '
';
}
-
- $html .= '
';
+ $html .= '
';
return $html;
}
diff --git a/adminer/views.php b/adminer/views.php
index 0f89449..fa2b1e2 100644
--- a/adminer/views.php
+++ b/adminer/views.php
@@ -6,16 +6,72 @@ function h($s)
return htmlspecialchars((string)$s, ENT_QUOTES);
}
-function admin_layout($title, $bodyHtml)
+function admin_layout($title, $bodyHtml, $subtitle = 'Datenbankverwaltung')
{
- echo "\n";
- echo "\n\n";
- echo "
\n";
- echo "
\n";
- echo '
' . h($title) . "\n";
- echo "
\n";
- echo "\n\n";
- echo "
\n";
- echo $bodyHtml;
- echo "
\n\n";
+ ?>
+
+
+
+
+
+
<?= h($title) ?> – Fabian Schieder
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+