X-Git-Url: http://git.shiar.nl/minimedit.git/blobdiff_plain/621fc2f9638a1a92aa8535310e7852de5542f11e..v4.5-6-g50f9b29cc2:/page.inc.php diff --git a/page.inc.php b/page.inc.php index 94ef7cf..8eba91b 100644 --- a/page.inc.php +++ b/page.inc.php @@ -1,17 +1,17 @@ \n"; +$menu = new ArchiveArticle('menu.inc.html'); ob_start(); -include 'menu.inc.html'; -ob_start(); -if ($User and $User->login) { +if ($User and property_exists($User, 'login') and $User->login) { print '

'; - printf('Ingelogd: %s', '/login', $User->login); - if ($User->admin("edit $Page$Args")) { - $editpage = $Page.$Args; + printf('%s %s', + '👤', + '/login', $User->login + ); + if ($User->admin("edit {$Page->link}")) { + $editpage = $Page->link; if (is_dir($editpage)) { if (file_exists("$editpage/index.html")) { $editpage .= '/index.html'; @@ -21,12 +21,13 @@ if ($User and $User->login) { $editpage .= '.html'; } if (!file_exists($editpage) or is_writable($editpage)) { - print ' Wijzig'; + print ' '; } } print "

\n"; } -$nav = getoutput(['login' => ob_get_clean()]); +$menu->place['login'] = ob_get_clean(); +$nav = $menu->render(); $nav = preg_replace_callback('{(.*?)}', function ($m) { $request = $_SERVER['REQUEST_URI']; @@ -36,20 +37,20 @@ $nav = preg_replace_callback('{(.*?)}', function ($m) { print $nav; print "\n\n"; -print $body; +print $Page->render(); register_shutdown_function(function () { print '\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(''."\n", "$ckesrc/ckeditor.js"); + printf("\n", "$ckesrc/ckeditor.js"); print ''."\n"; }