git.shiar.nl
/
minimedit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
login: status 403 for initial unauthorised redirects
[minimedit.git]
/
login
/
index.php
diff --git
a/login/index.php
b/login/index.php
index 66cb0c943c485edd8fe58ea9a7e6a8ebcfe7d091..897346d98275f712f1fdfa8906bacbf2085b4eaa 100644
(file)
--- a/
login/index.php
+++ b/
login/index.php
@@
-35,18
+35,35
@@
elseif (isset($_GET['logout'])) {
$message = "Je bent uitgelogd. Graag tot ziens!";
}
$message = "Je bent uitgelogd. Graag tot ziens!";
}
-if (empty($User)) {
- require_once 'login/form.inc.php';
- $Place['warn'] = $message;
+if (!$User or !$User->login) {
$Article->title = 'Inloggen';
if (isset($_REQUEST['goto'])) {
$Article->title = 'Inloggen';
if (isset($_REQUEST['goto'])) {
+ if (empty($message)) http_response_code(403);
$target = ltrim($_REQUEST['goto'], '/');
$target = new ArchiveArticle("$target.html");
$target = ltrim($_REQUEST['goto'], '/');
$target = new ArchiveArticle("$target.html");
+
+ if ($Page = $target->handler and $target->handler == 'melding') {
+ $caller = $Article;
+ $Article = $target;
+ $Args = $target->path;
+ ob_start();
+ include "./{$target->handler}/index.php";
+ ob_end_clean();
+ $Article = $caller;
+ }
+
if ($target->title) {
$Article->title .= ' voor ' . $target->title;
}
if ($target->title) {
$Article->title .= ' voor ' . $target->title;
}
+ if ($target->image) {
+ $Article->image = $target->image;
+ }
}
}
- return;
+ ob_start();
+ require_once 'login/form.inc.php';
+ $Article->raw = ob_get_clean();
+ $Place['warn'] = $message;
+ return TRUE;
}
if (isset($_REQUEST['goto'])) {
}
if (isset($_REQUEST['goto'])) {
@@
-59,7
+76,7
@@
if (isset($_REQUEST['goto'])) {
if (isset($Article->raw)) {
print $Article->raw;
}
if (isset($Article->raw)) {
print $Article->raw;
}
-if (empty($Args) and $User
and $User
->admin) {
+if (empty($Args) and $User->admin) {
include_once 'login/admin.html';
}
include_once 'login/admin.html';
}