X-Git-Url: http://git.shiar.net/minimedit.git/blobdiff_plain/41811556ca2ca3ca29191bee012c35e5f40a3995..17653d5b7ab2c7276c97b0953648fcb885383711:/nieuws/index.php

diff --git a/nieuws/index.php b/nieuws/index.php
index 0f81de2..ff433d5 100644
--- a/nieuws/index.php
+++ b/nieuws/index.php
@@ -1,22 +1,25 @@
 <?php
-$replyform = $Page == 'melding' && !empty($User);
+$replyform = $Page == 'melding' && $User->login;
 @list ($year, $page) = explode('/', trim($Args, '/'));
 
-if ($User and $User->admin) {
+if ($User->admin("edit $Page")) {
 	print '<script src="/nieuws/edit.js"></script>'."\n";
 }
 
 if ($page and !is_numeric($page)) {
-	$edit = $User && $User->admin ? htmlspecialchars(@$_GET['edit']) : NULL;
+	$Article->meta['og:type'] = 'article';
+	$edit = $User->admin("edit $Page$Args") ? htmlspecialchars(@$_GET['edit']) : NULL;
 	if ($edit) {
 		$Article->title = $edit;
 	}
-	if (isset($Article->raw)) {
-		$Place['description'] = $Article->teaser;
+	if ($Article->dateparts) {
+		$Place[1] = ' <small class="date">'.$Article->date.'</small>';
 	}
-	$Place[1] = ' <small class="date">'.$Article->date.'</small>';
-	print preg_replace('{(?<=<h2>)(.*?)(?=</h2>)}', ($edit ?: '\1').' [[1]]', ob_get_clean());
-	if ($User and $User->admin) {
+	else {
+		$Place[1] = '';
+	}
+	print preg_replace('{(?<=<h2>)(.*?)(?=</h2>)}', ($edit ?: '\1').' [[1]]', $Article->raw);
+	if ($User->admin("edit $Page$Args")) {
 		$taglist = [];
 		foreach (glob("$Page/.tags/*") as $tagpath) {
 			$tagname = pathinfo($tagpath, PATHINFO_BASENAME);
@@ -38,13 +41,12 @@ if ($page and !is_numeric($page)) {
 		}
 	}
 	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) {
@@ -66,5 +68,5 @@ if ($year) {
 
 	print "<h2>$title</h2>\n\n";
 	print placeholder_include('nieuws', [$match]);
-	return 1;
+	return;
 }