auth: create user object regardless of login

[minimedit.git] / nieuws / index.php

diff --git a/nieuws/index.php b/nieuws/index.php
index cc2a8bf870ed0fa150d100f9268841bcb8798438..f74c632bd762ea06dab685c70ce9c41a6f4733fa 100644 (file)
--- a/nieuws/index.php
+++ b/nieuws/index.php
@@ -1,26 +1,22 @@
 <?php
-include 'nieuws.inc.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 = new ArchiveArticle("$Page$Args.html");
-       $Place['title'] = $edit ?: $article->title;
-       if ($article->file) {
-               $Place['description'] = $article->teaser;
+       $Article->meta['og:type'] = 'article';
+       $edit = $User->admin("edit $Page$Args") ? htmlspecialchars(@$_GET['edit']) : NULL;
+       if ($edit) {
+               $Article->title = $edit;
        }
-       $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');
+       if ($Article->dateparts) {
+               $Place[1] = ' <small class="date">'.$Article->date.'</small>';
        }
-       if ($User and $User->admin) {
+       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);
@@ -42,13 +38,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) {
@@ -70,5 +65,5 @@ if ($year) {
 
        print "<h2>$title</h2>\n\n";
        print placeholder_include('nieuws', [$match]);
-       return 1;
+       return;
 }