From: Mischa POSLAWSKY <perl@shiar.org>
Date: Mon, 30 Nov 2020 21:43:11 +0000 (+0100)
Subject: page: ignore failed user setup during errors
X-Git-Tag: v4.5~24
X-Git-Url: http://git.shiar.nl/minimedit.git/commitdiff_plain/088e48c44ae79498f459e79dcf52ff02b2467772

page: ignore failed user setup during errors

Report auth.inc.php exceptions without breaking on attempted usage of
$User->login in output, or missing ArchiveArticle class.
---

diff --git a/page.inc.php b/page.inc.php
index 94ef7cf..120fb95 100644
--- a/page.inc.php
+++ b/page.inc.php
@@ -7,7 +7,7 @@ print "<header>\n";
 ob_start();
 include 'menu.inc.html';
 ob_start();
-if ($User and $User->login) {
+if ($User and property_exists($User, 'login') and $User->login) {
 	print '<div class="login"><p>';
 	printf('<span>Ingelogd: <b><a href="%s">%s</a></b></span>', '/login', $User->login);
 	if ($User->admin("edit $Page$Args")) {
diff --git a/page.php b/page.php
index bb2de0b..ed0ec1b 100644
--- 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 = $User && $User->login ? 'logout' : 'login';
+	$hideclass = $User && property_exists($User, 'login') && $User->login ? 'logout' : 'login';
 	$doc = preg_replace('{\s*<([a-z]+) class="'.$hideclass.'">.*?</\1>}s', '', $doc);
 
 	return preg_replace_callback(
@@ -86,6 +86,7 @@ function fail($error)
 	global $User, $Page, $Args;
 	http_response_code(500);
 	if (!isset($Article)) {
+		require_once('article.inc.php');
 		$Article = new ArchiveArticle(NULL);
 		$Article->title = 'Fout';
 	}