X-Git-Url: http://git.shiar.net/minimedit.git/blobdiff_plain/2cdc2cb95e16975c4d210f8cebcc8b04a43b79ad..e23ce7dc52392f928bf5879605da57e4bf7a7823:/nieuws.inc.php

diff --git a/nieuws.inc.php b/nieuws.inc.php
index c5dfa23..930eb00 100644
--- a/nieuws.inc.php
+++ b/nieuws.inc.php
@@ -54,7 +54,7 @@ class ArchiveArticle
 
 	function dateparts()
 	{
-		preg_match('</(\d{4})/(\d{2})-(\d{2})->', $this->page, $ymd);
+		preg_match('</(\d{4})[/-](\d{2})-(\d{2})->', $this->page, $ymd);
 		return $ymd;
 	}
 
@@ -70,22 +70,33 @@ class ArchiveArticle
 
 	function body()
 	{
-		return fread($this->file, filesize($this->page));
+		$this->title;
+		$rest = fread($this->file, filesize($this->page));
+		if ( preg_match('{\n<p>(<img [^>]*>)</p>\s*\z}', $rest, $img, PREG_OFFSET_CAPTURE) ) {
+			$this->img = $img[1][0];
+			return substr($rest, 0, $img[0][1]);
+		}
+		$this->img = NULL;
+		return $rest;
+	}
+
+	function img()
+	{
+		$this->body;
+		return $this->img;
 	}
 
 	function image()
 	{
-		foreach (['jpg', 'png'] as $ext) {
-			if (file_exists("{$this->link}.$ext")) {
-				return "{$this->link}.$ext";
-			}
+		if ( preg_match('/\bsrc="([^"]*)"/', $this->img, $src) ) {
+			return $src[1];
 		}
 	}
 
 	function thumb($size = '300x')
 	{
-		if ($this->image)
-		return "thumb/$size/{$this->image}";
+		if (!$this->image or $this->image[0] !== '/') return;
+		return preg_replace('{^(?:/thumb/[^/]*)?}', "thumb/$size", $this->image);
 	}
 }