X-Git-Url: http://git.shiar.nl/minimedit.git/blobdiff_plain/234326791b1e8177eb475bffc5956d7086cfac4e..1abb286e88defee799e43cdd296914f74f722bde:/article.inc.php

diff --git a/article.inc.php b/article.inc.php
index c6f3be9..bc8dbff 100644
--- a/article.inc.php
+++ b/article.inc.php
@@ -33,16 +33,18 @@ class ArchiveArticle
 		return fopen($this->page, 'r');
 	}
 
+	function rawtitle()
+	{
+		return fgets($this->file);
+	}
 	function title()
 	{
-		return preg_replace('{<h2>(.*)</h2>\s*}', '\1', fgets($this->file));
+		return preg_replace('{<h2>(.*)</h2>\s*}', '\1', $this->rawtitle);
 	}
-
 	function safetitle()
 	{
 		return trim(strip_tags($this->title));
 	}
-
 	function name()
 	{
 		return $this->safetitle ?: $this->link;
@@ -52,7 +54,6 @@ class ArchiveArticle
 	{
 		return filemtime($this->page);
 	}
-
 	function lastiso()
 	{
 		return date(DATE_ATOM, $this->last);
@@ -64,12 +65,10 @@ class ArchiveArticle
 		array_shift($ymd);
 		return $ymd;
 	}
-
 	function dateiso()
 	{
 		return implode('-', $this->dateparts()) . 'T12:00:00+02:00';
 	}
-
 	function date()
 	{
 		return showdate($this->dateparts);
@@ -77,22 +76,31 @@ class ArchiveArticle
 
 	function body()
 	{
-		$this->title;
-		$rest = fread($this->file, filesize($this->page));
+		if (!$this->file) return;
+		$this->rawtitle;
+		return fread($this->file, filesize($this->page) ?: 1);
+	}
+	function story()
+	{
 		if ( preg_match('{
 			\n (?: < (?: p | figure [^>]* ) >\s* )+ (<img\ [^>]*>) | \n <hr\ />
-		}x', $rest, $img, PREG_OFFSET_CAPTURE) ) {
+		}x', $this->body, $img, PREG_OFFSET_CAPTURE) ) {
+			# strip part after matching divider (image)
 			if (isset($img[1])) {
 				$this->img = $img[1][0];
 			}
-			return substr($rest, 0, $img[0][1]);
+			return substr($this->body, 0, $img[0][1]);
 		}
-		return $rest;
+		return $this->body;
 	}
 
+	function raw()
+	{
+		return $this->rawtitle . $this->body;
+	}
 	function teaser()
 	{
-		if (preg_match('{<p>(.*?)</p>}s', $this->body, $bodyp)) {
+		if (preg_match('{<p>(.*?)</p>}s', $this->story, $bodyp)) {
 			return $bodyp[1];
 		}
 	}
@@ -100,17 +108,15 @@ class ArchiveArticle
 	function img()
 	{
 		$this->img = NULL;
-		$this->body;
+		$this->story;
 		return $this->img;
 	}
-
 	function image()
 	{
 		if ( preg_match('/\bsrc="([^"]*)"/', $this->img, $src) ) {
 			return $src[1];
 		}
 	}
-
 	function thumb($size = '300x')
 	{
 		if (!$this->image or $this->image[0] !== '/') return;