X-Git-Url: http://git.shiar.net/minimedit.git/blobdiff_plain/3dd944a535c60c1b25dedda5c942d43fd0b6421e..72fc7bdc6b1dfd858c108c578c8d73a5ad40cbcd:/page.inc.php?ds=sidebyside
diff --git a/page.inc.php b/page.inc.php
index 9d49fad..8298c6d 100644
--- a/page.inc.php
+++ b/page.inc.php
@@ -1,17 +1,28 @@
\n";
ob_start();
-include DOCROOT.'menu.html';
+include 'menu.html';
ob_start();
-if (isset($User)) {
+if ($User) {
print '
';
- printf('Ingelogd: %s', $User['name']);
- if ($User['admin']) {
- print ' Wijzig';
+ printf('Ingelogd: %s', '/login', $User->login);
+ if ($User->admin) {
+ $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 ' Wijzig';
+ }
}
print "
\n";
}
@@ -22,12 +33,6 @@ $nav = preg_replace_callback('{(.*?)}', function ($m) {
$html = $request == $m[1] ? $m[2] : $m[0]; # text or full link
return $m[1] == substr($request, 0, strlen($m[1])) ? "$html" : $html;
}, $nav);
-if (isset($User)) {
- $nav = preg_replace('{\s*.*?}', '', $nav);
-}
-else {
- $nav = preg_replace('{\s*.*?}', '', $nav);
-}
print $nav;
print "\n\n";
@@ -35,13 +40,17 @@ print $body;
register_shutdown_function(function () {
print '\n";
global $User;
- if (isset($User) and $User['admin']) {
- print ''."\n";
- print ''."\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(''."\n", "$ckesrc/ckeditor.js");
+ print ''."\n";
}
print "