Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
07b53b8002 | ||
|
|
bd8b519753 | ||
|
|
7deee2be61 | ||
|
|
ea73d15eaf | ||
|
|
0948a8da24 |
No files matched your search
+14
-3
@@ -140,7 +140,7 @@ try {
|
||||
$installedVerData = file_exists("{$appDir}/version.json")
|
||||
? json_decode((string)file_get_contents("{$appDir}/version.json"), true)
|
||||
: [];
|
||||
$installedVer = $installedVerData['version'] ?? '1.3.9';
|
||||
$installedVer = $installedVerData['version'] ?? '1.4.4';
|
||||
|
||||
echo json_encode([
|
||||
'success' => true,
|
||||
@@ -2311,14 +2311,25 @@ try {
|
||||
|
||||
$newVerJson = file_exists("{$appDir}/version.json")
|
||||
? json_decode((string)file_get_contents("{$appDir}/version.json"), true)
|
||||
: ['version' => '1.3.8'];
|
||||
: ['version' => '1.4.3'];
|
||||
|
||||
while (ob_get_level() > 0) {
|
||||
@ob_end_clean();
|
||||
}
|
||||
|
||||
header('Content-Type: application/json; charset=utf-8');
|
||||
header('Cache-Control: no-cache, no-store, must-revalidate');
|
||||
|
||||
echo json_encode([
|
||||
'success' => ($code === 0),
|
||||
'new_version' => $newVerJson['version'] ?? '1.3.8',
|
||||
'new_version' => $newVerJson['version'] ?? '1.4.3',
|
||||
'output' => $outputStr,
|
||||
'message' => ($code === 0) ? "Mise à jour réussie !" : "Erreur lors de la mise à jour",
|
||||
]);
|
||||
|
||||
if (function_exists('fastcgi_finish_request')) {
|
||||
fastcgi_finish_request();
|
||||
}
|
||||
break;
|
||||
|
||||
default:
|
||||
|
||||
+177
-38
@@ -266,20 +266,28 @@ function renderCompanyBranding() {
|
||||
|
||||
if (loginBox) {
|
||||
loginBox.classList.remove('hidden');
|
||||
loginBox.classList.add('flex');
|
||||
if (logo && loginLogo) {
|
||||
loginLogo.src = logo;
|
||||
loginLogo.classList.remove('hidden');
|
||||
} else if (loginLogo) {
|
||||
loginLogo.src = '';
|
||||
loginLogo.classList.add('hidden');
|
||||
}
|
||||
if (loginName) loginName.textContent = name;
|
||||
if (loginName) {
|
||||
loginName.textContent = name;
|
||||
loginName.classList.toggle('hidden', !name);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
emptyBox?.classList.remove('hidden');
|
||||
filledBox?.classList.add('hidden');
|
||||
if (logoImg) { logoImg.src = ''; logoImg.classList.add('hidden'); }
|
||||
if (nameEl) { nameEl.textContent = ''; nameEl.classList.add('hidden'); }
|
||||
loginBox?.classList.add('hidden');
|
||||
if (loginBox) {
|
||||
loginBox.classList.add('hidden');
|
||||
loginBox.classList.remove('flex');
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -629,20 +637,56 @@ function drawDualAreaChart(svgId, seriesA, seriesB, maxVal, colorA, colorB, unit
|
||||
const padTop = 14;
|
||||
const padBottom = 18;
|
||||
const plotH = height - padTop - padBottom;
|
||||
const baselineY = padTop + plotH;
|
||||
const safeMax = maxVal > 0 ? maxVal : 100;
|
||||
|
||||
const toPoints = (arr) => arr.map((val, idx) => {
|
||||
const clampY = (y) => Math.max(padTop, Math.min(baselineY, y));
|
||||
|
||||
// Génération de courbes splines adoucies (Catmull-Rom / Bézier cubique) pour éliminer les angles pointus
|
||||
const computeSmoothPaths = (arr, tension = 0.2) => {
|
||||
if (!arr || arr.length === 0) return { line: '', area: '' };
|
||||
|
||||
const points = arr.map((val, idx) => {
|
||||
const x = (idx / (arr.length - 1)) * width;
|
||||
const ratio = Math.max(0, Math.min(1, val / safeMax));
|
||||
const y = padTop + plotH - (ratio * plotH);
|
||||
return `${x.toFixed(1)},${y.toFixed(1)}`;
|
||||
const y = baselineY - (ratio * plotH);
|
||||
return { x, y };
|
||||
});
|
||||
|
||||
const ptsA = toPoints(seriesA);
|
||||
const ptsB = toPoints(seriesB);
|
||||
if (points.length === 1) {
|
||||
return {
|
||||
line: `M ${points[0].x.toFixed(1)},${points[0].y.toFixed(1)}`,
|
||||
area: `M 0,${baselineY} L ${points[0].x.toFixed(1)},${points[0].y.toFixed(1)} L ${width},${baselineY} Z`
|
||||
};
|
||||
}
|
||||
|
||||
const areaA = `0,${padTop + plotH} ` + ptsA.join(' ') + ` ${width},${padTop + plotH}`;
|
||||
const areaB = `0,${padTop + plotH} ` + ptsB.join(' ') + ` ${width},${padTop + plotH}`;
|
||||
let line = `M ${points[0].x.toFixed(1)},${points[0].y.toFixed(1)}`;
|
||||
|
||||
for (let i = 0; i < points.length - 1; i++) {
|
||||
const p0 = points[i === 0 ? i : i - 1];
|
||||
const p1 = points[i];
|
||||
const p2 = points[i + 1];
|
||||
const p3 = points[i + 2 < points.length ? i + 2 : i + 1];
|
||||
|
||||
let cp1x = p1.x + (p2.x - p0.x) * tension;
|
||||
let cp1y = p1.y + (p2.y - p0.y) * tension;
|
||||
|
||||
let cp2x = p2.x - (p3.x - p1.x) * tension;
|
||||
let cp2y = p2.y - (p3.y - p1.y) * tension;
|
||||
|
||||
// Clamping vertical pour garantir que la courbe ne déborde pas sous l'axe ni au-dessus du max
|
||||
cp1y = clampY(cp1y);
|
||||
cp2y = clampY(cp2y);
|
||||
|
||||
line += ` C ${cp1x.toFixed(1)},${cp1y.toFixed(1)} ${cp2x.toFixed(1)},${cp2y.toFixed(1)} ${p2.x.toFixed(1)},${p2.y.toFixed(1)}`;
|
||||
}
|
||||
|
||||
const area = `${line} L ${width},${baselineY} L 0,${baselineY} Z`;
|
||||
return { line, area };
|
||||
};
|
||||
|
||||
const pathA = computeSmoothPaths(seriesA);
|
||||
const pathB = computeSmoothPaths(seriesB);
|
||||
|
||||
const gradIdA = `${svgId}-grad-a`;
|
||||
const gradIdB = `${svgId}-grad-b`;
|
||||
@@ -662,18 +706,18 @@ function drawDualAreaChart(svgId, seriesA, seriesB, maxVal, colorA, colorB, unit
|
||||
<!-- Lignes de grille horizontales -->
|
||||
<line x1="0" y1="${padTop}" x2="${width}" y2="${padTop}" stroke="#2c323f" stroke-dasharray="3,3" stroke-width="1"/>
|
||||
<line x1="0" y1="${padTop + plotH / 2}" x2="${width}" y2="${padTop + plotH / 2}" stroke="#2c323f" stroke-dasharray="3,3" stroke-width="1"/>
|
||||
<line x1="0" y1="${padTop + plotH}" x2="${width}" y2="${padTop + plotH}" stroke="#3d4657" stroke-width="1"/>
|
||||
<line x1="0" y1="${baselineY}" x2="${width}" y2="${baselineY}" stroke="#3d4657" stroke-width="1"/>
|
||||
|
||||
<text x="6" y="${padTop + 10}" fill="#94a3b8" font-size="10" font-family="monospace">${Math.round(safeMax)} ${unitLabel}</text>
|
||||
<text x="6" y="${padTop + plotH / 2 - 4}" fill="#64748b" font-size="10" font-family="monospace">${Math.round(safeMax / 2)} ${unitLabel}</text>
|
||||
|
||||
<!-- Courbe B -->
|
||||
<polygon points="${areaB}" fill="url(#${gradIdB})"/>
|
||||
<polyline fill="none" stroke="${colorB}" stroke-width="2.2" stroke-linecap="round" stroke-linejoin="round" points="${ptsB.join(' ')}"/>
|
||||
<!-- Courbe B lissée avec dégradé -->
|
||||
<path d="${pathB.area}" fill="url(#${gradIdB})"/>
|
||||
<path d="${pathB.line}" fill="none" stroke="${colorB}" stroke-width="2.2" stroke-linecap="round" stroke-linejoin="round"/>
|
||||
|
||||
<!-- Courbe A -->
|
||||
<polygon points="${areaA}" fill="url(#${gradIdA})"/>
|
||||
<polyline fill="none" stroke="${colorA}" stroke-width="2.5" stroke-linecap="round" stroke-linejoin="round" points="${ptsA.join(' ')}"/>
|
||||
<!-- Courbe A lissée avec dégradé -->
|
||||
<path d="${pathA.area}" fill="url(#${gradIdA})"/>
|
||||
<path d="${pathA.line}" fill="none" stroke="${colorA}" stroke-width="2.5" stroke-linecap="round" stroke-linejoin="round"/>
|
||||
`;
|
||||
}
|
||||
|
||||
@@ -5852,14 +5896,57 @@ async function checkSystemUpdate(notify = false) {
|
||||
}
|
||||
}
|
||||
|
||||
async function runSystemUpdate() {
|
||||
if (!confirm("Voulez-vous lancer la mise à jour de NexusPBX ?\n\nUne sauvegarde préventive automatique de vos configurations et de votre base de données sera créée.")) {
|
||||
return;
|
||||
}
|
||||
function openUpdateConfirmModal() {
|
||||
const modal = document.getElementById('modal-confirm-update');
|
||||
if (!modal) return;
|
||||
|
||||
let targetVer = '';
|
||||
let currVer = (appState && appState.version) ? appState.version : (document.querySelector('meta[name="nexus-app-version"]')?.content || '');
|
||||
|
||||
try {
|
||||
const cachedRaw = localStorage.getItem('nexus_update_cached_data');
|
||||
if (cachedRaw) {
|
||||
const cached = JSON.parse(cachedRaw);
|
||||
if (cached.latest_version) targetVer = cached.latest_version;
|
||||
if (cached.current_version) currVer = cached.current_version;
|
||||
}
|
||||
} catch (_) {}
|
||||
|
||||
const elTarget = document.getElementById('update-modal-target-version');
|
||||
const elCurrent = document.getElementById('update-modal-current-version');
|
||||
const elBadge = document.getElementById('update-modal-target-badge');
|
||||
|
||||
if (elTarget) elTarget.textContent = targetVer ? `v${targetVer}` : 'Dernière version';
|
||||
if (elCurrent) elCurrent.textContent = currVer ? `v${currVer}` : 'vActuelle';
|
||||
if (elBadge && targetVer) elBadge.textContent = `v${targetVer} disponible`;
|
||||
|
||||
modal.classList.remove('hidden');
|
||||
modal.classList.add('flex');
|
||||
}
|
||||
|
||||
function closeUpdateConfirmModal() {
|
||||
const modal = document.getElementById('modal-confirm-update');
|
||||
if (modal) {
|
||||
modal.classList.add('hidden');
|
||||
modal.classList.remove('flex');
|
||||
}
|
||||
}
|
||||
|
||||
function runSystemUpdate() {
|
||||
openUpdateConfirmModal();
|
||||
}
|
||||
|
||||
async function executeSystemUpdate() {
|
||||
const btnModalConfirm = document.getElementById('btn-confirm-update-action');
|
||||
const btnRun = document.getElementById('btn-run-update');
|
||||
const statusText = document.getElementById('update-status-text');
|
||||
|
||||
if (btnModalConfirm) {
|
||||
btnModalConfirm.disabled = true;
|
||||
btnModalConfirm.classList.add('opacity-75', 'cursor-not-allowed');
|
||||
btnModalConfirm.innerHTML = '<span class="animate-spin mr-2">↻</span> Déploiement en cours...';
|
||||
}
|
||||
|
||||
if (btnRun) {
|
||||
btnRun.disabled = true;
|
||||
btnRun.innerHTML = '<span class="animate-spin mr-1.5">↻</span> Mise à jour en cours...';
|
||||
@@ -5875,18 +5962,8 @@ async function runSystemUpdate() {
|
||||
localStorage.removeItem('nexus_update_last_check_ts');
|
||||
localStorage.removeItem('nexus_update_cached_data');
|
||||
|
||||
try {
|
||||
const res = await fetch('/api.php?action=run_update&_t=' + Date.now(), {
|
||||
method: 'POST',
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
body: JSON.stringify({})
|
||||
});
|
||||
const data = await res.json();
|
||||
|
||||
if (data.success) {
|
||||
const newVer = data.new_version || '';
|
||||
|
||||
// 1. Mettre à jour immédiatement le cache avec l'état à jour
|
||||
function finalizeUpdateSuccess(newVer) {
|
||||
newVer = String(newVer || '').replace(/^v/, '');
|
||||
localStorage.setItem('nexus_update_last_check_ts', Date.now().toString());
|
||||
localStorage.setItem('nexus_update_cached_data', JSON.stringify({
|
||||
success: true,
|
||||
@@ -5897,7 +5974,6 @@ async function runSystemUpdate() {
|
||||
release_date: ''
|
||||
}));
|
||||
|
||||
// 2. Mettre à jour visuellement les badges immédiatement
|
||||
const verTag = document.getElementById('system-version-tag');
|
||||
const appBadge = document.getElementById('app-version-badge');
|
||||
const headerUpdateBadge = document.getElementById('header-update-badge');
|
||||
@@ -5914,23 +5990,86 @@ async function runSystemUpdate() {
|
||||
statusText.className = 'text-emerald-400 font-bold';
|
||||
statusText.textContent = `Mise à jour terminée avec succès (v${newVer}) ! Rechargement...`;
|
||||
}
|
||||
if (btnModalConfirm) {
|
||||
btnModalConfirm.className = 'px-5 py-2.5 rounded-xl text-xs font-bold bg-emerald-600 text-white flex items-center gap-2';
|
||||
btnModalConfirm.innerHTML = '✓ Mise à jour terminée ! Rechargement...';
|
||||
}
|
||||
|
||||
// 3. Rechargement avec paramètre anti-cache pour forcer le navigateur à récupérer le nouveau DOM
|
||||
setTimeout(() => {
|
||||
closeUpdateConfirmModal();
|
||||
window.location.href = window.location.origin + window.location.pathname + '?_t=' + Date.now();
|
||||
}, 2000);
|
||||
} else {
|
||||
alert("Erreur lors de la mise à jour :\n\n" + (data.output || data.message));
|
||||
}, 1800);
|
||||
}
|
||||
|
||||
try {
|
||||
const res = await fetch('/api.php?action=run_update&_t=' + Date.now(), {
|
||||
method: 'POST',
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
body: JSON.stringify({})
|
||||
});
|
||||
|
||||
const rawText = await res.text();
|
||||
let data = null;
|
||||
try {
|
||||
data = JSON.parse(rawText);
|
||||
} catch (_) {
|
||||
data = null;
|
||||
}
|
||||
|
||||
if (data && data.success) {
|
||||
finalizeUpdateSuccess(data.new_version);
|
||||
return;
|
||||
}
|
||||
|
||||
// Si la réponse n'était pas un JSON valide ou a été interrompue par le rechargement de php-fpm/nginx,
|
||||
// on sonde le serveur pour vérifier si la mise à jour a en réalité bien été appliquée sur le disque
|
||||
await new Promise(r => setTimeout(r, 2000));
|
||||
try {
|
||||
const probeRes = await fetch('/api.php?action=check_update&_t=' + Date.now());
|
||||
const probeData = await probeRes.json();
|
||||
if (probeData && probeData.success && probeData.current_version) {
|
||||
finalizeUpdateSuccess(probeData.current_version);
|
||||
return;
|
||||
}
|
||||
} catch (_) {}
|
||||
|
||||
// En cas d'échec réel avéré
|
||||
closeUpdateConfirmModal();
|
||||
const errMsg = (data && (data.output || data.message)) ? (data.output || data.message) : (rawText.slice(0, 150) || "Erreur inconnue");
|
||||
alert("Erreur lors de la mise à jour :\n\n" + errMsg);
|
||||
if (btnRun) {
|
||||
btnRun.disabled = false;
|
||||
btnRun.innerHTML = 'Réessayer la mise à jour';
|
||||
}
|
||||
if (btnModalConfirm) {
|
||||
btnModalConfirm.disabled = false;
|
||||
btnModalConfirm.classList.remove('opacity-75', 'cursor-not-allowed');
|
||||
btnModalConfirm.innerHTML = '<svg class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M13 10V3L4 14h7v7l9-11h-7z"/></svg><span>Lancer la mise à jour (1-Clic)</span>';
|
||||
}
|
||||
|
||||
} catch (e) {
|
||||
alert("Erreur réseau lors de la mise à jour : " + e.message);
|
||||
// En cas d'interruption réseau du socket (Safari WebKit DOMException ou timeout),
|
||||
// on vérifie avant d'alerter si le serveur a quand même réussi à déployer les fichiers
|
||||
await new Promise(r => setTimeout(r, 2000));
|
||||
try {
|
||||
const probeRes = await fetch('/api.php?action=check_update&_t=' + Date.now());
|
||||
const probeData = await probeRes.json();
|
||||
if (probeData && probeData.success && probeData.current_version) {
|
||||
finalizeUpdateSuccess(probeData.current_version);
|
||||
return;
|
||||
}
|
||||
} catch (_) {}
|
||||
|
||||
closeUpdateConfirmModal();
|
||||
alert("Erreur réseau lors de la mise à jour : " + (e.message || "Connexion interrompue"));
|
||||
if (btnRun) {
|
||||
btnRun.disabled = false;
|
||||
btnRun.innerHTML = 'Réessayer la mise à jour';
|
||||
}
|
||||
if (btnModalConfirm) {
|
||||
btnModalConfirm.disabled = false;
|
||||
btnModalConfirm.classList.remove('opacity-75', 'cursor-not-allowed');
|
||||
btnModalConfirm.innerHTML = '<svg class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M13 10V3L4 14h7v7l9-11h-7z"/></svg><span>Lancer la mise à jour (1-Clic)</span>';
|
||||
}
|
||||
}
|
||||
}
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 44 KiB |
+107
-10
@@ -11,8 +11,14 @@ Database::getConnection();
|
||||
$isAuth = Auth::isAuthenticated();
|
||||
$currentUser = Auth::getUsername();
|
||||
|
||||
$stmtSettings = Database::getConnection()->query('SELECT company_name, company_logo FROM settings WHERE id = 1 LIMIT 1');
|
||||
$branding = $stmtSettings ? $stmtSettings->fetch(\PDO::FETCH_ASSOC) : null;
|
||||
$companyName = trim($branding['company_name'] ?? '');
|
||||
$companyLogo = trim($branding['company_logo'] ?? '');
|
||||
$hasBranding = !empty($companyName) || !empty($companyLogo);
|
||||
|
||||
$appVerData = file_exists(__DIR__ . '/../version.json') ? json_decode((string)file_get_contents(__DIR__ . '/../version.json'), true) : [];
|
||||
$appVersion = $appVerData['version'] ?? '1.3.9';
|
||||
$appVersion = $appVerData['version'] ?? '1.4.4';
|
||||
?>
|
||||
<!DOCTYPE html>
|
||||
<html lang="fr" class="h-full">
|
||||
@@ -144,8 +150,13 @@ $appVersion = $appVerData['version'] ?? '1.3.9';
|
||||
<div id="toast-container" class="fixed bottom-5 right-5 z-50 flex flex-col gap-2.5 max-w-md w-full pointer-events-none px-4 sm:px-0"></div>
|
||||
|
||||
<!-- ÉCRAN DE CONNEXION -->
|
||||
<div id="login-screen" class="<?= $isAuth ? 'hidden' : 'flex' ?> min-h-screen w-full items-center justify-center p-4 bg-gradient-to-br from-anthracite-950 via-anthracite-900 to-indigo-950/40">
|
||||
<div class="w-full max-w-md bg-anthracite-800 border border-anthracite-700 rounded-2xl shadow-2xl p-8">
|
||||
<div id="login-screen" class="<?= $isAuth ? 'hidden' : 'flex' ?> min-h-screen w-full items-center justify-center p-4 relative overflow-hidden bg-anthracite-950">
|
||||
<!-- Arrière-plan personnalisé / Image de fond avec overlay sombre et léger flou -->
|
||||
<div id="login-bg-layer" class="absolute inset-0 bg-cover bg-center bg-no-repeat" style="background-image: url('/assets/login-bg.jpg?v=<?= file_exists(__DIR__ . '/assets/login-bg.jpg') ? filemtime(__DIR__ . '/assets/login-bg.jpg') : 1 ?>');"></div>
|
||||
<div class="absolute inset-0 bg-gradient-to-tr from-anthracite-950/70 via-anthracite-950/50 to-indigo-950/30 backdrop-blur-[1px]"></div>
|
||||
|
||||
<!-- Carte de connexion flottante avec effet Glassmorphism transparent et aéré -->
|
||||
<div class="relative z-10 w-full max-w-md bg-anthracite-900/60 backdrop-blur-2xl border border-white/15 rounded-3xl shadow-2xl shadow-black/50 p-8 sm:p-9 transition-all">
|
||||
<div class="flex items-center gap-3.5 mb-6">
|
||||
<div class="w-12 h-12 rounded-xl bg-indigo-500/20 border border-indigo-400/40 flex items-center justify-center text-indigo-300 shadow-inner">
|
||||
<svg class="w-6 h-6" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
||||
@@ -158,25 +169,25 @@ $appVersion = $appVerData['version'] ?? '1.3.9';
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Aperçu Logo Entreprise sur l'écran de connexion (si configuré) -->
|
||||
<div id="login-company-box" class="hidden mb-5 p-3 rounded-xl bg-anthracite-950/90 border border-anthracite-700 flex items-center justify-center gap-3">
|
||||
<img id="login-company-logo" src="" alt="Logo Entreprise" class="max-h-10 max-w-[160px] object-contain hidden">
|
||||
<span id="login-company-name" class="text-xs font-semibold text-slate-200"></span>
|
||||
<!-- Aperçu Logo Entreprise sur l'écran de connexion (rendu serveur natif) -->
|
||||
<div id="login-company-box" class="<?= $hasBranding ? 'flex' : 'hidden' ?> mb-5 p-3 rounded-xl bg-anthracite-950/45 border border-white/10 backdrop-blur-md items-center justify-center gap-3">
|
||||
<img id="login-company-logo" src="<?= htmlspecialchars($companyLogo) ?>" alt="Logo Entreprise" class="max-h-10 max-w-[160px] object-contain <?= !empty($companyLogo) ? '' : 'hidden' ?>">
|
||||
<span id="login-company-name" class="text-xs font-semibold text-slate-200 <?= !empty($companyName) ? '' : 'hidden' ?>"><?= htmlspecialchars($companyName) ?></span>
|
||||
</div>
|
||||
|
||||
<form id="login-form" class="space-y-4">
|
||||
<div>
|
||||
<label class="block text-xs font-semibold uppercase tracking-wider text-slate-300 mb-1.5">Identifiant</label>
|
||||
<input type="text" name="username" value="admin" required
|
||||
class="w-full px-3.5 py-2.5 rounded-lg bg-anthracite-950 border border-anthracite-700 text-white focus:outline-none focus:border-indigo-400 text-sm">
|
||||
class="w-full px-3.5 py-2.5 rounded-xl bg-anthracite-950/50 backdrop-blur-md border border-white/10 text-white placeholder-slate-400 focus:outline-none focus:border-indigo-400 focus:ring-2 focus:ring-indigo-500/20 text-sm transition">
|
||||
</div>
|
||||
<div>
|
||||
<label class="block text-xs font-semibold uppercase tracking-wider text-slate-300 mb-1.5">Mot de passe</label>
|
||||
<input type="password" name="password" placeholder="••••••••" required
|
||||
class="w-full px-3.5 py-2.5 rounded-lg bg-anthracite-950 border border-anthracite-700 text-white focus:outline-none focus:border-indigo-400 text-sm">
|
||||
class="w-full px-3.5 py-2.5 rounded-xl bg-anthracite-950/50 backdrop-blur-md border border-white/10 text-white placeholder-slate-400 focus:outline-none focus:border-indigo-400 focus:ring-2 focus:ring-indigo-500/20 text-sm transition">
|
||||
</div>
|
||||
<button type="submit"
|
||||
class="w-full py-2.5 px-4 bg-indigo-600 hover:bg-indigo-500 active:bg-indigo-700 text-white font-semibold rounded-lg shadow-lg shadow-indigo-600/25 transition text-sm">
|
||||
class="w-full py-2.5 px-4 bg-gradient-to-r from-indigo-600 to-indigo-500 hover:from-indigo-500 hover:to-indigo-400 active:from-indigo-700 active:to-indigo-600 text-white font-semibold rounded-xl shadow-lg shadow-indigo-500/25 transition text-sm">
|
||||
Se connecter au PBX
|
||||
</button>
|
||||
</form>
|
||||
@@ -4715,6 +4726,92 @@ $appVersion = $appVerData['version'] ?? '1.3.9';
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- ===================================================================== -->
|
||||
<!-- MODAL : CONFIRMATION MISE À JOUR SYSTEME (OTA 1-CLIC) -->
|
||||
<!-- ===================================================================== -->
|
||||
<div id="modal-confirm-update" class="fixed inset-0 z-50 hidden items-center justify-center bg-black/80 backdrop-blur-sm p-3 sm:p-4 overflow-y-auto">
|
||||
<div class="bg-anthracite-900 border border-indigo-500/40 rounded-2xl w-full max-w-lg shadow-2xl overflow-hidden my-6 animate-fadeIn">
|
||||
<!-- Entête stylisée -->
|
||||
<div class="px-6 py-5 border-b border-anthracite-800 bg-gradient-to-r from-indigo-950/50 via-anthracite-900 to-anthracite-900 flex items-start justify-between">
|
||||
<div class="flex items-center gap-3.5">
|
||||
<div class="w-11 h-11 rounded-xl bg-indigo-500/15 border border-indigo-500/30 text-indigo-400 flex items-center justify-center shrink-0 shadow-lg shadow-indigo-950/50">
|
||||
<svg class="w-6 h-6" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
||||
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M4 16v1a3 3 0 003 3h10a3 3 0 003-3v-1m-4-4l-4 4m0 0l-4-4m4 4V4"/>
|
||||
</svg>
|
||||
</div>
|
||||
<div>
|
||||
<div class="flex items-center gap-2">
|
||||
<h3 class="text-base font-bold text-white">Mise à Jour du Système NexusPBX</h3>
|
||||
<span id="update-modal-target-badge" class="px-2 py-0.5 rounded text-[10px] font-bold tracking-wide uppercase bg-indigo-500/20 text-indigo-300 border border-indigo-500/30">OTA 1-Clic</span>
|
||||
</div>
|
||||
<p class="text-xs text-slate-400 mt-0.5">Déploiement officiel et rechargement sans coupure</p>
|
||||
</div>
|
||||
</div>
|
||||
<button type="button" onclick="closeUpdateConfirmModal()" class="text-slate-400 hover:text-white p-1.5 rounded-lg hover:bg-anthracite-800 transition">
|
||||
<svg class="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12"/></svg>
|
||||
</button>
|
||||
</div>
|
||||
|
||||
<!-- Corps de la modale -->
|
||||
<div class="p-6 space-y-4">
|
||||
<!-- Info cible -->
|
||||
<div class="p-3.5 rounded-xl bg-anthracite-950/90 border border-anthracite-800 flex items-center justify-between">
|
||||
<div>
|
||||
<div class="text-[11px] font-semibold text-slate-400 uppercase tracking-wider">Version Cible</div>
|
||||
<div id="update-modal-target-version" class="text-base font-bold text-emerald-400 font-mono mt-0.5">v...</div>
|
||||
</div>
|
||||
<div class="text-right">
|
||||
<div class="text-[11px] font-semibold text-slate-400 uppercase tracking-wider">Version Actuelle</div>
|
||||
<div id="update-modal-current-version" class="text-sm font-semibold text-slate-300 font-mono mt-0.5">v...</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Garanties & Sauvegarde automatique -->
|
||||
<div class="p-3.5 rounded-xl bg-emerald-500/10 border border-emerald-500/20 text-xs text-emerald-300 flex items-start gap-3">
|
||||
<svg class="w-5 h-5 text-emerald-400 shrink-0 mt-0.5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
||||
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 12l2 2 4-4m5.618-4.016A11.955 11.955 0 0112 2.944a11.955 11.955 0 01-8.618 3.04A12.02 12.02 0 003 9c0 5.591 3.824 10.29 9 11.622 5.176-1.332 9-6.03 9-11.622 0-1.042-.133-2.052-.382-3.016z"/>
|
||||
</svg>
|
||||
<div>
|
||||
<strong class="font-bold text-emerald-200">Sauvegarde préventive automatique incluse :</strong>
|
||||
<p class="mt-0.5 text-emerald-300/90 leading-relaxed">Une sauvegarde complète de votre base SQLite et de vos configurations Asterisk sera créée avant toute modification.</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Ce que fait la mise à jour -->
|
||||
<div class="space-y-2">
|
||||
<div class="text-xs font-semibold text-slate-300">Étapes automatiques du déploiement :</div>
|
||||
<ul class="text-xs text-slate-400 space-y-1.5 pl-1">
|
||||
<li class="flex items-center gap-2">
|
||||
<span class="w-1.5 h-1.5 rounded-full bg-cyan-400 shrink-0"></span>
|
||||
<span>Téléchargement des derniers fichiers et correctifs du dépôt officiel.</span>
|
||||
</li>
|
||||
<li class="flex items-center gap-2">
|
||||
<span class="w-1.5 h-1.5 rounded-full bg-indigo-400 shrink-0"></span>
|
||||
<span>Exécution des migrations SQLite et régénération des configurations Asterisk.</span>
|
||||
</li>
|
||||
<li class="flex items-center gap-2">
|
||||
<span class="w-1.5 h-1.5 rounded-full bg-emerald-400 shrink-0"></span>
|
||||
<span>Rechargement à chaud sans interruption des communications actives.</span>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Boutons d'action -->
|
||||
<div class="px-6 py-4 border-t border-anthracite-800 bg-anthracite-950/80 flex items-center justify-end gap-3">
|
||||
<button type="button" onclick="closeUpdateConfirmModal()"
|
||||
class="px-4 py-2.5 rounded-xl text-xs font-semibold bg-anthracite-800 hover:bg-anthracite-750 text-slate-300 border border-anthracite-700 transition">
|
||||
Annuler
|
||||
</button>
|
||||
<button type="button" id="btn-confirm-update-action" onclick="executeSystemUpdate()"
|
||||
class="px-5 py-2.5 rounded-xl text-xs font-bold bg-gradient-to-r from-indigo-600 to-indigo-500 hover:from-indigo-500 hover:to-indigo-400 text-white shadow-lg shadow-indigo-600/30 transition flex items-center gap-2">
|
||||
<svg class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M13 10V3L4 14h7v7l9-11h-7z"/></svg>
|
||||
<span>Lancer la mise à jour (1-Clic)</span>
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- ===================================================================== -->
|
||||
<!-- MODAL : URL XML YEALINK REMOTE PHONEBOOK (cm_to_yl_ab.php) -->
|
||||
<!-- ===================================================================== -->
|
||||
|
||||
+8
-2
@@ -139,8 +139,14 @@ echo -e "${C_GRAY}[6/6] Rechargement à chaud d'Asterisk et des services web...$
|
||||
asterisk -rx "core reload" >/dev/null 2>&1 || true
|
||||
asterisk -rx "pjsip reload" >/dev/null 2>&1 || true
|
||||
asterisk -rx "dialplan reload" >/dev/null 2>&1 || true
|
||||
systemctl reload php8.4-fpm 2>/dev/null || systemctl reload php8.2-fpm 2>/dev/null || systemctl reload php*-fpm 2>/dev/null || true
|
||||
systemctl reload nginx 2>/dev/null || true
|
||||
|
||||
# Rechargement des services web : différé si exécuté depuis l'interface web pour éviter de couper la requête HTTP
|
||||
if [ -t 1 ]; then
|
||||
systemctl reload php8.4-fpm 2>/dev/null || systemctl reload php8.2-fpm 2>/dev/null || systemctl reload php*-fpm 2>/dev/null || true
|
||||
systemctl reload nginx 2>/dev/null || true
|
||||
else
|
||||
(nohup bash -c "sleep 2 && (systemctl reload php8.4-fpm 2>/dev/null || systemctl reload php8.2-fpm 2>/dev/null || systemctl reload php*-fpm 2>/dev/null || true); systemctl reload nginx 2>/dev/null || true" >/dev/null 2>&1 &)
|
||||
fi
|
||||
|
||||
NEW_VER="Inconnue"
|
||||
if [ -f "$APP_DIR/version.json" ]; then
|
||||
|
||||
+5
-5
@@ -1,12 +1,12 @@
|
||||
{
|
||||
"version": "1.3.9",
|
||||
"version": "1.4.4",
|
||||
"codename": "Helios",
|
||||
"release_date": "2026-11-04",
|
||||
"min_php_version": "8.2",
|
||||
"changelog": [
|
||||
"Mise à jour instantanée du numéro de version sur tous les badges sans aucun délai de cache navigateur",
|
||||
"Invalidation automatique du cache local et rechargement propre anti-cache après chaque mise à jour",
|
||||
"Affichage serveur natif du numéro de version installée directement dans le HTML généré",
|
||||
"Suppression définitive de l'indication des identifiants et mot de passe par défaut sur l'écran de connexion"
|
||||
"Fiabilisation maximale de la mise à jour (rechargement web asynchrone non-bloquant et gestion d'erreurs tolérante)",
|
||||
"Sonde automatique de secours évitant toute fausse alerte réseau sous Safari / WebKit lors du rechargement des services",
|
||||
"Nouvelle boîte modale élégante et personnalisée pour confirmer le lancement des mises à jour",
|
||||
"Rendu serveur natif garanti du logo et nom de l'exploitant sur la page de connexion"
|
||||
]
|
||||
}
|
||||
Reference in new issue
Block a user