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

diff --git a/nieuws/index.php b/nieuws/index.php
index 4da5a8b..11e305e 100644
--- a/nieuws/index.php
+++ b/nieuws/index.php
@@ -20,9 +20,10 @@ if ($page and !is_numeric($page)) {
 
 if ($year) {
 	ob_clean();
+	$match = $Page;
 	$title = "Nieuws";
 	if (is_numeric($year) and $year > 999) {
-		$match = "$Page/$year/";
+		$match .= "/$year";
 		if (is_numeric($page)) {
 			$title .= ' '.$monthname[intval($page)];
 			$match .= sprintf('%02d-', $page);
@@ -30,51 +31,19 @@ if ($year) {
 		$title .= ' '.$year;
 	}
 	elseif ($year === '19') {
-		$match = "$Page/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";
-	shownews(glob($match.'*.html'));
+	print placeholder_include('nieuws', [$match]);
 	return 1;
 }
 
-$html = ob_get_clean();
-printf('<div class="nav right"><a href="%s"%s>Feed</a></div>'."\n",
-	"/$Page/feed",
-	' rel="alternate" title="Atom feed van nieuwsberichten" type="application/atom+xml"'
-);
-print $html;
-
-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/19", 'Eerder');
-	printtoc($pages);
-}
-
-print "</div>\n\n";
-
-if ($replyform) {
-	print "<h3>Melding rapporteren</h3>\n";
-	$_REQUEST['subject'] = 'melding';
-	require 'contact.php';
-?>
-<form method="post">
-<p>
-	<textarea name="body" cols=60 rows=4></textarea>
-	<input type="submit" value="Versturen" />
-</p>
-</form>
-<?php
-}
-
 if (!empty($User['admin'])) {
 	print '<script src="/nieuws/edit.js"></script>'."\n";
 }