fix admin check: isolate error handling, match caddyLoad curl config

This commit is contained in:
Daniel committed 2026-04-06 22:39:22 +02:00
1 parent e955f032a8
commit 05b9ab6d3b
1 file changed
+19 -9
+19 -9
View File
@@ -91,14 +91,18 @@ if (isset($_GET['action'])) {
switch ($_GET['action']) { switch ($_GET['action']) {
case 'check_admin': case 'check_admin':
$ch = curl_init(rtrim(CADDY_ADMIN_URL, '/') . '/config/'); $ch = curl_init(rtrim(CADDY_ADMIN_URL, '/') . '/load');
curl_setopt_array($ch, [CURLOPT_RETURNTRANSFER => true, CURLOPT_TIMEOUT => 3]); curl_setopt_array($ch, [
CURLOPT_CUSTOMREQUEST => 'GET',
CURLOPT_RETURNTRANSFER => true,
CURLOPT_TIMEOUT => 10,
]);
curl_exec($ch); curl_exec($ch);
$code = curl_getinfo($ch, CURLINFO_HTTP_CODE); $code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
$err = curl_error($ch); $err = curl_error($ch);
curl_close($ch); curl_close($ch);
if ($err) { echo json_encode(['ok' => false, 'error' => $err]); exit; } if ($err) { echo json_encode(['ok' => false, 'error' => $err]); exit; }
if (!$code) { echo json_encode(['ok' => false, 'error' => 'No response from Caddy admin API']); exit; } if (!$code) { echo json_encode(['ok' => false, 'error' => 'No response from Caddy admin API']); exit; }
echo json_encode(['ok' => true]); echo json_encode(['ok' => true]);
exit; exit;
@@ -492,12 +496,18 @@ async function init() {
syncAdminToggle(); syncAdminToggle();
renderSites(); renderSites();
const admin = await adminRes.json(); try {
if (!admin.ok) { const admin = await adminRes.json();
setEditable(false, admin.error || 'Caddy admin API unreachable'); if (!admin.ok) {
} else { setEditable(false, admin.error || 'Caddy admin API unreachable');
setStatus('Ready', ''); return;
}
} catch (e) {
setEditable(false, 'Caddy admin API unreachable');
return;
} }
setStatus('Ready', '');
} catch (e) { } catch (e) {
setStatus('Load error: ' + e.message, 'error'); setStatus('Load error: ' + e.message, 'error');
} }