X-Git-Url: http://git.shiar.nl/minimedit.git/blobdiff_plain/1ed6d72f061c2bc619f4e69cd0fa8f458a1e1206..refs/tags/v3.7:/page.php diff --git a/page.php b/page.php index 50e098a..175c2eb 100644 --- a/page.php +++ b/page.php @@ -8,6 +8,36 @@ function abort($body, $status = NULL) { exit; } +function placeholder_include($name, $params = []) +{ + $path = stream_resolve_include_path("$name.php"); + if (!file_exists($path)) { + return ''.$name.' ontbreekt'; + } + + ob_start(); + $Page = $GLOBALS['Page'] . $GLOBALS['Args']; + $Args = ''; + $Place = $GLOBALS['Place']; + foreach ($params as $param) { + if ($set = strpos($param, '=')) { + $Place[ substr($param, 0, $set) ] = substr($param, $set + 1); + } + elseif (!empty($param)) { + $Args .= '/'.$param; + } + } + try { + include "$name.php"; + return ob_get_clean(); + } + catch (Exception $e) { + return sprintf('%s', + "fout in $name: {$e->getMessage()}" + ); + } +} + function getoutput($blocks = []) { $doc = ob_get_clean(); @@ -29,23 +59,8 @@ function getoutput($blocks = []) if (isset($blocks[$name])) { $html = $blocks[$name]; } - elseif (file_exists("$name.php")) { - ob_start(); - $Page = $GLOBALS['Page']; - $Args = $GLOBALS['Args']; - foreach (explode(' ', $params) as $param) { - if ($set = strpos($param, '=')) { - $_GET[ substr($param, 0, $set) ] = substr($param, $set + 1); - } - elseif (!empty($param)) { - $Args .= '/'.$param; - } - } - include "$name.php"; - $html = ob_get_clean(); - } else { - $html = ''.$name.' ontbreekt'; + $html = placeholder_include($name, explode(' ', $params)); } return sprintf('%s', is_numeric($name) ? '' : $placeholder, # edit replacement @@ -58,14 +73,15 @@ function getoutput($blocks = []) # custom error handling -define('DOCROOT', getcwd().'/'); +define('DOCROOT', getcwd()); +set_include_path(implode(PATH_SEPARATOR, [ DOCROOT, __DIR__ ])); function fail($error) { http_response_code(500); include_once 'page.inc.php'; ob_start(); - require_once DOCROOT.'500.html'; + require_once '500.html'; print getoutput(['debug' => $error]); } @@ -124,6 +140,23 @@ while (TRUE) { } } +$staticpage = NULL; +if (file_exists("$Page$Args.html")) { + $staticpage = "$Page$Args.html"; + if (is_link($staticpage)) { + $target = preg_replace('/\.html$/', '', readlink($staticpage)); + header("HTTP/1.1 302 Shorthand"); + header("Location: $target"); + exit; + } +} +elseif (file_exists("$Page$Args/index.html")) { + $staticpage = "$Page$Args/index.html"; +} +elseif (!empty($User['admin'])) { + $staticpage = (file_exists("$Page/template.html") ? "$Page/template.html" : 'template.html'); +} + # load static contents ob_start(); # page body @@ -131,14 +164,8 @@ ob_start(); # inner html print '