login: separate include for unauthorised form

Static page for user contents to match edit.

diff --git a/login.html b/login.html
index 9d01ca68dd74ab141987032bc301229dbb91dfb7..b29920d4db632b28fff1d18c949e0d2727c28334 100644 (file)
--- a/login.html
+++ b/login.html
@@ -1,2 +1,2 @@
-<h2>Inloggen</h2>
+<h2>Ingelogd</h2>
 

diff --git a/login.inc.php b/login.inc.php
new file mode 100644 (file)
index 0000000..69607df
--- /dev/null
+++ b/login.inc.php
@@ -0,0 +1,12 @@
+<h2>Inloggen</h2>
+
+<?php
+if (isset($message)) {
+       printf('<p class="warn">%s</p>'."\n\n", $message);
+}
+?>
+<form action="" method="post">
+       <input id="login" name="login" placeholder="Huisnummer" />
+       <input id="pass" name="pass" type="password" value="" placeholder="Wachtwoord" />
+       <input type="submit" value="Log in" />
+</form>

diff --git a/login.php b/login.php
index bcb1edc44cd709a9f9e1bc4b1c6931ee46621946..3b590641649ed69d6237d8fba0e78a144114acc6 100644 (file)
--- a/login.php
+++ b/login.php
@@ -1,16 +1,18 @@
 <?php
+$message = NULL;
+
 if (isset($_POST['login'])) {
        if ($User = login($_POST['login'], $_POST['pass'])) {
                setcookie('login', $User['auth'], 0, '/');
        }
        else {
-               echo '<p class="warn">Ongeldige gebruikersnaam of wachtwoord.</p>'."\n\n";
+               $message = 'Ongeldige gebruikersnaam of wachtwoord.';
        }
 }
 elseif (isset($_GET['logout'])) {
        setcookie('login', '', time(), '/'); # expire immediately
        $User = NULL;
-       echo '<p class="warn">Uitgelogd.</p>'."\n\n";
+       $message = 'Uitgelogd.';
 }
 
 if (isset($_GET['goto']) and isset($User)) {
@@ -22,20 +24,11 @@ if (isset($_GET['goto']) and isset($User)) {
 }
 
 if (empty($User)) {
-?>
-<form action="" method="post">
-       <input id="login" name="login" placeholder="Huisnummer" />
-       <input id="pass" name="pass" type="password" value="" placeholder="Wachtwoord" />
-       <input type="submit" value="Log in" />
-</form>
-<?php
-       return;
+       ob_clean();
+       require_once 'login.inc.php';
+       return TRUE;
 }
-
-ob_clean();
 ?>
-<h2>Ingelogd</h2>
-
 <p>Ingelogd als <em><?php print $User['name']; ?></em>.</p>
 
 <p class="nav"><a href="?logout">Uitloggen</a></p>