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: redirect location option in abort()
[minimedit.git]
/
page.php
diff --git
a/page.php
b/page.php
index f7c8f7d1b7841944154d0e99d5c1e3adaed90f44..a9607c0cf9ab49d60d7dc78aaca2cba629cedbc3 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")) {
@@
-35,10
+33,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
+42,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
])));