git.shiar.nl
/
minimedit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
auth: store global user metadata in User object
[minimedit.git]
/
page.php
diff --git
a/page.php
b/page.php
index dd629fd8d4f0f869af47c8bb84515a12e34546d8..894efc003cc2671014e5115b2012870a4c55da2e 100644
(file)
--- a/
page.php
+++ b/
page.php
@@
-10,7
+10,7
@@
function abort($body, $status = NULL) {
function placeholder_include($name, $params = [])
{
function placeholder_include($name, $params = [])
{
- $path =
"$name.php"
;
+ $path =
stream_resolve_include_path("$name.php")
;
if (!file_exists($path)) {
return '<strong class="warn"><em>'.$name.'</em> ontbreekt</strong>';
}
if (!file_exists($path)) {
return '<strong class="warn"><em>'.$name.'</em> ontbreekt</strong>';
}
@@
-52,8
+52,13
@@
function getoutput($blocks = [])
}
}
}
}
+ # keep either login or logout parts depending on user level
+ global $User;
+ $hideclass = empty($User) ? 'login' : 'logout';
+ $doc = preg_replace('{\s*<(p|li|span) class="'.$hideclass.'">.*?</\1>}s', '', $doc);
+
return preg_replace_callback(
return preg_replace_callback(
- '
< \[\[ ([^] ]+) ([^]]*) \]\] >
x',
+ '
{ (?<! <!--BLOCK: ) \[\[ ([^] ]+) ([^]]*) \]\] }
x',
function ($sub) use ($blocks) {
list ($placeholder, $name, $params) = $sub;
if (isset($blocks[$name])) {
function ($sub) use ($blocks) {
list ($placeholder, $name, $params) = $sub;
if (isset($blocks[$name])) {
@@
-108,6
+113,7
@@
error_reporting(error_reporting() & ~E_FATAL);
# user login and control
# user login and control
+$User = NULL;
include_once 'auth.inc.php';
$Edit = isset($_GET['edit']);
include_once 'auth.inc.php';
$Edit = isset($_GET['edit']);
@@
-153,7
+159,7
@@
if (file_exists("$Page$Args.html")) {
elseif (file_exists("$Page$Args/index.html")) {
$staticpage = "$Page$Args/index.html";
}
elseif (file_exists("$Page$Args/index.html")) {
$staticpage = "$Page$Args/index.html";
}
-elseif (
!empty($User['admin'])
) {
+elseif (
$User and $User->admin
) {
$staticpage = (file_exists("$Page/template.html") ? "$Page/template.html" : 'template.html');
}
$staticpage = (file_exists("$Page/template.html") ? "$Page/template.html" : 'template.html');
}
@@
-179,7
+185,7
@@
if ($Page) {
}
$Place += [
}
$Place += [
- 'user' =>
empty($User) ? '' : $User['name']
,
+ 'user' =>
$User ? $User->login : ''
,
'url' => htmlspecialchars($_SERVER['REQUEST_URI']),
];
'url' => htmlspecialchars($_SERVER['REQUEST_URI']),
];