X-Git-Url: http://git.shiar.nl/minimedit.git/blobdiff_plain/628a39772933c58908f2ec68cc05b027e939b207..c0f916285fa69edb97a6c8311f567b90b3959ed3:/nieuws.inc.php

diff --git a/nieuws.inc.php b/nieuws.inc.php
index 6d84d1a..1a68993 100644
--- a/nieuws.inc.php
+++ b/nieuws.inc.php
@@ -78,11 +78,14 @@ class ArchiveArticle
 	{
 		$this->title;
 		$rest = fread($this->file, filesize($this->page));
-		if ( preg_match('{\n<p>(<img [^>]*>)</p>}', $rest, $img, PREG_OFFSET_CAPTURE) ) {
-			$this->img = $img[1][0];
+		if ( preg_match('{
+			\n (?: < (?: p | figure [^>]* ) >\s* )+ (<img\ [^>]*>) | \n <hr\ />
+		}x', $rest, $img, PREG_OFFSET_CAPTURE) ) {
+			if (isset($img[1])) {
+				$this->img = $img[1][0];
+			}
 			return substr($rest, 0, $img[0][1]);
 		}
-		$this->img = NULL;
 		return $rest;
 	}
 
@@ -95,6 +98,7 @@ class ArchiveArticle
 
 	function img()
 	{
+		$this->img = NULL;
 		$this->body;
 		return $this->img;
 	}
@@ -120,9 +124,11 @@ function shownews($input, $limit = 1000)
 		$article = new ArchiveArticle($filename);
 		print '<article class="left">';
 		if ($article->thumb) {
-			$img = preg_replace('{(?<= \b src="/) [^"]* }x', $article->thumb, $article->img);
-			$img = preg_replace('{(?= />$)}', ' class="left"', $img);
-			print $img;
+			$imgattr = ' class="left"';
+			if (preg_match('{ (\s alt="[^"]+") }x', $article->img, $img)) {
+				$imgattr .= $img[0];  # preserve alt value
+			}
+			printf('<img src="/%s"%s />', $article->thumb, $imgattr);
 		}
 		print '<div>';
 		printf(