Compare commits
15 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| de8785d088 | |||
| 4b5943c0a4 | |||
| a552f105cd | |||
| 16afec3039 | |||
| 2d2148079d | |||
| 3965be6854 | |||
| e803d2d0a7 | |||
| 9069a64a0c | |||
| 819d6d1b8f | |||
| 16965ee8cb | |||
| 55a2120be1 | |||
| 8be56bc27f | |||
| 8cab6362a3 | |||
| dbd76556fb | |||
| 5828aac4f5 |
@@ -6,6 +6,7 @@
|
||||
APP_URL=https://example.com
|
||||
APP_ENV=prod
|
||||
APP_DEBUG=0
|
||||
APP_TIMEZONE=Europe/Paris
|
||||
|
||||
# Authentification admin (email de l'administrateur principal)
|
||||
ADMIN_EMAIL=
|
||||
@@ -40,6 +41,17 @@ SMTP_FROM_NAME=
|
||||
CONTACT_EMAIL=
|
||||
CONTACT_FROM_EMAIL=
|
||||
|
||||
# Dépôt Folio pour le vérificateur de mises à jour (UpdateChecker)
|
||||
# URL de base du dépôt Gitea (sans slash final)
|
||||
FOLIO_REPO_URL=https://git.abonnel.fr/cedricAbonnel/folio
|
||||
# Branche suivie pour les mises à jour (défaut : main)
|
||||
# FOLIO_UPDATE_BRANCH=main
|
||||
|
||||
# Chemin absolu vers le répertoire des articles (data/)
|
||||
# Par défaut : BASE_PATH/data (dans le répertoire de l'application)
|
||||
# Recommandé en production : chemin hors du répertoire web, ex. /srv/data/folio
|
||||
DATA_PATH=/srv/data/folio
|
||||
|
||||
# Logs Apache (onglet Recherches dans /admin)
|
||||
# Nom du fichier de log d'accès du vhost dans /var/log/apache2/
|
||||
APACHE_ACCESS_LOG=lan.acegrp.varlog-access.log
|
||||
|
||||
@@ -9,6 +9,34 @@ Format : [Keep a Changelog](https://keepachangelog.com/fr/1.0.0/) — versionnag
|
||||
|
||||
---
|
||||
|
||||
## [1.4.0] - 2026-05-15
|
||||
|
||||
### Ajouté
|
||||
- **`DATA_PATH`** : chemin des articles configurable via `.env`, indépendant du document root — permet de stocker `/data` hors de l'arborescence web (ex. `/srv/data/folio`)
|
||||
- **`DataGit`** : auto-commit git sur toutes les écritures articles et livres (création, modification, suppression, métadonnées, tags, fichiers, liens…) sauf `autosave` — no-op silencieux si `DATA_PATH` n'est pas un dépôt git
|
||||
- **Admin — Moteur Folio** : affiche la branche suivie pour les mises à jour (`FOLIO_UPDATE_BRANCH`, défaut `main`), la date du dernier contrôle, et un bouton **Vérifier** pour forcer la vérification sans attendre le TTL du cache (1 h)
|
||||
|
||||
### Modifié
|
||||
- `UpdateChecker` : branche cible configurable via `FOLIO_UPDATE_BRANCH` (plus de `main` hardcodé dans l'URL Gitea)
|
||||
|
||||
---
|
||||
|
||||
## [1.3.0] - 2026-05-15
|
||||
|
||||
### Ajouté
|
||||
- Onglet **Statistiques** dans l'admin : pages les plus visitées, livres consultés, répartition par AS (#64)
|
||||
- `AccessLogParser` : lecture des logs Apache (plain, `.gz`, `.tar.gz`), cache 10 min
|
||||
- `AsnLookup` : résolution ASN via ip-api.com (batch, cache 30 j), détection LAN automatique
|
||||
- Filtrage des AS par groupes configurables (motifs case-insensitive, formulaire admin)
|
||||
- Pattern de log configurable via l'UI (onglet Recherches) avec support glob
|
||||
|
||||
### Corrigé
|
||||
- Permissions rsync : `--chmod=Fug+rw,Fo-w` assure la lisibilité groupe sur les fichiers déployés
|
||||
- `saveSiteSettings()` et `saveSmtpSettings()` : retournent un `bool` et affichent une erreur si l'écriture échoue
|
||||
- `scripts/setup.sh` : script d'initialisation Folio (composer, répertoires, droits, migrations, groupe `adm`)
|
||||
|
||||
---
|
||||
|
||||
## [1.2.2] - 2026-05-14
|
||||
|
||||
### Corrigé
|
||||
|
||||
@@ -0,0 +1,62 @@
|
||||
# CLAUDE.md
|
||||
|
||||
## Ce qu'est ce dépôt
|
||||
|
||||
**Folio** est un moteur de blog PHP.
|
||||
Ce répertoire est la **copie locale du dépôt Git** (`https://git.abonnel.fr/cedricAbonnel/folio`), branche DEV.
|
||||
Il contient uniquement le code du moteur — pas de données, pas de credentials.
|
||||
|
||||
## Architecture
|
||||
|
||||
| Répertoire local | Site distant | Rôle |
|
||||
|-----------------|-------------|------|
|
||||
| `~/Projects/folio/` | — | Copie du dépôt Folio (branche DEV). On code ici. |
|
||||
| `~/Projects/varlog/` | varlog.a5l.fr | Sync bidirectionnelle des articles varlog. Sert de site de test pour le moteur. |
|
||||
| `~/Projects/fr.abonnel.www/` | www.abonnel.fr | Sync bidirectionnelle des articles abonnel.fr. A aussi servi au déploiement initial. |
|
||||
|
||||
**abonnel.fr** utilise Folio mais se met à jour seul via son UpdateChecker interne (vérifie `version.txt` sur Gitea). Aucune action manuelle nécessaire côté serveur.
|
||||
|
||||
## Articles (`data/`)
|
||||
|
||||
Les articles ne sont pas versionnés dans ce dépôt. Ils ont leur propre git local dans chaque workspace site (`~/Projects/varlog/data/`, `~/Projects/fr.abonnel.www/data/`), synchronisé de façon bidirectionnelle avec le serveur distant.
|
||||
|
||||
## Modifier le moteur
|
||||
|
||||
Pour toute correction ou fonctionnalité : **créer un ticket et une PR**.
|
||||
|
||||
1. Coder ici dans `~/Projects/folio/` (branche feature)
|
||||
2. **Tester sur varlog.a5l.fr** :
|
||||
```bash
|
||||
~/Projects/varlog/scripts/sync.sh
|
||||
# puis tester sur http://varlog.acegrp.lan
|
||||
```
|
||||
3. Une fois validé, ouvrir une PR sur Gitea. Le commit doit inclure :
|
||||
- `public/version.txt` (bump semver)
|
||||
- `CHANGELOG.md` (entrée `### Ajouté / Corrigé / Modifié`)
|
||||
4. Merger la PR → abonnel.fr se met à jour automatiquement.
|
||||
|
||||
## Données articles (`DATA_PATH`)
|
||||
|
||||
Les articles sont stockés dans un répertoire **hors du dépôt Folio**, configurable via `DATA_PATH` dans `.env`.
|
||||
|
||||
| Environnement | Chemin local | Chemin serveur |
|
||||
|--------------|-------------|----------------|
|
||||
| varlog | `~/Projects/varlog-data/` | `/srv/data/folio` |
|
||||
| abonnel.fr | `~/Projects/fr.abonnel.www-data/` | `/srv/data/folio` |
|
||||
|
||||
Les scripts de sync (`pull-data.sh`, `push-data.sh`, `sync.sh`) utilisent `DATA_DIR` (overridable via env) pointant vers ces chemins locaux.
|
||||
|
||||
## Asymétrie de déploiement moteur
|
||||
|
||||
| Site | Mécanisme | Raison |
|
||||
|------|-----------|--------|
|
||||
| varlog (test) | rsync depuis `~/Projects/folio/` | Itération rapide, pas de contrainte de stabilité |
|
||||
| abonnel.fr (prod) | `git pull origin main` sur le serveur | Contrôle via PR/merge, UpdateChecker autonome |
|
||||
|
||||
Pour initialiser git sur un serveur abonnel.fr déployé via rsync : `scripts/git-init-remote.sh`
|
||||
|
||||
## Ne pas mettre ici
|
||||
|
||||
- `.env` (credentials → dans chaque workspace site)
|
||||
- `data/` (articles → dans chaque workspace site)
|
||||
- `vendor/` (non versionné)
|
||||
@@ -0,0 +1,69 @@
|
||||
# FOLIO
|
||||
|
||||
Moteur de blog PHP — utilisé par plusieurs sites.
|
||||
|
||||
## Dépôt
|
||||
|
||||
`https://git.abonnel.fr/cedricAbonnel/folio` — branche `main`
|
||||
|
||||
## Sites utilisant Folio
|
||||
|
||||
| Site | Workspace local | Serveur |
|
||||
|---|---|---|
|
||||
| varlog.a5l.fr | `~/Projects/varlog/` | `ssh varlog` |
|
||||
| www.abonnel.fr | `~/Projects/fr.abonnel.www/` | `ssh abonnel-wiki` |
|
||||
|
||||
## Structure du moteur
|
||||
|
||||
```
|
||||
folio/
|
||||
├── src/ Classes PHP (ArticleManager, PostManager, auth…)
|
||||
├── public/ Point d'entrée web (index.php, route.php, assets/)
|
||||
├── templates/ Vues PHP (layout, header, footer, post_*)
|
||||
├── config/ Configuration (config.php)
|
||||
├── database/ Schéma SQL + migrate.php
|
||||
├── composer.json
|
||||
└── CHANGELOG.md
|
||||
```
|
||||
|
||||
## Workflow de modification du moteur
|
||||
|
||||
### 1. Développement et test sur varlog.a5l.fr
|
||||
|
||||
Modifier le code ici dans `~/Projects/folio/`, tester sur **varlog.a5l.fr** :
|
||||
|
||||
```bash
|
||||
# Déployer sur varlog pour test
|
||||
~/Projects/varlog/scripts/sync.sh
|
||||
|
||||
# Tester sur http://varlog.acegrp.lan (ou https://varlog.a5l.fr)
|
||||
```
|
||||
|
||||
### 2. Validation
|
||||
|
||||
Une fois validé sur varlog.a5l.fr :
|
||||
|
||||
```bash
|
||||
# Commiter sur le serveur varlog (git de déploiement)
|
||||
~/Projects/varlog/scripts/commit.sh "description du changement"
|
||||
```
|
||||
|
||||
### 3. Push vers le dépôt Folio
|
||||
|
||||
Pousser le code validé vers le dépôt canonique Folio :
|
||||
|
||||
```bash
|
||||
cd ~/Projects/folio
|
||||
./scripts/push.sh "description du changement"
|
||||
```
|
||||
|
||||
### 4. Déployer sur les autres sites si nécessaire
|
||||
|
||||
```bash
|
||||
~/Projects/fr.abonnel.www/scripts/sync.sh
|
||||
~/Projects/fr.abonnel.www/scripts/commit.sh "même message"
|
||||
```
|
||||
|
||||
## Credentials locaux
|
||||
|
||||
Aucun credential dans folio/ — les `.env` sont dans chaque workspace site.
|
||||
@@ -0,0 +1,158 @@
|
||||
# Folio
|
||||
|
||||
Moteur de blog PHP minimaliste — articles Markdown, authentification SSO (OIDC) ou lien magique, commentaires, recherche, flux RSS.
|
||||
|
||||
---
|
||||
|
||||
## Prérequis
|
||||
|
||||
- PHP ≥ 8.2 avec les extensions `pdo`, `pdo_pgsql`, `mbstring`, `openssl`
|
||||
- PostgreSQL ≥ 14
|
||||
- Composer
|
||||
- Apache avec `mod_rewrite` (ou Nginx — voir ci-dessous)
|
||||
|
||||
## Installation
|
||||
|
||||
### 1. Cloner et installer les dépendances
|
||||
|
||||
```bash
|
||||
git clone https://git.abonnel.fr/cedricAbonnel/folio mon-site
|
||||
cd mon-site
|
||||
composer install --no-dev
|
||||
```
|
||||
|
||||
### 2. Configurer l'environnement
|
||||
|
||||
```bash
|
||||
cp .env.example .env
|
||||
```
|
||||
|
||||
Remplir les valeurs dans `.env` :
|
||||
|
||||
| Variable | Description |
|
||||
|---|---|
|
||||
| `APP_URL` | URL publique du site (`https://example.com`) |
|
||||
| `ADMIN_EMAIL` | Email de l'administrateur principal |
|
||||
| `SESSION_NAME` | Nom du cookie de session — doit être unique par instance |
|
||||
| `DATA_PATH` | Chemin absolu vers le répertoire des articles (ex. `/srv/data/mon-site`). Par défaut : `<racine>/data` |
|
||||
| `OIDC_ISSUER` / `OIDC_CLIENT_ID` / `OIDC_CLIENT_SECRET` | SSO OpenID Connect |
|
||||
| `DB_DSN` / `DB_USER` / `DB_PASS` | Connexion PostgreSQL |
|
||||
| `SMTP_*` | Serveur email sortant (commentaires, contact, lien magique) |
|
||||
| `CONTACT_EMAIL` | Destinataire du formulaire de contact |
|
||||
|
||||
> En production, placer `DATA_PATH` **hors du document root** (ex. `/srv/data/mon-site`) pour que les articles ne soient pas accessibles directement via le serveur web.
|
||||
|
||||
### 3. Créer la base de données
|
||||
|
||||
```bash
|
||||
createdb monsite
|
||||
```
|
||||
|
||||
### 4. Initialiser le schéma et jouer les migrations
|
||||
|
||||
```bash
|
||||
php database/migrate.php
|
||||
```
|
||||
|
||||
Ce script crée toutes les tables et applique les migrations dans l'ordre. À relancer après chaque mise à jour.
|
||||
|
||||
### 5. Configurer le vhost Apache
|
||||
|
||||
```apache
|
||||
<VirtualHost *:443>
|
||||
ServerName example.com
|
||||
DocumentRoot /var/www/mon-site/public
|
||||
|
||||
<Directory /var/www/mon-site/public>
|
||||
AllowOverride All
|
||||
Require all granted
|
||||
</Directory>
|
||||
</VirtualHost>
|
||||
```
|
||||
|
||||
Le fichier `public/.htaccess` gère le routage via `mod_rewrite`. `AllowOverride All` est requis.
|
||||
|
||||
<details>
|
||||
<summary>Nginx</summary>
|
||||
|
||||
```nginx
|
||||
server {
|
||||
listen 443 ssl;
|
||||
server_name example.com;
|
||||
root /var/www/mon-site/public;
|
||||
index index.php;
|
||||
|
||||
location / {
|
||||
try_files $uri $uri/ /index.php?$query_string;
|
||||
}
|
||||
|
||||
location ~ \.php$ {
|
||||
fastcgi_pass unix:/run/php/php8.2-fpm.sock;
|
||||
fastcgi_param SCRIPT_FILENAME $realpath_root$fastcgi_script_name;
|
||||
include fastcgi_params;
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
</details>
|
||||
|
||||
### 6. Permissions fichiers
|
||||
|
||||
```bash
|
||||
# Répertoire des articles
|
||||
mkdir -p /srv/data/mon-site
|
||||
chown -R www-data:www-data /srv/data/mon-site
|
||||
|
||||
# .env lisible par www-data uniquement
|
||||
chown user:www-data .env
|
||||
chmod 640 .env
|
||||
```
|
||||
|
||||
PHP-FPM tourne en `www-data`. Le `.env` doit être lisible par `www-data` mais pas par les autres.
|
||||
|
||||
> Le script `scripts/setup.sh` automatise la vérification des prérequis, la création des répertoires et les droits.
|
||||
|
||||
### 7. Paramètres du site
|
||||
|
||||
Au premier lancement, se connecter en tant qu'admin et aller dans **Administration → Paramètres du site** pour définir le titre, le claim, la langue et la licence.
|
||||
|
||||
Ou créer directement `$DATA_PATH/site_settings.json` :
|
||||
|
||||
```json
|
||||
{
|
||||
"site_title": "Mon site",
|
||||
"site_claim": "Un blog propulsé par Folio",
|
||||
"site_lang": "fr-FR",
|
||||
"site_license_label": "CC BY 4.0",
|
||||
"site_license_url": "https://creativecommons.org/licenses/by/4.0/",
|
||||
"posts_per_page": 12
|
||||
}
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Mise à jour
|
||||
|
||||
```bash
|
||||
git pull
|
||||
composer install --no-dev
|
||||
php database/migrate.php
|
||||
```
|
||||
|
||||
## Structure du projet
|
||||
|
||||
```
|
||||
├── config/ Configuration (charge .env, définit APP_URL et DATA_PATH)
|
||||
├── database/ Schéma SQL et runner de migrations
|
||||
├── docs/ Documentation technique
|
||||
├── public/ Racine web (index.php, assets, .htaccess)
|
||||
├── scripts/ Scripts utilitaires (setup.sh, migrations de contenu)
|
||||
├── src/ Code applicatif
|
||||
└── templates/ Vues PHP
|
||||
```
|
||||
|
||||
Les articles sont stockés dans `DATA_PATH` (hors dépôt git).
|
||||
|
||||
## Licence
|
||||
|
||||
[MIT](LICENSE)
|
||||
@@ -6,6 +6,16 @@ if (!defined('BASE_PATH')) {
|
||||
define('BASE_PATH', __DIR__);
|
||||
}
|
||||
|
||||
$__tz = $_ENV['APP_TIMEZONE'] ?? getenv('APP_TIMEZONE') ?: 'Europe/Paris';
|
||||
date_default_timezone_set($__tz);
|
||||
unset($__tz);
|
||||
|
||||
if (!defined('DATA_PATH')) {
|
||||
$__dataPath = $_ENV['DATA_PATH'] ?? getenv('DATA_PATH') ?: '';
|
||||
define('DATA_PATH', $__dataPath !== '' ? rtrim($__dataPath, '/') : BASE_PATH . '/data');
|
||||
unset($__dataPath);
|
||||
}
|
||||
|
||||
if (session_status() === PHP_SESSION_NONE) {
|
||||
$isHttps = !empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off';
|
||||
$sessionName = $_ENV['SESSION_NAME'] ?? (getenv('SESSION_NAME') ?: null);
|
||||
|
||||
@@ -20,6 +20,12 @@ if (!$_ENV['APP_URL']) {
|
||||
// Normalise: toujours un trailing slash unique
|
||||
define('APP_URL', rtrim($_ENV['APP_URL'], '/') . '/');
|
||||
|
||||
if (!defined('DATA_PATH')) {
|
||||
$__dp = $_ENV['DATA_PATH'] ?? getenv('DATA_PATH') ?: '';
|
||||
define('DATA_PATH', $__dp !== '' ? rtrim($__dp, '/') : BASE_PATH . '/data');
|
||||
unset($__dp);
|
||||
}
|
||||
|
||||
// (Optionnel) Expose dans $_ENV si besoin
|
||||
$_ENV['APP_URL'] = APP_URL;
|
||||
|
||||
|
||||
@@ -0,0 +1,49 @@
|
||||
-- Schéma initial : tables créées avant la mise en place du système de migrations.
|
||||
-- Remplace tables_create.sql et interactions_create.sql.
|
||||
|
||||
CREATE TABLE IF NOT EXISTS posts (
|
||||
id SERIAL PRIMARY KEY,
|
||||
title TEXT NOT NULL,
|
||||
content TEXT,
|
||||
created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
|
||||
updated_at TIMESTAMP,
|
||||
is_published BOOLEAN DEFAULT FALSE
|
||||
);
|
||||
|
||||
CREATE TABLE IF NOT EXISTS post_files (
|
||||
id SERIAL PRIMARY KEY,
|
||||
post_id INTEGER REFERENCES posts(id) ON DELETE CASCADE,
|
||||
file_type TEXT,
|
||||
file_path TEXT,
|
||||
original_name TEXT,
|
||||
uploaded_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
|
||||
);
|
||||
|
||||
CREATE TABLE IF NOT EXISTS article_reactions (
|
||||
id SERIAL PRIMARY KEY,
|
||||
article_uuid TEXT NOT NULL,
|
||||
reaction_type TEXT NOT NULL CHECK (reaction_type IN ('useful', 'important', 'interesting')),
|
||||
visitor_hash TEXT NOT NULL,
|
||||
created_at TIMESTAMP NOT NULL DEFAULT NOW(),
|
||||
UNIQUE (article_uuid, reaction_type, visitor_hash)
|
||||
);
|
||||
CREATE INDEX IF NOT EXISTS article_reactions_article_uuid_idx ON article_reactions (article_uuid);
|
||||
|
||||
CREATE TABLE IF NOT EXISTS comments (
|
||||
id SERIAL PRIMARY KEY,
|
||||
article_uuid TEXT NOT NULL,
|
||||
author_name TEXT NOT NULL,
|
||||
author_email TEXT NOT NULL,
|
||||
content TEXT NOT NULL CHECK (LENGTH(content) <= 2000),
|
||||
verify_token TEXT,
|
||||
verification_code TEXT,
|
||||
verify_attempts INTEGER NOT NULL DEFAULT 0,
|
||||
verified BOOLEAN NOT NULL DEFAULT FALSE,
|
||||
published BOOLEAN NOT NULL DEFAULT FALSE,
|
||||
created_at TIMESTAMP NOT NULL DEFAULT NOW(),
|
||||
ip_address TEXT,
|
||||
user_agent TEXT
|
||||
);
|
||||
CREATE INDEX IF NOT EXISTS comments_article_uuid_idx ON comments (article_uuid, verified, published);
|
||||
CREATE INDEX IF NOT EXISTS comments_verify_token_idx ON comments (verify_token)
|
||||
WHERE verified = FALSE AND verify_token IS NOT NULL;
|
||||
@@ -0,0 +1,10 @@
|
||||
CREATE TABLE IF NOT EXISTS user_profiles (
|
||||
email TEXT NOT NULL PRIMARY KEY,
|
||||
display_name TEXT NOT NULL DEFAULT '',
|
||||
updated_at TIMESTAMP DEFAULT now(),
|
||||
profile_url TEXT NOT NULL DEFAULT '',
|
||||
profile_slug TEXT NOT NULL DEFAULT '',
|
||||
bio TEXT NOT NULL DEFAULT ''
|
||||
);
|
||||
CREATE UNIQUE INDEX IF NOT EXISTS user_profiles_profile_slug_idx
|
||||
ON user_profiles (profile_slug) WHERE profile_slug <> '';
|
||||
@@ -0,0 +1,16 @@
|
||||
CREATE TABLE IF NOT EXISTS journal_smtp (
|
||||
id SERIAL PRIMARY KEY,
|
||||
created_at TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT now(),
|
||||
script_path VARCHAR(512),
|
||||
to_email VARCHAR(255) NOT NULL,
|
||||
subject VARCHAR(512),
|
||||
content_html TEXT,
|
||||
content_text TEXT,
|
||||
status VARCHAR(20) NOT NULL DEFAULT 'queued',
|
||||
ip VARCHAR(128),
|
||||
user_agent VARCHAR(512),
|
||||
error_message VARCHAR(1000),
|
||||
sent_at TIMESTAMP WITH TIME ZONE
|
||||
);
|
||||
CREATE INDEX IF NOT EXISTS idx_journal_smtp_created_at ON journal_smtp (created_at DESC);
|
||||
CREATE INDEX IF NOT EXISTS idx_journal_smtp_to_email ON journal_smtp (to_email);
|
||||
@@ -0,0 +1,5 @@
|
||||
CREATE TABLE IF NOT EXISTS role_capabilities (
|
||||
role_id INTEGER NOT NULL REFERENCES roles(id) ON DELETE CASCADE,
|
||||
capability VARCHAR(50) NOT NULL,
|
||||
PRIMARY KEY (role_id, capability)
|
||||
);
|
||||
@@ -0,0 +1,7 @@
|
||||
CREATE TABLE IF NOT EXISTS user_capabilities (
|
||||
user_email TEXT NOT NULL,
|
||||
capability TEXT NOT NULL,
|
||||
granted_by TEXT,
|
||||
granted_at TIMESTAMP WITH TIME ZONE DEFAULT now(),
|
||||
PRIMARY KEY (user_email, capability)
|
||||
);
|
||||
@@ -0,0 +1,8 @@
|
||||
CREATE TABLE IF NOT EXISTS users (
|
||||
id SERIAL PRIMARY KEY,
|
||||
email TEXT NOT NULL UNIQUE,
|
||||
password_hash TEXT NOT NULL,
|
||||
is_active BOOLEAN NOT NULL DEFAULT TRUE,
|
||||
updated_at TIMESTAMP,
|
||||
password_changed_at TIMESTAMP
|
||||
);
|
||||
@@ -0,0 +1,9 @@
|
||||
CREATE TABLE IF NOT EXISTS profiles (
|
||||
id SERIAL PRIMARY KEY,
|
||||
slug TEXT NOT NULL UNIQUE,
|
||||
label TEXT NOT NULL DEFAULT '',
|
||||
description TEXT,
|
||||
permissions JSONB NOT NULL DEFAULT '[]',
|
||||
is_system BOOLEAN NOT NULL DEFAULT FALSE,
|
||||
is_active BOOLEAN NOT NULL DEFAULT TRUE
|
||||
);
|
||||
@@ -0,0 +1,13 @@
|
||||
CREATE TABLE IF NOT EXISTS app_config (
|
||||
id INTEGER PRIMARY KEY DEFAULT 1,
|
||||
allow_password BOOLEAN NOT NULL DEFAULT TRUE,
|
||||
allow_oidc BOOLEAN NOT NULL DEFAULT FALSE,
|
||||
registrations_open BOOLEAN NOT NULL DEFAULT TRUE,
|
||||
oidc_issuer TEXT,
|
||||
oidc_name TEXT,
|
||||
oidc_client_id TEXT,
|
||||
oidc_client_secret TEXT,
|
||||
oidc_redirect_uri TEXT,
|
||||
updated_at TIMESTAMP,
|
||||
CONSTRAINT app_config_single_row CHECK (id = 1)
|
||||
);
|
||||
@@ -0,0 +1,15 @@
|
||||
CREATE TABLE IF NOT EXISTS mail_queue (
|
||||
id SERIAL PRIMARY KEY,
|
||||
to_email TEXT NOT NULL,
|
||||
subject TEXT NOT NULL,
|
||||
body TEXT NOT NULL,
|
||||
status TEXT NOT NULL DEFAULT 'pending',
|
||||
attempts INTEGER NOT NULL DEFAULT 0,
|
||||
available_at TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT now(),
|
||||
locked_at TIMESTAMP WITH TIME ZONE,
|
||||
last_error TEXT,
|
||||
created_at TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT now()
|
||||
);
|
||||
CREATE INDEX IF NOT EXISTS idx_mail_queue_pending
|
||||
ON mail_queue (available_at ASC, id ASC)
|
||||
WHERE status = 'pending';
|
||||
@@ -0,0 +1,44 @@
|
||||
-- Tables du dictionnaire de données (formulaires dynamiques)
|
||||
|
||||
CREATE TABLE IF NOT EXISTS dd_entities (
|
||||
id SERIAL PRIMARY KEY,
|
||||
code TEXT NOT NULL UNIQUE,
|
||||
label TEXT NOT NULL DEFAULT '',
|
||||
is_active BOOLEAN NOT NULL DEFAULT TRUE
|
||||
);
|
||||
|
||||
CREATE TABLE IF NOT EXISTS dd_fields (
|
||||
id SERIAL PRIMARY KEY,
|
||||
entity_id INTEGER NOT NULL REFERENCES dd_entities(id) ON DELETE CASCADE,
|
||||
code TEXT NOT NULL,
|
||||
label TEXT NOT NULL DEFAULT '',
|
||||
field_type TEXT NOT NULL DEFAULT 'text',
|
||||
ui_order INTEGER,
|
||||
is_required BOOLEAN NOT NULL DEFAULT FALSE,
|
||||
default_val TEXT,
|
||||
UNIQUE (entity_id, code)
|
||||
);
|
||||
|
||||
CREATE TABLE IF NOT EXISTS dd_rules (
|
||||
id SERIAL PRIMARY KEY,
|
||||
entity_id INTEGER NOT NULL REFERENCES dd_entities(id) ON DELETE CASCADE,
|
||||
rule_type TEXT NOT NULL,
|
||||
expression TEXT,
|
||||
message TEXT,
|
||||
active BOOLEAN NOT NULL DEFAULT TRUE
|
||||
);
|
||||
|
||||
CREATE TABLE IF NOT EXISTS dd_enums (
|
||||
id SERIAL PRIMARY KEY,
|
||||
name TEXT NOT NULL UNIQUE
|
||||
);
|
||||
|
||||
CREATE TABLE IF NOT EXISTS dd_enum_values (
|
||||
id SERIAL PRIMARY KEY,
|
||||
enum_id INTEGER NOT NULL REFERENCES dd_enums(id) ON DELETE CASCADE,
|
||||
code TEXT NOT NULL,
|
||||
label TEXT NOT NULL DEFAULT '',
|
||||
active BOOLEAN NOT NULL DEFAULT TRUE,
|
||||
sort_order INTEGER NOT NULL DEFAULT 0,
|
||||
UNIQUE (enum_id, code)
|
||||
);
|
||||
@@ -3,3 +3,4 @@
|
||||
declare(strict_types=1);
|
||||
|
||||
define('BASE_PATH', __DIR__);
|
||||
define('DATA_PATH', BASE_PATH . '/data');
|
||||
|
||||
@@ -15,6 +15,9 @@ RewriteRule ^ - [L]
|
||||
# URL propre pour les articles : /post/<slug>
|
||||
RewriteRule ^post/([a-z0-9][a-z0-9-]*)/?$ /index.php?action=view&slug=$1 [L,QSA]
|
||||
|
||||
# Livres : /book/<slug>
|
||||
RewriteRule ^book/([a-z0-9][a-z0-9-]*)/?$ /index.php?action=book&book_slug=$1 [L,QSA]
|
||||
|
||||
# Filtre par catégorie : /categorie/<nom>
|
||||
RewriteRule ^categorie/(.+?)/?$ /index.php?cat=$1 [L,QSA,B]
|
||||
|
||||
|
||||
@@ -1807,3 +1807,171 @@ footer.mt-5 { margin-top: 0 !important; }
|
||||
color: var(--vl-muted);
|
||||
margin-top: 0.15rem;
|
||||
}
|
||||
|
||||
/* ─── Livres ─────────────────────────────────────────────────────── */
|
||||
|
||||
/* Bandeau dans un article appartenant à un livre */
|
||||
.book-article-banner {
|
||||
border-radius: var(--vl-radius);
|
||||
background: var(--vl-accent-soft);
|
||||
border: 1px solid rgba(79,70,229,.18);
|
||||
overflow: hidden;
|
||||
}
|
||||
.book-article-banner-link {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 0.6rem;
|
||||
padding: 0.6rem 1rem;
|
||||
text-decoration: none;
|
||||
color: var(--vl-accent);
|
||||
transition: background 0.15s;
|
||||
}
|
||||
.book-article-banner-link:hover {
|
||||
background: rgba(79,70,229,.08);
|
||||
color: var(--vl-accent-dark);
|
||||
}
|
||||
.book-article-banner-icon { font-size: 1.1rem; flex-shrink: 0; }
|
||||
.book-article-banner-text { flex: 1; font-size: 0.875rem; }
|
||||
.book-article-banner-cta { font-size: 0.8rem; opacity: .75; white-space: nowrap; }
|
||||
|
||||
/* Navigation précédent/suivant en bas d'article */
|
||||
.book-chapter-nav {
|
||||
border-top: 1px solid var(--vl-border);
|
||||
margin-top: 1.5rem;
|
||||
padding-top: 1rem;
|
||||
}
|
||||
.book-chapter-nav-inner {
|
||||
display: flex;
|
||||
gap: 0.75rem;
|
||||
align-items: stretch;
|
||||
}
|
||||
.book-nav-btn {
|
||||
flex: 1;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
padding: 0.65rem 0.875rem;
|
||||
background: var(--vl-surface);
|
||||
border: 1px solid var(--vl-border);
|
||||
border-radius: var(--vl-radius);
|
||||
text-decoration: none;
|
||||
color: var(--vl-text);
|
||||
transition: border-color 0.15s, box-shadow 0.15s;
|
||||
min-width: 0;
|
||||
}
|
||||
.book-nav-btn:hover {
|
||||
border-color: var(--vl-accent);
|
||||
box-shadow: var(--vl-shadow-sm);
|
||||
color: var(--vl-text);
|
||||
}
|
||||
.book-nav-btn--disabled {
|
||||
opacity: .45;
|
||||
cursor: default;
|
||||
pointer-events: none;
|
||||
}
|
||||
.book-nav-btn--next { text-align: right; }
|
||||
.book-nav-dir {
|
||||
font-size: 0.72rem;
|
||||
font-weight: 600;
|
||||
text-transform: uppercase;
|
||||
letter-spacing: .04em;
|
||||
color: var(--vl-muted);
|
||||
display: block;
|
||||
}
|
||||
.book-nav-title {
|
||||
font-size: 0.875rem;
|
||||
font-weight: 500;
|
||||
display: block;
|
||||
margin-top: 0.15rem;
|
||||
overflow: hidden;
|
||||
display: -webkit-box;
|
||||
-webkit-line-clamp: 2;
|
||||
-webkit-box-orient: vertical;
|
||||
}
|
||||
.book-nav-toc {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
padding: 0.5rem 0.75rem;
|
||||
border: 1px solid var(--vl-border);
|
||||
border-radius: var(--vl-radius);
|
||||
color: var(--vl-muted);
|
||||
text-decoration: none;
|
||||
font-size: 1.1rem;
|
||||
transition: border-color 0.15s, color 0.15s;
|
||||
flex-shrink: 0;
|
||||
}
|
||||
.book-nav-toc:hover {
|
||||
border-color: var(--vl-accent);
|
||||
color: var(--vl-accent);
|
||||
}
|
||||
|
||||
/* Page sommaire d'un livre (/book/<slug>) */
|
||||
.book-page { max-width: 720px; margin: 0 auto; padding: 2rem 0; }
|
||||
.book-label {
|
||||
font-size: 0.75rem;
|
||||
font-weight: 700;
|
||||
text-transform: uppercase;
|
||||
letter-spacing: .08em;
|
||||
color: var(--vl-accent);
|
||||
}
|
||||
.book-chapters {
|
||||
list-style: none;
|
||||
padding: 0;
|
||||
margin: 0;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 0.5rem;
|
||||
}
|
||||
.book-chapter-link {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 0.875rem;
|
||||
padding: 0.75rem 1rem;
|
||||
background: var(--vl-surface);
|
||||
border: 1px solid var(--vl-border);
|
||||
border-radius: var(--vl-radius);
|
||||
text-decoration: none;
|
||||
color: var(--vl-text);
|
||||
transition: border-color 0.15s, box-shadow 0.15s;
|
||||
}
|
||||
.book-chapter-link:hover {
|
||||
border-color: var(--vl-accent);
|
||||
box-shadow: var(--vl-shadow-sm);
|
||||
color: var(--vl-text);
|
||||
}
|
||||
.book-chapter-num {
|
||||
width: 1.75rem;
|
||||
height: 1.75rem;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
background: var(--vl-accent-soft);
|
||||
color: var(--vl-accent);
|
||||
border-radius: 50%;
|
||||
font-size: 0.8rem;
|
||||
font-weight: 700;
|
||||
flex-shrink: 0;
|
||||
}
|
||||
.book-chapter-thumb {
|
||||
width: 56px;
|
||||
height: 44px;
|
||||
border-radius: 6px;
|
||||
flex-shrink: 0;
|
||||
background: var(--vl-accent-soft);
|
||||
background-size: cover;
|
||||
background-position: center;
|
||||
}
|
||||
.book-chapter-body { flex: 1; min-width: 0; }
|
||||
.book-chapter-title {
|
||||
font-size: 0.9375rem;
|
||||
font-weight: 600;
|
||||
line-height: 1.3;
|
||||
overflow: hidden;
|
||||
white-space: nowrap;
|
||||
text-overflow: ellipsis;
|
||||
}
|
||||
.book-chapter-meta {
|
||||
font-size: 0.78rem;
|
||||
color: var(--vl-muted);
|
||||
margin-top: 0.15rem;
|
||||
}
|
||||
|
||||
+1
-1
@@ -12,7 +12,7 @@ require_once BASE_PATH . '/src/Parsedown.php';
|
||||
|
||||
const FEED_PAGE_SIZE = 20;
|
||||
|
||||
$articles = new ArticleManager(BASE_PATH . '/data');
|
||||
$articles = new ArticleManager(DATA_PATH);
|
||||
$privateCats = $articles->getPrivateCategories();
|
||||
$Parsedown = new Parsedown();
|
||||
|
||||
|
||||
+4
-1
@@ -4,6 +4,9 @@ declare(strict_types=1);
|
||||
|
||||
define('BASE_PATH', realpath(__DIR__ . '/../'));
|
||||
|
||||
require_once BASE_PATH . '/vendor/autoload.php';
|
||||
require_once BASE_PATH . '/config/config.php';
|
||||
|
||||
$uuid = $_GET['uuid'] ?? '';
|
||||
$name = $_GET['name'] ?? '';
|
||||
|
||||
@@ -20,7 +23,7 @@ if ($name === '' || $name[0] === '.') {
|
||||
exit;
|
||||
}
|
||||
|
||||
$path = BASE_PATH . '/data/' . $uuid . '/files/' . $name;
|
||||
$path = DATA_PATH . '/' . $uuid . '/files/' . $name;
|
||||
|
||||
if (!is_file($path)) {
|
||||
http_response_code(404);
|
||||
|
||||
+85
-14
@@ -24,12 +24,14 @@ require_once BASE_PATH . '/src/auth.php';
|
||||
require_once BASE_PATH . '/src/SiteSettings.php';
|
||||
require_once BASE_PATH . '/src/ArticleManager.php';
|
||||
require_once BASE_PATH . '/src/BookManager.php';
|
||||
require_once BASE_PATH . '/src/DataGit.php';
|
||||
|
||||
$articles = new ArticleManager(BASE_PATH . '/data');
|
||||
$books = new BookManager(BASE_PATH . '/data/books');
|
||||
$_dataGit = new DataGit(DATA_PATH);
|
||||
$articles = new ArticleManager(DATA_PATH, $_dataGit);
|
||||
$books = new BookManager(DATA_PATH . '/books', $_dataGit);
|
||||
|
||||
// ─── Mode maintenance ──────────────────────────────────────────────────────
|
||||
if (file_exists(BASE_PATH . '/data/.maintenance')) {
|
||||
if (file_exists(DATA_PATH . '/.maintenance')) {
|
||||
http_response_code(503);
|
||||
header('Retry-After: 60');
|
||||
include BASE_PATH . '/templates/maintenance.php';
|
||||
@@ -37,13 +39,13 @@ if (file_exists(BASE_PATH . '/data/.maintenance')) {
|
||||
}
|
||||
|
||||
require_once BASE_PATH . '/src/UpdateChecker.php';
|
||||
$_updateChecker = new UpdateChecker(BASE_PATH . '/data', BASE_PATH);
|
||||
$_updateChecker = new UpdateChecker(DATA_PATH, BASE_PATH);
|
||||
|
||||
$action = $_GET['action'] ?? 'list';
|
||||
$uuid = $_GET['uuid'] ?? '';
|
||||
$slug = $_GET['slug'] ?? '';
|
||||
|
||||
$_noindexActions = ['create', 'edit', 'admin', 'categories', 'diff', 'add_files', 'import_image', 'import_image_step2', 'sources', 'profile', 'delete_file', 'delete_external_link', 'rename_category', 'delete_category', 'toggle_private_category', 'admin_save_site', 'not_found', 'add_feed', 'delete_feed', 'add_link', 'delete_link', 'reorder_links', 'react', 'comment', 'verify_comment', 'comment_moderate', 'comment_delete', 'comment_resend', 'create_tag_type', 'delete_tag_type', 'edit_tags', 'book_save', 'book_delete'];
|
||||
$_noindexActions = ['create', 'edit', 'admin', 'categories', 'diff', 'add_files', 'import_image', 'import_image_step2', 'sources', 'profile', 'delete_file', 'delete_external_link', 'rename_category', 'delete_category', 'toggle_private_category', 'admin_save_site', 'not_found', 'add_feed', 'delete_feed', 'add_link', 'delete_link', 'reorder_links', 'react', 'comment', 'verify_comment', 'comment_moderate', 'comment_delete', 'comment_resend', 'create_tag_type', 'delete_tag_type', 'edit_tags', 'book_save', 'book_delete', 'admin_save_as_groups', 'admin_save_folio_config'];
|
||||
$metaRobots = in_array($action, $_noindexActions, true) ? 'noindex, nofollow' : null;
|
||||
unset($_noindexActions);
|
||||
|
||||
@@ -78,7 +80,7 @@ function searchAndRedirect(string $rawPath, ArticleManager $articles): void
|
||||
// ─── Pages statiques depuis data/site/ ──────────────────────────────────────
|
||||
function loadSitePageData(string $slug): array
|
||||
{
|
||||
$base = BASE_PATH . '/data/site';
|
||||
$base = DATA_PATH . '/site';
|
||||
$meta = [];
|
||||
$raw = @file_get_contents($base . '/' . $slug . '.json');
|
||||
if ($raw !== false) {
|
||||
@@ -1383,7 +1385,7 @@ switch ($action) {
|
||||
|
||||
case 'flux':
|
||||
require_once BASE_PATH . '/src/FeedFetcher.php';
|
||||
$fetcher = new FeedFetcher(BASE_PATH . '/data/_cache/feeds');
|
||||
$fetcher = new FeedFetcher(DATA_PATH . '/_cache/feeds');
|
||||
$fluxItems = [];
|
||||
$pdo = dbPdo();
|
||||
if ($pdo) {
|
||||
@@ -1535,8 +1537,8 @@ switch ($action) {
|
||||
echo json_encode(['ok' => false, 'error' => 'Paramètres invalides']);
|
||||
exit;
|
||||
}
|
||||
$cfSrc = BASE_PATH . '/data/' . $cfFrom . '/files/' . $cfName;
|
||||
$cfDstDir = BASE_PATH . '/data/' . $cfTo . '/files';
|
||||
$cfSrc = DATA_PATH . '/' . $cfFrom . '/files/' . $cfName;
|
||||
$cfDstDir = DATA_PATH . '/' . $cfTo . '/files';
|
||||
$cfDst = $cfDstDir . '/' . $cfName;
|
||||
if (!file_exists($cfSrc)) {
|
||||
echo json_encode(['ok' => false, 'error' => 'Fichier source introuvable']);
|
||||
@@ -1649,7 +1651,7 @@ switch ($action) {
|
||||
// Capture d'écran pour prévisualisation (pages HTML uniquement, URL externes uniquement)
|
||||
$step2Screenshot = null;
|
||||
if (!$step2IsInternal && str_starts_with($step2Meta['mime'] ?? '', 'text/html')) {
|
||||
$filesDir = BASE_PATH . '/data/' . $uuid . '/files';
|
||||
$filesDir = DATA_PATH . '/' . $uuid . '/files';
|
||||
if (!is_dir($filesDir)) {
|
||||
mkdir($filesDir, 0755, true);
|
||||
}
|
||||
@@ -1725,7 +1727,7 @@ switch ($action) {
|
||||
header('Location: /import/' . rawurlencode($urlUuid) . '?error=1');
|
||||
exit;
|
||||
}
|
||||
$filesDir = BASE_PATH . '/data/' . $urlUuid . '/files';
|
||||
$filesDir = DATA_PATH . '/' . $urlUuid . '/files';
|
||||
$previewPath = $filesDir . '/' . $screenshotFile;
|
||||
if (!file_exists($previewPath)) {
|
||||
header('Location: /import/' . rawurlencode($urlUuid) . '?error=1');
|
||||
@@ -1744,7 +1746,7 @@ switch ($action) {
|
||||
}
|
||||
|
||||
if ($mode === 'link') {
|
||||
$filesDir = BASE_PATH . '/data/' . $urlUuid . '/files';
|
||||
$filesDir = DATA_PATH . '/' . $urlUuid . '/files';
|
||||
if (!is_dir($filesDir)) {
|
||||
mkdir($filesDir, 0755, true);
|
||||
}
|
||||
@@ -1895,7 +1897,7 @@ switch ($action) {
|
||||
$done = $fail = $skip = 0;
|
||||
foreach ($articles->getAll() as $article) {
|
||||
$artUuid = $article['uuid'];
|
||||
$filesDir = BASE_PATH . '/data/' . $artUuid . '/files';
|
||||
$filesDir = DATA_PATH . '/' . $artUuid . '/files';
|
||||
foreach ($article['external_links'] ?? [] as $link) {
|
||||
$lMeta = $link['meta'] ?? [];
|
||||
$lMime = $lMeta['mime'] ?? 'text/html';
|
||||
@@ -2542,6 +2544,27 @@ switch ($action) {
|
||||
$adminData['search_log_readable'] = $parser->isReadable();
|
||||
}
|
||||
|
||||
if ($tab === 'stats') {
|
||||
if (!isAdmin()) {
|
||||
http_response_code(403);
|
||||
exit;
|
||||
}
|
||||
require_once BASE_PATH . '/src/AccessLogParser.php';
|
||||
require_once BASE_PATH . '/src/AsnLookup.php';
|
||||
$accessParser = new AccessLogParser('/var/log/apache2', apacheAccessLog());
|
||||
$accessStats = $accessParser->stats();
|
||||
$adminData['stats_readable'] = $accessParser->isReadable();
|
||||
$adminData['stats_pages'] = array_slice($accessStats['pages'], 0, 30, true);
|
||||
$adminData['stats_books'] = array_slice($accessStats['books'], 0, 20, true);
|
||||
// Lookup AS pour les top 200 IPs
|
||||
$topIps = array_slice($accessStats['ips'], 0, 200, true);
|
||||
$asnMap = (new AsnLookup())->batchLookup(array_keys($topIps));
|
||||
$asList = AsnLookup::aggregateByAs($topIps, $asnMap);
|
||||
$adminData['stats_as'] = $asList;
|
||||
$adminData['stats_as_groups'] = AsnLookup::applyGroups($asList, asGroups());
|
||||
$adminData['as_groups'] = asGroups();
|
||||
}
|
||||
|
||||
if ($tab === 'categories') {
|
||||
$adminData['cats'] = $articles->getCategories();
|
||||
$adminData['privateCats'] = $articles->getPrivateCategories();
|
||||
@@ -2763,7 +2786,7 @@ switch ($action) {
|
||||
http_response_code(403);
|
||||
exit;
|
||||
}
|
||||
$_cmDataDir = BASE_PATH . '/data';
|
||||
$_cmDataDir = DATA_PATH;
|
||||
$_cmTrack = $_cmDataDir . '/.content_migrations.json';
|
||||
$_cmFlag = $_cmDataDir . '/.maintenance';
|
||||
$_cmApplied = file_exists($_cmTrack) ? (json_decode((string) file_get_contents($_cmTrack), true) ?? []) : [];
|
||||
@@ -2793,6 +2816,30 @@ switch ($action) {
|
||||
header('Location: /admin?tab=dashboard¬ice=' . ($_cmErrors ? 'migration_error' : 'migrated'));
|
||||
exit;
|
||||
|
||||
case 'force_update_check':
|
||||
requireAuth();
|
||||
if (!isAdmin() || $_SERVER['REQUEST_METHOD'] !== 'POST') {
|
||||
http_response_code(403);
|
||||
exit;
|
||||
}
|
||||
$_updateChecker->clearCache();
|
||||
header('Location: /admin?tab=dashboard');
|
||||
exit;
|
||||
|
||||
case 'admin_save_folio_config':
|
||||
requireAuth();
|
||||
if (!isAdmin() || $_SERVER['REQUEST_METHOD'] !== 'POST') {
|
||||
http_response_code(403);
|
||||
exit;
|
||||
}
|
||||
$ok = saveSiteSettings([
|
||||
'folio_repo_url' => $_POST['folio_repo_url'] ?? '',
|
||||
'folio_update_branch' => $_POST['folio_update_branch'] ?? '',
|
||||
]);
|
||||
$_updateChecker->clearCache();
|
||||
header('Location: /admin/site?notice=' . ($ok ? 'folio_saved' : 'folio_error'));
|
||||
exit;
|
||||
|
||||
case 'admin_save_site':
|
||||
requireAuth();
|
||||
if (!isAdmin() || $_SERVER['REQUEST_METHOD'] !== 'POST') {
|
||||
@@ -2820,6 +2867,30 @@ switch ($action) {
|
||||
header('Location: /admin/searches?' . ($ok ? 'saved=1' : 'error=write'));
|
||||
exit;
|
||||
|
||||
case 'admin_save_as_groups':
|
||||
requireAuth();
|
||||
if (!isAdmin() || $_SERVER['REQUEST_METHOD'] !== 'POST') {
|
||||
http_response_code(403);
|
||||
exit;
|
||||
}
|
||||
$rawLabels = $_POST['as_group_label'] ?? [];
|
||||
$rawPatterns = $_POST['as_group_patterns'] ?? [];
|
||||
$groups = [];
|
||||
foreach ((array) $rawLabels as $i => $label) {
|
||||
$label = trim((string) $label);
|
||||
if ($label === '') {
|
||||
continue;
|
||||
}
|
||||
$patterns = array_values(array_filter(array_map(
|
||||
'trim',
|
||||
explode("\n", (string) ($rawPatterns[$i] ?? ''))
|
||||
)));
|
||||
$groups[] = ['label' => $label, 'patterns' => $patterns];
|
||||
}
|
||||
$ok = saveSiteSettings(['as_groups' => $groups]);
|
||||
header('Location: /admin/stats?' . ($ok ? 'saved=1' : 'error=write'));
|
||||
exit;
|
||||
|
||||
case 'admin_create_role':
|
||||
requireAuth();
|
||||
if (!isAdmin() || $_SERVER['REQUEST_METHOD'] !== 'POST') {
|
||||
|
||||
+1
-1
@@ -8,7 +8,7 @@ require_once BASE_PATH . '/src/helpers.php';
|
||||
require_once BASE_PATH . '/config/config.php';
|
||||
require_once BASE_PATH . '/src/ArticleManager.php';
|
||||
|
||||
$articles = new ArticleManager(BASE_PATH . '/data');
|
||||
$articles = new ArticleManager(DATA_PATH);
|
||||
$privateCats = $articles->getPrivateCategories();
|
||||
|
||||
$published = array_filter($articles->getAll(true), static function (array $a) use ($privateCats): bool {
|
||||
|
||||
+1
-1
@@ -1 +1 @@
|
||||
1.2.2
|
||||
1.4.0
|
||||
|
||||
@@ -0,0 +1,178 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
class AccessLogParser
|
||||
{
|
||||
private string $logDir;
|
||||
private string $pattern;
|
||||
private string $cacheFile;
|
||||
private int $cacheTtl;
|
||||
private int $days;
|
||||
|
||||
private static ?array $memo = null;
|
||||
|
||||
// Apache COMBINED : IP - - [timestamp] "METHOD /path HTTP/x" STATUS bytes "ref" "ua"
|
||||
private const RE = '/^(\S+) \S+ \S+ \[(\d{2}\/\w+\/\d{4}:\d{2}:\d{2}:\d{2} [+-]\d{4})\] "[A-Z-]+ ([^\s"?]+)[^"]*" (\d{3}) /';
|
||||
|
||||
public function __construct(
|
||||
string $logDir = '/var/log/apache2',
|
||||
string $pattern = '*-access.log',
|
||||
string $cacheFile = '',
|
||||
int $cacheTtl = 600,
|
||||
int $days = 14
|
||||
) {
|
||||
$this->logDir = rtrim($logDir, '/');
|
||||
$this->pattern = $pattern;
|
||||
$this->cacheFile = $cacheFile !== '' ? $cacheFile : dirname(__DIR__) . '/_cache/access_stats.json';
|
||||
$this->cacheTtl = $cacheTtl;
|
||||
$this->days = $days;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return array{pages:array<string,int>,books:array<string,int>,ips:array<string,int>}
|
||||
*/
|
||||
public function stats(): array
|
||||
{
|
||||
if (self::$memo !== null) {
|
||||
return self::$memo;
|
||||
}
|
||||
if ($this->cacheValid()) {
|
||||
$d = json_decode((string) file_get_contents($this->cacheFile), true);
|
||||
if (is_array($d)) {
|
||||
return self::$memo = $d;
|
||||
}
|
||||
}
|
||||
|
||||
$cutoff = strtotime("-{$this->days} days midnight") ?: (time() - $this->days * 86400);
|
||||
$pages = [];
|
||||
$books = [];
|
||||
$ips = [];
|
||||
|
||||
foreach ($this->logFiles() as $file) {
|
||||
$this->parseFile($file, $cutoff, $pages, $books, $ips);
|
||||
}
|
||||
|
||||
arsort($pages);
|
||||
arsort($books);
|
||||
arsort($ips);
|
||||
|
||||
$result = compact('pages', 'books', 'ips');
|
||||
@mkdir(dirname($this->cacheFile), 0755, true);
|
||||
@file_put_contents($this->cacheFile, json_encode($result, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES));
|
||||
return self::$memo = $result;
|
||||
}
|
||||
|
||||
public function isReadable(): bool
|
||||
{
|
||||
return count($this->logFiles()) > 0;
|
||||
}
|
||||
|
||||
private function cacheValid(): bool
|
||||
{
|
||||
return file_exists($this->cacheFile)
|
||||
&& (time() - filemtime($this->cacheFile)) < $this->cacheTtl;
|
||||
}
|
||||
|
||||
/** @return list<array{path:string,type:string}> */
|
||||
private function logFiles(): array
|
||||
{
|
||||
$files = [];
|
||||
$cutoff = time() - ($this->days + 1) * 86400;
|
||||
|
||||
foreach (glob($this->logDir . '/' . $this->pattern) ?: [] as $base) {
|
||||
if (str_ends_with($base, '.gz') || preg_match('/\.\d+$/', $base)) {
|
||||
continue;
|
||||
}
|
||||
foreach (array_merge([$base], glob($base . '.*') ?: []) as $path) {
|
||||
if ($path !== $base && filemtime($path) < $cutoff) {
|
||||
continue;
|
||||
}
|
||||
if (!is_readable($path)) {
|
||||
continue;
|
||||
}
|
||||
if (str_ends_with($path, '.tar.gz')) {
|
||||
$files[] = ['path' => $path, 'type' => 'tgz'];
|
||||
} elseif (str_ends_with($path, '.gz')) {
|
||||
$files[] = ['path' => $path, 'type' => 'gz'];
|
||||
} else {
|
||||
$files[] = ['path' => $path, 'type' => 'plain'];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return $files;
|
||||
}
|
||||
|
||||
private static function parseTimestamp(string $raw): int
|
||||
{
|
||||
// "15/May/2026:00:41:01 +0200"
|
||||
if (!preg_match('/(\d{2})\/(\w{3})\/(\d{4}):(\d{2}:\d{2}:\d{2}) ([+-]\d{4})/', $raw, $m)) {
|
||||
return 0;
|
||||
}
|
||||
return (int) strtotime("{$m[1]} {$m[2]} {$m[3]} {$m[4]} {$m[5]}");
|
||||
}
|
||||
|
||||
private function parseLine(string $line, int $cutoff, array &$pages, array &$books, array &$ips): void
|
||||
{
|
||||
if (!preg_match(self::RE, $line, $m)) {
|
||||
return;
|
||||
}
|
||||
[, $ip, $ts, $path, $status] = $m;
|
||||
|
||||
if ($status !== '200') {
|
||||
return;
|
||||
}
|
||||
if (self::parseTimestamp($ts) < $cutoff) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (str_starts_with($path, '/post/') && strlen($path) > 6) {
|
||||
$pages[$path] = ($pages[$path] ?? 0) + 1;
|
||||
$ips[$ip] = ($ips[$ip] ?? 0) + 1;
|
||||
} elseif (str_starts_with($path, '/book/') && strlen($path) > 6) {
|
||||
$books[$path] = ($books[$path] ?? 0) + 1;
|
||||
$ips[$ip] = ($ips[$ip] ?? 0) + 1;
|
||||
}
|
||||
}
|
||||
|
||||
private function parseFile(array $file, int $cutoff, array &$pages, array &$books, array &$ips): void
|
||||
{
|
||||
if ($file['type'] === 'tgz') {
|
||||
try {
|
||||
$phar = new PharData($file['path']);
|
||||
foreach ($phar as $entry) {
|
||||
$content = @file_get_contents('phar://' . $file['path'] . '/' . $entry->getFilename());
|
||||
if ($content === false) {
|
||||
continue;
|
||||
}
|
||||
foreach (explode("\n", $content) as $line) {
|
||||
$this->parseLine($line, $cutoff, $pages, $books, $ips);
|
||||
}
|
||||
}
|
||||
} catch (\Exception $e) {
|
||||
}
|
||||
} elseif ($file['type'] === 'gz') {
|
||||
$h = @gzopen($file['path'], 'rb');
|
||||
if (!$h) {
|
||||
return;
|
||||
}
|
||||
while (!gzeof($h)) {
|
||||
$line = gzgets($h, 8192);
|
||||
if ($line !== false) {
|
||||
$this->parseLine($line, $cutoff, $pages, $books, $ips);
|
||||
}
|
||||
}
|
||||
gzclose($h);
|
||||
} else {
|
||||
$h = @fopen($file['path'], 'rb');
|
||||
if (!$h) {
|
||||
return;
|
||||
}
|
||||
while (($line = fgets($h)) !== false) {
|
||||
$this->parseLine($line, $cutoff, $pages, $books, $ips);
|
||||
}
|
||||
fclose($h);
|
||||
}
|
||||
}
|
||||
}
|
||||
+52
-11
@@ -9,7 +9,7 @@ class ArticleManager
|
||||
private ?array $allCache = null;
|
||||
private ?array $searchIndexCache = null;
|
||||
|
||||
public function __construct(private string $dataDir)
|
||||
public function __construct(private string $dataDir, private ?DataGit $git = null)
|
||||
{
|
||||
}
|
||||
|
||||
@@ -132,11 +132,12 @@ class ArticleManager
|
||||
file_put_contents($dir . '/index.md', ltrim($content));
|
||||
$this->rebuildSearchIndex();
|
||||
$this->rebuildBacklinksCache();
|
||||
$this->git?->commit("add: $title");
|
||||
|
||||
return $uuid;
|
||||
}
|
||||
|
||||
public function update(string $uuid, string $title, string $content, bool $published, string $slug, string $publishedAt, string $revisionComment = '', string $seoTitle = '', string $seoDescription = '', string $ogImage = '', string $category = '', ?array $tags = null): void
|
||||
public function update(string $uuid, string $title, string $content, bool $published, string $slug, string $publishedAt, string $revisionComment = '', string $seoTitle = '', string $seoDescription = '', string $ogImage = '', string $category = '', ?array $tags = null, bool $skipGit = false): void
|
||||
{
|
||||
$article = $this->getByUuid($uuid);
|
||||
if (!$article) {
|
||||
@@ -199,6 +200,9 @@ class ArticleManager
|
||||
file_put_contents($dir . '/index.md', ltrim($content));
|
||||
$this->rebuildSearchIndex();
|
||||
$this->rebuildBacklinksCache();
|
||||
if (!$skipGit) {
|
||||
$this->git?->commit("update: $title");
|
||||
}
|
||||
}
|
||||
|
||||
public function autosave(string $uuid, string $title, string $content, string $slug): bool
|
||||
@@ -247,6 +251,7 @@ class ArticleManager
|
||||
}
|
||||
$meta['updated_at'] = date('Y-m-d H:i:s');
|
||||
$this->writeMeta($dir, $meta);
|
||||
$this->git?->commit("meta: " . ($meta['title'] ?? $uuid));
|
||||
}
|
||||
|
||||
public function saveDraftOverlay(string $uuid, array $metaFields, ?string $content = null): void
|
||||
@@ -269,6 +274,9 @@ class ArticleManager
|
||||
if ($content !== null) {
|
||||
file_put_contents($dir . '/draft_overlay.md', $content);
|
||||
}
|
||||
$raw2 = @file_get_contents($dir . '/meta.json');
|
||||
$title = is_string($raw2) ? (json_decode($raw2, true)['title'] ?? $uuid) : $uuid;
|
||||
$this->git?->commit("draft: $title");
|
||||
}
|
||||
|
||||
public function getDraftOverlay(string $uuid): ?array
|
||||
@@ -315,14 +323,22 @@ class ArticleManager
|
||||
return file_exists($this->dataDir . '/' . $uuid . '/draft_overlay.json');
|
||||
}
|
||||
|
||||
public function discardDraftOverlay(string $uuid): void
|
||||
public function discardDraftOverlay(string $uuid, bool $skipGit = false): void
|
||||
{
|
||||
if (!$this->isValidUuid($uuid)) {
|
||||
return;
|
||||
}
|
||||
$dir = $this->dataDir . '/' . $uuid;
|
||||
$dir = $this->dataDir . '/' . $uuid;
|
||||
$title = null;
|
||||
if (!$skipGit && $this->git !== null) {
|
||||
$raw = @file_get_contents($dir . '/meta.json');
|
||||
$title = is_string($raw) ? (json_decode($raw, true)['title'] ?? $uuid) : $uuid;
|
||||
}
|
||||
@unlink($dir . '/draft_overlay.json');
|
||||
@unlink($dir . '/draft_overlay.md');
|
||||
if ($title !== null) {
|
||||
$this->git?->commit("discard-draft: $title");
|
||||
}
|
||||
}
|
||||
|
||||
public function commitDraftOverlay(string $uuid, string $revisionComment = ''): void
|
||||
@@ -331,9 +347,10 @@ class ArticleManager
|
||||
if (!$draft) {
|
||||
return;
|
||||
}
|
||||
$title = $draft['title'];
|
||||
$this->update(
|
||||
$uuid,
|
||||
$draft['title'],
|
||||
$title,
|
||||
$draft['content'],
|
||||
(bool)$draft['published'],
|
||||
$draft['slug'] ?? '',
|
||||
@@ -343,12 +360,14 @@ class ArticleManager
|
||||
$draft['seo_description'] ?? '',
|
||||
$draft['og_image'] ?? '',
|
||||
$draft['category'] ?? '',
|
||||
$draft['tags'] ?? []
|
||||
$draft['tags'] ?? [],
|
||||
true // skipGit — commit unique ci-dessous
|
||||
);
|
||||
$this->discardDraftOverlay($uuid);
|
||||
$this->discardDraftOverlay($uuid, skipGit: true);
|
||||
$this->git?->commit("publish: $title");
|
||||
}
|
||||
|
||||
public function addFileMeta(string $uuid, string $filename, string $author, string $sourceUrl, string $title = '', array $extraMeta = []): void
|
||||
public function addFileMeta(string $uuid, string $filename, string $author, string $sourceUrl, string $title = '', array $extraMeta = [], bool $skipGit = false): void
|
||||
{
|
||||
if (!$this->isValidUuid($uuid)) {
|
||||
return;
|
||||
@@ -377,6 +396,9 @@ class ArticleManager
|
||||
}
|
||||
$meta['files_meta'][$filename] = $entry;
|
||||
$this->writeMeta($this->dataDir . '/' . $uuid, $meta);
|
||||
if (!$skipGit) {
|
||||
$this->git?->commit("file-meta: {$uuid}/{$filename}");
|
||||
}
|
||||
}
|
||||
|
||||
public function setCover(string $uuid, string $filename): void
|
||||
@@ -424,6 +446,7 @@ class ArticleManager
|
||||
}
|
||||
$meta['cover'] = $coverName;
|
||||
$this->writeMeta($this->dataDir . '/' . $uuid, $meta);
|
||||
$this->git?->commit("cover: " . ($article['title'] ?? $uuid));
|
||||
}
|
||||
|
||||
public function addFileFromUrl(string $uuid, string $url, bool $isCover = false, string $author = '', string $sourceUrl = '', string $title = '', array $extraMeta = []): ?string
|
||||
@@ -499,7 +522,7 @@ class ArticleManager
|
||||
rename($tmp, $filesDir . '/' . $filename);
|
||||
|
||||
if ($author !== '' || $sourceUrl !== '' || $title !== '' || !empty($extraMeta)) {
|
||||
$this->addFileMeta($uuid, $filename, $author, $sourceUrl, $title, $extraMeta);
|
||||
$this->addFileMeta($uuid, $filename, $author, $sourceUrl, $title, $extraMeta, skipGit: true);
|
||||
}
|
||||
|
||||
if ($isCover && $isImage) {
|
||||
@@ -513,6 +536,7 @@ class ArticleManager
|
||||
}
|
||||
}
|
||||
|
||||
$this->git?->commit("add-file: {$uuid}/{$filename}");
|
||||
return $filename;
|
||||
}
|
||||
|
||||
@@ -553,6 +577,7 @@ class ArticleManager
|
||||
$meta['external_links'][] = $entry;
|
||||
$this->writeMeta($dir, $meta);
|
||||
$this->rebuildBacklinksCache();
|
||||
$this->git?->commit("link: {$uuid}");
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -583,6 +608,7 @@ class ArticleManager
|
||||
return false;
|
||||
}
|
||||
$this->writeMeta($dir, $meta);
|
||||
$this->git?->commit("link-meta: {$uuid}");
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -606,6 +632,7 @@ class ArticleManager
|
||||
));
|
||||
$this->writeMeta($dir, $meta);
|
||||
$this->rebuildBacklinksCache();
|
||||
$this->git?->commit("unlink: {$uuid}");
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -623,7 +650,7 @@ class ArticleManager
|
||||
return $cats;
|
||||
}
|
||||
|
||||
public function renameCategory(string $old, string $new): void
|
||||
public function renameCategory(string $old, string $new, bool $skipGit = false): void
|
||||
{
|
||||
if (!is_dir($this->dataDir)) {
|
||||
return;
|
||||
@@ -647,11 +674,15 @@ class ArticleManager
|
||||
$meta['category'] = $new;
|
||||
$this->writeMeta($this->dataDir . '/' . $entry, $meta);
|
||||
}
|
||||
if (!$skipGit) {
|
||||
$this->git?->commit("rename-cat: $old → $new");
|
||||
}
|
||||
}
|
||||
|
||||
public function deleteCategory(string $name): void
|
||||
{
|
||||
$this->renameCategory($name, '');
|
||||
$this->renameCategory($name, '', skipGit: true);
|
||||
$this->git?->commit("delete-cat: $name");
|
||||
}
|
||||
|
||||
public function getPrivateCategories(): array
|
||||
@@ -676,6 +707,7 @@ class ArticleManager
|
||||
$this->dataDir . '/private_cats.json',
|
||||
json_encode(array_values($cats), JSON_UNESCAPED_UNICODE)
|
||||
);
|
||||
$this->git?->commit("private-cat: $cat");
|
||||
}
|
||||
|
||||
// ─── Tag types ──────────────────────────────────────────────────────────────
|
||||
@@ -701,6 +733,7 @@ class ArticleManager
|
||||
$this->tagTypesPath(),
|
||||
json_encode($types, JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE) . "\n"
|
||||
);
|
||||
$this->git?->commit("tag-types");
|
||||
}
|
||||
|
||||
/** Enregistre les tags d'un article directement (utile pour les scripts de migration). */
|
||||
@@ -720,6 +753,7 @@ class ArticleManager
|
||||
$meta['tags'] = $this->normalizeTags($tags);
|
||||
$this->writeMeta($dir, $meta);
|
||||
$this->rebuildSearchIndex();
|
||||
$this->git?->commit("tags: " . ($meta['title'] ?? $uuid));
|
||||
}
|
||||
|
||||
/** @return list<string> Toutes les valeurs distinctes d'un type de tag, triées. */
|
||||
@@ -769,6 +803,7 @@ class ArticleManager
|
||||
$this->writeMeta($dir, $meta);
|
||||
$this->allCache = null;
|
||||
@unlink($this->articleCachePath($uuid));
|
||||
$this->git?->commit("featured: " . ($meta['title'] ?? $uuid) . " (" . ($featured ? 'on' : 'off') . ")");
|
||||
}
|
||||
|
||||
public function delete(string $uuid): void
|
||||
@@ -777,6 +812,11 @@ class ArticleManager
|
||||
return;
|
||||
}
|
||||
$dir = $this->dataDir . '/' . $uuid;
|
||||
$title = null;
|
||||
if ($this->git !== null && is_dir($dir)) {
|
||||
$raw = @file_get_contents($dir . '/meta.json');
|
||||
$title = is_string($raw) ? (json_decode($raw, true)['title'] ?? null) : null;
|
||||
}
|
||||
if (is_dir($dir)) {
|
||||
$this->allCache = null;
|
||||
@unlink($this->articleCachePath($uuid));
|
||||
@@ -785,6 +825,7 @@ class ArticleManager
|
||||
}
|
||||
$this->rebuildSearchIndex();
|
||||
$this->rebuildBacklinksCache();
|
||||
$this->git?->commit("delete: " . ($title ?? $uuid));
|
||||
}
|
||||
|
||||
// ------------------------------------------------------------------ //
|
||||
|
||||
@@ -0,0 +1,190 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
class AsnLookup
|
||||
{
|
||||
private string $cacheDir;
|
||||
private int $ttl;
|
||||
|
||||
public function __construct(string $cacheDir = '', int $ttl = 86400 * 30)
|
||||
{
|
||||
$this->cacheDir = $cacheDir !== '' ? $cacheDir : dirname(__DIR__) . '/_cache/asn';
|
||||
$this->ttl = $ttl;
|
||||
}
|
||||
|
||||
/**
|
||||
* Lookup AS info pour une liste d'IPs.
|
||||
* IPs privées : retournées avec name='LAN', pas d'appel API.
|
||||
*
|
||||
* @param list<string> $ips
|
||||
* @return array<string, array{asn:string,name:string,country:string}>
|
||||
*/
|
||||
public function batchLookup(array $ips): array
|
||||
{
|
||||
$results = [];
|
||||
$missing = [];
|
||||
|
||||
foreach (array_unique($ips) as $ip) {
|
||||
if ($this->isPrivate($ip)) {
|
||||
$results[$ip] = ['asn' => '', 'name' => 'LAN', 'country' => ''];
|
||||
continue;
|
||||
}
|
||||
$cached = $this->fromCache($ip);
|
||||
if ($cached !== null) {
|
||||
$results[$ip] = $cached;
|
||||
} else {
|
||||
$missing[] = $ip;
|
||||
}
|
||||
}
|
||||
|
||||
foreach (array_chunk($missing, 100) as $chunk) {
|
||||
foreach ($this->fetchBatch($chunk) as $ip => $info) {
|
||||
$this->toCache($ip, $info);
|
||||
$results[$ip] = $info;
|
||||
}
|
||||
}
|
||||
|
||||
return $results;
|
||||
}
|
||||
|
||||
public function isPrivate(string $ip): bool
|
||||
{
|
||||
return filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE | FILTER_FLAG_NO_RES_RANGE) === false;
|
||||
}
|
||||
|
||||
/**
|
||||
* Agrège les hits par AS depuis un tableau [ip => hits] et les infos AS.
|
||||
* Retourne [asKey => [asn, name, country, hits]] trié par hits desc.
|
||||
*
|
||||
* @param array<string,int> $ipHits
|
||||
* @param array<string, array{asn:string,name:string,country:string}> $asnMap
|
||||
* @return list<array{asn:string,name:string,country:string,hits:int}>
|
||||
*/
|
||||
public static function aggregateByAs(array $ipHits, array $asnMap): array
|
||||
{
|
||||
$byAs = [];
|
||||
foreach ($ipHits as $ip => $hits) {
|
||||
$info = $asnMap[$ip] ?? ['asn' => '?', 'name' => '?', 'country' => ''];
|
||||
$key = $info['asn'] !== '' ? $info['asn'] : $info['name'];
|
||||
if (!isset($byAs[$key])) {
|
||||
$byAs[$key] = ['asn' => $info['asn'], 'name' => $info['name'], 'country' => $info['country'], 'hits' => 0];
|
||||
}
|
||||
$byAs[$key]['hits'] += $hits;
|
||||
}
|
||||
usort($byAs, static fn ($a, $b) => $b['hits'] <=> $a['hits']);
|
||||
return array_values($byAs);
|
||||
}
|
||||
|
||||
/**
|
||||
* Applique les groupes définis par l'admin.
|
||||
* Chaque groupe : ['label' => string, 'patterns' => [string, ...]]
|
||||
* Un AS est affecté au premier groupe dont un pattern est contenu dans son nom (case-insensitive).
|
||||
*
|
||||
* @param list<array{asn:string,name:string,country:string,hits:int}> $asList
|
||||
* @param list<array{label:string,patterns:list<string>}> $groups
|
||||
* @return array<string, list<array{asn:string,name:string,country:string,hits:int}>>
|
||||
* clés : labels des groupes + 'Autres'
|
||||
*/
|
||||
public static function applyGroups(array $asList, array $groups): array
|
||||
{
|
||||
$result = [];
|
||||
foreach ($groups as $g) {
|
||||
$result[$g['label']] = [];
|
||||
}
|
||||
$result['Autres'] = [];
|
||||
|
||||
foreach ($asList as $as) {
|
||||
$matched = false;
|
||||
foreach ($groups as $g) {
|
||||
foreach ($g['patterns'] as $pattern) {
|
||||
if ($pattern !== '' && mb_stripos($as['name'], $pattern) !== false) {
|
||||
$result[$g['label']][] = $as;
|
||||
$matched = true;
|
||||
break 2;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (!$matched) {
|
||||
$result['Autres'][] = $as;
|
||||
}
|
||||
}
|
||||
|
||||
return $result;
|
||||
}
|
||||
|
||||
// ─── Cache ────────────────────────────────────────────────────────────────
|
||||
|
||||
private function cacheFile(string $ip): string
|
||||
{
|
||||
return $this->cacheDir . '/' . md5($ip) . '.json';
|
||||
}
|
||||
|
||||
/** @return array{asn:string,name:string,country:string}|null */
|
||||
private function fromCache(string $ip): ?array
|
||||
{
|
||||
$f = $this->cacheFile($ip);
|
||||
if (!file_exists($f) || (time() - filemtime($f)) > $this->ttl) {
|
||||
return null;
|
||||
}
|
||||
$d = json_decode((string) file_get_contents($f), true);
|
||||
return is_array($d) ? $d : null;
|
||||
}
|
||||
|
||||
/** @param array{asn:string,name:string,country:string} $data */
|
||||
private function toCache(string $ip, array $data): void
|
||||
{
|
||||
@mkdir($this->cacheDir, 0755, true);
|
||||
@file_put_contents($this->cacheFile($ip), json_encode($data));
|
||||
}
|
||||
|
||||
// ─── API ip-api.com ───────────────────────────────────────────────────────
|
||||
|
||||
/**
|
||||
* @param list<string> $ips
|
||||
* @return array<string, array{asn:string,name:string,country:string}>
|
||||
*/
|
||||
private function fetchBatch(array $ips): array
|
||||
{
|
||||
$body = json_encode($ips);
|
||||
$context = stream_context_create(['http' => [
|
||||
'method' => 'POST',
|
||||
'header' => "Content-Type: application/json\r\nContent-Length: " . strlen((string) $body) . "\r\n",
|
||||
'content' => $body,
|
||||
'timeout' => 10,
|
||||
]]);
|
||||
|
||||
$resp = @file_get_contents(
|
||||
'http://ip-api.com/batch?fields=query,as,org,country,countryCode',
|
||||
false,
|
||||
$context
|
||||
);
|
||||
|
||||
if ($resp === false) {
|
||||
return [];
|
||||
}
|
||||
|
||||
$rows = json_decode($resp, true);
|
||||
if (!is_array($rows)) {
|
||||
return [];
|
||||
}
|
||||
|
||||
$results = [];
|
||||
foreach ($rows as $row) {
|
||||
$ip = $row['query'] ?? '';
|
||||
if ($ip === '') {
|
||||
continue;
|
||||
}
|
||||
$asRaw = $row['as'] ?? '';
|
||||
$asn = '';
|
||||
if (preg_match('/^AS(\d+)/', $asRaw, $m)) {
|
||||
$asn = $m[1];
|
||||
}
|
||||
$name = $row['org'] !== '' ? ($row['org'] ?? '') : preg_replace('/^AS\d+\s*/', '', $asRaw);
|
||||
$country = $row['countryCode'] ?? '';
|
||||
$results[$ip] = ['asn' => $asn, 'name' => (string) $name, 'country' => $country];
|
||||
}
|
||||
|
||||
return $results;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,134 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
class BookManager
|
||||
{
|
||||
public function __construct(private string $booksDir, private ?DataGit $git = null)
|
||||
{
|
||||
}
|
||||
|
||||
// ------------------------------------------------------------------ //
|
||||
// Lecture
|
||||
// ------------------------------------------------------------------ //
|
||||
|
||||
public function getAll(): array
|
||||
{
|
||||
$books = [];
|
||||
if (!is_dir($this->booksDir)) {
|
||||
return $books;
|
||||
}
|
||||
foreach (scandir($this->booksDir) as $file) {
|
||||
if (!str_ends_with($file, '.json')) {
|
||||
continue;
|
||||
}
|
||||
$raw = file_get_contents($this->booksDir . '/' . $file);
|
||||
if ($raw === false) {
|
||||
continue;
|
||||
}
|
||||
$book = json_decode($raw, true);
|
||||
if (!is_array($book) || empty($book['slug'])) {
|
||||
continue;
|
||||
}
|
||||
$books[] = $book;
|
||||
}
|
||||
usort($books, static fn ($a, $b) => strcmp($a['title'] ?? '', $b['title'] ?? ''));
|
||||
return $books;
|
||||
}
|
||||
|
||||
public function getBySlug(string $slug): ?array
|
||||
{
|
||||
$path = $this->bookPath($slug);
|
||||
if (!file_exists($path)) {
|
||||
return null;
|
||||
}
|
||||
$raw = file_get_contents($path);
|
||||
if ($raw === false) {
|
||||
return null;
|
||||
}
|
||||
$book = json_decode($raw, true);
|
||||
return is_array($book) && !empty($book['slug']) ? $book : null;
|
||||
}
|
||||
|
||||
/**
|
||||
* Cherche dans quel livre se trouve un article (par son slug).
|
||||
* Retourne le contexte complet ou null si l'article n'appartient à aucun livre.
|
||||
*
|
||||
* @return array{book: array, position: int, total: int, prev: ?string, next: ?string}|null
|
||||
*/
|
||||
public function findForArticle(string $articleSlug): ?array
|
||||
{
|
||||
foreach ($this->getAll() as $book) {
|
||||
$arts = $book['articles'] ?? [];
|
||||
$pos = array_search($articleSlug, $arts, true);
|
||||
if ($pos === false) {
|
||||
continue;
|
||||
}
|
||||
$pos = (int) $pos;
|
||||
return [
|
||||
'book' => $book,
|
||||
'position' => $pos + 1,
|
||||
'total' => count($arts),
|
||||
'prev' => $pos > 0 ? $arts[$pos - 1] : null,
|
||||
'next' => $pos < count($arts) - 1 ? $arts[$pos + 1] : null,
|
||||
];
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
// ------------------------------------------------------------------ //
|
||||
// Écriture
|
||||
// ------------------------------------------------------------------ //
|
||||
|
||||
public function save(array $book): void
|
||||
{
|
||||
$slug = $this->sanitizeSlug($book['slug'] ?? '');
|
||||
if ($slug === '') {
|
||||
return;
|
||||
}
|
||||
$book['slug'] = $slug;
|
||||
$book['articles'] = array_values(array_filter(array_map('strval', $book['articles'] ?? [])));
|
||||
if (!is_dir($this->booksDir)) {
|
||||
mkdir($this->booksDir, 0755, true);
|
||||
}
|
||||
file_put_contents(
|
||||
$this->bookPath($slug),
|
||||
json_encode($book, JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES) . "\n"
|
||||
);
|
||||
$this->git?->commit("book: " . ($book['title'] ?? $slug));
|
||||
}
|
||||
|
||||
public function delete(string $slug): void
|
||||
{
|
||||
$title = $this->getBySlug($slug)['title'] ?? $slug;
|
||||
$path = $this->bookPath($slug);
|
||||
if (file_exists($path)) {
|
||||
@unlink($path);
|
||||
}
|
||||
$this->git?->commit("delete-book: $title");
|
||||
}
|
||||
|
||||
// ------------------------------------------------------------------ //
|
||||
// Helpers
|
||||
// ------------------------------------------------------------------ //
|
||||
|
||||
private function bookPath(string $slug): string
|
||||
{
|
||||
return $this->booksDir . '/' . $slug . '.json';
|
||||
}
|
||||
|
||||
private function sanitizeSlug(string $slug): string
|
||||
{
|
||||
$map = [
|
||||
'à' => 'a', 'â' => 'a', 'ä' => 'a',
|
||||
'é' => 'e', 'è' => 'e', 'ê' => 'e', 'ë' => 'e',
|
||||
'î' => 'i', 'ï' => 'i',
|
||||
'ô' => 'o', 'ö' => 'o',
|
||||
'ù' => 'u', 'û' => 'u', 'ü' => 'u',
|
||||
'ç' => 'c', 'æ' => 'ae', 'œ' => 'oe',
|
||||
];
|
||||
$slug = mb_strtolower(strtr(trim($slug), $map), 'UTF-8');
|
||||
$slug = (string) preg_replace('/[^a-z0-9]+/', '-', $slug);
|
||||
return trim($slug, '-');
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,22 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
class DataGit
|
||||
{
|
||||
public function __construct(private string $dataDir) {}
|
||||
|
||||
public function commit(string $message): void
|
||||
{
|
||||
if (!is_dir($this->dataDir . '/.git')) {
|
||||
return;
|
||||
}
|
||||
$dir = escapeshellarg($this->dataDir);
|
||||
$msg = escapeshellarg($message);
|
||||
shell_exec("git -C $dir add -A 2>/dev/null");
|
||||
exec("git -C $dir diff --cached --quiet 2>/dev/null", $_, $rc);
|
||||
if ($rc !== 0) {
|
||||
shell_exec("git -C $dir commit -m $msg 2>/dev/null");
|
||||
}
|
||||
}
|
||||
}
|
||||
+31
-2
@@ -4,7 +4,7 @@ declare(strict_types=1);
|
||||
|
||||
function siteSettingsPath(): string
|
||||
{
|
||||
return BASE_PATH . '/data/site_settings.json';
|
||||
return DATA_PATH . '/site_settings.json';
|
||||
}
|
||||
|
||||
function siteSettings(): array
|
||||
@@ -68,10 +68,35 @@ function apacheAccessLog(): string
|
||||
return (string)($_ENV['APACHE_ACCESS_LOG'] ?? getenv('APACHE_ACCESS_LOG') ?: '*-access.log');
|
||||
}
|
||||
|
||||
function folioRepoUrl(): string
|
||||
{
|
||||
$fromSettings = siteSettings()['folio_repo_url'] ?? '';
|
||||
if ($fromSettings !== '') {
|
||||
return rtrim($fromSettings, '/');
|
||||
}
|
||||
return rtrim((string)($_ENV['FOLIO_REPO_URL'] ?? getenv('FOLIO_REPO_URL') ?: ''), '/');
|
||||
}
|
||||
|
||||
function folioUpdateBranch(): string
|
||||
{
|
||||
$fromSettings = siteSettings()['folio_update_branch'] ?? '';
|
||||
if ($fromSettings !== '') {
|
||||
return $fromSettings;
|
||||
}
|
||||
return (string)($_ENV['FOLIO_UPDATE_BRANCH'] ?? getenv('FOLIO_UPDATE_BRANCH') ?: 'main');
|
||||
}
|
||||
|
||||
/** @return list<array{label:string,patterns:list<string>}> */
|
||||
function asGroups(): array
|
||||
{
|
||||
$raw = siteSettings()['as_groups'] ?? [];
|
||||
return is_array($raw) ? $raw : [];
|
||||
}
|
||||
|
||||
function saveSiteSettings(array $data): bool
|
||||
{
|
||||
$current = siteSettings();
|
||||
$stringKeys = ['site_title', 'site_claim', 'site_lang', 'site_license_label', 'site_license_url', 'apache_access_log'];
|
||||
$stringKeys = ['site_title', 'site_claim', 'site_lang', 'site_license_label', 'site_license_url', 'apache_access_log', 'folio_repo_url', 'folio_update_branch'];
|
||||
foreach ($stringKeys as $key) {
|
||||
if (array_key_exists($key, $data)) {
|
||||
$val = trim((string)$data[$key]);
|
||||
@@ -86,6 +111,10 @@ function saveSiteSettings(array $data): bool
|
||||
$current['posts_per_page'] = $val;
|
||||
}
|
||||
}
|
||||
if (array_key_exists('as_groups', $data) && is_array($data['as_groups'])) {
|
||||
$current['as_groups'] = $data['as_groups'];
|
||||
}
|
||||
|
||||
return file_put_contents(
|
||||
siteSettingsPath(),
|
||||
json_encode($current, JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES)
|
||||
|
||||
@@ -4,7 +4,7 @@ declare(strict_types=1);
|
||||
|
||||
function smtpSettingsPath(): string
|
||||
{
|
||||
return BASE_PATH . '/data/smtp_settings.json';
|
||||
return DATA_PATH . '/smtp_settings.json';
|
||||
}
|
||||
|
||||
function smtpSettings(): array
|
||||
|
||||
+28
-4
@@ -67,7 +67,7 @@ class UpdateChecker
|
||||
*/
|
||||
private function checkRemoteVersion(): ?string
|
||||
{
|
||||
$repoUrl = rtrim((string) ($_ENV['FOLIO_REPO_URL'] ?? getenv('FOLIO_REPO_URL') ?: ''), '/');
|
||||
$repoUrl = folioRepoUrl();
|
||||
if ($repoUrl === '') {
|
||||
return null;
|
||||
}
|
||||
@@ -89,8 +89,31 @@ class UpdateChecker
|
||||
return version_compare($remoteVer, $deployedVer, '>') ? $remoteVer : null;
|
||||
}
|
||||
|
||||
public function getBranch(): string
|
||||
{
|
||||
return folioUpdateBranch();
|
||||
}
|
||||
|
||||
public function getLastChecked(): ?int
|
||||
{
|
||||
$cacheFile = $this->dataDir . '/.version_check_cache.json';
|
||||
if (!file_exists($cacheFile)) {
|
||||
return null;
|
||||
}
|
||||
$cache = json_decode((string) file_get_contents($cacheFile), true) ?? [];
|
||||
return isset($cache['fetched_at']) ? (int) $cache['fetched_at'] : null;
|
||||
}
|
||||
|
||||
public function clearCache(): void
|
||||
{
|
||||
$cacheFile = $this->dataDir . '/.version_check_cache.json';
|
||||
if (file_exists($cacheFile)) {
|
||||
unlink($cacheFile);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Récupère `public/version.txt` depuis le dépôt Gitea (branche main).
|
||||
* Récupère `public/version.txt` depuis le dépôt Gitea.
|
||||
* Résultat mis en cache 1 h dans `data/.version_check_cache.json`.
|
||||
*/
|
||||
private function fetchRemoteVersion(string $repoUrl): ?string
|
||||
@@ -107,8 +130,9 @@ class UpdateChecker
|
||||
}
|
||||
}
|
||||
|
||||
// URL du fichier brut : {repo}/raw/branch/main/public/version.txt
|
||||
$rawUrl = $repoUrl . '/raw/branch/main/public/version.txt';
|
||||
$branch = $this->getBranch();
|
||||
// URL du fichier brut : {repo}/raw/branch/{branch}/public/version.txt
|
||||
$rawUrl = $repoUrl . '/raw/branch/' . $branch . '/public/version.txt';
|
||||
|
||||
$token = (string) ($_ENV['GITEA_TOKEN'] ?? getenv('GITEA_TOKEN') ?: '');
|
||||
$opts = [
|
||||
|
||||
@@ -0,0 +1,19 @@
|
||||
<?php
|
||||
// Page d'erreur 404 — à inclure après http_response_code(404).
|
||||
// Aucune variable externe requise.
|
||||
$title = '404 — ' . siteTitle();
|
||||
$metaRobots = 'noindex, nofollow';
|
||||
ob_start();
|
||||
?>
|
||||
<div class="container py-5 text-center">
|
||||
<p class="display-1 fw-bold text-muted mb-0">404</p>
|
||||
<h1 class="h3 mb-3">Page introuvable</h1>
|
||||
<p class="text-muted mb-4">
|
||||
Cette adresse ne correspond à aucun contenu.<br>
|
||||
Vous avez peut-être suivi un ancien lien.
|
||||
</p>
|
||||
<a href="/" class="btn btn-primary">← Retour à l'accueil</a>
|
||||
</div>
|
||||
<?php
|
||||
$content = ob_get_clean();
|
||||
include __DIR__ . '/layout.php';
|
||||
+54
-1
@@ -69,6 +69,10 @@ function adminStatusBadge(array $a, int $now): string
|
||||
<a class="nav-link <?= $tab === 'books' ? 'active' : '' ?>"
|
||||
href="/admin/books">Livres</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a class="nav-link <?= $tab === 'stats' ? 'active' : '' ?>"
|
||||
href="/admin/stats">Statistiques</a>
|
||||
</li>
|
||||
<?php endif; ?>
|
||||
</ul>
|
||||
|
||||
@@ -100,6 +104,9 @@ function adminStatusBadge(array $a, int $now): string
|
||||
$_deployedVer = trim((string) @file_get_contents(BASE_PATH . '/public/version.txt'));
|
||||
$_deployedLabel = $_deployedVer !== '' ? $_deployedVer : '—';
|
||||
$_notices = isset($_updateChecker) ? $_updateChecker->adminNotices() : [];
|
||||
$_branch = isset($_updateChecker) ? $_updateChecker->getBranch() : 'main';
|
||||
$_lastChecked = isset($_updateChecker) ? $_updateChecker->getLastChecked() : null;
|
||||
$_repoConfigured = folioRepoUrl() !== '';
|
||||
$_remoteLabel = '—';
|
||||
foreach ($_notices as $_n) {
|
||||
if ($_n['type'] === 'info' && preg_match('/v([\d]+\.[\d]+\.[\d]+)/', $_n['message'], $_m)) {
|
||||
@@ -118,7 +125,20 @@ function adminStatusBadge(array $a, int $now): string
|
||||
</tr>
|
||||
<tr>
|
||||
<th class="text-muted fw-normal ps-0 pe-2 text-nowrap">Dernière version disponible</th>
|
||||
<td><?= htmlspecialchars($_remoteLabel) ?><?= $_remoteLabel !== '—' && $_remoteLabel !== $_deployedLabel ? ' <span class="badge bg-warning text-dark ms-1">Mise à jour disponible</span>' : '' ?></td>
|
||||
<td class="d-flex align-items-center gap-2 flex-wrap">
|
||||
<span><?= htmlspecialchars($_remoteLabel) ?><?= $_remoteLabel !== '—' && $_remoteLabel !== $_deployedLabel ? ' <span class="badge bg-warning text-dark ms-1">Mise à jour disponible</span>' : '' ?></span>
|
||||
<?php if ($_repoConfigured): ?>
|
||||
<form method="POST" action="/?action=force_update_check" class="d-inline">
|
||||
<button type="submit" class="btn btn-outline-secondary btn-sm py-0">Vérifier</button>
|
||||
</form>
|
||||
<?php else: ?>
|
||||
<span class="text-muted small">(<code>FOLIO_REPO_URL</code> non configuré)</span>
|
||||
<?php endif; ?>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th class="text-muted fw-normal ps-0 pe-2 text-nowrap">Branche suivie</th>
|
||||
<td><code><?= htmlspecialchars($_branch) ?></code><?= $_lastChecked !== null ? ' <span class="text-muted ms-2">· vérifié le ' . date('d/m/Y à H:i', $_lastChecked) . '</span>' : '' ?></td>
|
||||
</tr>
|
||||
<?php if (!empty($_notices)): ?>
|
||||
<tr>
|
||||
@@ -527,6 +547,33 @@ function adminStatusBadge(array $a, int $now): string
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<?php if (($_GET['notice'] ?? '') === 'folio_saved'): ?>
|
||||
<div class="alert alert-success py-2 mt-3 small">Configuration Folio enregistrée.</div>
|
||||
<?php elseif (($_GET['notice'] ?? '') === 'folio_error'): ?>
|
||||
<div class="alert alert-danger py-2 mt-3 small">Impossible d'enregistrer.</div>
|
||||
<?php endif; ?>
|
||||
<div class="card mt-4" style="max-width:540px">
|
||||
<div class="card-header bg-transparent py-2 small fw-semibold">Mises à jour du moteur</div>
|
||||
<div class="card-body">
|
||||
<form method="POST" action="/?action=admin_save_folio_config">
|
||||
<div class="mb-3">
|
||||
<label class="form-label small fw-semibold mb-1">URL du dépôt Folio</label>
|
||||
<input type="url" name="folio_repo_url" class="form-control form-control-sm font-monospace"
|
||||
placeholder="https://git.abonnel.fr/cedricAbonnel/folio"
|
||||
value="<?= htmlspecialchars(folioRepoUrl()) ?>">
|
||||
<div class="form-text">Sans slash final. Laissez vide pour utiliser <code>FOLIO_REPO_URL</code> du .env.</div>
|
||||
</div>
|
||||
<div class="mb-3">
|
||||
<label class="form-label small fw-semibold mb-1">Branche suivie</label>
|
||||
<input type="text" name="folio_update_branch" class="form-control form-control-sm font-monospace"
|
||||
placeholder="main"
|
||||
value="<?= htmlspecialchars(folioUpdateBranch()) ?>">
|
||||
</div>
|
||||
<button type="submit" class="btn btn-primary btn-sm">Enregistrer</button>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<?php endif; ?>
|
||||
|
||||
<!-- ─────────────────────────── CATÉGORIES & TAGS ─────────────────── -->
|
||||
@@ -1300,6 +1347,12 @@ foreach (COLOR_PALETTE_16 as $_i => $_rgb):
|
||||
|
||||
<?php endif; ?>
|
||||
|
||||
<?php if ($tab === 'stats' && isAdmin()): ?>
|
||||
|
||||
<?php include __DIR__ . '/admin_stats.php'; ?>
|
||||
|
||||
<?php endif; ?>
|
||||
|
||||
<?php
|
||||
$content = ob_get_clean();
|
||||
$title = 'Administration — ' . siteTitle();
|
||||
|
||||
@@ -0,0 +1,241 @@
|
||||
<?php
|
||||
$_statsSaved = isset($_GET['saved']);
|
||||
$_statsError = ($_GET['error'] ?? '') === 'write';
|
||||
$_readable = $adminData['stats_readable'] ?? false;
|
||||
$_pages = $adminData['stats_pages'] ?? [];
|
||||
$_books = $adminData['stats_books'] ?? [];
|
||||
$_asList = $adminData['stats_as'] ?? [];
|
||||
$_asGroups = $adminData['stats_as_groups'] ?? [];
|
||||
$_groups = $adminData['as_groups'] ?? [];
|
||||
$_activeGroup = trim($_GET['group'] ?? '');
|
||||
?>
|
||||
|
||||
<?php if ($_statsSaved): ?>
|
||||
<div class="alert alert-success py-2 mb-3">Configuration enregistrée.</div>
|
||||
<?php elseif ($_statsError): ?>
|
||||
<div class="alert alert-danger py-2 mb-3">Impossible d'enregistrer : fichier non accessible en écriture.</div>
|
||||
<?php endif; ?>
|
||||
|
||||
<?php if (!$_readable): ?>
|
||||
<div class="alert alert-warning">
|
||||
Les logs ne sont pas lisibles. Vérifiez le pattern dans l'onglet <a href="/admin/searches">Recherches</a>
|
||||
et que <code>www-data</code> appartient au groupe <code>adm</code>.
|
||||
</div>
|
||||
<?php else: ?>
|
||||
|
||||
<p class="text-muted small mb-4">14 derniers jours · cache 10 min</p>
|
||||
|
||||
<div class="row g-4">
|
||||
|
||||
<!-- Pages -->
|
||||
<div class="col-lg-6">
|
||||
<div class="card h-100">
|
||||
<div class="card-header bg-transparent py-2 small fw-semibold d-flex justify-content-between">
|
||||
<span>Pages les plus visitées</span>
|
||||
<span class="text-muted"><?= count($_pages) ?> URLs</span>
|
||||
</div>
|
||||
<div class="card-body p-0">
|
||||
<?php if (empty($_pages)): ?>
|
||||
<p class="text-muted p-3 mb-0">Aucune donnée.</p>
|
||||
<?php else: ?>
|
||||
<div class="table-responsive">
|
||||
<table class="table table-sm table-hover mb-0 small">
|
||||
<tbody>
|
||||
<?php
|
||||
$maxP = max($_pages) ?: 1;
|
||||
$rankP = 0;
|
||||
foreach ($_pages as $url => $hits):
|
||||
$rankP++;
|
||||
$slug = rawurldecode(substr($url, 6));
|
||||
$pct = round($hits / $maxP * 100);
|
||||
?>
|
||||
<tr>
|
||||
<td class="text-muted ps-3" style="width:2rem"><?= $rankP ?></td>
|
||||
<td>
|
||||
<a href="<?= htmlspecialchars($url) ?>" target="_blank"
|
||||
class="text-decoration-none text-truncate d-block" style="max-width:260px"
|
||||
title="<?= htmlspecialchars($slug) ?>">
|
||||
<?= htmlspecialchars($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"><?= number_format($hits, 0, ',', '\u{202F}') ?></td>
|
||||
</tr>
|
||||
<?php endforeach; ?>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
<?php endif; ?>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Livres -->
|
||||
<div class="col-lg-6">
|
||||
<div class="card h-100">
|
||||
<div class="card-header bg-transparent py-2 small fw-semibold d-flex justify-content-between">
|
||||
<span>Livres consultés</span>
|
||||
<span class="text-muted"><?= count($_books) ?> livres</span>
|
||||
</div>
|
||||
<div class="card-body p-0">
|
||||
<?php if (empty($_books)): ?>
|
||||
<p class="text-muted p-3 mb-0">Aucun accès à <code>/book/</code> dans les logs.</p>
|
||||
<?php else: ?>
|
||||
<div class="table-responsive">
|
||||
<table class="table table-sm table-hover mb-0 small">
|
||||
<tbody>
|
||||
<?php
|
||||
$maxB = max($_books) ?: 1;
|
||||
$rankB = 0;
|
||||
foreach ($_books as $url => $hits):
|
||||
$rankB++;
|
||||
$slug = rawurldecode(substr($url, 6));
|
||||
$pct = round($hits / $maxB * 100);
|
||||
?>
|
||||
<tr>
|
||||
<td class="text-muted ps-3" style="width:2rem"><?= $rankB ?></td>
|
||||
<td>
|
||||
<a href="<?= htmlspecialchars($url) ?>" target="_blank"
|
||||
class="text-decoration-none text-truncate d-block" style="max-width:260px"
|
||||
title="<?= htmlspecialchars($slug) ?>">
|
||||
<?= htmlspecialchars($slug) ?>
|
||||
</a>
|
||||
<div class="progress mt-1" style="height:3px">
|
||||
<div class="progress-bar bg-success" style="width:<?= $pct ?>%"></div>
|
||||
</div>
|
||||
</td>
|
||||
<td class="text-end fw-semibold pe-3"><?= number_format($hits, 0, ',', '\u{202F}') ?></td>
|
||||
</tr>
|
||||
<?php endforeach; ?>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
<?php endif; ?>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div><!-- /row -->
|
||||
|
||||
<!-- Répartition par réseau -->
|
||||
<div class="card mt-4">
|
||||
<div class="card-header bg-transparent py-2 small fw-semibold d-flex align-items-center gap-3 flex-wrap">
|
||||
<span>Répartition par réseau</span>
|
||||
<?php if (!empty($_groups)): ?>
|
||||
<div class="d-flex gap-1 flex-wrap">
|
||||
<a href="/admin/stats" class="badge <?= $_activeGroup === '' ? 'bg-primary' : 'bg-secondary' ?> text-decoration-none">Tous</a>
|
||||
<?php foreach ($_groups as $g): ?>
|
||||
<a href="/admin/stats?group=<?= rawurlencode($g['label']) ?>"
|
||||
class="badge <?= $_activeGroup === $g['label'] ? 'bg-primary' : 'bg-secondary' ?> text-decoration-none">
|
||||
<?= htmlspecialchars($g['label']) ?>
|
||||
</a>
|
||||
<?php endforeach; ?>
|
||||
<a href="/admin/stats?group=Autres"
|
||||
class="badge <?= $_activeGroup === 'Autres' ? 'bg-primary' : 'bg-secondary' ?> text-decoration-none">Autres</a>
|
||||
</div>
|
||||
<?php endif; ?>
|
||||
</div>
|
||||
<div class="card-body p-0">
|
||||
<?php
|
||||
// Sélectionner les AS à afficher
|
||||
if ($_activeGroup !== '' && isset($_asGroups[$_activeGroup])) {
|
||||
$displayAs = $_asGroups[$_activeGroup];
|
||||
} else {
|
||||
$displayAs = $_asList;
|
||||
}
|
||||
?>
|
||||
<?php if (empty($displayAs)): ?>
|
||||
<p class="text-muted p-3 mb-0">
|
||||
<?= empty($_asList) ? 'Aucune IP résolue (LAN ou logs vides).' : 'Aucun AS dans ce groupe.' ?>
|
||||
</p>
|
||||
<?php else: ?>
|
||||
<?php $maxAS = max(array_column($displayAs, 'hits')) ?: 1; ?>
|
||||
<div class="table-responsive">
|
||||
<table class="table table-sm table-hover mb-0 small">
|
||||
<thead class="table-light">
|
||||
<tr>
|
||||
<th class="ps-3" style="width:2rem">#</th>
|
||||
<th>Réseau</th>
|
||||
<th style="width:3rem">Pays</th>
|
||||
<th style="width:5rem" class="text-end pe-3">Visites</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<?php foreach ($displayAs as $i => $as): ?>
|
||||
<tr>
|
||||
<td class="text-muted ps-3"><?= $i + 1 ?></td>
|
||||
<td>
|
||||
<span class="fw-medium"><?= htmlspecialchars($as['name'] ?: '?') ?></span>
|
||||
<?php if ($as['asn'] !== ''): ?>
|
||||
<span class="text-muted ms-1">AS<?= htmlspecialchars($as['asn']) ?></span>
|
||||
<?php endif; ?>
|
||||
<div class="progress mt-1" style="height:3px">
|
||||
<div class="progress-bar bg-info" style="width:<?= round($as['hits'] / $maxAS * 100) ?>%"></div>
|
||||
</div>
|
||||
</td>
|
||||
<td class="text-muted"><?= htmlspecialchars($as['country']) ?></td>
|
||||
<td class="text-end fw-semibold pe-3"><?= number_format($as['hits'], 0, ',', '\u{202F}') ?></td>
|
||||
</tr>
|
||||
<?php endforeach; ?>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
<?php endif; ?>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<?php endif; // readable ?>
|
||||
|
||||
<!-- Groupes de réseaux -->
|
||||
<div class="card mt-4" style="max-width:600px">
|
||||
<div class="card-header bg-transparent py-2 small fw-semibold">Groupes de réseaux</div>
|
||||
<div class="card-body">
|
||||
<p class="text-muted small">Regroupez plusieurs réseaux sous un label. Chaque ligne est un motif cherché dans le nom du réseau (insensible à la casse).</p>
|
||||
<form method="post" action="/?action=admin_save_as_groups" id="as-groups-form">
|
||||
<div id="as-groups-list">
|
||||
<?php foreach ($_groups as $gi => $g): ?>
|
||||
<div class="as-group-row border rounded p-3 mb-3">
|
||||
<div class="d-flex align-items-center gap-2 mb-2">
|
||||
<input type="text" name="as_group_label[]" class="form-control form-control-sm"
|
||||
placeholder="Label (ex : Opérateurs FR)"
|
||||
value="<?= htmlspecialchars($g['label']) ?>" required>
|
||||
<button type="button" class="btn btn-outline-danger btn-sm as-group-delete" title="Supprimer">✕</button>
|
||||
</div>
|
||||
<textarea name="as_group_patterns[]" class="form-control form-control-sm font-monospace"
|
||||
rows="3" placeholder="Un motif par ligne ex : Free SAS Orange SFR"><?= htmlspecialchars(implode("\n", $g['patterns'])) ?></textarea>
|
||||
</div>
|
||||
<?php endforeach; ?>
|
||||
</div>
|
||||
<div class="d-flex gap-2 mt-2">
|
||||
<button type="button" id="as-group-add" class="btn btn-outline-secondary btn-sm">+ Ajouter un groupe</button>
|
||||
<button type="submit" class="btn btn-primary btn-sm">Enregistrer</button>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<template id="as-group-tpl">
|
||||
<div class="as-group-row border rounded p-3 mb-3">
|
||||
<div class="d-flex align-items-center gap-2 mb-2">
|
||||
<input type="text" name="as_group_label[]" class="form-control form-control-sm"
|
||||
placeholder="Label (ex : Moteurs de recherche)" required>
|
||||
<button type="button" class="btn btn-outline-danger btn-sm as-group-delete" title="Supprimer">✕</button>
|
||||
</div>
|
||||
<textarea name="as_group_patterns[]" class="form-control form-control-sm font-monospace"
|
||||
rows="3" placeholder="Un motif par ligne ex : Googlebot Bingbot"></textarea>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
document.getElementById('as-group-add').addEventListener('click', () => {
|
||||
const tpl = document.getElementById('as-group-tpl').content.cloneNode(true);
|
||||
document.getElementById('as-groups-list').appendChild(tpl);
|
||||
});
|
||||
document.getElementById('as-groups-list').addEventListener('click', e => {
|
||||
if (e.target.classList.contains('as-group-delete')) {
|
||||
e.target.closest('.as-group-row').remove();
|
||||
}
|
||||
});
|
||||
</script>
|
||||
@@ -0,0 +1,62 @@
|
||||
<?php ob_start(); ?>
|
||||
|
||||
<div class="book-page">
|
||||
|
||||
<div class="book-header mb-4">
|
||||
<p class="book-label">Livre</p>
|
||||
<h1 class="h2 mb-2"><?= htmlspecialchars($book['title']) ?></h1>
|
||||
<?php if (!empty($book['description'])): ?>
|
||||
<p class="lead text-muted"><?= htmlspecialchars($book['description']) ?></p>
|
||||
<?php endif; ?>
|
||||
<p class="text-muted small"><?= count($bookArticles) ?> page<?= count($bookArticles) > 1 ? 's' : '' ?></p>
|
||||
</div>
|
||||
|
||||
<?php if (empty($bookArticles)): ?>
|
||||
<p class="text-muted">Ce livre ne contient pas encore de pages publiées.</p>
|
||||
<?php else: ?>
|
||||
<ol class="book-chapters">
|
||||
<?php foreach ($bookArticles as $i => $a):
|
||||
$cat = trim($a['category'] ?? '');
|
||||
$gradient = coverGradient($cat !== '' ? $cat : $a['uuid'], $allCats);
|
||||
$cover = $a['cover'] ?? '';
|
||||
$date = $a['published_at'] ? date('d/m/Y', strtotime((string)$a['published_at'])) : '';
|
||||
?>
|
||||
<li class="book-chapter">
|
||||
<a href="/post/<?= rawurlencode($a['slug'] ?? '') ?>" class="book-chapter-link">
|
||||
<span class="book-chapter-num"><?= $i + 1 ?></span>
|
||||
<div class="book-chapter-thumb" style="<?= $cover !== ''
|
||||
? 'background-image:url(/file?uuid=' . rawurlencode($a['uuid']) . '&name=' . rawurlencode($cover) . ');background-size:cover;background-position:center'
|
||||
: 'background:' . htmlspecialchars($gradient) ?>">
|
||||
</div>
|
||||
<div class="book-chapter-body">
|
||||
<div class="book-chapter-title"><?= htmlspecialchars($a['title'] ?? '') ?></div>
|
||||
<div class="book-chapter-meta">
|
||||
<?php if ($cat !== ''): ?><?= htmlspecialchars($cat) ?><?php endif; ?>
|
||||
<?php if ($cat !== '' && $date !== ''): ?> · <?php endif; ?>
|
||||
<?php if ($date !== ''): ?><?= $date ?><?php endif; ?>
|
||||
</div>
|
||||
<?php if (!$a['published']): ?>
|
||||
<span class="badge bg-secondary small">Brouillon</span>
|
||||
<?php endif; ?>
|
||||
</div>
|
||||
</a>
|
||||
</li>
|
||||
<?php endforeach; ?>
|
||||
</ol>
|
||||
<?php endif; ?>
|
||||
|
||||
<?php if (function_exists('isAdmin') && isAdmin()): ?>
|
||||
<div class="mt-4 text-end">
|
||||
<a href="/admin/books?edit=<?= rawurlencode($book['slug']) ?>" class="btn btn-sm btn-outline-secondary">
|
||||
✎ Modifier ce livre
|
||||
</a>
|
||||
</div>
|
||||
<?php endif; ?>
|
||||
|
||||
</div>
|
||||
|
||||
<?php
|
||||
$content = ob_get_clean();
|
||||
$title = htmlspecialchars($book['title']) . ' — ' . siteTitle();
|
||||
$canonical = rtrim(APP_URL, '/') . '/book/' . rawurlencode($book['slug']);
|
||||
include __DIR__ . '/layout.php';
|
||||
@@ -60,7 +60,7 @@ $preSource = $step2Meta['canonical'] ?? $step2Meta['source'] ?? $step2Url;
|
||||
<div class="mb-4">
|
||||
<p class="fw-semibold small mb-2">Aperçu de la page</p>
|
||||
<?php
|
||||
$previewMtime = @filemtime(BASE_PATH . '/data/' . $step2Article['uuid'] . '/files/' . $step2Screenshot) ?: time();
|
||||
$previewMtime = @filemtime(DATA_PATH . '/' . $step2Article['uuid'] . '/files/' . $step2Screenshot) ?: time();
|
||||
?>
|
||||
<img src="/file?uuid=<?= rawurlencode($step2Article['uuid']) ?>&name=<?= rawurlencode($step2Screenshot) ?>&v=<?= $previewMtime ?>"
|
||||
class="img-fluid rounded shadow-sm d-block"
|
||||
|
||||
@@ -70,6 +70,19 @@ $externalLinks = $article['external_links'] ?? [];
|
||||
<!-- Colonne principale -->
|
||||
<div class="col">
|
||||
|
||||
<?php if (!empty($bookContext)): ?>
|
||||
<div class="book-article-banner mb-3">
|
||||
<a href="/book/<?= rawurlencode($bookContext['book']['slug']) ?>" class="book-article-banner-link">
|
||||
<span class="book-article-banner-icon">📖</span>
|
||||
<span class="book-article-banner-text">
|
||||
Chapitre <?= $bookContext['position'] ?>/<?= $bookContext['total'] ?> —
|
||||
<strong><?= htmlspecialchars($bookContext['book']['title']) ?></strong>
|
||||
</span>
|
||||
<span class="book-article-banner-cta">Voir le sommaire →</span>
|
||||
</a>
|
||||
</div>
|
||||
<?php endif; ?>
|
||||
|
||||
<div class="card mb-4">
|
||||
<?php if (!$article['published']): ?>
|
||||
<div class="draft-ribbon">Brouillon</div>
|
||||
@@ -163,6 +176,41 @@ $hasSources = (!empty($externalLinks) || !empty($files))
|
||||
<div class="card-text post-content">
|
||||
<?= $_renderedContent ?>
|
||||
</div>
|
||||
|
||||
<?php if (!empty($bookContext)): ?>
|
||||
<nav class="book-chapter-nav">
|
||||
<div class="book-chapter-nav-inner">
|
||||
<?php if (!empty($bookContext['prev_article'])): ?>
|
||||
<a href="/post/<?= rawurlencode($bookContext['prev_article']['slug'] ?? '') ?>"
|
||||
class="book-nav-btn book-nav-btn--prev">
|
||||
<span class="book-nav-dir">← Précédent</span>
|
||||
<span class="book-nav-title"><?= htmlspecialchars($bookContext['prev_article']['title'] ?? '') ?></span>
|
||||
</a>
|
||||
<?php else: ?>
|
||||
<span class="book-nav-btn book-nav-btn--prev book-nav-btn--disabled">
|
||||
<span class="book-nav-dir">Premier chapitre</span>
|
||||
</span>
|
||||
<?php endif; ?>
|
||||
|
||||
<a href="/book/<?= rawurlencode($bookContext['book']['slug']) ?>"
|
||||
class="book-nav-toc" title="Sommaire du livre">
|
||||
☰
|
||||
</a>
|
||||
|
||||
<?php if (!empty($bookContext['next_article'])): ?>
|
||||
<a href="/post/<?= rawurlencode($bookContext['next_article']['slug'] ?? '') ?>"
|
||||
class="book-nav-btn book-nav-btn--next">
|
||||
<span class="book-nav-dir">Suivant →</span>
|
||||
<span class="book-nav-title"><?= htmlspecialchars($bookContext['next_article']['title'] ?? '') ?></span>
|
||||
</a>
|
||||
<?php else: ?>
|
||||
<span class="book-nav-btn book-nav-btn--next book-nav-btn--disabled">
|
||||
<span class="book-nav-dir">Dernier chapitre</span>
|
||||
</span>
|
||||
<?php endif; ?>
|
||||
</div>
|
||||
</nav>
|
||||
<?php endif; ?>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user