git.shiar.nl
/
minimedit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
nieuws: fix block replacement of variable contents
[minimedit.git]
/
login
/
index.php
diff --git
a/login/index.php
b/login/index.php
index 0ac33ac863f7d59bded2317e5c837358de36f53a..897346d98275f712f1fdfa8906bacbf2085b4eaa 100644
(file)
--- a/
login/index.php
+++ b/
login/index.php
@@
-35,9
+35,10
@@
elseif (isset($_GET['logout'])) {
$message = "Je bent uitgelogd. Graag tot ziens!";
}
$message = "Je bent uitgelogd. Graag tot ziens!";
}
-if (
empty($User)
) {
+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");
@@
-54,10
+55,15
@@
if (empty($User)) {
if ($target->title) {
$Article->title .= ' voor ' . $target->title;
}
if ($target->title) {
$Article->title .= ' voor ' . $target->title;
}
+ if ($target->image) {
+ $Article->image = $target->image;
+ }
}
}
+ ob_start();
require_once 'login/form.inc.php';
require_once 'login/form.inc.php';
+ $Article->raw = ob_get_clean();
$Place['warn'] = $message;
$Place['warn'] = $message;
- return;
+ return
TRUE
;
}
if (isset($_REQUEST['goto'])) {
}
if (isset($_REQUEST['goto'])) {
@@
-70,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';
}