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: write edit includes from common script
[minimedit.git]
/
page.php
diff --git
a/page.php
b/page.php
index 9e3388ee0757cc27a3d384066c74799d1f805ade..8b264bf7e35e6512e6ac2b6cebc8bfeeafa97f43 100644
(file)
--- a/
page.php
+++ b/
page.php
@@
-52,6
+52,9
@@
if (file_exists("$Page$Args/index.html")) {
elseif (file_exists("$Page$Args.html")) {
$found = include "./$Page$Args.html";
}
elseif (file_exists("$Page$Args.html")) {
$found = include "./$Page$Args.html";
}
+elseif (isset($User) and $User['admin']) {
+ $found = require (file_exists("$Page/template.html") ? "$Page/template.html" : './template.html');
+}
print "</div>\n\n";
print "</div>\n\n";
@@
-62,7
+65,10
@@
if ($Page) {
{
$rep = [];
foreach ($blocks as $name => $html) {
{
$rep = [];
foreach ($blocks as $name => $html) {
- $rep["[[$name]]"] = "<!--BLOCK $name-->$html<!--/-->";
+ $rep["[[$name]]"] = sprintf('<!--BLOCK:%s-->%s<!--/-->',
+ is_numeric($name) ? '' : "[[$name]]",
+ preg_replace('{<!--[^-]*-->}', '', $html)
+ );
}
return str_replace(array_keys($rep), array_values($rep), ob_get_clean());
}
}
return str_replace(array_keys($rep), array_values($rep), ob_get_clean());
}
@@
-76,14
+82,9
@@
include_once 'page.inc.php';
if (!$found) {
# no resulting output
if (!$found) {
# no resulting output
- if (isset($User) and $User['admin']) {
- require './template.html';
- }
- else {
- http_response_code(404);
- ob_start();
- require "./404.html";
- print getoutput([ 'url' => htmlspecialchars($_SERVER['REQUEST_URI']) ]);
- }
+ http_response_code(404);
+ ob_start();
+ require "./404.html";
+ print getoutput([ 'url' => htmlspecialchars($_SERVER['REQUEST_URI']) ]);
}
}