git.shiar.nl
/
minimedit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
login/edit: generic multi-values declaration
[minimedit.git]
/
page.php
diff --git
a/page.php
b/page.php
index 50e098acaf1c0606e1483bca1886124f04339c31..33a1f4440ed5469e3aee9e7be5c27913606053f2 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>';