X-Git-Url: http://git.shiar.net/minimedit.git/blobdiff_plain/7b2536e0bef980a9d153522320c14dc5261b4ba4..v3.5-16-g9e9882d6f2:/page.php
diff --git a/page.php b/page.php
index 290a596..bb53a94 100644
--- a/page.php
+++ b/page.php
@@ -23,12 +23,35 @@ function getoutput($blocks = [])
}
return preg_replace_callback(
- '< \[\[ ([^]]*) \]\] >x',
+ '< \[\[ ([^] ]+) ([^]]*) \]\] >x',
function ($sub) use ($blocks) {
- list ($placeholder, $name) = $sub;
+ list ($placeholder, $name, $params) = $sub;
if (isset($blocks[$name])) {
$html = $blocks[$name];
}
+ elseif (file_exists("$name.php")) {
+ ob_start();
+ $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';
}
@@ -43,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]);
}
@@ -97,7 +121,7 @@ while (TRUE) {
$PageAccess = $Page;
}
- if (file_exists("$Page.php")) {
+ if (file_exists("$Page/index.php")) {
break;
}
@@ -130,19 +154,24 @@ print "\n\n";
# execute dynamic code
+$Place = [];
+
if ($Page) {
- $found |= require "./$Page.php";
+ $found |= require "./$Page/index.php";
}
-# global html
+$Place += [
+ 'user' => empty($User) ? '' : $User['name'],
+ 'url' => htmlspecialchars($_SERVER['REQUEST_URI']),
+];
-include_once 'page.inc.php';
+# global html
if (!$found) {
# no resulting output
http_response_code(404);
- ob_start();
- @require "./404.html";
- print getoutput([ 'url' => htmlspecialchars($_SERVER['REQUEST_URI']) ]);
+ @require '404.html';
}
+include_once 'page.inc.php';
+