X-Git-Url: http://git.shiar.net/minimedit.git/blobdiff_plain/674f6d3f070bcd8a08b725619e80fac0c9f72f1e..ead5bed24e07383fbcf783c3b5c70a755dbc1982:/article.inc.php

diff --git a/article.inc.php b/article.inc.php
index a39b897..503c5a1 100644
--- a/article.inc.php
+++ b/article.inc.php
@@ -23,20 +23,26 @@ class ArchiveArticle
 	{
 		$this->page = preg_replace('{^\.(?:/|$)}', '', $path);
 		$this->link = preg_replace('{(?:/index)?\.html$}', '', $this->page);
-		if (file_exists($this->page)) {
-			$this->raw = file_get_contents($this->page);
-
-			if (preg_match_all('{
-				\G <meta \s+ property="( [^"]+ )" \s+ content="( [^"]* )" > \s*
-			}x', $this->raw, $meta)) {
-				$matchlen = array_sum(array_map('strlen', $meta[0]));
-				$this->raw = substr($this->raw, $matchlen); # delete matched contents
-				$this->meta = array_combine($meta[1], $meta[2]); # [property => content]
-			}
+		$this->raw($this->page);
+	}
 
-			@list ($this->preface, $this->title, $this->body) =
-				preg_split('{<h2>(.*?)</h2>\s*}', $this->raw, 2, PREG_SPLIT_DELIM_CAPTURE);
+	function raw($page)
+	{
+		if (!file_exists($page)) {
+			return;
+		}
+		$this->raw = file_get_contents($page);
+
+		if (preg_match_all('{
+			\G <meta \s+ property="( [^"]+ )" \s+ content="( [^"]* )" > \s*
+		}x', $this->raw, $meta)) {
+			$matchlen = array_sum(array_map('strlen', $meta[0]));
+			$this->raw = substr($this->raw, $matchlen); # delete matched contents
+			$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);
 	}
 
 	function __get($col)
@@ -44,6 +50,30 @@ class ArchiveArticle
 		return $this->$col = $this->$col();  # run method and cache
 	}
 
+	function handler()
+	{
+		$path = $this->link;
+		$this->path = '';
+		$this->restricted = FALSE;
+		while (TRUE) {
+			if (file_exists("$path/.private")) {
+				$this->restricted = $path;
+			}
+
+			if (file_exists("$path/index.php")) {
+				return $path;
+			}
+
+			$up = strrpos($path, '/');
+			$this->path = substr($path, $up) . $this->path;
+			$path = substr($path, 0, $up);
+			if ($up === FALSE) {
+				break;
+			}
+		}
+		return;
+	}
+
 	function safetitle()
 	{
 		return trim($this->meta['og:title'] ?? strip_tags($this->title));
@@ -80,7 +110,7 @@ class ArchiveArticle
 	function story()
 	{
 		if ( preg_match('{
-			\n (?: < (?: p | figure [^>]* ) >\s* )+ (<img\ [^>]*>) | \n <hr\ />
+			(?: < (?: p | figure [^>]* ) >\s* )+ (<img\ [^>]*>) | \n <hr\ />
 		}x', $this->body, $img, PREG_OFFSET_CAPTURE) ) {
 			# strip part after matching divider (image)
 			if (isset($img[1])) {
@@ -109,7 +139,7 @@ class ArchiveArticle
 
 		# starting paragraph for documents without title (assumed simple/partial)
 		if (strpos($this->raw, '<h2') === FALSE and preg_match('{
-			\A <p> \s* (.*?) </p>
+			\A (?: <div [^>]*> \s* )* <p> \s* (.*?) </p>
 		}sx', $this->raw, $bodyp)) {
 			return $bodyp[1];
 		}
@@ -157,9 +187,12 @@ class PageSearch
 					# ignore symlinks, original contents only
 					return FALSE;
 				}
+				if ($current->isDir()) {
+					# traverse subdirectories unless untracked in any amount
+					return !file_exists("$current/.gitignore");
+				}
 				# match **/*.html
-				return $current->isDir()
-					|| preg_match('/\.html$/', $current->getFilename());
+				return preg_match('/(?<!\.inc)\.html$/', $current->getFilename());
 			}
 		);
 	}