X-Git-Url: http://git.shiar.net/minimedit.git/blobdiff_plain/328e964708c7e9dc479a25f9358b2d03e9d7f66c..686de24f732b400e770df83b469c37bf4e6d4874:/nieuws.inc.php

diff --git a/nieuws.inc.php b/nieuws.inc.php
index 7e723e4..3f3f163 100644
--- a/nieuws.inc.php
+++ b/nieuws.inc.php
@@ -1,4 +1,5 @@
 <?php
+global $monthname;
 $monthname = ['?',
 	'januari', 'februari', 'maart', 'april', 'mei', 'juni',
 	'juli', 'augustus', 'september', 'oktober', 'november', 'december',
@@ -6,12 +7,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]), $parts[2] > 0 ? $monthname[intval($parts[2])] : '', $parts[1],
+	]));
 }
 
 function shownewsarticle($url, $link = TRUE, $title = NULL)
@@ -25,29 +25,30 @@ function shownewsarticle($url, $link = TRUE, $title = NULL)
 	$title = sprintf(
 		$link ? '<h3><a href="/%2$s">%s</a></h3>' : '<h2>%s</h2>',
 		getoutput([1 => ' <small class="date">'.$date.'</small>']),
-		preg_replace('/\.html$/', '', $url)
+		$url
 	);
 	return preg_replace('{<h2>(.*?)</h2>}', $title, $html);
 }
 
-function shownews($root, $limit = 5)
+function shownews($input, $limit = 1000)
 {
-	if (strpos($root, '/') === FALSE) $root .= '/*';
-	foreach (array_reverse(glob("$root/*.html")) as $url) {
+	if (!is_array($input)) $input = glob("$input/*.html");
+	foreach (array_reverse($input) as $url) {
 		print "<article>";
 		ob_start();
 		include $url;
-		print shownewsarticle($url);
+		print shownewsarticle(preg_replace('/\.html$/', '', $url));
 		print "</article>\n\n";
 
 		if (--$limit <= 0) break;
 	}
 }
 
-function printtoc($root)
+function printtoc($input)
 {
+	if (!is_array($input)) $input = glob("$input/*.html");
 	print '<ul>';
-	foreach (array_reverse(glob("$root/*.html")) as $page) {
+	foreach (array_reverse($input) as $page) {
 		$title = fgets(fopen($page, 'r'));
 		$title = strip_tags($title);
 		$linkurl = preg_replace('/\.html$/', '', $page);