X-Git-Url: http://git.shiar.net/minimedit.git/blobdiff_plain/f3264dbe1629fb53f70d1284190fe4781b61d6e5..a1bb8561064d0985ecb6c65054bf352f667bc9b7:/page.php
diff --git a/page.php b/page.php
index c2dfd9f..bb53a94 100644
--- a/page.php
+++ b/page.php
@@ -23,7 +23,7 @@ function getoutput($blocks = [])
}
return preg_replace_callback(
- '< \[\[ ([^]/]+) ([^]]*) \]\] >x',
+ '< \[\[ ([^] ]+) ([^]]*) \]\] >x',
function ($sub) use ($blocks) {
list ($placeholder, $name, $params) = $sub;
if (isset($blocks[$name])) {
@@ -31,10 +31,26 @@ function getoutput($blocks = [])
}
elseif (file_exists("$name.php")) {
ob_start();
- $Page = $GLOBALS['Page'];
- $Args = $GLOBALS['Args'] . $params;
- include "$name.php";
- $html = ob_get_clean();
+ $Page = $GLOBALS['Page'] . $GLOBALS['Args'];
+ $Args = '';
+ $Place = $GLOBALS['Place'];
+ foreach (explode(' ', $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";
+ $html = ob_get_clean();
+ }
+ catch (Exception $e) {
+ $html = sprintf('%s',
+ "fout in $name: {$e->getMessage()}"
+ );
+ }
}
else {
$html = ''.$name.' ontbreekt';
@@ -50,14 +66,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]);
}
@@ -137,21 +154,23 @@ print "\n\n";
# execute dynamic code
-$Place = [
- 'user' => $User['name'],
- 'url' => htmlspecialchars($_SERVER['REQUEST_URI']),
-];
+$Place = [];
if ($Page) {
$found |= require "./$Page/index.php";
}
+$Place += [
+ 'user' => empty($User) ? '' : $User['name'],
+ 'url' => htmlspecialchars($_SERVER['REQUEST_URI']),
+];
+
# global html
if (!$found) {
# no resulting output
http_response_code(404);
- @require "./404.html";
+ @require '404.html';
}
include_once 'page.inc.php';