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

diff --git a/nieuws/index.php b/nieuws/index.php
index 4ffaa23..0f81de2 100644
--- a/nieuws/index.php
+++ b/nieuws/index.php
@@ -1,23 +1,22 @@
 <?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) {
 	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['title'] = $edit ?: $article->title;
-	$Place[1] = ' <small class="date">'.$article->date.'</small>';
-	print preg_replace('{(?<=<h2>)(.*?)(?=</h2>)}', ($edit ?: '\1').' [[1]]', ob_get_clean());
-	if ($article->file and $article->image) {
-		$Place['image'] = "/".$article->thumb('600x');
+	$edit = $User && $User->admin ? htmlspecialchars(@$_GET['edit']) : NULL;
+	if ($edit) {
+		$Article->title = $edit;
 	}
-	if (!empty($User['admin'])) {
+	if (isset($Article->raw)) {
+		$Place['description'] = $Article->teaser;
+	}
+	$Place[1] = ' <small class="date">'.$Article->date.'</small>';
+	print preg_replace('{(?<=<h2>)(.*?)(?=</h2>)}', ($edit ?: '\1').' [[1]]', ob_get_clean());
+	if ($User and $User->admin) {
 		$taglist = [];
 		foreach (glob("$Page/.tags/*") as $tagpath) {
 			$tagname = pathinfo($tagpath, PATHINFO_BASENAME);