git.shiar.nl
/
minimedit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
contact: fix login indicator, omit unresolved host names
[minimedit.git]
/
page.php
diff --git
a/page.php
b/page.php
index 554735c69b53f9f0db275d5c6ea2fe6df80a4198..bb53a94a407306a04c99c13c3102a40562b2417c 100644
(file)
--- a/
page.php
+++ b/
page.php
@@
-31,18
+31,26
@@
function getoutput($blocks = [])
}
elseif (file_exists("$name.php")) {
ob_start();
}
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, '=')) {
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;
}
}
}
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('<strong class="warn">%s</strong>',
+ "fout in <em>$name</em>: {$e->getMessage()}"
+ );
+ }
}
else {
$html = '<strong class="warn"><em>'.$name.'</em> ontbreekt</strong>';
}
else {
$html = '<strong class="warn"><em>'.$name.'</em> ontbreekt</strong>';
@@
-58,14
+66,15
@@
function getoutput($blocks = [])
# custom error handling
# 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();
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]);
}
print getoutput(['debug' => $error]);
}
@@
-152,7
+161,7
@@
if ($Page) {
}
$Place += [
}
$Place += [
- 'user' =>
$User ? $User['name'] : ''
,
+ 'user' =>
empty($User) ? '' : $User['name']
,
'url' => htmlspecialchars($_SERVER['REQUEST_URI']),
];
'url' => htmlspecialchars($_SERVER['REQUEST_URI']),
];
@@
-161,7
+170,7
@@
$Place += [
if (!$found) {
# no resulting output
http_response_code(404);
if (!$found) {
# no resulting output
http_response_code(404);
- @require
"./404.html"
;
+ @require
'404.html'
;
}
include_once 'page.inc.php';
}
include_once 'page.inc.php';