X-Git-Url: http://git.shiar.nl/minimedit.git/blobdiff_plain/dcf14e6ed4093fd464367806e2211bb4bec3c8ba..772961fd4e9be46ad340cad1e55ee5f28cc5b968:/article.inc.php

diff --git a/article.inc.php b/article.inc.php
index 503c5a1..acd219d 100644
--- a/article.inc.php
+++ b/article.inc.php
@@ -16,13 +16,13 @@ function showdate($parts)
 
 class ArchiveArticle
 {
-	public $raw, $preface, $title, $body;
-	public $meta = [];
+	public $raw, $title, $body; # file contents
+	public $meta = [];  # head metadata properties
 
 	function __construct($path)
 	{
 		$this->page = preg_replace('{^\.(?:/|$)}', '', $path);
-		$this->link = preg_replace('{(?:/index)?\.html$}', '', $this->page);
+		$this->link = preg_replace('{(?:(?:/|^)index)?\.html$}', '', $this->page);
 		$this->raw($this->page);
 	}
 
@@ -41,8 +41,11 @@ class ArchiveArticle
 			$this->meta = array_combine($meta[1], $meta[2]); # [property => content]
 		}
 
-		@list ($this->preface, $this->title, $this->body) =
-			preg_split('{<h2>(.*?)</h2>\s*}s', $this->raw, 2, PREG_SPLIT_DELIM_CAPTURE);
+		// find significant contents
+		$this->body = preg_replace('{<aside\b.*?</aside>}s', '', $this->raw);
+		if (preg_match('{<h2>(.*?)</h2>\s*(.*)}s', $this->body, $titlematch)) {
+			list (, $this->title, $this->body) = $titlematch;
+		}
 	}
 
 	function __get($col)
@@ -74,6 +77,12 @@ class ArchiveArticle
 		return;
 	}
 
+	function restricted()
+	{
+		$this->handler;
+		return $this->restricted;
+	}
+
 	function safetitle()
 	{
 		return trim($this->meta['og:title'] ?? strip_tags($this->title));
@@ -128,19 +137,10 @@ class ArchiveArticle
 			return $override;
 		}
 
+		# paragraph contents following the page header if any
 		if (preg_match('{
-			</h2> (?: \s+ | <p\sclass="nav\b.*?</p> | <div[^>]*> )* <p> \s* (.*?) </p>
-		}sx', $this->raw, $bodyp, PREG_OFFSET_CAPTURE)) {
-			# fallback paragraph contents following the page header
-			if ($bodyp[1][1] < 256) {
-				return $bodyp[1][0];
-			}
-		}
-
-		# starting paragraph for documents without title (assumed simple/partial)
-		if (strpos($this->raw, '<h2') === FALSE and preg_match('{
-			\A (?: <div [^>]*> \s* )* <p> \s* (.*?) </p>
-		}sx', $this->raw, $bodyp)) {
+			\G (?> \s+ | <div [^>]*> | \[\[[^]]*\]\] )* <p> \s* (.*?) </p>
+		}sx', $this->body, $bodyp, 0)) {
 			return $bodyp[1];
 		}
 	}