login: redirection message if pending page

Assume ?goto page required authorisation.

diff --git a/login/form.inc.php b/login/form.inc.php
index 7e78f8201cd988d55674e004b88944c94f8a8930..9a7c01503a4ba70bfc38ddd9fca2e61cb200be57 100644 (file)
--- a/login/form.inc.php
+++ b/login/form.inc.php
@@ -1,5 +1,12 @@
 <h2>Inloggen</h2>
 
+<?php if (isset($target)) { ?>
+<p>
+De pagina <a href="<?= $target->link ?>"><?= $target->title ?: $target->link ?></a>
+is alleen toegankelijk voor leden.
+</p>
+<?php } ?>
+
 <form action="?" method="post">
        <input type="hidden" name="goto" value="<?php print htmlspecialchars(@$_REQUEST['goto']); ?>" />
        <input id="login" name="login" placeholder="Gebruikersnaam" value="<?php

diff --git a/login/index.php b/login/index.php
index 66cb0c943c485edd8fe58ea9a7e6a8ebcfe7d091..d2f22acd6d0dc7441dc45d7b416960bde37822c6 100644 (file)
--- a/login/index.php
+++ b/login/index.php
@@ -36,8 +36,6 @@ elseif (isset($_GET['logout'])) {
 }
 
 if (empty($User)) {
-       require_once 'login/form.inc.php';
-       $Place['warn'] = $message;
        $Article->title = 'Inloggen';
        if (isset($_REQUEST['goto'])) {
                $target = ltrim($_REQUEST['goto'], '/');
@@ -46,6 +44,8 @@ if (empty($User)) {
                        $Article->title .= ' voor ' . $target->title;
                }
        }
+       require_once 'login/form.inc.php';
+       $Place['warn'] = $message;
        return;
 }