X-Git-Url: http://git.shiar.nl/minimedit.git/blobdiff_plain/6ce5695197ca6b3137a44d775baff00aaa6e0673..c3518f67a1134e20a497dbfc3161353b650e279d:/page.inc.php

diff --git a/page.inc.php b/page.inc.php
index 54a3944..8298c6d 100644
--- a/page.inc.php
+++ b/page.inc.php
@@ -1,16 +1,16 @@
 <?php
-$body = ob_get_clean();
+$body = getoutput(@$Place);
 
-include_once DOCROOT.'head.inc.php';
+include_once 'head.inc.php';
 
 print "<header>\n";
 ob_start();
-include DOCROOT.'menu.html';
+include 'menu.html';
 ob_start();
-if (!empty($User)) {
+if ($User) {
 	print '<div class="login"><p>';
-	printf('<span>Ingelogd: <b><a href="%s">%s</a></b></span>', '/login', $User['name']);
-	if (!empty($User['admin'])) {
+	printf('<span>Ingelogd: <b><a href="%s">%s</a></b></span>', '/login', $User->login);
+	if ($User->admin) {
 		$editpage = $Page.$Args;
 		if (is_dir($editpage)) {
 			if (file_exists("$editpage/index.html")) {
@@ -20,7 +20,7 @@ if (!empty($User)) {
 		else {
 			$editpage .= '.html';
 		}
-		if (is_writable($editpage)) {
+		if (!file_exists($editpage) or is_writable($editpage)) {
 			print ' <a href="#edit">Wijzig</a>';
 		}
 	}
@@ -33,12 +33,6 @@ $nav = preg_replace_callback('{<a href="([^"]+)">(.*?)</a>}', function ($m) {
 	$html = $request == $m[1] ? $m[2] : $m[0]; # text or full link
 	return $m[1] == substr($request, 0, strlen($m[1])) ? "<b>$html</b>" : $html;
 }, $nav);
-if (!empty($User)) {
-	$nav = preg_replace('{\s*<li class="logout">.*?</li>}', '', $nav);
-}
-else {
-	$nav = preg_replace('{\s*<li class="login">.*?</li>}', '', $nav);
-}
 print $nav;
 print "</header>\n\n";
 
@@ -46,13 +40,17 @@ print $body;
 
 register_shutdown_function(function () {
 	print '<footer>';
-	@include DOCROOT.'footer.html';
+	@include 'footer.html';
 	print "</footer>\n";
 
 	global $User;
-	if (!empty($User['admin'])) {
-		print '<script src="//cdn.ckeditor.com/4.7.3/full-all/ckeditor.js"></script>'."\n";
-		print '<script src="/edit.js"></script>'."\n";
+	if ($User and $User->admin) {
+		$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";