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: replace output caching by article object
[minimedit.git]
/
page.php
diff --git
a/page.php
b/page.php
index bca7a6745e7e9809e5b8c746818c5041933a54b9..f02544bd0b06dbd7add643d19a17e02bbdca69c2 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) {
@@
-86,7
+86,7
@@
function fail($error)
http_response_code(500);
include_once 'page.inc.php';
ob_start();
http_response_code(500);
include_once 'page.inc.php';
ob_start();
- require_once '500.html';
+ require_once '500.
inc.
html';
print getoutput(['debug' => $error]);
}
print getoutput(['debug' => $error]);
}
@@
-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,42
+159,37
@@
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']
)) {
- $staticpage = (file_exists("$Page/template.
html") ? "$Page/template.html" : 'template
.html');
+elseif (
$User and $User->admin("edit $Page$Args"
)) {
+ $staticpage = (file_exists("$Page/template.
inc.html") ? "$Page/template.inc.html" : 'template.inc
.html');
}
}
-#
load static
contents
+#
prepare page
contents
-ob_start(); # page body
-ob_start(); # inner html
-print '<div class="static">'."\n\n";
-
-$found = FALSE;
-if (isset($staticpage)) {
- $found = include "./$staticpage";
-}
-
-print "</div>\n\n";
+require_once('article.inc.php');
+$Article = new ArchiveArticle($staticpage);
-# execute dynamic code
-
-$Place = [];
-
-if ($Page) {
- $found |= require "./$Page/index.php";
-}
-
-$Place += [
- 'user' => empty($User) ? '' : $User['name'],
+ob_start(); # page body
+$Place = [
+ 'user' => $User ? $User->login : '',
'url' => htmlspecialchars($_SERVER['REQUEST_URI']),
];
'url' => htmlspecialchars($_SERVER['REQUEST_URI']),
];
-# global html
+if (isset($Article->raw)) {
+ $Article->raw = '<div class="static">'."\n\n".$Article->raw."</div>\n\n";
+}
+
+# output dynamic and/or static html
-if (!$found) {
- # no resulting output
- http_response_code(404);
- @require '404.html';
+if (!$Page or require("./$Page/index.php")) {
+ # static contents
+ if (isset($Article->raw)) {
+ print $Article->raw;
+ }
+ else {
+ # no resulting output
+ http_response_code(404);
+ @require '404.inc.html';
+ }
}
include_once 'page.inc.php';
}
include_once 'page.inc.php';