page: replace global variables by $Page object

[minimedit.git] / article.inc.php

diff --git a/article.inc.php b/article.inc.php
index 2f5b8739deb3f6c2a2446395156749b7b6284e14..acd219d164aab81397d9da33ef104148f3e23574 100644 (file)
--- a/article.inc.php
+++ b/article.inc.php
@@ -16,8 +16,8 @@ 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)
        {
@@ -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));
@@ -129,11 +138,9 @@ class ArchiveArticle
                }
 
                # paragraph contents following the page header if any
-               $offset = strpos($this->raw, '</h2>');
-               $offset = $offset ? $offset + 5 : 0;
                if (preg_match('{
-                       \G (?> \s+ | <p\sclass="nav\b.*?</p> | <div [^>]*> | \[\[[^]]*\]\] )* <p> \s* (.*?) </p>
-               }sx', $this->raw, $bodyp, 0, $offset)) {
+                       \G (?> \s+ | <div [^>]*> | \[\[[^]]*\]\] )* <p> \s* (.*?) </p>
+               }sx', $this->body, $bodyp, 0)) {
                        return $bodyp[1];
                }
        }