X-Git-Url: http://git.shiar.net/minimedit.git/blobdiff_plain/fa30f71a6ab727c90e0b600582f9944dfaa1ca89..519348de7aa1839fe208ecceca7386e1b9ff609d:/nieuws.inc.php

diff --git a/nieuws.inc.php b/nieuws.inc.php
index 35ae092..40313e4 100644
--- a/nieuws.inc.php
+++ b/nieuws.inc.php
@@ -9,7 +9,7 @@ function showdate($parts)
 {
 	global $monthname;
 	return implode(' ', array_filter([
-		intval($parts[3]), $parts[2] > 0 ? $monthname[intval($parts[2])] : '', $parts[1],
+		intval(@$parts[3]), $parts[2] > 0 ? $monthname[intval($parts[2])] : '', $parts[1],
 		count($parts) > 6 ? "$parts[4]:$parts[5]" : '',
 	]));
 }
@@ -60,7 +60,7 @@ class ArchiveArticle
 
 	function dateparts()
 	{
-		preg_match('</(\d{4})[/-](\d{2})-(\d{2})->', $this->page, $ymd);
+		preg_match('< / (\d{4}) [/-] (\d{2}) (?:- (\d{2}) )? - >x', $this->page, $ymd);
 		return $ymd;
 	}
 
@@ -78,7 +78,7 @@ class ArchiveArticle
 	{
 		$this->title;
 		$rest = fread($this->file, filesize($this->page));
-		if ( preg_match('{\n<p>(<img [^>]*>)</p>\s*\z}', $rest, $img, PREG_OFFSET_CAPTURE) ) {
+		if ( preg_match('{\n<p>(<img [^>]*>)</p>}', $rest, $img, PREG_OFFSET_CAPTURE) ) {
 			$this->img = $img[1][0];
 			return substr($rest, 0, $img[0][1]);
 		}
@@ -109,34 +109,47 @@ class ArchiveArticle
 function shownews($input, $limit = 1000)
 {
 	if (!is_array($input)) $input = glob("$input/*.html");
-	print '<ul class="left">'."\n\n";
 	foreach (array_reverse($input) as $filename) {
 		$article = new ArchiveArticle($filename);
-		print '<li>';
+		print '<article class="left">';
 		if ($article->thumb) {
-			printf('<img src="/%s" class="left" />', $article->thumb);
+			$img = preg_replace('{(?<= \b src="/) [^"]* }x', $article->thumb, $article->img);
+			$img = preg_replace('{(?= />$)}', ' class="left"', $img);
+			print $img;
 		}
-		print '<article>';
+		print '<div>';
 		printf(
 			'<h3><a href="/%s">%s <small class="date">%s</small></a></h3>',
 			$article->link, $article->title, $article->date
 		);
 		print $article->body;
-		print "</article></li>\n\n";
+		print '</div>';
+		print "</article>\n\n";
 
 		if (--$limit <= 0) break;
 	}
-	print "</ul>\n\n";
 }
 
-function printtoc($input)
+function printtoc($input, $class = FALSE)
 {
 	if (!is_array($input)) $input = glob("$input/*.html");
-	print '<ul>';
+	print '<ul';
+	if ($class) printf(' class="%s"', $class);
+	print '>';
 	foreach (array_reverse($input) as $page) {
 		$article = new ArchiveArticle($page);
-		printf('<li><a href="/%s">%s <small class="date">%s</small></a></li>',
-			$article->link, $article->safetitle, $article->date);
+		$html = $article->safetitle;
+		$dateparts = $article->dateparts;
+		if ($class) {
+			$dateparts[1] = NULL;  # omit year
+		}
+		$html .= sprintf(' <small class="date">%s</small>', showdate($dateparts));
+		if ($class == 'gallery' and $article->img) {
+			$html = "<div>$html</div>";
+			$html = sprintf('<img src="%s" />', $article->thumb(200)) . $html;
+		}
+		$html = sprintf('<a href="/%s">%s</a>', $article->link, $html);
+		print "<li><article>$html</article></li>\n";
 	}
 	print "</ul>\n";
 }