git.shiar.nl
/
minimedit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
contact: silence warning checking missing client headers
[minimedit.git]
/
page.inc.php
diff --git
a/page.inc.php
b/page.inc.php
index 1253338db4707fe6f56e4f6ff424c628242ad678..120fb957c2ea35b8f7ab07f56344370128823815 100644
(file)
--- a/
page.inc.php
+++ b/
page.inc.php
@@
-5,12
+5,12
@@
include_once 'head.inc.php';
print "<header>\n";
ob_start();
print "<header>\n";
ob_start();
-include 'menu.html';
+include 'menu.
inc.
html';
ob_start();
ob_start();
-if (
!empty($User)
) {
+if (
$User and property_exists($User, 'login') and $User->login
) {
print '<div class="login"><p>';
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("edit $Page$Args"
)) {
$editpage = $Page.$Args;
if (is_dir($editpage)) {
if (file_exists("$editpage/index.html")) {
$editpage = $Page.$Args;
if (is_dir($editpage)) {
if (file_exists("$editpage/index.html")) {
@@
-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);
$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";
print $nav;
print "</header>\n\n";
@@
-46,11
+40,11
@@
print $body;
register_shutdown_function(function () {
print '<footer>';
register_shutdown_function(function () {
print '<footer>';
- @include 'footer.html';
+ @include 'footer.
inc.
html';
print "</footer>\n";
print "</footer>\n";
- global $User;
- if (
!empty($User['admin']
)) {
+ global $User
, $Page, $Args
;
+ if (
$User and $User->admin("edit $Page$Args"
)) {
$ckesrc = '/lib/ckeditor'; # local install
if (!file_exists(DOCROOT . $ckesrc)) {
$ckesrc = '//cdn.ckeditor.com/4.7.3/full-all'; # remote fallback
$ckesrc = '/lib/ckeditor'; # local install
if (!file_exists(DOCROOT . $ckesrc)) {
$ckesrc = '//cdn.ckeditor.com/4.7.3/full-all'; # remote fallback