Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
0948a8da24 | ||
|
|
c5eb849095 | ||
|
|
1d09f06dc2 |
No files matched your search
+25
-13
@@ -136,8 +136,15 @@ try {
|
||||
$settings['local_networks'] = [$settings['local_net']];
|
||||
}
|
||||
|
||||
$appDir = dirname(__DIR__);
|
||||
$installedVerData = file_exists("{$appDir}/version.json")
|
||||
? json_decode((string)file_get_contents("{$appDir}/version.json"), true)
|
||||
: [];
|
||||
$installedVer = $installedVerData['version'] ?? '1.4.0';
|
||||
|
||||
echo json_encode([
|
||||
'success' => true,
|
||||
'version' => $installedVer,
|
||||
'user' => Auth::getUsername(),
|
||||
'settings' => $settings,
|
||||
'extensions' => $extensions,
|
||||
@@ -2233,23 +2240,28 @@ try {
|
||||
|
||||
case 'check_update':
|
||||
$appDir = dirname(__DIR__);
|
||||
clearstatcache(true, "{$appDir}/version.json");
|
||||
$localVerJson = file_exists("{$appDir}/version.json")
|
||||
? json_decode((string)file_get_contents("{$appDir}/version.json"), true)
|
||||
: ['version' => '1.2.0', 'changelog' => []];
|
||||
: ['version' => '1.3.8', 'changelog' => []];
|
||||
|
||||
$currentVer = $localVerJson['version'] ?? '1.2.0';
|
||||
$currentVer = $localVerJson['version'] ?? '1.3.8';
|
||||
$remoteVer = $currentVer;
|
||||
$remoteChangelog = [];
|
||||
$remoteDate = '';
|
||||
|
||||
// 1. Interrogation directe via HTTP Raw (indépendant de .git et ultra-rapide)
|
||||
$rawHttp = @shell_exec("curl -k -s --connect-timeout 4 \"https://git.sorcier-research.com/sorcier/NexusPBX/raw/branch/main/version.json\" 2>/dev/null");
|
||||
// 1. Interrogation directe via HTTP Raw avec cache-busting strict (bypass OpenResty/Cloudflare max-age)
|
||||
$ts = time();
|
||||
$rawHttp = @shell_exec("curl -k -s -H 'Cache-Control: no-cache, no-store' -H 'Pragma: no-cache' --connect-timeout 4 \"https://git.sorcier-research.com/sorcier/NexusPBX/raw/branch/main/version.json?_t={$ts}\" 2>/dev/null");
|
||||
if (empty($rawHttp)) {
|
||||
$ctx = stream_context_create([
|
||||
'http' => ['timeout' => 4],
|
||||
'http' => [
|
||||
'timeout' => 4,
|
||||
'header' => "Cache-Control: no-cache\r\nPragma: no-cache\r\n"
|
||||
],
|
||||
'ssl' => ['verify_peer' => false, 'verify_peer_name' => false]
|
||||
]);
|
||||
$rawHttp = @file_get_contents("https://git.sorcier-research.com/sorcier/NexusPBX/raw/branch/main/version.json", false, $ctx);
|
||||
$rawHttp = @file_get_contents("https://git.sorcier-research.com/sorcier/NexusPBX/raw/branch/main/version.json?_t={$ts}", false, $ctx);
|
||||
}
|
||||
|
||||
if (!empty($rawHttp)) {
|
||||
@@ -2274,11 +2286,6 @@ try {
|
||||
}
|
||||
|
||||
$hasUpdate = version_compare($remoteVer, $currentVer, '>');
|
||||
$localHash = trim((string)shell_exec("git --git-dir={$appDir}/.git rev-parse HEAD 2>/dev/null"));
|
||||
$remoteHash = trim((string)shell_exec("git --git-dir={$appDir}/.git rev-parse origin/main 2>/dev/null"));
|
||||
if (!$hasUpdate && $localHash !== '' && $remoteHash !== '' && $localHash !== $remoteHash) {
|
||||
$hasUpdate = true;
|
||||
}
|
||||
|
||||
echo json_encode([
|
||||
'success' => true,
|
||||
@@ -2297,13 +2304,18 @@ try {
|
||||
$outputStr = implode("\n", $output);
|
||||
|
||||
$appDir = dirname(__DIR__);
|
||||
clearstatcache(true, "{$appDir}/version.json");
|
||||
if (function_exists('opcache_reset')) {
|
||||
@opcache_reset();
|
||||
}
|
||||
|
||||
$newVerJson = file_exists("{$appDir}/version.json")
|
||||
? json_decode((string)file_get_contents("{$appDir}/version.json"), true)
|
||||
: ['version' => '1.3.0'];
|
||||
: ['version' => '1.3.8'];
|
||||
|
||||
echo json_encode([
|
||||
'success' => ($code === 0),
|
||||
'new_version' => $newVerJson['version'] ?? '1.3.0',
|
||||
'new_version' => $newVerJson['version'] ?? '1.3.8',
|
||||
'output' => $outputStr,
|
||||
'message' => ($code === 0) ? "Mise à jour réussie !" : "Erreur lors de la mise à jour",
|
||||
]);
|
||||
|
||||
+99
-21
@@ -629,20 +629,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 +698,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"/>
|
||||
`;
|
||||
}
|
||||
|
||||
@@ -5735,15 +5771,26 @@ async function checkSystemUpdate(notify = false) {
|
||||
const TWENTY_FOUR_HOURS = 24 * 60 * 60 * 1000;
|
||||
|
||||
// Si pas de clic explicite (notify === false), vérifier si un check a déjà été fait il y a moins de 24h
|
||||
const installedVer = (appState && appState.version) ? appState.version : (document.querySelector('meta[name="nexus-app-version"]')?.content || '');
|
||||
if (!notify) {
|
||||
const lastTs = parseInt(localStorage.getItem(STORAGE_KEY_TIME) || '0', 10);
|
||||
const cachedRaw = localStorage.getItem(STORAGE_KEY_DATA);
|
||||
if (lastTs && (Date.now() - lastTs < TWENTY_FOUR_HOURS) && cachedRaw) {
|
||||
try {
|
||||
const cached = JSON.parse(cachedRaw);
|
||||
// Si la version locale correspond et qu'on n'a pas un vieux flag "mise à jour dispo" vers la version déjà installée
|
||||
if (installedVer && (cached.current_version !== installedVer || (cached.has_update && cached.latest_version === installedVer))) {
|
||||
// Cache périmé suite à une mise à jour : on purge pour rafraîchir en direct
|
||||
localStorage.removeItem(STORAGE_KEY_TIME);
|
||||
localStorage.removeItem(STORAGE_KEY_DATA);
|
||||
} else {
|
||||
applyUpdateUI(cached);
|
||||
return;
|
||||
} catch (_) {}
|
||||
}
|
||||
} catch (_) {
|
||||
localStorage.removeItem(STORAGE_KEY_TIME);
|
||||
localStorage.removeItem(STORAGE_KEY_DATA);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
localStorage.removeItem(STORAGE_KEY_TIME);
|
||||
@@ -5759,7 +5806,7 @@ async function checkSystemUpdate(notify = false) {
|
||||
}
|
||||
|
||||
try {
|
||||
const res = await fetch('/api.php?action=check_update');
|
||||
const res = await fetch('/api.php?action=check_update&_t=' + Date.now());
|
||||
const data = await res.json();
|
||||
|
||||
// Enregistrement du timestamp de vérification et des données en cache local (24h)
|
||||
@@ -5860,8 +5907,12 @@ async function runSystemUpdate() {
|
||||
|
||||
showToast("Mise à jour en cours d'exécution en arrière-plan...", 'info');
|
||||
|
||||
// Purge préventive du cache local
|
||||
localStorage.removeItem('nexus_update_last_check_ts');
|
||||
localStorage.removeItem('nexus_update_cached_data');
|
||||
|
||||
try {
|
||||
const res = await fetch('/api.php?action=run_update', {
|
||||
const res = await fetch('/api.php?action=run_update&_t=' + Date.now(), {
|
||||
method: 'POST',
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
body: JSON.stringify({})
|
||||
@@ -5869,14 +5920,41 @@ async function runSystemUpdate() {
|
||||
const data = await res.json();
|
||||
|
||||
if (data.success) {
|
||||
showToast(`NexusPBX a été mis à jour avec succès en v${data.new_version} ! Rechargement...`, 'success');
|
||||
const newVer = data.new_version || '';
|
||||
|
||||
// 1. Mettre à jour immédiatement le cache avec l'état à jour
|
||||
localStorage.setItem('nexus_update_last_check_ts', Date.now().toString());
|
||||
localStorage.setItem('nexus_update_cached_data', JSON.stringify({
|
||||
success: true,
|
||||
current_version: newVer,
|
||||
latest_version: newVer,
|
||||
has_update: false,
|
||||
changelog: [],
|
||||
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');
|
||||
const pingDot = document.getElementById('update-ping-dot');
|
||||
|
||||
if (verTag && newVer) verTag.textContent = `v${newVer}`;
|
||||
if (appBadge && newVer) appBadge.textContent = `v${newVer}`;
|
||||
if (headerUpdateBadge) headerUpdateBadge.style.display = 'none';
|
||||
if (btnRun) btnRun.style.display = 'none';
|
||||
if (pingDot) pingDot.classList.add('hidden');
|
||||
|
||||
showToast(`NexusPBX a été mis à jour avec succès en v${newVer} ! Rechargement...`, 'success');
|
||||
if (statusText) {
|
||||
statusText.className = 'text-emerald-400 font-bold';
|
||||
statusText.textContent = `Mise à jour terminée avec succès (v${data.new_version}) ! Rechargement de la page...`;
|
||||
statusText.textContent = `Mise à jour terminée avec succès (v${newVer}) ! Rechargement...`;
|
||||
}
|
||||
|
||||
// 3. Rechargement avec paramètre anti-cache pour forcer le navigateur à récupérer le nouveau DOM
|
||||
setTimeout(() => {
|
||||
window.location.reload();
|
||||
}, 2500);
|
||||
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));
|
||||
if (btnRun) {
|
||||
|
||||
+6
-7
@@ -10,12 +10,16 @@ use App\Auth;
|
||||
Database::getConnection();
|
||||
$isAuth = Auth::isAuthenticated();
|
||||
$currentUser = Auth::getUsername();
|
||||
|
||||
$appVerData = file_exists(__DIR__ . '/../version.json') ? json_decode((string)file_get_contents(__DIR__ . '/../version.json'), true) : [];
|
||||
$appVersion = $appVerData['version'] ?? '1.4.0';
|
||||
?>
|
||||
<!DOCTYPE html>
|
||||
<html lang="fr" class="h-full">
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
<meta name="nexus-app-version" content="<?= htmlspecialchars($appVersion) ?>">
|
||||
<title>NexusPBX — Supervision & Gestion PJSIP sur Debian</title>
|
||||
<script src="https://cdn.tailwindcss.com"></script>
|
||||
<script>
|
||||
@@ -176,11 +180,6 @@ $currentUser = Auth::getUsername();
|
||||
Se connecter au PBX
|
||||
</button>
|
||||
</form>
|
||||
|
||||
<div class="mt-6 pt-5 border-t border-anthracite-700 text-xs text-slate-300 flex items-center justify-between">
|
||||
<span>Accès initial par défaut :</span>
|
||||
<code class="px-2.5 py-1 rounded bg-anthracite-950 border border-anthracite-700 text-indigo-300 font-mono">admin / admin123</code>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -207,7 +206,7 @@ $currentUser = Auth::getUsername();
|
||||
<div class="font-black text-white text-2xl tracking-tight leading-none">
|
||||
Nexus<span class="text-indigo-400">PBX</span>
|
||||
</div>
|
||||
<span id="app-version-badge" class="px-1.5 py-0.5 text-[10px] font-mono font-bold tracking-wider rounded bg-indigo-500/20 text-indigo-300 border border-indigo-500/30">v1.3.0</span>
|
||||
<span id="app-version-badge" class="px-1.5 py-0.5 text-[10px] font-mono font-bold tracking-wider rounded bg-indigo-500/20 text-indigo-300 border border-indigo-500/30">v<?= htmlspecialchars($appVersion) ?></span>
|
||||
</div>
|
||||
<div class="text-[10px] text-slate-400 font-medium tracking-wide mt-0.5">Moteur VoIP & Téléphonie IP</div>
|
||||
</div>
|
||||
@@ -1577,7 +1576,7 @@ $currentUser = Auth::getUsername();
|
||||
<span id="update-dot" class="relative inline-flex rounded-full h-3 w-3 bg-emerald-500"></span>
|
||||
</span>
|
||||
<h3 class="text-base font-bold text-white">Mises à Jour du Système NexusPBX</h3>
|
||||
<span id="system-version-tag" class="px-2 py-0.5 text-xs font-mono font-bold rounded-lg bg-indigo-500/20 text-indigo-300 border border-indigo-500/30">v1.3.0</span>
|
||||
<span id="system-version-tag" class="px-2 py-0.5 text-xs font-mono font-bold rounded-lg bg-indigo-500/20 text-indigo-300 border border-indigo-500/30">v<?= htmlspecialchars($appVersion) ?></span>
|
||||
</div>
|
||||
<p class="text-xs text-slate-300 mt-1">Vérifiez les nouvelles versions officielles et mettez à jour votre PBX en 1 clic sans coupure de service.</p>
|
||||
</div>
|
||||
|
||||
+2
-2
@@ -93,7 +93,7 @@ echo -e "${C_GREEN} ✓ Sauvegarde de sécurité créée : $(basename "$BACKUP_
|
||||
|
||||
# 2. Application des derniers fichiers de code Git
|
||||
echo -e "${C_GRAY}[2/6] Déploiement des nouveaux fichiers de code...${C_RESET}"
|
||||
git reset --hard "${GIT_REMOTE}/${GIT_BRANCH}"
|
||||
git reset --hard FETCH_HEAD 2>/dev/null || git reset --hard "${GIT_REMOTE}/${GIT_BRANCH}"
|
||||
chown -R www-data:asterisk "$APP_DIR" 2>/dev/null || true
|
||||
chmod 2775 "$APP_DIR/storage" "$APP_DIR/storage/backups" "$APP_DIR/storage/sounds" 2>/dev/null || true
|
||||
chmod +x "$APP_DIR/scripts/update.sh" "$APP_DIR/scripts/nexus-firewall" "$APP_DIR/scripts/nexus-banner.sh" 2>/dev/null || true
|
||||
@@ -139,7 +139,7 @@ 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 php*-fpm 2>/dev/null || 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
|
||||
|
||||
NEW_VER="Inconnue"
|
||||
|
||||
+5
-5
@@ -1,12 +1,12 @@
|
||||
{
|
||||
"version": "1.3.7",
|
||||
"version": "1.4.0",
|
||||
"codename": "Helios",
|
||||
"release_date": "2026-11-04",
|
||||
"min_php_version": "8.2",
|
||||
"changelog": [
|
||||
"Vérification ultra-rapide des mises à jour en direct via cURL CLI et flux HTTP sans dépendre de git ou de php-curl",
|
||||
"Bouton 'Vérifier les mises à jour' forçant le rafraîchissement immédiat du cache navigateur (bypass 24h)",
|
||||
"Nouvelle modale de confirmation de restauration système alignée sur le thème sombre NexusPBX",
|
||||
"Remplacement des popups d'alerte natives du navigateur lors des restaurations locales et téléversées"
|
||||
"Lissage élégant des graphiques CPU/RAM et Réseau (splines Bézier cubiques sans angles vifs)",
|
||||
"Amélioration des transitions et gradients dynamiques sur les graphiques du tableau de bord",
|
||||
"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"
|
||||
]
|
||||
}
|
||||
Reference in new issue
Block a user