From 0869034ed71e3d3a6bc03551e48657bd83be9b96 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Thu, 17 Oct 2013 19:45:55 +0200
Subject: Day 3

---
 modules/session.inc.php | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

(limited to 'modules/session.inc.php')

diff --git a/modules/session.inc.php b/modules/session.inc.php
index 5b8c5f4d..456ff6b8 100644
--- a/modules/session.inc.php
+++ b/modules/session.inc.php
@@ -14,26 +14,23 @@ if (isset($_POST['action']) && $_POST['action'] === 'login') {
 		Util::redirect('?do=main');
 	}
 	// Login credentials wrong
-	Util::redirect('?do=session&action=fail');
+	Message::addError('loginfail');
 }
 
 if ($_REQUEST['action'] === 'logout') {
-	// Log user out (or do nothing if not logged in)
-	exit(0);
+	if (Util::verifyToken()) {
+		// Log user out (or do nothing if not logged in)
+		User::logout();
+		Util::redirect('?do=main');
+	}
 }
 
 function render_module()
 {
-	if (!isset($_GET['action'])) Util::traceError('No action on render');
-	if ($_GET['action'] === 'login') {
+	if ($_REQUEST['action'] === 'login') {
 		Render::setTitle('Anmelden');
 		Render::addTemplate('page-login');
 		return;
 	}
-	if ($_GET['action'] === 'fail') {
-		Render::setTitle('Fehler');
-		Render::addError('Benutzer oder Passwort falsch');
-		return;
-	}
 }
 
-- 
cgit v1.2.3-55-g7522