page: move getoutput() to render method

[minimedit.git] / page.inc.php

diff --git a/page.inc.php b/page.inc.php
index ae223f1a1f5383f6ca2dbf795f82a7eb27f87940..78cca99f070bcd61e1e4c06e0ed1972680fab489 100644 (file)
--- a/page.inc.php
+++ b/page.inc.php
@@ -1,11 +1,12 @@
 <?php
-$body = getoutput(@$Place);
+$body = $Page->render(@$Place);
 
 include_once 'head.inc.php';
 
 print "<header>\n";
 ob_start();
-include 'menu.inc.html';
+$menu = new ArchiveArticle('menu.inc.html');
+print $menu->raw;
 ob_start();
 if ($User and property_exists($User, 'login') and $User->login) {
        print '<div class="login"><p>';
@@ -13,8 +14,8 @@ if ($User and property_exists($User, 'login') and $User->login) {
                '<span class="icon icon-user">&#x1F464;</span>',
                '/login', $User->login
        );
-       if ($User->admin("edit $Page$Args")) {
-               $editpage = $Page.$Args;
+       if ($User->admin("edit {$Page->link}")) {
+               $editpage = $Page->link;
                if (is_dir($editpage)) {
                        if (file_exists("$editpage/index.html")) {
                                $editpage .= '/index.html';
@@ -29,7 +30,7 @@ if ($User and property_exists($User, 'login') and $User->login) {
        }
        print "</p></div>\n";
 }
-$nav = getoutput(['login' => ob_get_clean()]);
+$nav = $menu->render(['login' => ob_get_clean()]);
 
 $nav = preg_replace_callback('{<a href="([^"]+)">(.*?)</a>}', function ($m) {
        $request = $_SERVER['REQUEST_URI'];
@@ -46,11 +47,11 @@ register_shutdown_function(function () {
        @include 'footer.inc.html';
        print "</footer>\n";
 
-       global $User, $Page, $Args;
-       if ($User and $User->admin("edit $Page$Args")) {
+       global $User, $Page;
+       if ($User and $User->admin("edit {$Page->link}")) {
                $ckesrc = '/lib/ckeditor'; # local install
                if (!file_exists(DOCROOT . $ckesrc)) {
-                       $ckesrc = '//cdn.ckeditor.com/4.7.3/full-all'; # remote fallback
+                       $ckesrc = '//cdn.ckeditor.com/4.15.1/full-all'; # remote fallback
                }
                printf("<script>var ckesrc = '%s'</script>\n", "$ckesrc/ckeditor.js");
                print '<script src="/edit/page.js"></script>'."\n";