git.shiar.nl
/
minimedit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
page: unconditional declaration of getoutput()
[minimedit.git]
/
page.inc.php
diff --git
a/page.inc.php
b/page.inc.php
index b3fa5f7780b70d272b2844e592bcb29f74eb78ea..654f37fa7ebeee2a412b2348fc3bab61d1ac4d88 100644
(file)
--- a/
page.inc.php
+++ b/
page.inc.php
@@
-1,4
+1,6
@@
<?php
<?php
+$body = ob_get_clean();
+
include_once './head.inc.php';
print "<header>\n";
include_once './head.inc.php';
print "<header>\n";
@@
-10,19
+12,30
@@
$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 (isset($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);
+}
print $nav;
print "</header>\n\n";
print $nav;
print "</header>\n\n";
-print '<div class="article">'."\n\n";
-
-include_once 'auth.inc.php';
+print $body;
+$footinc = realpath('footer.html'); # cwd lost during shutdown
register_shutdown_function(function () {
register_shutdown_function(function () {
- print "</div>\n\n";
- include 'foot.inc.php';
+ print '<footer>';
+ @include $GLOBALS['footinc'];
+ print "</footer>\n";
+
+ global $User;
+ if (isset($User) and $User['admin']) {
+ print '<script src="//cdn.ckeditor.com/4.7.3/full-all/ckeditor.js"></script>'."\n";
+ print '<script src="/edit.js"></script>'."\n";
+ }
+
print "</body></html>\n";
});
print "</body></html>\n";
});
-include "./$Page.html";
-if (file_exists("$Page.php")) include_once("./$Page.php");
-