X-Git-Url: http://git.shiar.net/minimedit.git/blobdiff_plain/85536cb70f85743054b6b3abfc36d05662e6878d..467fdea52c27dcf01e79cb96068134403afff660:/page.php diff --git a/page.php b/page.php index 2c3a68a..5eefadb 100644 --- a/page.php +++ b/page.php @@ -8,50 +8,25 @@ function abort($body, $status = NULL) { exit; } -function getoutput($blocks = []) -{ - $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 preg_replace_callback( - '< \[\[ ([^]]*) \]\] >x', - function ($sub) use ($blocks) { - list ($placeholder, $name) = $sub; - if (isset($blocks[$name])) { - $html = $blocks[$name]; - } - else { - $html = ''.$name.' ontbreekt'; - } - return sprintf('%s', - is_numeric($name) ? '' : $placeholder, # edit replacement - preg_replace('{}', '', $html) # contents - ); - }, - $doc - ); -} - # custom error handling -define('DOCROOT', getcwd().'/'); +define('DOCROOT', getcwd()); +set_include_path(implode(PATH_SEPARATOR, [ DOCROOT, __DIR__ ])); function fail($error) { + global $User, $Page; http_response_code(500); + if (!isset($Page)) { + require_once('article.inc.php'); + $Page = new ArchiveArticle(NULL); + $Page->title = 'Fout'; + } include_once 'page.inc.php'; ob_start(); - require_once DOCROOT.'500.html'; - print getoutput(['debug' => $error]); + require '500.inc.html'; + $Page->place['debug'] = htmlspecialchars($error); + print $Page->render(); } set_exception_handler('fail'); @@ -77,74 +52,91 @@ error_reporting(error_reporting() & ~E_FATAL); # user login and control -include_once 'auth.inc.php'; +include_once 'auth.inc.php'; // sets global $User $Edit = isset($_GET['edit']); -# distinguish subpage Args from topmost Page script - -$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; - } +# setup requested page - if (file_exists("$Page/index.php")) { - break; - } +$request = preg_replace('/\?.*/', '', @$_SERVER['PATH_INFO'] ?: $_SERVER['REQUEST_URI']); +$request = urldecode(trim($request, '/')) ?: 'index'; - $up = strrpos($Page, '/'); - $Args = substr($Page, $up) . $Args; - $Page = substr($Page, 0, $up); - if ($up === FALSE) { - break; +$staticpage = "$request.html"; +if (file_exists($staticpage)) { + if (is_link($staticpage)) { + $target = preg_replace('/\.html$/', '', readlink($staticpage)); + header("HTTP/1.1 302 Shorthand"); + header("Location: $target"); + exit; } } +elseif (file_exists("$request/index.html")) { + $staticpage = "$request/index.html"; +} -# load static contents - -ob_start(); # page body -ob_start(); # inner html -print '