page: retrieve static contents from article object

[minimedit.git] / page.php

diff --git a/page.php b/page.php
index bca7a6745e7e9809e5b8c746818c5041933a54b9..a05e158f198960358599af2001522c2f13cc1fc7 100644 (file)
--- a/page.php
+++ b/page.php
@@ -113,6 +113,7 @@ error_reporting(error_reporting() & ~E_FATAL);
 
 # user login and control
 
+$User = NULL;
 include_once 'auth.inc.php';
 $Edit = isset($_GET['edit']);
 
@@ -158,19 +159,23 @@ if (file_exists("$Page$Args.html")) {
 elseif (file_exists("$Page$Args/index.html")) {
        $staticpage = "$Page$Args/index.html";
 }
-elseif (!empty($User['admin'])) {
+elseif ($User and $User->admin) {
        $staticpage = (file_exists("$Page/template.html") ? "$Page/template.html" : 'template.html');
 }
 
 # load static contents
 
+require_once('article.inc.php');
+$Article = new ArchiveArticle($staticpage);
+
 ob_start(); # page body
 ob_start(); # inner html
 print '<div class="static">'."\n\n";
 
 $found = FALSE;
-if (isset($staticpage)) {
-       $found = include "./$staticpage";
+if ($Article->file) {
+       print $Article->raw;
+       $found = 1;
 }
 
 print "</div>\n\n";
@@ -184,7 +189,7 @@ if ($Page) {
 }
 
 $Place += [
-       'user'  => empty($User) ? '' : $User['name'],
+       'user'  => $User ? $User->login : '',
        'url'   => htmlspecialchars($_SERVER['REQUEST_URI']),
 ];