X-Git-Url: http://git.shiar.net/minimedit.git/blobdiff_plain/1ed6d72f061c2bc619f4e69cd0fa8f458a1e1206..700b027b0ab773706664b4dafb32d7999a980db6:/page.php?ds=sidebyside
diff --git a/page.php b/page.php
index 50e098a..bb53a94 100644
--- a/page.php
+++ b/page.php
@@ -31,18 +31,26 @@ function getoutput($blocks = [])
}
elseif (file_exists("$name.php")) {
ob_start();
- $Page = $GLOBALS['Page'];
- $Args = $GLOBALS['Args'];
+ $Page = $GLOBALS['Page'] . $GLOBALS['Args'];
+ $Args = '';
+ $Place = $GLOBALS['Place'];
foreach (explode(' ', $params) as $param) {
if ($set = strpos($param, '=')) {
- $_GET[ substr($param, 0, $set) ] = substr($param, $set + 1);
+ $Place[ substr($param, 0, $set) ] = substr($param, $set + 1);
}
elseif (!empty($param)) {
$Args .= '/'.$param;
}
}
- include "$name.php";
- $html = ob_get_clean();
+ try {
+ include "$name.php";
+ $html = ob_get_clean();
+ }
+ catch (Exception $e) {
+ $html = sprintf('%s',
+ "fout in $name: {$e->getMessage()}"
+ );
+ }
}
else {
$html = ''.$name.' ontbreekt';
@@ -58,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]);
}
@@ -161,7 +170,7 @@ $Place += [
if (!$found) {
# no resulting output
http_response_code(404);
- @require "./404.html";
+ @require '404.html';
}
include_once 'page.inc.php';