X-Git-Url: http://git.shiar.net/minimedit.git/blobdiff_plain/ba6c22ab7c2f350603f3c1510be7ead7ddbadc3a..e23ce7dc52392f928bf5879605da57e4bf7a7823:/nieuws/index.php

diff --git a/nieuws/index.php b/nieuws/index.php
index 25efd2d..11e305e 100644
--- a/nieuws/index.php
+++ b/nieuws/index.php
@@ -1,56 +1,49 @@
 <?php
 include 'nieuws.inc.php';
 
+$replyform = $Page == 'melding' && !empty($User);
 @list ($year, $page) = explode('/', trim($Args, '/'));
 
 if ($page and !is_numeric($page)) {
 	$edit = !empty($User['admin']) ? htmlspecialchars(@$_GET['edit']) : NULL;
-	print shownewsarticle($Args, FALSE, $edit);
+	$article = new ArchiveArticle("$Page$Args.html");
+	$Place[1] = ' <small class="date">'.$article->date.'</small>';
+	print preg_replace('{(?<=<h2>)(.*?)(?=</h2>)}', ($edit ?: '\1').' [[1]]', ob_get_clean());
+	if ($article->image) {
+		$Place['image'] = "https://lijtweg.nl/".$article->thumb('600x');
+	}
+	if ($replyform) {
+		print placeholder_include('nieuws/replies');
+	}
 	return 1;
 }
 
 if ($year) {
 	ob_clean();
+	$match = $Page;
 	$title = "Nieuws";
-	if (is_numeric($year)) {
-		$match = "$Page/$year/";
+	if (is_numeric($year) and $year > 999) {
+		$match .= "/$year";
 		if (is_numeric($page)) {
 			$title .= ' '.$monthname[intval($page)];
 			$match .= sprintf('%02d-', $page);
 		}
 		$title .= ' '.$year;
 	}
-	else {
-		$match = "$Page/19??/";
+	elseif ($year === '19') {
+		$match .= "/19??";
 		$title .= " vóór 2000";
 	}
+	elseif (file_exists("$Page/.tags/$year")) {
+		$match .= "/.tags/$year";
+		$title .= " met $year";
+	}
 
 	print "<h2>$title</h2>\n\n";
-	print '<div id="news">'."\n\n";
-	shownews(glob($match.'*.html'));
-	print "</div>\n\n";
+	print placeholder_include('nieuws', [$match]);
 	return 1;
 }
 
-if ($Args) {
-	return;
-}
-
-print '<div id="news">'."\n\n";
-
-foreach (array_reverse(glob("$Page/2???")) as $page) {
-	$year = basename($page, '.html');
-	printf('<h3><a href="/%s">%s</a></h3>'."\n", $page, $year);
-	printtoc($page);
-}
-
-if ($pages = glob("$Page/19??/*.html")) {
-	printf('<h3><a href="/%s">%s</a></h3>'."\n", "$Page/oud", 'Eerder');
-	printtoc($pages);
-}
-
-print "</div>\n\n";
-
 if (!empty($User['admin'])) {
 	print '<script src="/nieuws/edit.js"></script>'."\n";
 }