X-Git-Url: http://git.shiar.nl/minimedit.git/blobdiff_plain/d8990050a9613532c92b86ad86bfbc58a9c2e5c9..37dbd7898c9c0baf9aec5073b757e3205a6a0c3d:/page.php diff --git a/page.php b/page.php index 02886a7..c6eee87 100644 --- a/page.php +++ b/page.php @@ -2,16 +2,38 @@ error_reporting(E_ALL); ini_set('display_errors', TRUE); +function abort($body, $status = NULL) { + if ($status) header("HTTP/1.1 $status"); + print "$body\n"; + exit; +} + function getoutput($blocks = []) { - $rep = []; - foreach ($blocks as $name => $html) { - $rep["[[$name]]"] = sprintf('%s', - is_numeric($name) ? '' : "[[$name]]", - preg_replace('{}', '', $html) - ); + $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), ob_get_clean()); + + return preg_replace_callback( + '< \[\[ ([^]]*) \]\] >x', + function ($sub) use ($blocks) { + list ($placeholder, $name) = $sub; + $html = $blocks[$name]; + return sprintf('%s', + is_numeric($name) ? '' : $placeholder, # edit replacement + preg_replace('{}', '', $html) # contents + ); + }, + $doc + ); } # custom error handling @@ -56,18 +78,18 @@ $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)) { - http_response_code(403); - include_once 'page.inc.php'; - ob_start(); - @require_once './403.html'; + if (empty($User)) { + http_response_code(303); + $target = urlencode($_SERVER['REQUEST_URI']); + header("Location: /login?goto=$target"); exit; } + $PageAccess = $Page; } if (file_exists("$Page.php")) { @@ -89,13 +111,13 @@ ob_start(); # inner html print '