X-Git-Url: http://git.shiar.net/minimedit.git/blobdiff_plain/6c50820df359e22fd0aa9da49c11708aa50f8253..HEAD:/page.inc.php

diff --git a/page.inc.php b/page.inc.php
index 577f1e0..23a7106 100644
--- a/page.inc.php
+++ b/page.inc.php
@@ -1,32 +1,19 @@
 <?php
-$body = getoutput(@$Place);
-
 include_once 'head.inc.php';
 
 print "<header>\n";
+$menu = new ArchiveArticle('menu.inc.html');
 ob_start();
-include 'menu.inc.html';
-ob_start();
-if ($User) {
+if ($User and property_exists($User, 'login') and $User->login) {
 	print '<div class="login"><p>';
-	printf('<span>Ingelogd: <b><a href="%s">%s</a></b></span>', '/login', $User->login);
-	if ($User->admin('edit')) {
-		$editpage = $Page.$Args;
-		if (is_dir($editpage)) {
-			if (file_exists("$editpage/index.html")) {
-				$editpage .= '/index.html';
-			}
-		}
-		else {
-			$editpage .= '.html';
-		}
-		if (!file_exists($editpage) or is_writable($editpage)) {
-			print ' <a href="#edit">Wijzig</a>';
-		}
-	}
+	printf('<span title="ingelogd">%s <a href="%s">%s</a></span>',
+		'<span class="icon icon-user">&#x1F464;</span>',
+		'/login', $User->login
+	);
 	print "</p></div>\n";
 }
-$nav = getoutput(['login' => ob_get_clean()]);
+$menu->place['login'] = ob_get_clean();
+$nav = $menu->render();
 
 $nav = preg_replace_callback('{<a href="([^"]+)">(.*?)</a>}', function ($m) {
 	$request = $_SERVER['REQUEST_URI'];
@@ -36,23 +23,10 @@ $nav = preg_replace_callback('{<a href="([^"]+)">(.*?)</a>}', function ($m) {
 print $nav;
 print "</header>\n\n";
 
-print $body;
-
 register_shutdown_function(function () {
 	print '<footer>';
 	@include 'footer.inc.html';
 	print "</footer>\n";
-
-	global $User;
-	if ($User and $User->admin('edit')) {
-		$ckesrc = '/lib/ckeditor'; # local install
-		if (!file_exists(DOCROOT . $ckesrc)) {
-			$ckesrc = '//cdn.ckeditor.com/4.7.3/full-all'; # remote fallback
-		}
-		printf('<script src="%s"></script>'."\n", "$ckesrc/ckeditor.js");
-		print '<script src="/edit/page.js"></script>'."\n";
-	}
-
 	print "</body></html>\n";
 });