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 bca7a6745e7e9809e5b8c746818c5041933a54b9..894efc003cc2671014e5115b2012870a4c55da2e 100644
(file)
--- a/
page.php
+++ b/
page.php
@@
-113,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']);
@@
-158,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');
}
@@
-184,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']),
];