auth: create user object regardless of login

[minimedit.git] / page.php

diff --git a/page.php b/page.php
index 93b705ff610ef837c2b78349ab1f871a2c9333ba..bb2de0b75f9ddddffb51d37749e575286941d235 100644 (file)
--- a/page.php
+++ b/page.php
@@ -54,7 +54,7 @@ function getoutput($blocks = [])
 
        # keep either login or logout parts depending on user level
        global $User;
-       $hideclass = empty($User) ? 'login' : 'logout';
+       $hideclass = $User && $User->login ? 'logout' : 'login';
        $doc = preg_replace('{\s*<([a-z]+) class="'.$hideclass.'">.*?</\1>}s', '', $doc);
 
        return preg_replace_callback(
@@ -118,8 +118,7 @@ error_reporting(error_reporting() & ~E_FATAL);
 
 # user login and control
 
-$User = NULL;
-include_once 'auth.inc.php';
+include_once 'auth.inc.php'; // sets global $User
 $Edit = isset($_GET['edit']);
 
 # setup requested page
@@ -149,7 +148,7 @@ $Args = $Article->path;
 
 if ($PageAccess = $Article->restricted) {
        # access restriction
-       if (empty($User)) {
+       if (!$User->login) {
                http_response_code(303);
                $target = urlencode($Article->link);
                header("Location: /login?goto=$target");
@@ -168,12 +167,12 @@ header(sprintf('Content-Security-Policy: %s', implode('; ', [
 
 ob_start(); # page body
 $Place = [
-       'user'  => $User ? $User->login : '',
+       'user'  => $User->login ?: '',
        'url'   => htmlspecialchars($_SERVER['REQUEST_URI']),
 ];
 
 if (isset($Article->raw)) {
-       if ($User and $User->admin("edit $Page$Args")) {
+       if ($User->admin("edit $Page$Args")) {
                # restore meta tags in static contents for editing
                foreach (array_reverse($Article->meta) as $metaprop => $val) {
                        $Article->raw = sprintf(
@@ -183,7 +182,7 @@ if (isset($Article->raw)) {
                }
        }
 }
-elseif ($User and $User->admin("edit {$Article->link}")) {
+elseif ($User->admin("edit {$Article->link}")) {
        $Article->raw(file_exists("$Page/template.inc.html") ? "$Page/template.inc.html" : 'template.inc.html');
 }
 if (isset($Article->raw)) {