X-Git-Url: http://git.shiar.net/minimedit.git/blobdiff_plain/8302e2ddeac5e241ad3f8bfaea0dbdfd069f26ef..c2fc02097a92084814ce87c068ef69dc36d282aa:/page.php diff --git a/page.php b/page.php index edb074e..290a596 100644 --- a/page.php +++ b/page.php @@ -2,16 +2,16 @@ 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, '')) { @@ -21,7 +21,24 @@ function getoutput($blocks = []) $doc = $warn . "\n\n" . $doc; } } - return str_replace(array_keys($rep), array_values($rep), $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 @@ -99,12 +116,12 @@ ob_start(); # inner html print '