X-Git-Url: http://git.shiar.net/minimedit.git/blobdiff_plain/396a686c85aa2a7fe3057da642382a12124b69bf..0c5ed43f3956281166535f0283a77195af2ae59a:/page.php diff --git a/page.php b/page.php index 6623c8b..1f86e5b 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 = '
[[warn]]
'; + if ($offset = strpos($doc, '')) { + $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 @@ -56,12 +66,12 @@ $Edit = isset($_GET['edit']); # distinguish subpage Args from topmost Page script $Args = ''; -$Page = preg_replace('/\?.*/', '', $_SERVER['REQUEST_URI']); +$Page = preg_replace('/\?.*/', '', @$_SERVER['PATH_INFO'] ?: $_SERVER['REQUEST_URI']); $Page = urldecode(trim($Page, '/')) ?: 'index'; while (TRUE) { if (file_exists("$Page/.private")) { # access restriction - if (!isset($User)) { + if (empty($User)) { http_response_code(303); $target = urlencode($_SERVER['REQUEST_URI']); header("Location: /login?goto=$target"); @@ -89,13 +99,13 @@ ob_start(); # inner html print '