From b95195ed4540a07ac0f31c363101698ada841d67 Mon Sep 17 00:00:00 2001
From: Mischa POSLAWSKY <perl@shiar.org>
Date: Sat, 9 Jun 2018 00:05:43 +0200
Subject: [PATCH] nieuws: archive pages by year only

---
 nieuws.inc.php   |  8 ++++----
 nieuws.php       |  2 +-
 nieuws/edit.js   |  2 +-
 nieuws/index.php | 19 +++++++++----------
 4 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/nieuws.inc.php b/nieuws.inc.php
index f4d42d8..8af5694 100644
--- a/nieuws.inc.php
+++ b/nieuws.inc.php
@@ -7,7 +7,7 @@ $monthname = ['?',
 
 function shownewsdate($url)
 {
-	if (!preg_match('</(\d{4})/(\d{2})/(\d{2})->', $url, $parts)) return;
+	if (!preg_match('</(\d{4})/(\d{2})-(\d{2})->', $url, $parts)) return;
 	global $monthname;
 	return implode(' ', array_filter([
 		intval($parts[3]), $parts[2] > 0 ? $monthname[intval($parts[2])] : '', $parts[1],
@@ -30,10 +30,10 @@ function shownewsarticle($url, $link = TRUE, $title = NULL)
 	return preg_replace('{<h2>(.*?)</h2>}', $title, $html);
 }
 
-function shownews($root, $limit = 1000)
+function shownews($input, $limit = 1000)
 {
-	if (strpos($root, '/') === FALSE) $root .= '/*';
-	foreach (array_reverse(glob("$root/*.html")) as $url) {
+	if (!is_array($input)) $input = glob("$input/*.html");
+	foreach (array_reverse($input) as $url) {
 		print "<article>";
 		ob_start();
 		include $url;
diff --git a/nieuws.php b/nieuws.php
index 83fdc7a..cafc94c 100644
--- a/nieuws.php
+++ b/nieuws.php
@@ -1,4 +1,4 @@
 <?php
 include_once 'nieuws.inc.php';
-$articles = ($Page ?: 'nieuws') . '/????/??';
+$articles = ($Page ?: 'nieuws') . '/????';
 shownews($articles, @$_GET['n'] ?: 5);
diff --git a/nieuws/edit.js b/nieuws/edit.js
index 64260e9..86b0b4c 100644
--- a/nieuws/edit.js
+++ b/nieuws/edit.js
@@ -5,7 +5,7 @@ editlink.onclick = function () {
 	var today = new Date().toJSON().slice(0, 10).split('-');
 	var input = prompt('Paginatitel', '');
 	if (!input) return false;
-	var url = today[0] + '/' + today[1] + '/' + today[2] + '-' +
+	var url = today[0] + '/' + today[1] + '-' + today[2] + '-' +
 		input.toLowerCase().replace(/[^a-z0-9]+/g, ' ').trim();
 	var title = encodeURIComponent(input.trim());
 	window.location = '/nieuws/'+url+'?edit='+title+'#edit';
diff --git a/nieuws/index.php b/nieuws/index.php
index bbc002a..05c995a 100644
--- a/nieuws/index.php
+++ b/nieuws/index.php
@@ -1,9 +1,9 @@
 <?php
 include 'nieuws.inc.php';
 
-@list ($year, $month, $page) = explode('/', trim($Args, '/'));
+@list ($year, $page) = explode('/', trim($Args, '/'));
 
-if ($page) {
+if ($page and !is_numeric($page)) {
 	$edit = !empty($User['admin']) ? htmlspecialchars(@$_GET['edit']) : NULL;
 	print shownewsarticle($Args, FALSE, $edit);
 	return 1;
@@ -12,19 +12,18 @@ if ($page) {
 if ($year) {
 	ob_clean();
 	if (is_numeric($year)) {
-		$title = "Nieuws ".($month ? $monthname[$month].' ' : '').$year;
-		$match = implode('/', [
-			$Page, $year, $month ? sprintf('%02d', $month) : '??',
-		]);
+		$title = "Nieuws ".($page ? $monthname[$page].' ' : '').$year;
+		$match = "$Page/$year/";
+		if ($page) $match .= sprintf('%02d-', $page);
 	}
 	else {
 		$title = "Nieuws vóór 2000";
-		$match = "$Page/19??/??";
+		$match = "$Page/19??/";
 	}
 
 	print "<h2>$title</h2>\n\n";
 	print '<div id="news">'."\n\n";
-	shownews($match);
+	shownews(glob($match.'*.html'));
 	print "</div>\n\n";
 	return 1;
 }
@@ -38,10 +37,10 @@ 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/??");
+	printtoc($page);
 }
 
-if ($pages = glob("$Page/19??/??/*.html")) {
+if ($pages = glob("$Page/19??/*.html")) {
 	printf('<h3><a href="/%s">%s</a></h3>'."\n", "$Page/oud", 'Eerder');
 	printtoc($pages);
 }
-- 
2.30.0