git.shiar.nl
/
minimedit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
issue/activity: only concatenate messages after images
[minimedit.git]
/
login
/
index.php
diff --git
a/login/index.php
b/login/index.php
index c69ec3c5d48395939d6e612564303b0bb9cd760c..38b7c234465006445ac2d89491b9c3cc7c60cc7b 100644
(file)
--- a/
login/index.php
+++ b/
login/index.php
@@
-1,4
+1,5
@@
<?php
<?php
+if ($Page->api) return;
$message = NULL;
if (isset($_POST['mail'])) {
$message = NULL;
if (isset($_POST['mail'])) {
@@
-35,47
+36,36
@@
elseif (isset($_GET['logout'])) {
$message = "Je bent uitgelogd. Graag tot ziens!";
}
$message = "Je bent uitgelogd. Graag tot ziens!";
}
-if (
empty($User)
) {
- $
Articl
e->title = 'Inloggen';
+if (
!$User or !$User->login
) {
+ $
Pag
e->title = 'Inloggen';
if (isset($_REQUEST['goto'])) {
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;
- }
+ $target->index; # run forbidden handler to determine metadata
if ($target->title) {
if ($target->title) {
- $Article->title .= ' voor ' . $target->title;
- }
- if ($target->image) {
- $Article->image = $target->image;
+ $Page->title .= ' voor ' . $target->title;
}
}
+ $Page->image = $target->image;
+ $Page->teaser = $target->teaser;
}
ob_start();
require_once 'login/form.inc.php';
}
ob_start();
require_once 'login/form.inc.php';
- $
Articl
e->raw = ob_get_clean();
- $Place['warn'] = $message;
+ $
Pag
e->raw = ob_get_clean();
+ $P
age->p
lace['warn'] = $message;
return TRUE;
}
if (isset($_REQUEST['goto'])) {
$target = ltrim($_REQUEST['goto'], '/');
return TRUE;
}
if (isset($_REQUEST['goto'])) {
$target = ltrim($_REQUEST['goto'], '/');
- header("Location: /$target");
- http_response_code(302);
- exit;
+ abort("/$target", 302);
}
}
-if (isset($
Articl
e->raw)) {
- print $
Articl
e->raw;
+if (isset($
Pag
e->raw)) {
+ print $
Pag
e->raw;
}
}
-if (empty($
Args) and $User
and $User->admin) {
+if (empty($
Page->path)
and $User->admin) {
include_once 'login/admin.html';
}
include_once 'login/admin.html';
}