git.shiar.nl
/
minimedit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
auth: admin edit permissions for page (sub)directories
[minimedit.git]
/
page.php
diff --git
a/page.php
b/page.php
index 9c88e79adef63baae3a0c04efad458e186108077..f5e9749cbeac10837f6d9bf0fb923c5a4234114d 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) {
@@
-52,6
+52,11
@@
function getoutput($blocks = [])
}
}
}
}
+ # keep either login or logout parts depending on user level
+ global $User;
+ $hideclass = empty($User) ? 'login' : 'logout';
+ $doc = preg_replace('{\s*<(p|li|span) class="'.$hideclass.'">.*?</\1>}s', '', $doc);
+
return preg_replace_callback(
'{ (?<! <!--BLOCK: ) \[\[ ([^] ]+) ([^]]*) \]\] }x',
function ($sub) use ($blocks) {
return preg_replace_callback(
'{ (?<! <!--BLOCK: ) \[\[ ([^] ]+) ([^]]*) \]\] }x',
function ($sub) use ($blocks) {
@@
-81,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]);
}
@@
-108,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']);
@@
-153,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']
)) {
- $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
}
# 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";
@@
-179,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']),
];
@@
-188,7
+198,7
@@
$Place += [
if (!$found) {
# no resulting output
http_response_code(404);
if (!$found) {
# no resulting output
http_response_code(404);
- @require '404.html';
+ @require '404.
inc.
html';
}
include_once 'page.inc.php';
}
include_once 'page.inc.php';