page: replace output caching by article object

[minimedit.git] / nieuws / index.php

diff --git a/nieuws/index.php b/nieuws/index.php
index 746baec4869bd6f7be2abe1223fefe78cb1a54bf..53dff0de76e24400c906372abc61bd8ce0f4f55c 100644 (file)
--- 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('news')) {
        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->file and $article->image) {
-               $Place['image'] = "https://lijtweg.nl/".$article->thumb('600x');
+       $edit = $User && $User->admin('news') ? 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('news')) {
                $taglist = [];
                foreach (glob("$Page/.tags/*") as $tagpath) {
                        $tagname = pathinfo($tagpath, PATHINFO_BASENAME);
@@ -38,13 +37,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 +64,5 @@ if ($year) {
 
        print "<h2>$title</h2>\n\n";
        print placeholder_include('nieuws', [$match]);
-       return 1;
+       return;
 }