From: Mischa POSLAWSKY <perl@shiar.org>
Date: Sat, 21 Apr 2018 12:37:27 +0000 (+0200)
Subject: login: templating support for warning message
X-Git-Tag: v2.6~6
X-Git-Url: http://git.shiar.nl/minimedit.git/commitdiff_plain/8302e2ddeac5e241ad3f8bfaea0dbdfd069f26ef

login: templating support for warning message
---

diff --git a/login.inc.php b/login.inc.php
index 4d05ded..9c2a604 100644
--- a/login.inc.php
+++ b/login.inc.php
@@ -1,10 +1,5 @@
 <h2>Inloggen</h2>
 
-<?php
-if (isset($message)) {
-	printf('<p class="warn">%s</p>'."\n\n", $message);
-}
-?>
 <form action="" method="post">
 	<input id="login" name="login" placeholder="Gebruikersnaam" value="<?php
 		if (isset($_POST['login'])) print htmlspecialchars($_REQUEST['login']);
diff --git a/login.php b/login.php
index 714b5c5..bcc2856 100644
--- a/login.php
+++ b/login.php
@@ -18,6 +18,8 @@ elseif (isset($_GET['logout'])) {
 if (empty($User)) {
 	ob_clean();
 	require_once 'login.inc.php';
+	$part = ['warn' => $message];
+	print getoutput($part);
 	return TRUE;
 }
 
diff --git a/page.php b/page.php
index 20f8244..edb074e 100644
--- a/page.php
+++ b/page.php
@@ -11,7 +11,17 @@ function getoutput($blocks = [])
 			preg_replace('{<!--[^-]*-->}', '', $html)
 		);
 	}
-	return str_replace(array_keys($rep), array_values($rep), ob_get_clean());
+	$doc = ob_get_clean();
+	if (!empty($blocks['warn'])) {
+		$warn = '<p class="warn">[[warn]]</p>';
+		if ($offset = strpos($doc, '</h2>')) {
+			$doc = substr_replace($doc, "\n\n".$warn, $offset + 5, 0);
+		}
+		else {
+			$doc = $warn . "\n\n" . $doc;
+		}
+	}
+	return str_replace(array_keys($rep), array_values($rep), $doc);
 }
 
 # custom error handling