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/emulate: user override from optional ?login parameter
[minimedit.git]
/
page.php
diff --git
a/page.php
b/page.php
index fb39f5143dfcd68f56aeb9ea07f5025e1ed29b74..c2c4282ab1b38bce9cfc0cfa172d952056acc551 100644
(file)
--- a/
page.php
+++ b/
page.php
@@
-10,7
+10,7
@@
function abort($body, $status = NULL) {
function placeholder_include($name, $params = [])
{
function placeholder_include($name, $params = [])
{
- $path = stream_resolve_include_path("$name.php");
+ $path = stream_resolve_include_path("
widget/
$name.php");
if (!file_exists($path)) {
return '<strong class="warn"><em>'.$name.'</em> ontbreekt</strong>';
}
if (!file_exists($path)) {
return '<strong class="warn"><em>'.$name.'</em> ontbreekt</strong>';
}
@@
-28,7
+28,7
@@
function placeholder_include($name, $params = [])
}
}
try {
}
}
try {
- include "$name.php";
+ include "
widget/
$name.php";
return ob_get_clean();
}
catch (Exception $e) {
return ob_get_clean();
}
catch (Exception $e) {
@@
-159,7
+159,7
@@
if (file_exists("$Page$Args.html")) {
elseif (file_exists("$Page$Args/index.html")) {
$staticpage = "$Page$Args/index.html";
}
elseif (file_exists("$Page$Args/index.html")) {
$staticpage = "$Page$Args/index.html";
}
-elseif ($User and $User->admin) {
+elseif ($User and $User->admin
('edit')
) {
$staticpage = (file_exists("$Page/template.html") ? "$Page/template.html" : 'template.html');
}
$staticpage = (file_exists("$Page/template.html") ? "$Page/template.html" : 'template.html');
}
@@
-173,8
+173,9
@@
ob_start(); # inner html
print '<div class="static">'."\n\n";
$found = FALSE;
print '<div class="static">'."\n\n";
$found = FALSE;
-if (isset($staticpage)) {
- $found = include "./$staticpage";
+if (isset($Article->raw)) {
+ print $Article->raw;
+ $found = 1;
}
print "</div>\n\n";
}
print "</div>\n\n";