X-Git-Url: http://git.shiar.net/minimedit.git/blobdiff_plain/62c99bb3ff5dee600a20fe6749f28c45b6cce7fd..a5cbc9ddb6ad65b17f83d2931e3318d94e498a0e:/page.inc.php?ds=sidebyside diff --git a/page.inc.php b/page.inc.php index 333a705..120fb95 100644 --- a/page.inc.php +++ b/page.inc.php @@ -1,16 +1,16 @@ \n"; ob_start(); -include DOCROOT.'menu.html'; +include 'menu.inc.html'; ob_start(); -if (!empty($User)) { +if ($User and property_exists($User, 'login') and $User->login) { print '
'; - printf('Ingelogd: %s', '/login', $User['name']); - if (!empty($User['admin'])) { + printf('Ingelogd: %s', '/login', $User->login); + if ($User->admin("edit $Page$Args")) { $editpage = $Page.$Args; if (is_dir($editpage)) { if (file_exists("$editpage/index.html")) { @@ -33,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 (!empty($User)) { - $nav = preg_replace('{\s*