X-Git-Url: http://git.shiar.nl/minimedit.git/blobdiff_plain/650a63a68456eee4dad31170e2660319a82c905d..v3.8-15-g628a397729:/page.php?ds=sidebyside
diff --git a/page.php b/page.php
index 0707426..9c88e79 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();
@@ -23,37 +53,14 @@ function getoutput($blocks = [])
}
return preg_replace_callback(
- '< \[\[ ([^] ]+) ([^]]*) \]\] >x',
+ '{ (?%s',
- "fout in $name: {$e->getMessage()}"
- );
- }
- }
else {
- $html = ''.$name.' ontbreekt';
+ $html = placeholder_include($name, explode(' ', $params));
}
return sprintf('%s',
is_numeric($name) ? '' : $placeholder, # edit replacement
@@ -137,7 +144,7 @@ $staticpage = NULL;
if (file_exists("$Page$Args.html")) {
$staticpage = "$Page$Args.html";
if (is_link($staticpage)) {
- $target = readlink($staticpage);
+ $target = preg_replace('/\.html$/', '', readlink($staticpage));
header("HTTP/1.1 302 Shorthand");
header("Location: $target");
exit;