git.shiar.nl
/
minimedit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
search: input form and extended results
[minimedit.git]
/
page.php
diff --git
a/page.php
b/page.php
index f7c8f7d1b7841944154d0e99d5c1e3adaed90f44..f9dabf07caf4f7a9e3e2d231a4e67f6efad86da9 100644
(file)
--- a/
page.php
+++ b/
page.php
@@
-16,9
+16,7
@@
$staticpage = "$request.html";
if (file_exists($staticpage)) {
if (is_link($staticpage)) {
$target = preg_replace('/\.html$/', '', readlink($staticpage));
if (file_exists($staticpage)) {
if (is_link($staticpage)) {
$target = preg_replace('/\.html$/', '', readlink($staticpage));
- header("HTTP/1.1 302 Shorthand");
- header("Location: $target");
- exit;
+ abort($target, '302 Shorthand');
}
}
elseif (file_exists("$request/index.html")) {
}
}
elseif (file_exists("$request/index.html")) {
@@
-28,6
+26,10
@@
elseif (file_exists("$request/index.html")) {
require_once('article.inc.php');
$Page = new ArchiveArticle($staticpage);
require_once('article.inc.php');
$Page = new ArchiveArticle($staticpage);
+if ($_SERVER['HTTP_ACCEPT'] === 'text/plain') {
+ $Page->api = TRUE;
+}
+
# user login and control
include_once 'auth.inc.php'; // sets global $User
# user login and control
include_once 'auth.inc.php'; // sets global $User
@@
-35,10
+37,8
@@
include_once 'auth.inc.php'; // sets global $User
if ($Page->restricted) {
# access restriction
if (!$User->login) {
if ($Page->restricted) {
# access restriction
if (!$User->login) {
- http_response_code(303);
$target = urlencode($Page->link);
$target = urlencode($Page->link);
- header("Location: /login?goto=$target");
- exit;
+ abort("/login?goto=$target", '303 Eerst inloggen');
}
}
}
}
@@
-46,7
+46,7
@@
if ($Page->restricted) {
header(sprintf('Content-Security-Policy: %s', implode('; ', [
"default-src 'self' 'unsafe-inline' http://cdn.ckeditor.com", # some overrides remain
header(sprintf('Content-Security-Policy: %s', implode('; ', [
"default-src 'self' 'unsafe-inline' http://cdn.ckeditor.com", # some overrides remain
- "img-src 'self' data: http://cdn.ckeditor.com", # inline svg (in css)
+ "img-src 'self' data:
blob:
http://cdn.ckeditor.com", # inline svg (in css)
"base-uri 'self'", # only local pages
"frame-ancestors 'none'", # prevent malicious embedding
])));
"base-uri 'self'", # only local pages
"frame-ancestors 'none'", # prevent malicious embedding
])));
@@
-56,7
+56,7
@@
$Page->place += [
'url' => htmlspecialchars($_SERVER['REQUEST_URI']),
];
'url' => htmlspecialchars($_SERVER['REQUEST_URI']),
];
-if ($User->admin("edit {$Page->link}")) {
+if ($
Page->editable = $
User->admin("edit {$Page->link}")) {
include_once 'edit/head.inc.php';
}
include_once 'edit/head.inc.php';
}
@@
-69,7
+69,7
@@
if (isset($Page->raw)) {
include_once 'format.inc.php';
ob_start();
include_once 'format.inc.php';
ob_start();
-if ($Page->handler and !
require("./{$Page->handler}/index.php"
)) {
+if ($Page->handler and !
$Page->index($Page->api
)) {
# replace contents by code output on false return
$Page->raw = ob_get_clean();
}
# replace contents by code output on false return
$Page->raw = ob_get_clean();
}
@@
-83,5
+83,11
@@
else {
}
}
}
}
-include_once 'page.inc.php';
+if ($_SERVER['HTTP_ACCEPT'] === 'application/xml') {
+ header('Access-Control-Allow-Origin: *');
+}
+elseif (!$Page->api) {
+ include_once 'page.inc.php';
+}
+print $Page->render();