From c00b91e7b8738a6f6a6c61dddc44b532c0d131d2 Mon Sep 17 00:00:00 2001
From: Mischa POSLAWSKY <perl@shiar.org>
Date: Mon, 3 Sep 2018 22:25:22 +0200
Subject: [PATCH] nieuws: call placeholder for year lists

---
 nieuws.php       | 5 ++++-
 nieuws/index.php | 7 ++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/nieuws.php b/nieuws.php
index fda142e..7127a54 100644
--- a/nieuws.php
+++ b/nieuws.php
@@ -1,6 +1,9 @@
 <?php
 include_once 'nieuws.inc.php';
-$articles = (ltrim($Args, '/') ?: 'nieuws') . '/????';
+$articles = (ltrim($Args, '/') ?: 'nieuws');
+if (strpos($articles, '/') === FALSE) {
+	$articles .= '/????';
+}
 ob_start();
 shownews($articles, @$Place['n'] ?: 5);
 print getoutput();
diff --git a/nieuws/index.php b/nieuws/index.php
index 4da5a8b..468de28 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,12 +31,12 @@ if ($year) {
 		$title .= ' '.$year;
 	}
 	elseif ($year === '19') {
-		$match = "$Page/19??/";
+		$match .= "/19??";
 		$title .= " vóór 2000";
 	}
 
 	print "<h2>$title</h2>\n\n";
-	shownews(glob($match.'*.html'));
+	print placeholder_include('nieuws', [$match]);
 	return 1;
 }
 
-- 
2.30.0