X-Git-Url: http://git.shiar.net/minimedit.git/blobdiff_plain/bd29158976da14f04451d58a8713674934c78379..refs/tags/v4.1:/nieuws/index.php

diff --git a/nieuws/index.php b/nieuws/index.php
index ad85011..c6234cf 100644
--- a/nieuws/index.php
+++ b/nieuws/index.php
@@ -1,22 +1,21 @@
 <?php
-include 'nieuws.inc.php';
-
 $replyform = $Page == 'melding' && !empty($User);
 @list ($year, $page) = explode('/', trim($Args, '/'));
 
-if (!empty($User['admin'])) {
+if ($User and $User->admin("edit $Page")) {
 	print '<script src="/nieuws/edit.js"></script>'."\n";
 }
 
 if ($page and !is_numeric($page)) {
-	$edit = !empty($User['admin']) ? htmlspecialchars(@$_GET['edit']) : NULL;
-	$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');
+	$edit = $User && $User->admin("edit $Page$Args") ? htmlspecialchars(@$_GET['edit']) : NULL;
+	if ($edit) {
+		$Article->title = $edit;
+	}
+	if ($Article->dateparts) {
+		$Place[1] = ' <small class="date">'.$Article->date.'</small>';
 	}
-	if (!empty($User['admin'])) {
+	print preg_replace('{(?<=<h2>)(.*?)(?=</h2>)}', ($edit ?: '\1').' [[1]]', $Article->raw);
+	if ($User and $User->admin("edit $Page$Args")) {
 		$taglist = [];
 		foreach (glob("$Page/.tags/*") as $tagpath) {
 			$tagname = pathinfo($tagpath, PATHINFO_BASENAME);
@@ -31,18 +30,19 @@ if ($page and !is_numeric($page)) {
 				ucfirst($tagname)
 			);
 		}
-		printf('<p class="tags"><strong>Tags:</strong> %s</p>'."\n",
-			implode("\n\t", $taglist)
-		);
+		if ($taglist) {
+			printf('<p class="tags"><strong>Tags:</strong> %s</p>'."\n",
+				implode("\n\t", $taglist)
+			);
+		}
 	}
 	if ($replyform) {
-		print placeholder_include('nieuws/replies');
+		print placeholder_include('reply');
 	}
-	return 1;
+	return;
 }
 
 if ($year) {
-	ob_clean();
 	$match = $Page;
 	$title = "Nieuws";
 	if (is_numeric($year) and $year > 999) {
@@ -64,5 +64,5 @@ if ($year) {
 
 	print "<h2>$title</h2>\n\n";
 	print placeholder_include('nieuws', [$match]);
-	return 1;
+	return;
 }