X-Git-Url: http://git.shiar.nl/minimedit.git/blobdiff_plain/1ed6d72f061c2bc619f4e69cd0fa8f458a1e1206..170f16e2dd3a643423ea3681bf4ea42d320e1cf4:/page.php?ds=sidebyside diff --git a/page.php b/page.php index 50e098a..e23b3e2 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("widget/$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 "widget/$name.php"; + return ob_get_clean(); + } + catch (Exception $e) { + return sprintf('%s', + "fout in $name: {$e->getMessage()}" + ); + } +} + function getoutput($blocks = []) { $doc = ob_get_clean(); @@ -22,30 +52,20 @@ function getoutput($blocks = []) } } + # keep either login or logout parts depending on user level + global $User; + $hideclass = empty($User) ? 'login' : 'logout'; + $doc = preg_replace('{\s*<([a-z]+) class="'.$hideclass.'">.*?\1>}s', '', $doc); + return preg_replace_callback( - '< \[\[ ([^] ]+) ([^]]*) \]\] >x', + '{ (?'.$name.' ontbreekt'; + $html = placeholder_include($name, explode(' ', $params)); } return sprintf('%s', is_numeric($name) ? '' : $placeholder, # edit replacement @@ -58,15 +78,21 @@ function getoutput($blocks = []) # custom error handling -define('DOCROOT', getcwd().'/'); +define('DOCROOT', getcwd()); +set_include_path(implode(PATH_SEPARATOR, [ DOCROOT, __DIR__ ])); function fail($error) { + global $User, $Page, $Args; http_response_code(500); + if (!isset($Article)) { + $Article = new ArchiveArticle(NULL); + $Article->title = 'Fout'; + } include_once 'page.inc.php'; ob_start(); - require_once DOCROOT.'500.html'; - print getoutput(['debug' => $error]); + require '500.inc.html'; + print getoutput(['debug' => htmlspecialchars($error)]); } set_exception_handler('fail'); @@ -92,6 +118,7 @@ error_reporting(error_reporting() & ~E_FATAL); # user login and control +$User = NULL; include_once 'auth.inc.php'; $Edit = isset($_GET['edit']); @@ -124,44 +151,59 @@ while (TRUE) { } } -# load static contents - -ob_start(); # page body -ob_start(); # inner html -print '