projects/emailtemplate.it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

adasd

Browse Source
This commit is contained in:
Lars Gebhardt-Kusche
2026-01-12 00:40:33 +01:00
parent f762f56f98
commit 5969b3643c
3 changed files with 105 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

96
partials/landingpage/accountsetup/bridge.php
View File

@@ -13,11 +13,11 @@ require dirname(__DIR__) . '/../structure/layout_start.php';
</p>
<div class="text-sm text-slate-600 mb-4 space-y-2">
<p><strong>Voraussetzung:</strong> Bridge-URL + Token in den <a class="underline" href="<?= htmlspecialchars($appBaseUrl . '/admin/settings.php') ?>">Einstellungen</a> hinterlegen.</p>
<p><strong>Moegliche Wege zur DB-Anbindung:</strong></p>
<p><strong>Import-Varianten:</strong></p>
<ul class="list-disc ps-5">
<li>Bridge-URL + Token laden Tabellen/Spalten (Standard, nur Schema).</li>
<li>Bridge kann zusaetzlich DB-Settings mitsenden (Host, Port, User, Passwort) und hier uebernommen werden.</li>
<li>DB-Settings hier direkt eintragen (wird in die Bridge-Datei geschrieben).</li>
<li>Tabellen/Spalten direkt ueber die Bridge-URL laden (Schema).</li>
<li>DB-Settings ueber die Bridge-URL laden und damit Tabellen/Spalten abfragen.</li>
<li>Fixe DB-Settings eingeben und damit Tabellen/Spalten abfragen.</li>
</ul>
</div>
<form id="bridgeSetupForm" class="space-y-4">
@@ -33,13 +33,25 @@ require dirname(__DIR__) . '/../structure/layout_start.php';
<p class="text-xs text-slate-500 mb-3">Die Auswahl bestimmt, welche Werte in die Bridge-Datei geschrieben werden.</p>
<div class="flex flex-wrap gap-4 text-sm text-slate-600 mb-3">
<label class="inline-flex items-center gap-2">
<input type="radio" name="db_mode" value="direct" checked> Direkte Angaben (Host, DB, Benutzer …)
<input type="radio" name="db_mode" value="bridge" checked> Konfiguration von URL laden
</label>
<label class="inline-flex items-center gap-2">
<input type="radio" name="db_mode" value="config"> Aus bestehender Konfigurationsdatei laden
<input type="radio" name="db_mode" value="direct"> Eingabe fixer Datenbank-Einstellungen
</label>
</div>
<div id="bridgeFields" class="space-y-2">
<label class="block text-sm text-slate-600">Import-Art</label>
<label class="inline-flex items-center gap-2 text-sm text-slate-600">
<input type="radio" name="bridge_import" value="schema" checked> Tabellen und Spalten importieren
</label>
<p class="text-xs text-slate-500">Liest die aktuelle DB-Struktur direkt von der Bridge-Datei.</p>
<label class="inline-flex items-center gap-2 text-sm text-slate-600">
<input type="radio" name="bridge_import" value="settings"> Datenbankeinstellungen importieren
</label>
<p class="text-xs text-slate-500">Liest DB-Settings ueber die Bridge-URL und nutzt sie zum Abfragen der Tabellen/Spalten.</p>
</div>
<div id="directFields" class="grid md:grid-cols-2 gap-3">
<label class="block text-sm text-slate-600">Server / Host
<input type="text" name="direct_host" class="input mt-1" placeholder="127.0.0.1">
@@ -60,46 +72,11 @@ require dirname(__DIR__) . '/../structure/layout_start.php';
<input type="text" name="direct_password" class="input mt-1" placeholder="••••">
</label>
</div>
<div id="configFields" class="hidden space-y-3">
<div>
<label class="block text-sm text-slate-600">Pfad zur Konfigurationsdatei</label>
<input type="text" name="config_file" class="input mt-1" placeholder="../config/database.php">
<p class="text-xs text-slate-500 mt-1">Relativ zur Bridge-Datei oder absolut. Die Datei sollte ein Array oder Objekt mit den Zugangsdaten liefern.</p>
<button type="button" id="btn-config-example" class="btn mt-2 text-xs" data-role="admin">Beispiel: Array-Mapping</button>
</div>
<div>
<label class="block text-sm text-slate-600">Basis-Pfad im Array (optional)</label>
<input type="text" name="config_base" class="input mt-1" placeholder="database.connections.mysql">
<p class="text-xs text-slate-500 mt-1">Dot-Notation, um in verschachtelte Arrays zu springen.</p>
</div>
<div class="grid md:grid-cols-2 gap-3">
<label class="block text-sm text-slate-600">Host-Key
<input type="text" name="config_host_key" class="input mt-1" placeholder="host">
</label>
<label class="block text-sm text-slate-600">Port-Key
<input type="text" name="config_port_key" class="input mt-1" placeholder="port">
</label>
<label class="block text-sm text-slate-600">DB-Name-Key
<input type="text" name="config_database_key" class="input mt-1" placeholder="database">
</label>
<label class="block text-sm text-slate-600">Charset-Key
<input type="text" name="config_charset_key" class="input mt-1" placeholder="charset">
</label>
<label class="block text-sm text-slate-600">User-Key
<input type="text" name="config_user_key" class="input mt-1" placeholder="username">
</label>
<label class="block text-sm text-slate-600">Passwort-Key
<input type="text" name="config_password_key" class="input mt-1" placeholder="password">
</label>
</div>
<p class="text-xs text-slate-500">Alle Keys nutzen Dot-Notation relativ zum Basis-Pfad.</p>
</div>
</fieldset>
<div class="flex flex-wrap gap-2 items-center">
<button type="button" id="btn-load-remote" class="btn" data-role="admin">Tabellen/DB-Settings ueber Bridge-URL laden</button>
<span class="text-xs text-slate-500">Nutzt Bridge-URL/Token aus den Einstellungen.</span>
<button type="button" id="btn-load-remote" class="btn" data-role="admin">Tabellen/Spalten laden</button>
<span class="text-xs text-slate-500">Nutzt die Bridge-URL/Token oder die direkten DB-Settings (je nach Auswahl).</span>
<button type="submit" class="btn">Bridge-Setup speichern</button>
</div>
<div id="setupStatus" class="text-xs text-slate-500">Noch nicht gespeichert.</div>
@@ -109,39 +86,6 @@ require dirname(__DIR__) . '/../structure/layout_start.php';
<div id="toast-root"></div>
<dialog id="configExampleDialog" class="rounded-xl max-w-2xl w-[90vw]">
<form method="dialog" class="space-y-3">
<h3 class="text-lg font-semibold">Beispiel: Mapping einer Config-Datei</h3>
<p class="text-sm text-slate-600">Angenommen, deine <code>../config/database.php</code> liefert folgendes Array:</p>
<pre class="bg-slate-900 text-slate-100 text-xs p-3 rounded-lg overflow-auto"><?php echo htmlspecialchars(<<<'PHP'
<?php
return [
'database' => [
'connections' => [
'default' => [
'host' => '127.0.0.1',
'port' => 3306,
'database' => 'kunden_db',
'username' => 'dbuser',
'password' => 'secret',
'charset' => 'utf8mb4',
],
],
],
];
PHP, ENT_QUOTES); ?></pre>
<p class="text-sm text-slate-600">Dann trägst du ein:</p>
<ul class="text-sm text-slate-700 list-disc ps-5">
<li><strong>Pfad zur Konfigurationsdatei:</strong> <code>../config/database.php</code></li>
<li><strong>Basis-Pfad:</strong> <code>database.connections.default</code></li>
<li><strong>Host-/Port-/DB-/User-/Pass-/Charset-Key:</strong> jeweils <code>host</code>, <code>port</code>, <code>database</code>, <code>username</code>, <code>password</code>, <code>charset</code></li>
</ul>
<p class="text-sm text-slate-600">Die Bridge liest dann automatisch die Werte aus diesem Array und baut daraus den DSN.</p>
<div class="text-right">
<button type="submit" class="btn">Verstanden</button>
</div>
</form>
</dialog>
<?php
tpl_add_script(app_asset_url('/assets/js/toast.js'));
tpl_add_script(app_asset_url('/assets/js/bridge-setup.js'), 'footer', false, false, '', null, true);

93
public/assets/js/bridge-setup-page.js
View File

@@ -9,32 +9,27 @@ let form;
let tablesInput;
let tablesPreview;
let modeInputs;
let importInputs;
let directFields;
let configFields;
let statusLabel;
let loadBtn;
let configExampleBtn;
let configExampleDialog;
let bridgeFields;
export function initBridgeSetupPage() {
form = document.getElementById('bridgeSetupForm');
if (!form) return;
tablesInput = form.elements.tables;
tablesPreview = document.getElementById('selectedTables');
bridgeFields = document.getElementById('bridgeFields');
directFields = document.getElementById('directFields');
configFields = document.getElementById('configFields');
statusLabel = document.getElementById('setupStatus');
loadBtn = document.getElementById('btn-load-remote');
configExampleBtn = document.getElementById('btn-config-example');
configExampleDialog = document.getElementById('configExampleDialog');
modeInputs = Array.from(form.querySelectorAll('input[name="db_mode"]'));
importInputs = Array.from(form.querySelectorAll('input[name="bridge_import"]'));
form.addEventListener('submit', submitBridgeSetup);
tablesInput?.addEventListener('input', () => updateTablesPreview(parseTablesInput()));
loadBtn?.addEventListener('click', loadTablesFromBridge);
configExampleBtn?.addEventListener('click', () => {
if (configExampleDialog?.showModal) configExampleDialog.showModal();
});
modeInputs.forEach(input => {
input.addEventListener('change', () => applyModeVisibility(input.value));
});
@@ -45,7 +40,8 @@ export function initBridgeSetupPage() {
function defaultSetup() {
return {
tables: [],
mode: 'direct',
mode: 'bridge',
import_type: 'schema',
direct: {
host: '',
port: 3306,
@@ -54,16 +50,6 @@ function defaultSetup() {
password: '',
charset: 'utf8mb4',
},
config: {
file: '',
base: '',
host_key: '',
port_key: '',
database_key: '',
user_key: '',
password_key: '',
charset_key: '',
},
};
}
@@ -95,6 +81,13 @@ function fillForm(setup) {
});
applyModeVisibility(activeMode);
if (importInputs.length) {
const importType = (data.import_type || 'schema').toLowerCase();
importInputs.forEach(input => {
input.checked = input.value === importType;
});
}
if (directFields) {
const directMap = {
direct_host: data.direct.host || '',
@@ -110,29 +103,12 @@ function fillForm(setup) {
});
}
if (configFields) {
const configMap = {
config_file: data.config.file || '',
config_base: data.config.base || '',
config_host_key: data.config.host_key || '',
config_port_key: data.config.port_key || '',
config_database_key: data.config.database_key || '',
config_user_key: data.config.user_key || '',
config_password_key: data.config.password_key || '',
config_charset_key: data.config.charset_key || '',
};
Object.entries(configMap).forEach(([name, value]) => {
const input = configFields.querySelector(`[name="${name}"]`);
if (input) input.value = value;
});
}
}
function applyModeVisibility(mode) {
const direct = mode === 'config' ? 'add' : 'remove';
const config = mode === 'config' ? 'remove' : 'add';
directFields?.classList[direct]('hidden');
configFields?.classList[config]('hidden');
const showDirect = mode === 'direct';
directFields?.classList[showDirect ? 'remove' : 'add']('hidden');
bridgeFields?.classList[showDirect ? 'add' : 'remove']('hidden');
}
function parseTablesInput() {
@@ -157,23 +133,17 @@ async function submitBridgeSetup(ev) {
ev.preventDefault();
if (!form) return;
const mode = form.querySelector('input[name="db_mode"]:checked')?.value || 'direct';
const importType = form.querySelector('input[name="bridge_import"]:checked')?.value || 'schema';
const payload = {
tables: parseTablesInput(),
mode,
import_type: importType,
direct_host: form.direct_host?.value.trim() || '',
direct_port: Number(form.direct_port?.value || 0) || 3306,
direct_database: form.direct_database?.value.trim() || '',
direct_charset: form.direct_charset?.value.trim() || 'utf8mb4',
direct_user: form.direct_user?.value.trim() || '',
direct_password: form.direct_password?.value || '',
config_file: form.config_file?.value.trim() || '',
config_base: form.config_base?.value.trim() || '',
config_host_key: form.config_host_key?.value.trim() || '',
config_port_key: form.config_port_key?.value.trim() || '',
config_database_key: form.config_database_key?.value.trim() || '',
config_user_key: form.config_user_key?.value.trim() || '',
config_password_key: form.config_password_key?.value.trim() || '',
config_charset_key: form.config_charset_key?.value.trim() || '',
};
try {
@@ -193,20 +163,26 @@ async function loadTablesFromBridge(ev) {
if (!loadBtn) return;
loadBtn.disabled = true;
try {
const res = await apiAction('account.bridge.test', { method: 'POST', data: {} });
const mode = form?.querySelector('input[name="db_mode"]:checked')?.value || 'bridge';
const importType = form?.querySelector('input[name="bridge_import"]:checked')?.value || 'schema';
const payload = {
mode,
import_type: importType,
direct_host: form?.direct_host?.value.trim() || '',
direct_port: Number(form?.direct_port?.value || 0) || 3306,
direct_database: form?.direct_database?.value.trim() || '',
direct_charset: form?.direct_charset?.value.trim() || 'utf8mb4',
direct_user: form?.direct_user?.value.trim() || '',
direct_password: form?.direct_password?.value || '',
};
const res = await apiAction('account.bridge.test', { method: 'POST', data: payload });
if (!res?.ok) throw new Error(res?.error || 'Bridge konnte nicht abgefragt werden');
const fetchedTables = normalizeTableNames(res.tables);
const allowedTables = normalizeTableNames(res.setup_hint?.tables ?? fetchedTables);
const merged = {
...(state.setup || {}),
tables: allowedTables,
...(res.setup_hint || {}),
};
if (res.setup_hint) {
merged.mode = res.setup_hint.mode || merged.mode;
merged.direct = { ...(merged.direct || {}), ...(res.setup_hint.direct || {}) };
merged.config = { ...(merged.config || {}), ...(res.setup_hint.config || {}) };
}
fillForm(merged);
updateStatus(`Tabellen geladen (${fetchedTables.length}).`);
toast('Tabellen erfolgreich geladen', true);
@@ -259,11 +235,12 @@ function normalizeSetupInput(input) {
const base = defaultSetup();
if (!input || typeof input !== 'object') return base;
const mode = (input.mode || base.mode).toLowerCase();
const validMode = mode === 'config' ? 'config' : 'direct';
const validMode = mode === 'direct' ? 'direct' : 'bridge';
const importType = (input.import_type || base.import_type).toLowerCase();
const validImport = importType === 'settings' ? 'settings' : 'schema';
const tables = normalizeTableNames(input.tables || base.tables);
const direct = { ...base.direct, ...(input.direct || {}) };
direct.port = Number(direct.port || 3306) || 3306;
direct.charset = direct.charset || 'utf8mb4';
const config = { ...base.config, ...(input.config || {}) };
return { tables, mode: validMode, direct, config };
return { tables, mode: validMode, import_type: validImport, direct };
}

50
src/ApiKernel.php
View File

@@ -2072,6 +2072,33 @@ class ApiKernel
$user = $this->requireAuth();
$this->ensureRole($user, ['owner', 'admin']);
$customerId = (int)($user['customer_id'] ?? 0);
$setup = $this->getBridgeSetupData($customerId);
$mode = strtolower((string)($this->in['mode'] ?? $this->in['db_mode'] ?? ($setup['mode'] ?? 'bridge')));
$importType = strtolower((string)($this->in['import_type'] ?? $this->in['bridge_import'] ?? ($setup['import_type'] ?? 'schema')));
$tablesAllow = $this->normalizeBridgeTables($this->in['tables'] ?? ($setup['tables'] ?? []));
if ($mode === 'direct') {
$direct = [
'host' => trim((string)($this->in['direct_host'] ?? ($setup['direct']['host'] ?? ''))),
'port' => (int)($this->in['direct_port'] ?? ($setup['direct']['port'] ?? 3306)),
'database' => trim((string)($this->in['direct_database'] ?? ($setup['direct']['database'] ?? ''))),
'user' => trim((string)($this->in['direct_user'] ?? ($setup['direct']['user'] ?? ''))),
'password' => (string)($this->in['direct_password'] ?? ($setup['direct']['password'] ?? '')),
'charset' => trim((string)($this->in['direct_charset'] ?? ($setup['direct']['charset'] ?? 'utf8mb4'))) ?: 'utf8mb4',
];
try {
$schema = $this->fetchSchemaFromDirect($direct, $tablesAllow);
} catch (Throwable $e) {
$this->fail('DB request failed', $e->getMessage(), 502);
return;
}
$this->respond([
'ok' => true,
'tables' => $schema['tables'] ?? [],
'fetched' => $schema['fetched'] ?? date(DATE_ATOM),
]);
}
$bridgeUrl = trim((string)($this->in['bridge_url'] ?? ''));
$bridgeToken = trim((string)($this->in['bridge_token'] ?? ''));
if ($bridgeUrl === '' || $bridgeToken === '') {
@@ -2088,6 +2115,29 @@ class ApiKernel
$this->fail('Bridge request failed', $e->getMessage(), 502);
return;
}
if ($importType === 'settings') {
$hint = is_array($schema['setup_hint'] ?? null) ? $schema['setup_hint'] : [];
$directHint = is_array($hint['direct'] ?? null) ? $hint['direct'] : [];
$direct = [
'host' => trim((string)($directHint['host'] ?? '')),
'port' => (int)($directHint['port'] ?? 3306),
'database' => trim((string)($directHint['database'] ?? '')),
'user' => trim((string)($directHint['user'] ?? '')),
'password' => (string)($directHint['password'] ?? ''),
'charset' => trim((string)($directHint['charset'] ?? 'utf8mb4')) ?: 'utf8mb4',
];
if ($direct['host'] === '' || $direct['database'] === '' || $direct['user'] === '') {
$this->fail('Bridge lieferte keine DB-Settings', null, 422);
}
try {
$schema = $this->fetchSchemaFromDirect($direct, $tablesAllow);
} catch (Throwable $e) {
$this->fail('DB request failed', $e->getMessage(), 502);
return;
}
}
$this->respond([
'ok' => true,
'tables' => $schema['tables'] ?? [],