nieuws: parse date using single regexp

[minimedit.git] / nieuws.inc.php

diff --git a/nieuws.inc.php b/nieuws.inc.php
index ca16b4a13a0bcddc5d3f62750376c17edf69f5f1..f9fec6ad3f4b0ebd290d9241c8d488cd371f88b6 100644 (file)
--- a/nieuws.inc.php
+++ b/nieuws.inc.php
@@ -6,12 +6,11 @@ $monthname = ['?',
 
 function shownewsdate($url)
 {
-       $parts = pathinfo($url);
-       $year = pathinfo($parts['dirname'], PATHINFO_FILENAME);
-       @list ($month, $day) = explode('-', $parts['filename'], 3);
+       if (!preg_match('</(\d{4})/(\d{2})/(\d{2})->', $url, $parts)) return;
        global $monthname;
-       return sprintf('<small class="date">%s %s %s</small>',
-               intval($day), $monthname[intval($month)], $year);
+       return implode(' ', array_filter([
+               intval($parts[3]), $monthname[intval($parts[2])], $parts[1],
+       ]));
 }
 
 function shownewsarticle($url, $link = TRUE, $title = NULL)
@@ -32,7 +31,8 @@ function shownewsarticle($url, $link = TRUE, $title = NULL)
 
 function shownews($root, $limit = 5)
 {
-       foreach (array_reverse(glob("$root/*/*.html")) as $url) {
+       if (strpos($root, '/') === FALSE) $root .= '/*';
+       foreach (array_reverse(glob("$root/*.html")) as $url) {
                print "<article>";
                ob_start();
                include $url;
@@ -42,3 +42,16 @@ function shownews($root, $limit = 5)
                if (--$limit <= 0) break;
        }
 }
+
+function printtoc($root)
+{
+       print '<ul>';
+       foreach (array_reverse(glob("$root/*.html")) as $page) {
+               $title = fgets(fopen($page, 'r'));
+               $title = strip_tags($title);
+               $linkurl = preg_replace('/\.html$/', '', $page);
+               printf('<li><a href="/%s">%s <small class="date">%s</small></a></li>',
+                       $linkurl, $title, shownewsdate($linkurl));
+       }
+       print "</ul>\n";
+}