git.shiar.nl
/
minimedit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
page: maintain all placeholder includes in widget/
[minimedit.git]
/
page.php
diff --git
a/page.php
b/page.php
index bca7a6745e7e9809e5b8c746818c5041933a54b9..5e529850e3bca3f51e1e1d59ca3fc173de845a94 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) {
@@
-113,6
+113,7
@@
error_reporting(error_reporting() & ~E_FATAL);
# user login and control
# user login and control
+$User = NULL;
include_once 'auth.inc.php';
$Edit = isset($_GET['edit']);
include_once 'auth.inc.php';
$Edit = isset($_GET['edit']);
@@
-158,19
+159,23
@@
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 (
!empty($User['admin'])
) {
+elseif (
$User and $User->admin
) {
$staticpage = (file_exists("$Page/template.html") ? "$Page/template.html" : 'template.html');
}
# load static contents
$staticpage = (file_exists("$Page/template.html") ? "$Page/template.html" : 'template.html');
}
# load static contents
+require_once('article.inc.php');
+$Article = new ArchiveArticle($staticpage);
+
ob_start(); # page body
ob_start(); # inner html
print '<div class="static">'."\n\n";
$found = FALSE;
ob_start(); # page body
ob_start(); # inner html
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";
@@
-184,7
+189,7
@@
if ($Page) {
}
$Place += [
}
$Place += [
- 'user' =>
empty($User) ? '' : $User['name']
,
+ 'user' =>
$User ? $User->login : ''
,
'url' => htmlspecialchars($_SERVER['REQUEST_URI']),
];
'url' => htmlspecialchars($_SERVER['REQUEST_URI']),
];