nieuws: archive pages by year only

[minimedit.git] / nieuws / index.php

diff --git a/nieuws/index.php b/nieuws/index.php
index bbc002a62eca92583b71832b729746faa01bc8f1..05c995af1a38b1f8b8646bd78f774848c22a335a 100644 (file)
--- 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);
 }