nieuws: find article image to append on page

[minimedit.git] / nieuws / index.php

diff --git a/nieuws/index.php b/nieuws/index.php
index 25efd2daf017882e6e3b49ac55c623e755457f5f..d6a85e7f36d88c62e0291505fcde2dac18e6d7e8 100644 (file)
--- a/nieuws/index.php
+++ b/nieuws/index.php
@@ -5,14 +5,14 @@ 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();
        $title = "Nieuws";
-       if (is_numeric($year)) {
+       if (is_numeric($year) and $year > 999) {
                $match = "$Page/$year/";
                if (is_numeric($page)) {
                        $title .= ' '.$monthname[intval($page)];
@@ -20,7 +20,7 @@ if ($year) {
                }
                $title .= ' '.$year;
        }
-       else {
+       elseif ($year === '19') {
                $match = "$Page/19??/";
                $title .= " vóór 2000";
        }
@@ -32,10 +32,6 @@ if ($year) {
        return 1;
 }
 
-if ($Args) {
-       return;
-}
-
 print '<div id="news">'."\n\n";
 
 foreach (array_reverse(glob("$Page/2???")) as $page) {
@@ -45,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);
 }