X-Git-Url: http://git.shiar.net/minimedit.git/blobdiff_plain/b95195ed4540a07ac0f31c363101698ada841d67..686de24f732b400e770df83b469c37bf4e6d4874:/nieuws/index.php

diff --git a/nieuws/index.php b/nieuws/index.php
index 05c995a..d6a85e7 100644
--- a/nieuws/index.php
+++ b/nieuws/index.php
@@ -5,20 +5,24 @@ include 'nieuws.inc.php';
 
 if ($page and !is_numeric($page)) {
 	$edit = !empty($User['admin']) ? htmlspecialchars(@$_GET['edit']) : NULL;
-	print shownewsarticle($Args, FALSE, $edit);
+	print shownewsarticle($Page.$Args, FALSE, $edit);
 	return 1;
 }
 
 if ($year) {
 	ob_clean();
-	if (is_numeric($year)) {
-		$title = "Nieuws ".($page ? $monthname[$page].' ' : '').$year;
+	$title = "Nieuws";
+	if (is_numeric($year) and $year > 999) {
 		$match = "$Page/$year/";
-		if ($page) $match .= sprintf('%02d-', $page);
+		if (is_numeric($page)) {
+			$title .= ' '.$monthname[intval($page)];
+			$match .= sprintf('%02d-', $page);
+		}
+		$title .= ' '.$year;
 	}
-	else {
-		$title = "Nieuws vóór 2000";
+	elseif ($year === '19') {
 		$match = "$Page/19??/";
+		$title .= " vóór 2000";
 	}
 
 	print "<h2>$title</h2>\n\n";
@@ -28,10 +32,6 @@ if ($year) {
 	return 1;
 }
 
-if ($Args) {
-	return;
-}
-
 print '<div id="news">'."\n\n";
 
 foreach (array_reverse(glob("$Page/2???")) as $page) {
@@ -41,7 +41,7 @@ foreach (array_reverse(glob("$Page/2???")) as $page) {
 }
 
 if ($pages = glob("$Page/19??/*.html")) {
-	printf('<h3><a href="/%s">%s</a></h3>'."\n", "$Page/oud", 'Eerder');
+	printf('<h3><a href="/%s">%s</a></h3>'."\n", "$Page/19", 'Eerder');
 	printtoc($pages);
 }