X-Git-Url: http://git.shiar.net/minimedit.git/blobdiff_plain/087428a7f2e31e2d9269084ba2a2f3b114a8c8d7..b95195ed4540a07ac0f31c363101698ada841d67:/nieuws.inc.php

diff --git a/nieuws.inc.php b/nieuws.inc.php
index f4d42d8..8af5694 100644
--- a/nieuws.inc.php
+++ b/nieuws.inc.php
@@ -7,7 +7,7 @@ $monthname = ['?',
 
 function shownewsdate($url)
 {
-	if (!preg_match('</(\d{4})/(\d{2})/(\d{2})->', $url, $parts)) return;
+	if (!preg_match('</(\d{4})/(\d{2})-(\d{2})->', $url, $parts)) return;
 	global $monthname;
 	return implode(' ', array_filter([
 		intval($parts[3]), $parts[2] > 0 ? $monthname[intval($parts[2])] : '', $parts[1],
@@ -30,10 +30,10 @@ function shownewsarticle($url, $link = TRUE, $title = NULL)
 	return preg_replace('{<h2>(.*?)</h2>}', $title, $html);
 }
 
-function shownews($root, $limit = 1000)
+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;