From d87348c388c40a3f4145a8be9960f01365f29553 Mon Sep 17 00:00:00 2001 From: Pontoporeia Date: Tue, 24 Mar 2026 13:12:48 +0100 Subject: [PATCH] feat: licence page, admin pages editor, license types, gradient card placeholders, latest-year home view - Feature 1: public /licence.php fetches 'licenses' page from DB, renders Markdown - Feature 1: nav.php adds 'Licence' link with active state - Feature 2: Database::getPage(), savePage(), getAllPages() methods - Feature 2: bundled src/Parsedown.php (MIT, zero-dependency) - Feature 2: apropos.php now renders 'about' page content from DB via Parsedown - Feature 2: admin/pages.php (list) + admin/pages-edit.php (EasyMDE editor) - Feature 2: admin/actions/page.php (auth+CSRF+validation+save) - Feature 2: admin/head.php adds 'Pages statiques' nav link - Feature 3: storage/schema.sql seeds 8 CC license types - Feature 3: storage/migrations/003_seed_license_types.sql (applied to live DB) - Feature 3: Database::getLicenseTypes() / getAllLicenseTypes() - Feature 3: admin/add.php + formulaire.php: license_id field on add form - Feature 3: admin/edit.php: license_id field on edit form with raw FK lookup - Feature 3: tfe.php: shows 'Licence :' meta row when non-null - Feature 6: main.css: .card__media--gradient styles - Feature 6: index.php: deterministic HSL gradient placeholder cards - Feature 6: Database::getLatestYearTheses() + getLatestPublishedYear() - Feature 6: index.php default home = random latest-year theses with info label --- TODO.md | 151 +- public/admin/actions/formulaire.php | 10 +- public/admin/actions/page.php | 35 + public/admin/add.php | 15 + public/admin/edit.php | 25 +- public/admin/pages-edit.php | 67 + public/admin/pages.php | 55 + public/apropos.php | 35 +- public/assets/apropos.css | 36 + public/assets/main.css | 35 + public/index.php | 58 +- public/licence.php | 64 + public/tfe.php | 7 + src/Database.php | 83 + src/Parsedown.php | 1995 +++++++++++++++++ storage/migrations/003_seed_license_types.sql | 19 + storage/posterg.db | Bin 204800 -> 204800 bytes storage/schema.sql | 10 + templates/admin/head.php | 1 + templates/nav.php | 4 +- 20 files changed, 2553 insertions(+), 152 deletions(-) create mode 100644 public/admin/actions/page.php create mode 100644 public/admin/pages-edit.php create mode 100644 public/admin/pages.php create mode 100644 public/licence.php create mode 100644 src/Parsedown.php create mode 100644 storage/migrations/003_seed_license_types.sql diff --git a/TODO.md b/TODO.md index 2af5bd5..8f0f64a 100644 --- a/TODO.md +++ b/TODO.md @@ -41,14 +41,11 @@ Create a public-facing `/licence.php` page, styled consistently with `apropos.php`. -- [ ] **`public/licence.php`** — new public page; fetches content from `pages` table - (slug `'licenses'`); renders with `nl2br` / Markdown; uses `apropos.css` layout - or a new `licence.css` if divergent styling needed -- [ ] **`templates/nav.php`** — add "Licence" link between "Répertoire" and "À Propos" - (or after "À Propos"); apply `site-nav__link--active` when `$currentNav === 'licence'` -- [ ] The `pages` table already has an `INSERT OR IGNORE` seed for slug `'licenses'` - in `storage/schema.sql` — no schema change needed here; verify the row exists - in the live DB and add a migration if not +- [x] **`public/licence.php`** — new public page; fetches content from `pages` table + (slug `'licenses'`); renders with Parsedown Markdown; uses `apropos.css` layout +- [x] **`templates/nav.php`** — add "Licence" link between "Répertoire" and "À Propos"; + apply `site-nav__link--active` when `$currentNav === 'licence'` +- [x] The `pages` table row for slug `'licenses'` verified in live DB --- @@ -59,45 +56,28 @@ panel, stored in the existing `pages` table. #### 2a — `src/Database.php` -- [ ] `getPage(string $slug): array|null` — `SELECT * FROM pages WHERE slug = ?` -- [ ] `savePage(string $slug, string $content): void` — `UPDATE pages SET content = ?, - updated_at = CURRENT_TIMESTAMP WHERE slug = ?`; throw if slug not found +- [x] `getPage(string $slug): array|null` — `SELECT * FROM pages WHERE slug = ?` +- [x] `savePage(string $slug, string $content): void` — throws if slug not found +- [x] `getAllPages(): array` — for listing in admin #### 2b — Admin pages editor UI -- [ ] **`public/admin/pages.php`** — list all editable pages (fetch all from `pages` - table); links to edit each one; reuse `.admin-table` styles -- [ ] **`public/admin/pages-edit.php`** — edit form for a single page (slug passed via - GET `?slug=`); loads page content; renders a **EasyMDE** (or SimpleMDE) Markdown - WYSIWYG editor via CDN; POST action → `actions/page.php` - - Include EasyMDE from CDN: `https://cdn.jsdelivr.net/npm/easymde/dist/easymde.min.js` - + matching CSS - - Textarea `name="content"` pre-filled with `$page['content']`; hidden input - `name="slug"` with the page slug - - CSRF token as hidden input +- [x] **`public/admin/pages.php`** — list all editable pages; links to edit each one +- [x] **`public/admin/pages-edit.php`** — EasyMDE WYSIWYG Markdown editor via CDN #### 2c — `public/admin/actions/page.php` -- [ ] Auth guard + CSRF check -- [ ] Validate `slug` ∈ `['about', 'licenses', 'charte', 'contact']` -- [ ] Validate `content` length ≤ 65 535 chars (TEXT column limit) -- [ ] Call `$db->savePage($slug, $content)` -- [ ] Set `$_SESSION['success']`; redirect to `../pages.php` +- [x] Auth guard + CSRF check + slug validation + length validation + savePage + redirect #### 2d — Public pages render Markdown -- [ ] **`public/apropos.php`** — replace hardcoded HTML body text with content from - `$db->getPage('about')`; render Markdown via a PHP parser - (use **Parsedown** via Composer, or a ~150-line zero-dependency inline parser - if Composer is not available in this project — check `composer.json`) -- [ ] **`public/licence.php`** — same: render `$db->getPage('licenses')` as Markdown -- [ ] Choose Markdown renderer: check if Composer is available; if not, bundle - `vendor/Parsedown.php` as a single-file include (MIT licensed, copy-paste friendly) +- [x] **`public/apropos.php`** — renders `$db->getPage('about')` via Parsedown (bundled `src/Parsedown.php`) +- [x] **`public/licence.php`** — renders `$db->getPage('licenses')` via Parsedown +- [x] Parsedown bundled as `src/Parsedown.php` (zero-dependency, MIT) #### 2e — Nav links in admin -- [ ] **`templates/admin/head.php`** — add "Pages statiques" nav item linking to - `/admin/pages.php`; apply active class when on `pages.php` or `pages-edit.php` +- [x] **`templates/admin/head.php`** — "Pages statiques" nav item added --- @@ -109,54 +89,36 @@ no seed data yet. #### 3a — Schema / DB -- [ ] **`storage/schema.sql`** — add seed `INSERT OR IGNORE` for common Creative Commons - licences into `license_types`: - `CC BY 4.0`, `CC BY-SA 4.0`, `CC BY-ND 4.0`, `CC BY-NC 4.0`, - `CC BY-NC-SA 4.0`, `CC BY-NC-ND 4.0`, `Tous droits réservés`, `Domaine public` -- [ ] **`storage/migrations/003_seed_license_types.sql`** — same inserts wrapped in - `INSERT OR IGNORE` so they're safe to run on an existing DB; also contains - no structural changes (no ALTER TABLE needed — `theses.license_id` FK already - exists in the schema) -- [ ] Verify live DB has `license_types` table; if missing (older DB without that - table), add `CREATE TABLE IF NOT EXISTS` to the migration +- [x] **`storage/schema.sql`** — seed `INSERT OR IGNORE` for 8 CC licence types added +- [x] **`storage/migrations/003_seed_license_types.sql`** — migration created + applied +- [x] Verified live DB has `license_types` with 8 rows #### 3b — `src/Database.php` -- [ ] `getLicenseTypes(): array` — `SELECT * FROM license_types ORDER BY name` -- [ ] `getAllLicenseTypes(): array` — alias for form-loading consistency +- [x] `getLicenseTypes(): array` +- [x] `getAllLicenseTypes(): array` — alias #### 3c — Add form (`public/admin/add.php`) -- [ ] Load `$licenseTypes = $db->getAllLicenseTypes()` alongside existing reference data -- [ ] Add "Licence" `` added before duration #### 3d — Add action (`public/admin/actions/formulaire.php`) -- [ ] Read `$licenseId = filter_var($_POST['license_id'] ?? '', FILTER_VALIDATE_INT) ?: null` -- [ ] Add `license_id` to the `INSERT INTO theses (…)` column list and `$stmt->execute([…])` +- [x] `$licenseId` parsed + included in INSERT #### 3e — Edit form (`public/admin/edit.php`) -- [ ] Load `$licenseTypes = $db->getAllLicenseTypes()` -- [ ] Add "Licence" ` + + + + + + +
diff --git a/public/admin/edit.php b/public/admin/edit.php index bdbb05e..7c7aa1b 100644 --- a/public/admin/edit.php +++ b/public/admin/edit.php @@ -36,6 +36,8 @@ try { $db->beginTransaction(); // Update thesis basic info + $editLicenseId = filter_var($_POST['license_id'] ?? '', FILTER_VALIDATE_INT) ?: null; + $stmt = $pdo->prepare(" UPDATE theses SET title = ?, @@ -47,6 +49,7 @@ try { synopsis = ?, file_size_info = ?, baiu_link = ?, + license_id = ?, is_published = ?, updated_at = CURRENT_TIMESTAMP WHERE id = ? @@ -62,6 +65,7 @@ try { trim($_POST['synopsis']), !empty($_POST['duration_info']) ? trim($_POST['duration_info']) : null, !empty($_POST['lien']) ? trim($_POST['lien']) : null, + $editLicenseId, isset($_POST['is_published']) ? 1 : 0, $thesisId ]); @@ -164,7 +168,13 @@ try { $finalityTypes = $db->getAllFinalityTypes(); $languages = $db->getAllLanguages(); $formatTypes = $db->getAllFormatTypes(); - + $licenseTypes = $db->getAllLicenseTypes(); + + // Fetch raw license_id FK (view only exposes license_type name string) + $licenseStmt = $pdo->prepare("SELECT license_id FROM theses WHERE id = ?"); + $licenseStmt->execute([$thesisId]); + $currentLicenseId = $licenseStmt->fetchColumn(); + // Set page title for header $pageTitle = "Éditer TFE - " . htmlspecialchars($thesis['title']); @@ -247,6 +257,19 @@ try { value="">
+
+ + +
+
getPage($slug); + if (!$page) { + die("Page introuvable."); + } +} catch (Exception $e) { + die("Erreur: " . htmlspecialchars($e->getMessage())); +} + +$pageTitle = "Éditer : " . htmlspecialchars($page['title']); +?> + + + + +
+

Éditer :

+ +
+ + + +
+ + +
+ +
+ + Annuler +
+
+
+ + + + + diff --git a/public/admin/pages.php b/public/admin/pages.php new file mode 100644 index 0000000..7f01879 --- /dev/null +++ b/public/admin/pages.php @@ -0,0 +1,55 @@ +getAllPages(); +} catch (Exception $e) { + error_log("Error loading pages: " . $e->getMessage()); + die("Erreur lors du chargement des pages."); +} + +$success = $_SESSION['success'] ?? null; +unset($_SESSION['success']); +?> + + +
+

Pages statiques

+ + +
✓
+ + + + + + + + + + + + + + + + + + + + + +
SlugTitreMis à jourAction
+ Éditer +
+
+ + diff --git a/public/apropos.php b/public/apropos.php index 810e8f0..f5f5758 100644 --- a/public/apropos.php +++ b/public/apropos.php @@ -1,6 +1,29 @@ getPage('about'); + $rawContent = $aboutPage ? $aboutPage['content'] : ''; + // Use static fallback if content is placeholder + if (empty(trim($rawContent)) || trim($rawContent) === 'Contenu à venir') { + $rawContent = APROPOS_STATIC_CONTENT; + } +} catch (Exception $e) { + error_log("Error loading about page: " . $e->getMessage()); + $rawContent = APROPOS_STATIC_CONTENT; +} + +$pd = new Parsedown(); +$pd->setSafeMode(true); +$aboutHtml = $pd->text($rawContent); ?> @@ -30,16 +53,10 @@ $currentNav = 'apropos';
- +
-
-

Ce site POSTERG a été créé pour répertorier et valoriser les mémoires de l'erg – École de Recherches Graphique de Bruxelles.

-

L'objectif est à la fois d'offrir une vitrine aux projets des anciens étudiantes et de mettre en lumière la diversité des disciplines et des parcours qui façonnent l'histoire de l'école à travers les âges, depuis près de 100 ans.

-
- -
-

Licences

-

Les contenus de ce site sont publiés avec l'accord des auteur·ices et de l'erg. La reproduction des œuvres est soumise à l'autorisation de leurs auteur·ices respectif·ives.

+
+
diff --git a/public/assets/apropos.css b/public/assets/apropos.css index e32c2a3..de976fc 100644 --- a/public/assets/apropos.css +++ b/public/assets/apropos.css @@ -93,6 +93,42 @@ html, body { line-height: 1.6; } +/* Markdown-rendered page content */ +.apropos-page-content p { + margin: 0 0 1.2em 0; +} +.apropos-page-content h1, +.apropos-page-content h2, +.apropos-page-content h3 { + font-family: "Courier New", Courier, monospace; + font-weight: 400; + margin: 1.5em 0 0.5em 0; +} +.apropos-page-content h1 { font-size: 1.55rem; } +.apropos-page-content h2 { font-size: 1.3rem; } +.apropos-page-content h3 { font-size: 1.1rem; } +.apropos-page-content a { + color: var(--purple); + text-underline-offset: 2px; +} +.apropos-page-content ul, +.apropos-page-content ol { + padding-left: 1.5rem; + margin-bottom: 1rem; +} +.apropos-page-content li { + margin-bottom: .3em; +} +.apropos-page-content strong { font-weight: 700; } +.apropos-page-content em { font-style: italic; } +.apropos-page-content code { + font-family: "Courier New", Courier, monospace; + font-size: 0.9em; + background: rgba(0,0,0,.06); + padding: .1em .3em; + border-radius: 2px; +} + /* Licences section */ .apropos-licences { margin-top: 2rem; diff --git a/public/assets/main.css b/public/assets/main.css index 93111e9..b138f4c 100644 --- a/public/assets/main.css +++ b/public/assets/main.css @@ -91,6 +91,41 @@ html, body { font-size: 2rem; } +.card__media--gradient { + width: 100%; + height: 100%; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + padding: 1rem; + text-align: center; + box-sizing: border-box; +} + +.card__gradient-author { + color: #fff; + font-size: 0.75rem; + opacity: .85; + margin-bottom: .25rem; + display: block; +} + +.card__gradient-title { + color: #fff; + font-size: 0.85rem; + font-weight: 600; + display: -webkit-box; + -webkit-line-clamp: 3; + -webkit-box-orient: vertical; + overflow: hidden; +} + +/* Latest-year label */ +.home-latest-label { + font-style: italic; +} + .card__info { padding: 0.55rem 0.5rem 0.65rem; font-size: 0.88rem; diff --git a/public/index.php b/public/index.php index 6e7340a..9000c61 100644 --- a/public/index.php +++ b/public/index.php @@ -3,9 +3,12 @@ require_once __DIR__ . '/../config/bootstrap.php'; require_once APP_ROOT . '/src/Database.php'; -$page = isset($_GET["page"]) ? intval($_GET["page"]) : 1; +$page = isset($_GET["page"]) ? max(1, intval($_GET["page"])) : 1; $year = isset($_GET["year"]) ? intval($_GET["year"]) : null; -$itemsPerPage = 24; // bigger grid +$itemsPerPage = 24; + +// Default home view: random theses from latest year (no year filter, no explicit page) +$isDefaultView = (!$year && $page === 1); try { $db = Database::getInstance(); @@ -14,19 +17,25 @@ try { if ($year) { $itemsToLoad = $db->searchTheses(['year' => $year], $itemsPerPage, $offset); - $totalItems = $db->countSearchResults(['year' => $year]); + $totalItems = $db->countSearchResults(['year' => $year]); + } elseif ($isDefaultView) { + $latestYear = $db->getLatestPublishedYear(); + $itemsToLoad = $db->getLatestYearTheses($itemsPerPage); + $totalItems = count($itemsToLoad); // no pagination on default view } else { $itemsToLoad = $db->getPublishedTheses($itemsPerPage, $offset); - $totalItems = $db->countPublishedTheses(); + $totalItems = $db->countPublishedTheses(); } - $totalPages = ceil($totalItems / $itemsPerPage); + $totalPages = $isDefaultView ? 1 : (int)ceil($totalItems / $itemsPerPage); } catch (Exception $e) { error_log("Error loading theses: " . $e->getMessage()); $itemsToLoad = []; - $totalPages = 0; + $totalPages = 0; $availableYears = []; - $totalItems = 0; + $totalItems = 0; + $latestYear = null; + $isDefaultView = false; } $currentNav = ''; @@ -61,6 +70,10 @@ $currentNav = ''; Année : ✕ Réinitialiser
+ +
+ Découvrez les TFE de — sélection aléatoire +
@@ -70,28 +83,31 @@ $currentNav = '';
<?= htmlspecialchars($item['title']) ?> -
◻
+ +
+ + +
diff --git a/public/licence.php b/public/licence.php new file mode 100644 index 0000000..a02ad5a --- /dev/null +++ b/public/licence.php @@ -0,0 +1,64 @@ +getPage('licenses'); + $content = $page ? $page['content'] : ''; + $pageTitle = $page ? $page['title'] : 'Licences'; +} catch (Exception $e) { + error_log("Error loading licence page: " . $e->getMessage()); + $content = ''; + $pageTitle = 'Licences'; +} + +$pd = new Parsedown(); +$pd->setSafeMode(true); +$html = $pd->text($content); +?> + + + + + + <?= htmlspecialchars($pageTitle) ?> – Posterg + + + + + + + + + + + + + +
+
+
+
+ + + +

Contenu à venir.

+ +
+
+
+
+
+ + + diff --git a/public/tfe.php b/public/tfe.php index dde280b..5d6620b 100644 --- a/public/tfe.php +++ b/public/tfe.php @@ -114,6 +114,13 @@ $currentNav = '';
+ +
+ Licence : + +
+ +
Contact : diff --git a/src/Database.php b/src/Database.php index 52614a6..b303718 100644 --- a/src/Database.php +++ b/src/Database.php @@ -115,6 +115,30 @@ class Database { return $stmt->fetchAll(); } + /** + * Get theses from the latest published year, in random order (per request). + * Used for the default home page view. + */ + public function getLatestYearTheses(int $limit = 24): array { + $sql = "SELECT * FROM v_theses_public + WHERE year = (SELECT MAX(year) FROM theses WHERE is_published = 1) + ORDER BY RANDOM() + LIMIT :limit"; + $stmt = $this->pdo->prepare($sql); + $stmt->bindValue(':limit', $limit, PDO::PARAM_INT); + $stmt->execute(); + return $stmt->fetchAll(); + } + + /** + * Get the latest year that has published theses + */ + public function getLatestPublishedYear(): ?int { + $stmt = $this->pdo->query("SELECT MAX(year) FROM theses WHERE is_published = 1"); + $val = $stmt->fetchColumn(); + return $val ? (int)$val : null; + } + /** * Count all published theses */ @@ -648,6 +672,65 @@ class Database { return $result ? $result['id'] : null; } + // ======================================================================== + // STATIC PAGES METHODS + // ======================================================================== + + /** + * Get a static page by slug + * @param string $slug Page slug (e.g. 'about', 'licenses') + * @return array|null + */ + public function getPage(string $slug): ?array { + $stmt = $this->pdo->prepare("SELECT * FROM pages WHERE slug = ?"); + $stmt->execute([$slug]); + $row = $stmt->fetch(); + return $row ?: null; + } + + /** + * Update content for a static page by slug + * @throws Exception if slug not found + */ + public function savePage(string $slug, string $content): void { + $stmt = $this->pdo->prepare("SELECT id FROM pages WHERE slug = ?"); + $stmt->execute([$slug]); + if (!$stmt->fetch()) { + throw new Exception("Page slug not found: $slug"); + } + $stmt = $this->pdo->prepare( + "UPDATE pages SET content = ?, updated_at = CURRENT_TIMESTAMP WHERE slug = ?" + ); + $stmt->execute([$content, $slug]); + } + + /** + * Get all static pages + */ + public function getAllPages(): array { + $stmt = $this->pdo->query("SELECT * FROM pages ORDER BY slug"); + return $stmt->fetchAll(); + } + + // ======================================================================== + // LICENSE TYPE METHODS + // ======================================================================== + + /** + * Get all license types ordered by name + */ + public function getLicenseTypes(): array { + $stmt = $this->pdo->query("SELECT * FROM license_types ORDER BY name"); + return $stmt->fetchAll(); + } + + /** + * Alias for form-loading consistency + */ + public function getAllLicenseTypes(): array { + return $this->getLicenseTypes(); + } + /** * Insert a thesis file record */ diff --git a/src/Parsedown.php b/src/Parsedown.php new file mode 100644 index 0000000..2f01d5c --- /dev/null +++ b/src/Parsedown.php @@ -0,0 +1,1995 @@ +textElements($text); + + # convert to markup + $markup = $this->elements($Elements); + + # trim line breaks + $markup = trim($markup, "\n"); + + return $markup; + } + + protected function textElements($text) + { + # make sure no definitions are set + $this->DefinitionData = array(); + + # standardize line breaks + $text = str_replace(array("\r\n", "\r"), "\n", $text); + + # remove surrounding line breaks + $text = trim($text, "\n"); + + # split text into lines + $lines = explode("\n", $text); + + # iterate through lines to identify blocks + return $this->linesElements($lines); + } + + # + # Setters + # + + function setBreaksEnabled($breaksEnabled) + { + $this->breaksEnabled = $breaksEnabled; + + return $this; + } + + protected $breaksEnabled; + + function setMarkupEscaped($markupEscaped) + { + $this->markupEscaped = $markupEscaped; + + return $this; + } + + protected $markupEscaped; + + function setUrlsLinked($urlsLinked) + { + $this->urlsLinked = $urlsLinked; + + return $this; + } + + protected $urlsLinked = true; + + function setSafeMode($safeMode) + { + $this->safeMode = (bool) $safeMode; + + return $this; + } + + protected $safeMode; + + function setStrictMode($strictMode) + { + $this->strictMode = (bool) $strictMode; + + return $this; + } + + protected $strictMode; + + protected $safeLinksWhitelist = array( + 'http://', + 'https://', + 'ftp://', + 'ftps://', + 'mailto:', + 'tel:', + 'data:image/png;base64,', + 'data:image/gif;base64,', + 'data:image/jpeg;base64,', + 'irc:', + 'ircs:', + 'git:', + 'ssh:', + 'news:', + 'steam:', + ); + + # + # Lines + # + + protected $BlockTypes = array( + '#' => array('Header'), + '*' => array('Rule', 'List'), + '+' => array('List'), + '-' => array('SetextHeader', 'Table', 'Rule', 'List'), + '0' => array('List'), + '1' => array('List'), + '2' => array('List'), + '3' => array('List'), + '4' => array('List'), + '5' => array('List'), + '6' => array('List'), + '7' => array('List'), + '8' => array('List'), + '9' => array('List'), + ':' => array('Table'), + '<' => array('Comment', 'Markup'), + '=' => array('SetextHeader'), + '>' => array('Quote'), + '[' => array('Reference'), + '_' => array('Rule'), + '`' => array('FencedCode'), + '|' => array('Table'), + '~' => array('FencedCode'), + ); + + # ~ + + protected $unmarkedBlockTypes = array( + 'Code', + ); + + # + # Blocks + # + + protected function lines(array $lines) + { + return $this->elements($this->linesElements($lines)); + } + + protected function linesElements(array $lines) + { + $Elements = array(); + $CurrentBlock = null; + + foreach ($lines as $line) + { + if (chop($line) === '') + { + if (isset($CurrentBlock)) + { + $CurrentBlock['interrupted'] = (isset($CurrentBlock['interrupted']) + ? $CurrentBlock['interrupted'] + 1 : 1 + ); + } + + continue; + } + + while (($beforeTab = strstr($line, "\t", true)) !== false) + { + $shortage = 4 - mb_strlen($beforeTab, 'utf-8') % 4; + + $line = $beforeTab + . str_repeat(' ', $shortage) + . substr($line, strlen($beforeTab) + 1) + ; + } + + $indent = strspn($line, ' '); + + $text = $indent > 0 ? substr($line, $indent) : $line; + + # ~ + + $Line = array('body' => $line, 'indent' => $indent, 'text' => $text); + + # ~ + + if (isset($CurrentBlock['continuable'])) + { + $methodName = 'block' . $CurrentBlock['type'] . 'Continue'; + $Block = $this->$methodName($Line, $CurrentBlock); + + if (isset($Block)) + { + $CurrentBlock = $Block; + + continue; + } + else + { + if ($this->isBlockCompletable($CurrentBlock['type'])) + { + $methodName = 'block' . $CurrentBlock['type'] . 'Complete'; + $CurrentBlock = $this->$methodName($CurrentBlock); + } + } + } + + # ~ + + $marker = $text[0]; + + # ~ + + $blockTypes = $this->unmarkedBlockTypes; + + if (isset($this->BlockTypes[$marker])) + { + foreach ($this->BlockTypes[$marker] as $blockType) + { + $blockTypes []= $blockType; + } + } + + # + # ~ + + foreach ($blockTypes as $blockType) + { + $Block = $this->{"block$blockType"}($Line, $CurrentBlock); + + if (isset($Block)) + { + $Block['type'] = $blockType; + + if ( ! isset($Block['identified'])) + { + if (isset($CurrentBlock)) + { + $Elements[] = $this->extractElement($CurrentBlock); + } + + $Block['identified'] = true; + } + + if ($this->isBlockContinuable($blockType)) + { + $Block['continuable'] = true; + } + + $CurrentBlock = $Block; + + continue 2; + } + } + + # ~ + + if (isset($CurrentBlock) and $CurrentBlock['type'] === 'Paragraph') + { + $Block = $this->paragraphContinue($Line, $CurrentBlock); + } + + if (isset($Block)) + { + $CurrentBlock = $Block; + } + else + { + if (isset($CurrentBlock)) + { + $Elements[] = $this->extractElement($CurrentBlock); + } + + $CurrentBlock = $this->paragraph($Line); + + $CurrentBlock['identified'] = true; + } + } + + # ~ + + if (isset($CurrentBlock['continuable']) and $this->isBlockCompletable($CurrentBlock['type'])) + { + $methodName = 'block' . $CurrentBlock['type'] . 'Complete'; + $CurrentBlock = $this->$methodName($CurrentBlock); + } + + # ~ + + if (isset($CurrentBlock)) + { + $Elements[] = $this->extractElement($CurrentBlock); + } + + # ~ + + return $Elements; + } + + protected function extractElement(array $Component) + { + if ( ! isset($Component['element'])) + { + if (isset($Component['markup'])) + { + $Component['element'] = array('rawHtml' => $Component['markup']); + } + elseif (isset($Component['hidden'])) + { + $Component['element'] = array(); + } + } + + return $Component['element']; + } + + protected function isBlockContinuable($Type) + { + return method_exists($this, 'block' . $Type . 'Continue'); + } + + protected function isBlockCompletable($Type) + { + return method_exists($this, 'block' . $Type . 'Complete'); + } + + # + # Code + + protected function blockCode($Line, $Block = null) + { + if (isset($Block) and $Block['type'] === 'Paragraph' and ! isset($Block['interrupted'])) + { + return; + } + + if ($Line['indent'] >= 4) + { + $text = substr($Line['body'], 4); + + $Block = array( + 'element' => array( + 'name' => 'pre', + 'element' => array( + 'name' => 'code', + 'text' => $text, + ), + ), + ); + + return $Block; + } + } + + protected function blockCodeContinue($Line, $Block) + { + if ($Line['indent'] >= 4) + { + if (isset($Block['interrupted'])) + { + $Block['element']['element']['text'] .= str_repeat("\n", $Block['interrupted']); + + unset($Block['interrupted']); + } + + $Block['element']['element']['text'] .= "\n"; + + $text = substr($Line['body'], 4); + + $Block['element']['element']['text'] .= $text; + + return $Block; + } + } + + protected function blockCodeComplete($Block) + { + return $Block; + } + + # + # Comment + + protected function blockComment($Line) + { + if ($this->markupEscaped or $this->safeMode) + { + return; + } + + if (strpos($Line['text'], '') !== false) + { + $Block['closed'] = true; + } + + return $Block; + } + } + + protected function blockCommentContinue($Line, array $Block) + { + if (isset($Block['closed'])) + { + return; + } + + $Block['element']['rawHtml'] .= "\n" . $Line['body']; + + if (strpos($Line['text'], '-->') !== false) + { + $Block['closed'] = true; + } + + return $Block; + } + + # + # Fenced Code + + protected function blockFencedCode($Line) + { + $marker = $Line['text'][0]; + + $openerLength = strspn($Line['text'], $marker); + + if ($openerLength < 3) + { + return; + } + + $infostring = trim(substr($Line['text'], $openerLength), "\t "); + + if (strpos($infostring, '`') !== false) + { + return; + } + + $Element = array( + 'name' => 'code', + 'text' => '', + ); + + if ($infostring !== '') + { + /** + * https://www.w3.org/TR/2011/WD-html5-20110525/elements.html#classes + * Every HTML element may have a class attribute specified. + * The attribute, if specified, must have a value that is a set + * of space-separated tokens representing the various classes + * that the element belongs to. + * [...] + * The space characters, for the purposes of this specification, + * are U+0020 SPACE, U+0009 CHARACTER TABULATION (tab), + * U+000A LINE FEED (LF), U+000C FORM FEED (FF), and + * U+000D CARRIAGE RETURN (CR). + */ + $language = substr($infostring, 0, strcspn($infostring, " \t\n\f\r")); + + $Element['attributes'] = array('class' => "language-$language"); + } + + $Block = array( + 'char' => $marker, + 'openerLength' => $openerLength, + 'element' => array( + 'name' => 'pre', + 'element' => $Element, + ), + ); + + return $Block; + } + + protected function blockFencedCodeContinue($Line, $Block) + { + if (isset($Block['complete'])) + { + return; + } + + if (isset($Block['interrupted'])) + { + $Block['element']['element']['text'] .= str_repeat("\n", $Block['interrupted']); + + unset($Block['interrupted']); + } + + if (($len = strspn($Line['text'], $Block['char'])) >= $Block['openerLength'] + and chop(substr($Line['text'], $len), ' ') === '' + ) { + $Block['element']['element']['text'] = substr($Block['element']['element']['text'], 1); + + $Block['complete'] = true; + + return $Block; + } + + $Block['element']['element']['text'] .= "\n" . $Line['body']; + + return $Block; + } + + protected function blockFencedCodeComplete($Block) + { + return $Block; + } + + # + # Header + + protected function blockHeader($Line) + { + $level = strspn($Line['text'], '#'); + + if ($level > 6) + { + return; + } + + $text = trim($Line['text'], '#'); + + if ($this->strictMode and isset($text[0]) and $text[0] !== ' ') + { + return; + } + + $text = trim($text, ' '); + + $Block = array( + 'element' => array( + 'name' => 'h' . $level, + 'handler' => array( + 'function' => 'lineElements', + 'argument' => $text, + 'destination' => 'elements', + ) + ), + ); + + return $Block; + } + + # + # List + + protected function blockList($Line, ?array $CurrentBlock = null) + { + list($name, $pattern) = $Line['text'][0] <= '-' ? array('ul', '[*+-]') : array('ol', '[0-9]{1,9}+[.\)]'); + + if (preg_match('/^('.$pattern.'([ ]++|$))(.*+)/', $Line['text'], $matches)) + { + $contentIndent = strlen($matches[2]); + + if ($contentIndent >= 5) + { + $contentIndent -= 1; + $matches[1] = substr($matches[1], 0, -$contentIndent); + $matches[3] = str_repeat(' ', $contentIndent) . $matches[3]; + } + elseif ($contentIndent === 0) + { + $matches[1] .= ' '; + } + + $markerWithoutWhitespace = strstr($matches[1], ' ', true); + + $Block = array( + 'indent' => $Line['indent'], + 'pattern' => $pattern, + 'data' => array( + 'type' => $name, + 'marker' => $matches[1], + 'markerType' => ($name === 'ul' ? $markerWithoutWhitespace : substr($markerWithoutWhitespace, -1)), + ), + 'element' => array( + 'name' => $name, + 'elements' => array(), + ), + ); + $Block['data']['markerTypeRegex'] = preg_quote($Block['data']['markerType'], '/'); + + if ($name === 'ol') + { + $listStart = ltrim(strstr($matches[1], $Block['data']['markerType'], true), '0') ?: '0'; + + if ($listStart !== '1') + { + if ( + isset($CurrentBlock) + and $CurrentBlock['type'] === 'Paragraph' + and ! isset($CurrentBlock['interrupted']) + ) { + return; + } + + $Block['element']['attributes'] = array('start' => $listStart); + } + } + + $Block['li'] = array( + 'name' => 'li', + 'handler' => array( + 'function' => 'li', + 'argument' => !empty($matches[3]) ? array($matches[3]) : array(), + 'destination' => 'elements' + ) + ); + + $Block['element']['elements'] []= & $Block['li']; + + return $Block; + } + } + + protected function blockListContinue($Line, array $Block) + { + if (isset($Block['interrupted']) and empty($Block['li']['handler']['argument'])) + { + return null; + } + + $requiredIndent = ($Block['indent'] + strlen($Block['data']['marker'])); + + if ($Line['indent'] < $requiredIndent + and ( + ( + $Block['data']['type'] === 'ol' + and preg_match('/^[0-9]++'.$Block['data']['markerTypeRegex'].'(?:[ ]++(.*)|$)/', $Line['text'], $matches) + ) or ( + $Block['data']['type'] === 'ul' + and preg_match('/^'.$Block['data']['markerTypeRegex'].'(?:[ ]++(.*)|$)/', $Line['text'], $matches) + ) + ) + ) { + if (isset($Block['interrupted'])) + { + $Block['li']['handler']['argument'] []= ''; + + $Block['loose'] = true; + + unset($Block['interrupted']); + } + + unset($Block['li']); + + $text = isset($matches[1]) ? $matches[1] : ''; + + $Block['indent'] = $Line['indent']; + + $Block['li'] = array( + 'name' => 'li', + 'handler' => array( + 'function' => 'li', + 'argument' => array($text), + 'destination' => 'elements' + ) + ); + + $Block['element']['elements'] []= & $Block['li']; + + return $Block; + } + elseif ($Line['indent'] < $requiredIndent and $this->blockList($Line)) + { + return null; + } + + if ($Line['text'][0] === '[' and $this->blockReference($Line)) + { + return $Block; + } + + if ($Line['indent'] >= $requiredIndent) + { + if (isset($Block['interrupted'])) + { + $Block['li']['handler']['argument'] []= ''; + + $Block['loose'] = true; + + unset($Block['interrupted']); + } + + $text = substr($Line['body'], $requiredIndent); + + $Block['li']['handler']['argument'] []= $text; + + return $Block; + } + + if ( ! isset($Block['interrupted'])) + { + $text = preg_replace('/^[ ]{0,'.$requiredIndent.'}+/', '', $Line['body']); + + $Block['li']['handler']['argument'] []= $text; + + return $Block; + } + } + + protected function blockListComplete(array $Block) + { + if (isset($Block['loose'])) + { + foreach ($Block['element']['elements'] as &$li) + { + if (end($li['handler']['argument']) !== '') + { + $li['handler']['argument'] []= ''; + } + } + } + + return $Block; + } + + # + # Quote + + protected function blockQuote($Line) + { + if (preg_match('/^>[ ]?+(.*+)/', $Line['text'], $matches)) + { + $Block = array( + 'element' => array( + 'name' => 'blockquote', + 'handler' => array( + 'function' => 'linesElements', + 'argument' => (array) $matches[1], + 'destination' => 'elements', + ) + ), + ); + + return $Block; + } + } + + protected function blockQuoteContinue($Line, array $Block) + { + if (isset($Block['interrupted'])) + { + return; + } + + if ($Line['text'][0] === '>' and preg_match('/^>[ ]?+(.*+)/', $Line['text'], $matches)) + { + $Block['element']['handler']['argument'] []= $matches[1]; + + return $Block; + } + + if ( ! isset($Block['interrupted'])) + { + $Block['element']['handler']['argument'] []= $Line['text']; + + return $Block; + } + } + + # + # Rule + + protected function blockRule($Line) + { + $marker = $Line['text'][0]; + + if (substr_count($Line['text'], $marker) >= 3 and chop($Line['text'], " $marker") === '') + { + $Block = array( + 'element' => array( + 'name' => 'hr', + ), + ); + + return $Block; + } + } + + # + # Setext + + protected function blockSetextHeader($Line, ?array $Block = null) + { + if ( ! isset($Block) or $Block['type'] !== 'Paragraph' or isset($Block['interrupted'])) + { + return; + } + + if ($Line['indent'] < 4 and chop(chop($Line['text'], ' '), $Line['text'][0]) === '') + { + $Block['element']['name'] = $Line['text'][0] === '=' ? 'h1' : 'h2'; + + return $Block; + } + } + + # + # Markup + + protected function blockMarkup($Line) + { + if ($this->markupEscaped or $this->safeMode) + { + return; + } + + if (preg_match('/^<[\/]?+(\w*)(?:[ ]*+'.$this->regexHtmlAttribute.')*+[ ]*+(\/)?>/', $Line['text'], $matches)) + { + $element = strtolower($matches[1]); + + if (in_array($element, $this->textLevelElements)) + { + return; + } + + $Block = array( + 'name' => $matches[1], + 'element' => array( + 'rawHtml' => $Line['text'], + 'autobreak' => true, + ), + ); + + return $Block; + } + } + + protected function blockMarkupContinue($Line, array $Block) + { + if (isset($Block['closed']) or isset($Block['interrupted'])) + { + return; + } + + $Block['element']['rawHtml'] .= "\n" . $Line['body']; + + return $Block; + } + + # + # Reference + + protected function blockReference($Line) + { + if (strpos($Line['text'], ']') !== false + and preg_match('/^\[(.+?)\]:[ ]*+?(?:[ ]+["\'(](.+)["\')])?[ ]*+$/', $Line['text'], $matches) + ) { + $id = strtolower($matches[1]); + + $Data = array( + 'url' => $matches[2], + 'title' => isset($matches[3]) ? $matches[3] : null, + ); + + $this->DefinitionData['Reference'][$id] = $Data; + + $Block = array( + 'element' => array(), + ); + + return $Block; + } + } + + # + # Table + + protected function blockTable($Line, ?array $Block = null) + { + if ( ! isset($Block) or $Block['type'] !== 'Paragraph' or isset($Block['interrupted'])) + { + return; + } + + if ( + strpos($Block['element']['handler']['argument'], '|') === false + and strpos($Line['text'], '|') === false + and strpos($Line['text'], ':') === false + or strpos($Block['element']['handler']['argument'], "\n") !== false + ) { + return; + } + + if (chop($Line['text'], ' -:|') !== '') + { + return; + } + + $alignments = array(); + + $divider = $Line['text']; + + $divider = trim($divider); + $divider = trim($divider, '|'); + + $dividerCells = explode('|', $divider); + + foreach ($dividerCells as $dividerCell) + { + $dividerCell = trim($dividerCell); + + if ($dividerCell === '') + { + return; + } + + $alignment = null; + + if ($dividerCell[0] === ':') + { + $alignment = 'left'; + } + + if (substr($dividerCell, - 1) === ':') + { + $alignment = $alignment === 'left' ? 'center' : 'right'; + } + + $alignments []= $alignment; + } + + # ~ + + $HeaderElements = array(); + + $header = $Block['element']['handler']['argument']; + + $header = trim($header); + $header = trim($header, '|'); + + $headerCells = explode('|', $header); + + if (count($headerCells) !== count($alignments)) + { + return; + } + + foreach ($headerCells as $index => $headerCell) + { + $headerCell = trim($headerCell); + + $HeaderElement = array( + 'name' => 'th', + 'handler' => array( + 'function' => 'lineElements', + 'argument' => $headerCell, + 'destination' => 'elements', + ) + ); + + if (isset($alignments[$index])) + { + $alignment = $alignments[$index]; + + $HeaderElement['attributes'] = array( + 'style' => "text-align: $alignment;", + ); + } + + $HeaderElements []= $HeaderElement; + } + + # ~ + + $Block = array( + 'alignments' => $alignments, + 'identified' => true, + 'element' => array( + 'name' => 'table', + 'elements' => array(), + ), + ); + + $Block['element']['elements'] []= array( + 'name' => 'thead', + ); + + $Block['element']['elements'] []= array( + 'name' => 'tbody', + 'elements' => array(), + ); + + $Block['element']['elements'][0]['elements'] []= array( + 'name' => 'tr', + 'elements' => $HeaderElements, + ); + + return $Block; + } + + protected function blockTableContinue($Line, array $Block) + { + if (isset($Block['interrupted'])) + { + return; + } + + if (count($Block['alignments']) === 1 or $Line['text'][0] === '|' or strpos($Line['text'], '|')) + { + $Elements = array(); + + $row = $Line['text']; + + $row = trim($row); + $row = trim($row, '|'); + + preg_match_all('/(?:(\\\\[|])|[^|`]|`[^`]++`|`)++/', $row, $matches); + + $cells = array_slice($matches[0], 0, count($Block['alignments'])); + + foreach ($cells as $index => $cell) + { + $cell = trim($cell); + + $Element = array( + 'name' => 'td', + 'handler' => array( + 'function' => 'lineElements', + 'argument' => $cell, + 'destination' => 'elements', + ) + ); + + if (isset($Block['alignments'][$index])) + { + $Element['attributes'] = array( + 'style' => 'text-align: ' . $Block['alignments'][$index] . ';', + ); + } + + $Elements []= $Element; + } + + $Element = array( + 'name' => 'tr', + 'elements' => $Elements, + ); + + $Block['element']['elements'][1]['elements'] []= $Element; + + return $Block; + } + } + + # + # ~ + # + + protected function paragraph($Line) + { + return array( + 'type' => 'Paragraph', + 'element' => array( + 'name' => 'p', + 'handler' => array( + 'function' => 'lineElements', + 'argument' => $Line['text'], + 'destination' => 'elements', + ), + ), + ); + } + + protected function paragraphContinue($Line, array $Block) + { + if (isset($Block['interrupted'])) + { + return; + } + + $Block['element']['handler']['argument'] .= "\n".$Line['text']; + + return $Block; + } + + # + # Inline Elements + # + + protected $InlineTypes = array( + '!' => array('Image'), + '&' => array('SpecialCharacter'), + '*' => array('Emphasis'), + ':' => array('Url'), + '<' => array('UrlTag', 'EmailTag', 'Markup'), + '[' => array('Link'), + '_' => array('Emphasis'), + '`' => array('Code'), + '~' => array('Strikethrough'), + '\\' => array('EscapeSequence'), + ); + + # ~ + + protected $inlineMarkerList = '!*_&[:<`~\\'; + + # + # ~ + # + + public function line($text, $nonNestables = array()) + { + return $this->elements($this->lineElements($text, $nonNestables)); + } + + protected function lineElements($text, $nonNestables = array()) + { + # standardize line breaks + $text = str_replace(array("\r\n", "\r"), "\n", $text); + + $Elements = array(); + + $nonNestables = (empty($nonNestables) + ? array() + : array_combine($nonNestables, $nonNestables) + ); + + # $excerpt is based on the first occurrence of a marker + + while ($excerpt = strpbrk($text, $this->inlineMarkerList)) + { + $marker = $excerpt[0]; + + $markerPosition = strlen($text) - strlen($excerpt); + + $Excerpt = array('text' => $excerpt, 'context' => $text); + + foreach ($this->InlineTypes[$marker] as $inlineType) + { + # check to see if the current inline type is nestable in the current context + + if (isset($nonNestables[$inlineType])) + { + continue; + } + + $Inline = $this->{"inline$inlineType"}($Excerpt); + + if ( ! isset($Inline)) + { + continue; + } + + # makes sure that the inline belongs to "our" marker + + if (isset($Inline['position']) and $Inline['position'] > $markerPosition) + { + continue; + } + + # sets a default inline position + + if ( ! isset($Inline['position'])) + { + $Inline['position'] = $markerPosition; + } + + # cause the new element to 'inherit' our non nestables + + + $Inline['element']['nonNestables'] = isset($Inline['element']['nonNestables']) + ? array_merge($Inline['element']['nonNestables'], $nonNestables) + : $nonNestables + ; + + # the text that comes before the inline + $unmarkedText = substr($text, 0, $Inline['position']); + + # compile the unmarked text + $InlineText = $this->inlineText($unmarkedText); + $Elements[] = $InlineText['element']; + + # compile the inline + $Elements[] = $this->extractElement($Inline); + + # remove the examined text + $text = substr($text, $Inline['position'] + $Inline['extent']); + + continue 2; + } + + # the marker does not belong to an inline + + $unmarkedText = substr($text, 0, $markerPosition + 1); + + $InlineText = $this->inlineText($unmarkedText); + $Elements[] = $InlineText['element']; + + $text = substr($text, $markerPosition + 1); + } + + $InlineText = $this->inlineText($text); + $Elements[] = $InlineText['element']; + + foreach ($Elements as &$Element) + { + if ( ! isset($Element['autobreak'])) + { + $Element['autobreak'] = false; + } + } + + return $Elements; + } + + # + # ~ + # + + protected function inlineText($text) + { + $Inline = array( + 'extent' => strlen($text), + 'element' => array(), + ); + + $Inline['element']['elements'] = self::pregReplaceElements( + $this->breaksEnabled ? '/[ ]*+\n/' : '/(?:[ ]*+\\\\|[ ]{2,}+)\n/', + array( + array('name' => 'br'), + array('text' => "\n"), + ), + $text + ); + + return $Inline; + } + + protected function inlineCode($Excerpt) + { + $marker = $Excerpt['text'][0]; + + if (preg_match('/^(['.$marker.']++)[ ]*+(.+?)[ ]*+(? strlen($matches[0]), + 'element' => array( + 'name' => 'code', + 'text' => $text, + ), + ); + } + } + + protected function inlineEmailTag($Excerpt) + { + $hostnameLabel = '[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?'; + + $commonMarkEmail = '[a-zA-Z0-9.!#$%&\'*+\/=?^_`{|}~-]++@' + . $hostnameLabel . '(?:\.' . $hostnameLabel . ')*'; + + if (strpos($Excerpt['text'], '>') !== false + and preg_match("/^<((mailto:)?$commonMarkEmail)>/i", $Excerpt['text'], $matches) + ){ + $url = $matches[1]; + + if ( ! isset($matches[2])) + { + $url = "mailto:$url"; + } + + return array( + 'extent' => strlen($matches[0]), + 'element' => array( + 'name' => 'a', + 'text' => $matches[1], + 'attributes' => array( + 'href' => $url, + ), + ), + ); + } + } + + protected function inlineEmphasis($Excerpt) + { + if ( ! isset($Excerpt['text'][1])) + { + return; + } + + $marker = $Excerpt['text'][0]; + + if ($Excerpt['text'][1] === $marker and preg_match($this->StrongRegex[$marker], $Excerpt['text'], $matches)) + { + $emphasis = 'strong'; + } + elseif (preg_match($this->EmRegex[$marker], $Excerpt['text'], $matches)) + { + $emphasis = 'em'; + } + else + { + return; + } + + return array( + 'extent' => strlen($matches[0]), + 'element' => array( + 'name' => $emphasis, + 'handler' => array( + 'function' => 'lineElements', + 'argument' => $matches[1], + 'destination' => 'elements', + ) + ), + ); + } + + protected function inlineEscapeSequence($Excerpt) + { + if (isset($Excerpt['text'][1]) and in_array($Excerpt['text'][1], $this->specialCharacters)) + { + return array( + 'element' => array('rawHtml' => $Excerpt['text'][1]), + 'extent' => 2, + ); + } + } + + protected function inlineImage($Excerpt) + { + if ( ! isset($Excerpt['text'][1]) or $Excerpt['text'][1] !== '[') + { + return; + } + + $Excerpt['text']= substr($Excerpt['text'], 1); + + $Link = $this->inlineLink($Excerpt); + + if ($Link === null) + { + return; + } + + $Inline = array( + 'extent' => $Link['extent'] + 1, + 'element' => array( + 'name' => 'img', + 'attributes' => array( + 'src' => $Link['element']['attributes']['href'], + 'alt' => $Link['element']['handler']['argument'], + ), + 'autobreak' => true, + ), + ); + + $Inline['element']['attributes'] += $Link['element']['attributes']; + + unset($Inline['element']['attributes']['href']); + + return $Inline; + } + + protected function inlineLink($Excerpt) + { + $Element = array( + 'name' => 'a', + 'handler' => array( + 'function' => 'lineElements', + 'argument' => null, + 'destination' => 'elements', + ), + 'nonNestables' => array('Url', 'Link'), + 'attributes' => array( + 'href' => null, + 'title' => null, + ), + ); + + $extent = 0; + + $remainder = $Excerpt['text']; + + if (preg_match('/\[((?:[^][]++|(?R))*+)\]/', $remainder, $matches)) + { + $Element['handler']['argument'] = $matches[1]; + + $extent += strlen($matches[0]); + + $remainder = substr($remainder, $extent); + } + else + { + return; + } + + if (preg_match('/^[(]\s*+((?:[^ ()]++|[(][^ )]+[)])++)(?:[ ]+("[^"]*+"|\'[^\']*+\'))?\s*+[)]/', $remainder, $matches)) + { + $Element['attributes']['href'] = $matches[1]; + + if (isset($matches[2])) + { + $Element['attributes']['title'] = substr($matches[2], 1, - 1); + } + + $extent += strlen($matches[0]); + } + else + { + if (preg_match('/^\s*\[(.*?)\]/', $remainder, $matches)) + { + $definition = strlen($matches[1]) ? $matches[1] : $Element['handler']['argument']; + $definition = strtolower($definition); + + $extent += strlen($matches[0]); + } + else + { + $definition = strtolower($Element['handler']['argument']); + } + + if ( ! isset($this->DefinitionData['Reference'][$definition])) + { + return; + } + + $Definition = $this->DefinitionData['Reference'][$definition]; + + $Element['attributes']['href'] = $Definition['url']; + $Element['attributes']['title'] = $Definition['title']; + } + + return array( + 'extent' => $extent, + 'element' => $Element, + ); + } + + protected function inlineMarkup($Excerpt) + { + if ($this->markupEscaped or $this->safeMode or strpos($Excerpt['text'], '>') === false) + { + return; + } + + if ($Excerpt['text'][1] === '/' and preg_match('/^<\/\w[\w-]*+[ ]*+>/s', $Excerpt['text'], $matches)) + { + return array( + 'element' => array('rawHtml' => $matches[0]), + 'extent' => strlen($matches[0]), + ); + } + + if ($Excerpt['text'][1] === '!' and preg_match('/^/s', $Excerpt['text'], $matches)) + { + return array( + 'element' => array('rawHtml' => $matches[0]), + 'extent' => strlen($matches[0]), + ); + } + + if ($Excerpt['text'][1] !== ' ' and preg_match('/^<\w[\w-]*+(?:[ ]*+'.$this->regexHtmlAttribute.')*+[ ]*+\/?>/s', $Excerpt['text'], $matches)) + { + return array( + 'element' => array('rawHtml' => $matches[0]), + 'extent' => strlen($matches[0]), + ); + } + } + + protected function inlineSpecialCharacter($Excerpt) + { + if (substr($Excerpt['text'], 1, 1) !== ' ' and strpos($Excerpt['text'], ';') !== false + and preg_match('/^&(#?+[0-9a-zA-Z]++);/', $Excerpt['text'], $matches) + ) { + return array( + 'element' => array('rawHtml' => '&' . $matches[1] . ';'), + 'extent' => strlen($matches[0]), + ); + } + } + + protected function inlineStrikethrough($Excerpt) + { + if ( ! isset($Excerpt['text'][1])) + { + return; + } + + if ($Excerpt['text'][1] === '~' and preg_match('/^~~(?=\S)(.+?)(?<=\S)~~/', $Excerpt['text'], $matches)) + { + return array( + 'extent' => strlen($matches[0]), + 'element' => array( + 'name' => 'del', + 'handler' => array( + 'function' => 'lineElements', + 'argument' => $matches[1], + 'destination' => 'elements', + ) + ), + ); + } + } + + protected function inlineUrl($Excerpt) + { + if ($this->urlsLinked !== true or ! isset($Excerpt['text'][2]) or $Excerpt['text'][2] !== '/') + { + return; + } + + if (strpos($Excerpt['context'], 'http') !== false + and preg_match('/\bhttps?+:[\/]{2}[^\s<]+\b\/*+/ui', $Excerpt['context'], $matches, PREG_OFFSET_CAPTURE) + ) { + $url = $matches[0][0]; + + $Inline = array( + 'extent' => strlen($matches[0][0]), + 'position' => $matches[0][1], + 'element' => array( + 'name' => 'a', + 'text' => $url, + 'attributes' => array( + 'href' => $url, + ), + ), + ); + + return $Inline; + } + } + + protected function inlineUrlTag($Excerpt) + { + if (strpos($Excerpt['text'], '>') !== false and preg_match('/^<(\w++:\/{2}[^ >]++)>/i', $Excerpt['text'], $matches)) + { + $url = $matches[1]; + + return array( + 'extent' => strlen($matches[0]), + 'element' => array( + 'name' => 'a', + 'text' => $url, + 'attributes' => array( + 'href' => $url, + ), + ), + ); + } + } + + # ~ + + protected function unmarkedText($text) + { + $Inline = $this->inlineText($text); + return $this->element($Inline['element']); + } + + # + # Handlers + # + + protected function handle(array $Element) + { + if (isset($Element['handler'])) + { + if (!isset($Element['nonNestables'])) + { + $Element['nonNestables'] = array(); + } + + if (is_string($Element['handler'])) + { + $function = $Element['handler']; + $argument = $Element['text']; + unset($Element['text']); + $destination = 'rawHtml'; + } + else + { + $function = $Element['handler']['function']; + $argument = $Element['handler']['argument']; + $destination = $Element['handler']['destination']; + } + + $Element[$destination] = $this->{$function}($argument, $Element['nonNestables']); + + if ($destination === 'handler') + { + $Element = $this->handle($Element); + } + + unset($Element['handler']); + } + + return $Element; + } + + protected function handleElementRecursive(array $Element) + { + return $this->elementApplyRecursive(array($this, 'handle'), $Element); + } + + protected function handleElementsRecursive(array $Elements) + { + return $this->elementsApplyRecursive(array($this, 'handle'), $Elements); + } + + protected function elementApplyRecursive($closure, array $Element) + { + $Element = call_user_func($closure, $Element); + + if (isset($Element['elements'])) + { + $Element['elements'] = $this->elementsApplyRecursive($closure, $Element['elements']); + } + elseif (isset($Element['element'])) + { + $Element['element'] = $this->elementApplyRecursive($closure, $Element['element']); + } + + return $Element; + } + + protected function elementApplyRecursiveDepthFirst($closure, array $Element) + { + if (isset($Element['elements'])) + { + $Element['elements'] = $this->elementsApplyRecursiveDepthFirst($closure, $Element['elements']); + } + elseif (isset($Element['element'])) + { + $Element['element'] = $this->elementsApplyRecursiveDepthFirst($closure, $Element['element']); + } + + $Element = call_user_func($closure, $Element); + + return $Element; + } + + protected function elementsApplyRecursive($closure, array $Elements) + { + foreach ($Elements as &$Element) + { + $Element = $this->elementApplyRecursive($closure, $Element); + } + + return $Elements; + } + + protected function elementsApplyRecursiveDepthFirst($closure, array $Elements) + { + foreach ($Elements as &$Element) + { + $Element = $this->elementApplyRecursiveDepthFirst($closure, $Element); + } + + return $Elements; + } + + protected function element(array $Element) + { + if ($this->safeMode) + { + $Element = $this->sanitiseElement($Element); + } + + # identity map if element has no handler + $Element = $this->handle($Element); + + $hasName = isset($Element['name']); + + $markup = ''; + + if ($hasName) + { + $markup .= '<' . $Element['name']; + + if (isset($Element['attributes'])) + { + foreach ($Element['attributes'] as $name => $value) + { + if ($value === null) + { + continue; + } + + $markup .= " $name=\"".self::escape($value).'"'; + } + } + } + + $permitRawHtml = false; + + if (isset($Element['text'])) + { + $text = $Element['text']; + } + // very strongly consider an alternative if you're writing an + // extension + elseif (isset($Element['rawHtml'])) + { + $text = $Element['rawHtml']; + + $allowRawHtmlInSafeMode = isset($Element['allowRawHtmlInSafeMode']) && $Element['allowRawHtmlInSafeMode']; + $permitRawHtml = !$this->safeMode || $allowRawHtmlInSafeMode; + } + + $hasContent = isset($text) || isset($Element['element']) || isset($Element['elements']); + + if ($hasContent) + { + $markup .= $hasName ? '>' : ''; + + if (isset($Element['elements'])) + { + $markup .= $this->elements($Element['elements']); + } + elseif (isset($Element['element'])) + { + $markup .= $this->element($Element['element']); + } + else + { + if (!$permitRawHtml) + { + $markup .= self::escape($text, true); + } + else + { + $markup .= $text; + } + } + + $markup .= $hasName ? '' : ''; + } + elseif ($hasName) + { + $markup .= ' />'; + } + + return $markup; + } + + protected function elements(array $Elements) + { + $markup = ''; + + $autoBreak = true; + + foreach ($Elements as $Element) + { + if (empty($Element)) + { + continue; + } + + $autoBreakNext = (isset($Element['autobreak']) + ? $Element['autobreak'] : isset($Element['name']) + ); + // (autobreak === false) covers both sides of an element + $autoBreak = !$autoBreak ? $autoBreak : $autoBreakNext; + + $markup .= ($autoBreak ? "\n" : '') . $this->element($Element); + $autoBreak = $autoBreakNext; + } + + $markup .= $autoBreak ? "\n" : ''; + + return $markup; + } + + # ~ + + protected function li($lines) + { + $Elements = $this->linesElements($lines); + + if ( ! in_array('', $lines) + and isset($Elements[0]) and isset($Elements[0]['name']) + and $Elements[0]['name'] === 'p' + ) { + unset($Elements[0]['name']); + } + + return $Elements; + } + + # + # AST Convenience + # + + /** + * Replace occurrences $regexp with $Elements in $text. Return an array of + * elements representing the replacement. + */ + protected static function pregReplaceElements($regexp, $Elements, $text) + { + $newElements = array(); + + while (preg_match($regexp, $text, $matches, PREG_OFFSET_CAPTURE)) + { + $offset = $matches[0][1]; + $before = substr($text, 0, $offset); + $after = substr($text, $offset + strlen($matches[0][0])); + + $newElements[] = array('text' => $before); + + foreach ($Elements as $Element) + { + $newElements[] = $Element; + } + + $text = $after; + } + + $newElements[] = array('text' => $text); + + return $newElements; + } + + # + # Deprecated Methods + # + + /** + * @deprecated use text() instead + */ + function parse($text) + { + $markup = $this->text($text); + + return $markup; + } + + protected function sanitiseElement(array $Element) + { + static $goodAttribute = '/^[a-zA-Z0-9][a-zA-Z0-9-_]*+$/'; + static $safeUrlNameToAtt = array( + 'a' => 'href', + 'img' => 'src', + ); + + if ( ! isset($Element['name'])) + { + unset($Element['attributes']); + return $Element; + } + + if (isset($safeUrlNameToAtt[$Element['name']])) + { + $Element = $this->filterUnsafeUrlInAttribute($Element, $safeUrlNameToAtt[$Element['name']]); + } + + if ( ! empty($Element['attributes'])) + { + foreach ($Element['attributes'] as $att => $val) + { + # filter out badly parsed attribute + if ( ! preg_match($goodAttribute, $att)) + { + unset($Element['attributes'][$att]); + } + # dump onevent attribute + elseif (self::striAtStart($att, 'on')) + { + unset($Element['attributes'][$att]); + } + } + } + + return $Element; + } + + protected function filterUnsafeUrlInAttribute(array $Element, $attribute) + { + foreach ($this->safeLinksWhitelist as $scheme) + { + if (self::striAtStart($Element['attributes'][$attribute], $scheme)) + { + return $Element; + } + } + + $Element['attributes'][$attribute] = str_replace(':', '%3A', $Element['attributes'][$attribute]); + + return $Element; + } + + # + # Static Methods + # + + protected static function escape($text, $allowQuotes = false) + { + return htmlspecialchars($text, $allowQuotes ? ENT_NOQUOTES : ENT_QUOTES, 'UTF-8'); + } + + protected static function striAtStart($string, $needle) + { + $len = strlen($needle); + + if ($len > strlen($string)) + { + return false; + } + else + { + return strtolower(substr($string, 0, $len)) === strtolower($needle); + } + } + + static function instance($name = 'default') + { + if (isset(self::$instances[$name])) + { + return self::$instances[$name]; + } + + $instance = new static(); + + self::$instances[$name] = $instance; + + return $instance; + } + + private static $instances = array(); + + # + # Fields + # + + protected $DefinitionData; + + # + # Read-Only + + protected $specialCharacters = array( + '\\', '`', '*', '_', '{', '}', '[', ']', '(', ')', '>', '#', '+', '-', '.', '!', '|', '~' + ); + + protected $StrongRegex = array( + '*' => '/^[*]{2}((?:\\\\\*|[^*]|[*][^*]*+[*])+?)[*]{2}(?![*])/s', + '_' => '/^__((?:\\\\_|[^_]|_[^_]*+_)+?)__(?!_)/us', + ); + + protected $EmRegex = array( + '*' => '/^[*]((?:\\\\\*|[^*]|[*][*][^*]+?[*][*])+?)[*](?![*])/s', + '_' => '/^_((?:\\\\_|[^_]|__[^_]*__)+?)_(?!_)\b/us', + ); + + protected $regexHtmlAttribute = '[a-zA-Z_:][\w:.-]*+(?:\s*+=\s*+(?:[^"\'=<>`\s]+|"[^"]*+"|\'[^\']*+\'))?+'; + + protected $voidElements = array( + 'area', 'base', 'br', 'col', 'command', 'embed', 'hr', 'img', 'input', 'link', 'meta', 'param', 'source', + ); + + protected $textLevelElements = array( + 'a', 'br', 'bdo', 'abbr', 'blink', 'nextid', 'acronym', 'basefont', + 'b', 'em', 'big', 'cite', 'small', 'spacer', 'listing', + 'i', 'rp', 'del', 'code', 'strike', 'marquee', + 'q', 'rt', 'ins', 'font', 'strong', + 's', 'tt', 'kbd', 'mark', + 'u', 'xm', 'sub', 'nobr', + 'sup', 'ruby', + 'var', 'span', + 'wbr', 'time', + ); +} diff --git a/storage/migrations/003_seed_license_types.sql b/storage/migrations/003_seed_license_types.sql new file mode 100644 index 0000000..d1eb4e5 --- /dev/null +++ b/storage/migrations/003_seed_license_types.sql @@ -0,0 +1,19 @@ +-- Migration 003: Seed license_types table +-- Safe to run on existing databases (INSERT OR IGNORE) + +CREATE TABLE IF NOT EXISTS license_types ( + id INTEGER PRIMARY KEY AUTOINCREMENT, + name TEXT NOT NULL UNIQUE, + description TEXT, + created_at DATETIME DEFAULT CURRENT_TIMESTAMP +); + +INSERT OR IGNORE INTO license_types (name) VALUES + ('CC BY 4.0'), + ('CC BY-SA 4.0'), + ('CC BY-ND 4.0'), + ('CC BY-NC 4.0'), + ('CC BY-NC-SA 4.0'), + ('CC BY-NC-ND 4.0'), + ('Tous droits réservés'), + ('Domaine public'); diff --git a/storage/posterg.db b/storage/posterg.db index e2bc5e5dcf30c785ec3e6133a48c0a2ee36099b2..47303f8aca406fa06da901ddc2d4d9fea6586396 100644 GIT binary patch delta 614 zcmZoTz|(MmXM!}N_Cy(HR&55oi4QiWERYxB;ICldf5(59|0Mq|{uTVw_`CTlHZ~^k z3kz~Et25?gCa2~Vr^c657Niz)Z0^>t{2;=?caQ<7emnm}{%n3Heo4NUds% z<6vdbWH5Hg&rQtCOI0W+O#*5+GB7gJH89pSGEp!zvNEu+GPcxXXJxQtFb>HtEmlY= z%Fiq*Rwz2WvN*M<3`k;8ug=EGpv_?H?5yAvsq5#g>*u0iqGy1iu-@2GofTDOup?HL z#+E89tPH9MBXOx>MplL0R-jo-5LJ<2_u;fsk&%@_9%>~H`?wew7&!Q|82CT)AK;(C zzlQ%J|0Dh^{@RU=LHzYX%$kg-LCYbvU4kgHgb o1i&6Liste des TFE Ajouter un TFE Importer une liste de TFE + Pages statiques Modifier diff --git a/templates/nav.php b/templates/nav.php index 3b8b77c..73c046c 100644 --- a/templates/nav.php +++ b/templates/nav.php @@ -1,7 +1,7 @@