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

diff --git a/nieuws.inc.php b/nieuws.inc.php
index 6d84d1a..34b565a 100644
--- a/nieuws.inc.php
+++ b/nieuws.inc.php
@@ -9,8 +9,8 @@ function showdate($parts)
 {
 	global $monthname;
 	return implode(' ', array_filter([
-		intval(@$parts[3]), $parts[2] > 0 ? $monthname[intval($parts[2])] : '', $parts[1],
-		count($parts) > 6 ? "$parts[4]:$parts[5]" : '',
+		intval(@$parts[2]), $parts[1] > 0 ? $monthname[intval($parts[1])] : '', $parts[0],
+		count($parts) > 5 ? "$parts[3]:$parts[4]" : '',
 	]));
 }
 
@@ -61,12 +61,13 @@ class ArchiveArticle
 	function dateparts()
 	{
 		preg_match('< / (\d{4}) [/-] (\d{2}) (?:- (\d{2}) )? - >x', $this->page, $ymd);
+		array_shift($ymd);
 		return $ymd;
 	}
 
 	function dateiso()
 	{
-		return implode('-', $this->dateparts());
+		return implode('-', $this->dateparts()) . 'T12:00:00+02:00';
 	}
 
 	function date()
@@ -78,11 +79,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 +99,7 @@ class ArchiveArticle
 
 	function img()
 	{
+		$this->img = NULL;
 		$this->body;
 		return $this->img;
 	}
@@ -109,7 +114,10 @@ class ArchiveArticle
 	function thumb($size = '300x')
 	{
 		if (!$this->image or $this->image[0] !== '/') return;
-		return preg_replace('{^(?:/thumb/[^/]*)?}', "thumb/$size", $this->image);
+		return preg_replace(
+			['{^(?:/thumb/[^/]*)?}', '/\.groot(?=\.\w+$)/'], ["thumb/$size", ''],
+			$this->image
+		);
 	}
 }
 
@@ -120,9 +128,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(
@@ -148,7 +158,7 @@ function printtoc($input, $class = FALSE)
 		$html = $article->safetitle;
 		$dateparts = $article->dateparts;
 		if ($class) {
-			$dateparts[1] = NULL;  # omit year
+			$dateparts[0] = NULL;  # omit year
 		}
 		$html .= sprintf(' <small class="date">%s</small>', showdate($dateparts));
 		if ($class == 'gallery' and $article->img) {