login/edit: set correct id for input fields

[minimedit.git] / page.inc.php

diff --git a/page.inc.php b/page.inc.php
index c0282eea341fcec090015953950f7c601c504c8f..c4884b9a098821f963514cf5be07334e57a5adea 100644 (file)
--- a/page.inc.php
+++ b/page.inc.php
@@ -1,20 +1,40 @@
 <?php
-$body = ob_get_clean();
+$body = getoutput($Place);
 
 include_once DOCROOT.'head.inc.php';
 
 print "<header>\n";
 ob_start();
 include DOCROOT.'menu.html';
-$nav = ob_get_clean();
+ob_start();
+if (!empty($User)) {
+       print '<div class="login"><p>';
+       printf('<span>Ingelogd: <b><a href="%s">%s</a></b></span>', '/login', $User['name']);
+       if (!empty($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 ' <a href="#edit">Wijzig</a>';
+               }
+       }
+       print "</p></div>\n";
+}
+$nav = getoutput(['login' => ob_get_clean()]);
+
 $nav = preg_replace_callback('{<a href="([^"]+)">(.*?)</a>}', function ($m) {
        $request = $_SERVER['REQUEST_URI'];
        $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 (isset($User)) {
+if (!empty($User)) {
        $nav = preg_replace('{\s*<li class="logout">.*?</li>}', '', $nav);
-       $nav = str_replace('[[login]]', $User['name'], $nav);
 }
 else {
        $nav = preg_replace('{\s*<li class="login">.*?</li>}', '', $nav);
@@ -30,7 +50,7 @@ register_shutdown_function(function () {
        print "</footer>\n";
 
        global $User;
-       if (isset($User) and $User['admin']) {
+       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";
        }