OO style modules

1 files changed, 34 insertions, 27 deletions

diff --git a/modules/session.inc.php b/modules/session.inc.php
index 456ff6b8..aa7719ab 100644
--- a/modules/session.inc.php
+++ b/modules/session.inc.php
@@ -1,36 +1,43 @@
 <?php
 
-if (!isset($_REQUEST['action'])) Util::traceError('No action on module init');
+class Page_Session extends Page
+{
+	
+	protected function doPreprocess()
+	{
+		if (!isset($_REQUEST['action'])) Util::traceError('No action on module init');
 
-User::load();
+		User::load();
 
-if (isset($_POST['action']) && $_POST['action'] === 'login') {
-	// Login - see if already logged in
-	if (User::isLoggedIn()) {
-		Util::redirect('?do=main');
-	}
-	// Else, try to log in
-	if (User::login($_POST['user'], $_POST['pass'])) {
-		Util::redirect('?do=main');
-	}
-	// Login credentials wrong
-	Message::addError('loginfail');
-}
+		if (isset($_POST['action']) && $_POST['action'] === 'login') {
+			// Login - see if already logged in
+			if (User::isLoggedIn()) {
+				Util::redirect('?do=Main');
+			}
+			// Else, try to log in
+			if (User::login($_POST['user'], $_POST['pass'])) {
+				Util::redirect('?do=Main');
+			}
+			// Login credentials wrong
+			Message::addError('loginfail');
+		}
 
-if ($_REQUEST['action'] === 'logout') {
-	if (Util::verifyToken()) {
-		// Log user out (or do nothing if not logged in)
-		User::logout();
-		Util::redirect('?do=main');
+		if ($_REQUEST['action'] === 'logout') {
+			if (Util::verifyToken()) {
+				// Log user out (or do nothing if not logged in)
+				User::logout();
+				Util::redirect('?do=Main');
+			}
+		}
 	}
-}
 
-function render_module()
-{
-	if ($_REQUEST['action'] === 'login') {
-		Render::setTitle('Anmelden');
-		Render::addTemplate('page-login');
-		return;
+	protected function doRender()
+	{
+		if ($_REQUEST['action'] === 'login') {
+			Render::setTitle('Anmelden');
+			Render::addTemplate('page-login');
+			return;
+		}
 	}
-}
 
+}