X-Git-Url: http://git.shiar.net/minimedit.git/blobdiff_plain/882347cba815e99ba8e7ad28d077420aa986e7c5..f6a56971c28026ca8f67783518b0ba6a39e1f8bc:/page.php diff --git a/page.php b/page.php index 894efc0..12e0690 100644 --- a/page.php +++ b/page.php @@ -10,7 +10,7 @@ function abort($body, $status = NULL) { function placeholder_include($name, $params = []) { - $path = stream_resolve_include_path("$name.php"); + $path = stream_resolve_include_path("widget/$name.php"); if (!file_exists($path)) { return ''.$name.' ontbreekt'; } @@ -28,7 +28,7 @@ function placeholder_include($name, $params = []) } } try { - include "$name.php"; + include "widget/$name.php"; return ob_get_clean(); } catch (Exception $e) { @@ -55,7 +55,7 @@ function getoutput($blocks = []) # keep either login or logout parts depending on user level global $User; $hideclass = empty($User) ? 'login' : 'logout'; - $doc = preg_replace('{\s*<(p|li|span) class="'.$hideclass.'">.*?\1>}s', '', $doc); + $doc = preg_replace('{\s*<([a-z]+) class="'.$hideclass.'">.*?\1>}s', '', $doc); return preg_replace_callback( '{ (?title = 'Fout'; + } include_once 'page.inc.php'; ob_start(); - require_once '500.html'; - print getoutput(['debug' => $error]); + require '500.inc.html'; + print getoutput(['debug' => htmlspecialchars($error)]); } set_exception_handler('fail'); @@ -117,38 +122,14 @@ $User = NULL; include_once 'auth.inc.php'; $Edit = isset($_GET['edit']); -# distinguish subpage Args from topmost Page script +# setup requested page $Args = ''; $Page = preg_replace('/\?.*/', '', @$_SERVER['PATH_INFO'] ?: $_SERVER['REQUEST_URI']); $Page = urldecode(trim($Page, '/')) ?: 'index'; -while (TRUE) { - if (file_exists("$Page/.private")) { - # access restriction - if (empty($User)) { - http_response_code(303); - $target = urlencode($_SERVER['REQUEST_URI']); - header("Location: /login?goto=$target"); - exit; - } - $PageAccess = $Page; - } - if (file_exists("$Page/index.php")) { - break; - } - - $up = strrpos($Page, '/'); - $Args = substr($Page, $up) . $Args; - $Page = substr($Page, 0, $up); - if ($up === FALSE) { - break; - } -} - -$staticpage = NULL; -if (file_exists("$Page$Args.html")) { - $staticpage = "$Page$Args.html"; +$staticpage = "$Page.html"; +if (file_exists($staticpage)) { if (is_link($staticpage)) { $target = preg_replace('/\.html$/', '', readlink($staticpage)); header("HTTP/1.1 302 Shorthand"); @@ -156,45 +137,64 @@ if (file_exists("$Page$Args.html")) { exit; } } -elseif (file_exists("$Page$Args/index.html")) { - $staticpage = "$Page$Args/index.html"; -} -elseif ($User and $User->admin) { - $staticpage = (file_exists("$Page/template.html") ? "$Page/template.html" : 'template.html'); +elseif (file_exists("$Page/index.html")) { + $staticpage = "$Page/index.html"; } -# load static contents +require_once('article.inc.php'); +$Article = new ArchiveArticle($staticpage); -ob_start(); # page body -ob_start(); # inner html -print '