nieuws: support tagged article links

[minimedit.git] / nieuws / index.php

diff --git a/nieuws/index.php b/nieuws/index.php
index d6a85e7f36d88c62e0291505fcde2dac18e6d7e8..11e305ef04a98fe7323306bf4640adcf9b08e8ba 100644 (file)
--- a/nieuws/index.php
+++ b/nieuws/index.php
@@ -1,19 +1,29 @@
 <?php
 include 'nieuws.inc.php';
 
+$replyform = $Page == 'melding' && !empty($User);
 @list ($year, $page) = explode('/', trim($Args, '/'));
 
 if ($page and !is_numeric($page)) {
        $edit = !empty($User['admin']) ? htmlspecialchars(@$_GET['edit']) : NULL;
-       print shownewsarticle($Page.$Args, FALSE, $edit);
+       $article = new ArchiveArticle("$Page$Args.html");
+       $Place[1] = ' <small class="date">'.$article->date.'</small>';
+       print preg_replace('{(?<=<h2>)(.*?)(?=</h2>)}', ($edit ?: '\1').' [[1]]', ob_get_clean());
+       if ($article->image) {
+               $Place['image'] = "https://lijtweg.nl/".$article->thumb('600x');
+       }
+       if ($replyform) {
+               print placeholder_include('nieuws/replies');
+       }
        return 1;
 }
 
 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);
@@ -21,32 +31,19 @@ if ($year) {
                $title .= ' '.$year;
        }
        elseif ($year === '19') {
-               $match = "$Page/19??/";
+               $match .= "/19??";
                $title .= " vóór 2000";
        }
+       elseif (file_exists("$Page/.tags/$year")) {
+               $match .= "/.tags/$year";
+               $title .= " met $year";
+       }
 
        print "<h2>$title</h2>\n\n";
-       print '<div id="news">'."\n\n";
-       shownews(glob($match.'*.html'));
-       print "</div>\n\n";
+       print placeholder_include('nieuws', [$match]);
        return 1;
 }
 
-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);
-}
-
-if ($pages = glob("$Page/19??/*.html")) {
-       printf('<h3><a href="/%s">%s</a></h3>'."\n", "$Page/19", 'Eerder');
-       printtoc($pages);
-}
-
-print "</div>\n\n";
-
 if (!empty($User['admin'])) {
        print '<script src="/nieuws/edit.js"></script>'."\n";
 }