cedricAbonnel/folio
1
0
Fork 0
Code Issues 15 Pull Requests Actions Packages Projects Releases Wiki Activity

feat : sparklines 14j stats + filtre IPs LAN (v1.6.27)

Browse Source 
- Admin stats : sparklines SVG par page (120×28 px, courbe + dégradé),
  carte « Pages les plus visitées » en pleine largeur
- AccessLogParser : données par jour (pages_by_day) sur 14 jours
- AccessLogParser : IPs privées/LAN exclues de la répartition réseau
- ArticleManager : suppression opérateur nullsafe superflu (PHPStan)

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
Cédric Abonnel
2026-05-19 18:20:19 +02:00
parent c2035314fb
commit ed3f8062da
6 changed files with 154 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/assets/js/admin-stats.js
+39 -12
View File
@@ -17,16 +17,39 @@
});
}());
// ── Pages les plus visitées (RSS XML) ────────────────────────────────────────
// ── Pages les plus visitées (RSS XML + sparklines) ───────────────────────────
(function () {
var container = document.getElementById('stats-pages-container');
var badge = document.getElementById('stats-pages-count');
var container = document.getElementById('stats-pages-container');
var badge = document.getElementById('stats-pages-count');
var pagesByDay = (typeof FOLIO_PAGES_BY_DAY !== 'undefined') ? FOLIO_PAGES_BY_DAY : {};
if (!container) { return; }
function esc(s) {
return String(s).replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;');
}
function sparkline(data) {
var W = 120, H = 28, padX = 2, padY = 3;
var max = Math.max.apply(null, data) || 1;
var n = data.length;
var pts = data.map(function (v, i) {
var x = padX + i * (W - 2 * padX) / (n - 1);
var y = H - padY - (v / max) * (H - 2 * padY);
return x.toFixed(1) + ',' + y.toFixed(1);
}).join(' ');
// Zone remplie sous la courbe
var first = padX.toFixed(1) + ',' + (H - padY).toFixed(1);
var last = (W - padX).toFixed(1) + ',' + (H - padY).toFixed(1);
return '<svg xmlns="http://www.w3.org/2000/svg" width="' + W + '" height="' + H + '" style="display:block;overflow:visible">'
+ '<defs><linearGradient id="spk-grad" x1="0" y1="0" x2="0" y2="1">'
+ '<stop offset="0%" stop-color="var(--bs-primary,#0d6efd)" stop-opacity="0.18"/>'
+ '<stop offset="100%" stop-color="var(--bs-primary,#0d6efd)" stop-opacity="0"/>'
+ '</linearGradient></defs>'
+ '<polygon points="' + first + ' ' + pts + ' ' + last + '" fill="url(#spk-grad)"/>'
+ '<polyline points="' + pts + '" fill="none" stroke="var(--bs-primary,#0d6efd)" stroke-width="1.5" stroke-linejoin="round" stroke-linecap="round"/>'
+ '</svg>';
}
fetch('/trending?period=14d')
.then(function (r) { return r.ok ? r.text() : Promise.reject(); })
.then(function (xml) {
@@ -43,19 +66,23 @@
var vis = m ? parseInt(m[1], 10) : 0;
var title = raw.replace(/\s*\(\d+\s+visiteurs?\)$/, '');
var slug = decodeURIComponent(link.replace(/.*\/post\//, ''));
return { title: title, link: link, slug: slug, vis: vis };
var pm = link.match(/\/post\/[^?#]*/);
var daily = pm ? (pagesByDay[pm[0]] || null) : null;
return { title: title, link: link, slug: slug, vis: vis, daily: daily };
});
var maxV = Math.max.apply(null, rows.map(function (r) { return r.vis; })) || 1;
var html = '<div class="table-responsive"><table class="table table-sm table-hover mb-0 small"><tbody>';
var html = '<div class="table-responsive"><table class="table table-sm table-hover mb-0 small w-100"><tbody>';
rows.forEach(function (row, i) {
var pct = Math.round(row.vis / maxV * 100);
var vis = row.vis.toLocaleString('fr-FR');
var vis = row.vis.toLocaleString('fr-FR');
var spk = row.daily ? sparkline(row.daily) : '';
html += '<tr>'
+ '<td class="text-muted ps-3" style="width:2rem">' + (i + 1) + '</td>'
+ '<td><a href="' + esc(row.link) + '" target="_blank" class="text-decoration-none text-truncate d-block" style="max-width:260px" title="' + esc(row.slug) + '">'
+ esc(row.title || row.slug) + '</a>'
+ '<div class="progress mt-1" style="height:3px"><div class="progress-bar" style="width:' + pct + '%"></div></div></td>'
+ '<td class="text-end fw-semibold pe-3">' + vis + ' <span class="text-muted fw-normal">vis.</span></td>'
+ '<td class="text-muted ps-3" style="width:2rem;vertical-align:middle">' + (i + 1) + '</td>'
+ '<td style="vertical-align:middle"><a href="' + esc(row.link) + '" target="_blank"'
+ ' class="text-decoration-none" title="' + esc(row.slug) + '">'
+ esc(row.title || row.slug) + '</a></td>'
+ '<td style="width:130px;vertical-align:middle;padding:4px 8px">' + spk + '</td>'
+ '<td class="text-end fw-semibold pe-3" style="width:5rem;vertical-align:middle">'
+ vis + ' <span class="text-muted fw-normal">vis.</span></td>'
+ '</tr>';
});
html += '</tbody></table></div>';
public/index.php
+38 -19
View File
@@ -73,7 +73,9 @@ function buildAutoSeoDesc(string $content, string $title = ''): string
{
require_once BASE_PATH . '/src/Parsedown.php';
$_pd = new Parsedown();
$_plain = trim((string)preg_replace('/\s+/', ' ',
$_plain = trim((string)preg_replace(
'/\s+/',
' ',
html_entity_decode(strip_tags($_pd->text($content)), ENT_QUOTES | ENT_HTML5, 'UTF-8')
));
if ($title !== '' && stripos($_plain, $title) === 0) {
@@ -85,7 +87,9 @@ function buildAutoSeoDesc(string $content, string $title = ''): string
function slugToSearchQuery(string $rawPath): string
{
return trim((string)preg_replace('/\s{2,}/', ' ', (string)preg_replace(
'/[^a-zA-ZÀ-ÿ0-9\s]/u', ' ', str_replace(['-', '_', '/'], ' ', $rawPath)
'/[^a-zA-ZÀ-ÿ0-9\s]/u',
' ',
str_replace(['-', '_', '/'], ' ', $rawPath)
)));
}
@@ -2512,7 +2516,7 @@ switch ($action) {
$allArticles = array_values(array_filter($allArticles, fn ($a) => !empty($a['featured'])));
}
$sortBy = in_array($_GET['sort'] ?? '', ['title', 'published', 'updated']) ? $_GET['sort'] : 'updated';
$sortBy = in_array($_GET['sort'] ?? '', ['title', 'published', 'updated'], true) ? $_GET['sort'] : 'updated';
$sortDir = ($_GET['dir'] ?? '') === 'asc' ? 'asc' : 'desc';
usort($allArticles, function ($a, $b) use ($sortBy, $sortDir) {
$cmp = match ($sortBy) {
@@ -2730,21 +2734,24 @@ switch ($action) {
$cutoff14 = strtotime('-14 days midnight') ?: (time() - 14 * 86400);
$tParser = new TrendingParser('/var/log/apache2', apacheAccessLog());
$accessParser = new AccessLogParser('/var/log/apache2', apacheAccessLog());
$topIps = array_slice($accessParser->stats()['ips'], 0, 200, true);
$accessStats = $accessParser->stats();
$topIps = array_slice($accessStats['ips'], 0, 200, true);
$asnMap = (new AsnLookup())->batchLookup(array_keys($topIps));
$statsRaw = [
'readable' => $accessParser->isReadable(),
'books' => $tParser->top($cutoff14, 20, ['/book/']),
'as' => AsnLookup::aggregateByAs($topIps, $asnMap),
'readable' => $accessParser->isReadable(),
'books' => $tParser->top($cutoff14, 20, ['/book/']),
'as' => AsnLookup::aggregateByAs($topIps, $asnMap),
'pages_by_day' => $accessStats['pages_by_day'] ?? [],
];
@file_put_contents($statsCacheFile, json_encode($statsRaw));
}
$adminData['stats_readable'] = $statsRaw['readable'];
$adminData['stats_books'] = $statsRaw['books'];
$adminData['stats_as'] = $statsRaw['as'];
$adminData['stats_as_groups'] = AsnLookup::applyGroups($statsRaw['as'], asGroups());
$adminData['as_groups'] = asGroups();
$adminData['stats_readable'] = $statsRaw['readable'];
$adminData['stats_books'] = $statsRaw['books'];
$adminData['stats_as'] = $statsRaw['as'];
$adminData['stats_as_groups'] = AsnLookup::applyGroups($statsRaw['as'], asGroups());
$adminData['as_groups'] = asGroups();
$adminData['stats_pages_by_day'] = $statsRaw['pages_by_day'] ?? [];
}
if ($tab === 'categories') {
@@ -2764,7 +2771,8 @@ switch ($action) {
try {
$st = $pdo->query('SELECT id, user_email, feed_url, label, created_at FROM rss_feeds ORDER BY created_at DESC');
$adminData['flux_feeds'] = $st->fetchAll(PDO::FETCH_ASSOC);
} catch (\Throwable) {}
} catch (\Throwable) {
}
}
}
@@ -2784,7 +2792,10 @@ switch ($action) {
}
if ($tab === 'ia') {
if (!isAdmin()) { http_response_code(403); exit; }
if (!isAdmin()) {
http_response_code(403);
exit;
}
require_once BASE_PATH . '/src/SiteSettings.php';
require_once BASE_PATH . '/src/Service/AiService.php';
$adminData['ai_provider'] = aiProvider();
@@ -2800,7 +2811,8 @@ switch ($action) {
case 'admin_save_ai_config':
requireAuth();
if (!isAdmin() || $_SERVER['REQUEST_METHOD'] !== 'POST') {
http_response_code(403); exit;
http_response_code(403);
exit;
}
require_once BASE_PATH . '/src/SiteSettings.php';
$allowedProviders = ['anthropic', 'claude_code'];
@@ -3439,7 +3451,8 @@ switch ($action) {
if ($pdo) {
try {
$pdo->prepare('DELETE FROM rss_feeds WHERE id = :id')->execute([':id' => $feedId]);
} catch (\Throwable) {}
} catch (\Throwable) {
}
}
}
header('Location: /admin/flux?deleted=1');
@@ -3541,7 +3554,9 @@ switch ($action) {
$_published[] = $_a;
}
}
if (empty($_published)) continue;
if (empty($_published)) {
continue;
}
$booksData[] = ['book' => $_bk, 'count' => count($_published), 'first' => $_published[0]];
}
unset($_bk, $_published, $_aSlug, $_a);
@@ -3864,9 +3879,13 @@ switch ($action) {
$_published[] = $_a;
}
}
if (empty($_published)) continue;
if (empty($_published)) {
continue;
}
$homeBooks[] = ['book' => $_bk, 'count' => count($_published), 'first' => $_published[0]];
if (count($homeBooks) >= 6) break;
if (count($homeBooks) >= 6) {
break;
}
}
unset($_bk, $_published, $_aSlug, $_a);
}