From d4387ee6bbf3ef104140bfb17f19cffad649e46d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emmanuel=20Beno=C3=AEt?= <tseeker@nocternity.net>
Date: Mon, 6 Feb 2012 10:09:36 +0100
Subject: [PATCH] Fixed redirect to installer
In some cases redirections to the installer would be ignored. Well, no
more.
---
includes/t-basics/controllers.inc.php | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/includes/t-basics/controllers.inc.php b/includes/t-basics/controllers.inc.php
index 275f9e5..34e15f1 100644
--- a/includes/t-basics/controllers.inc.php
+++ b/includes/t-basics/controllers.inc.php
@@ -8,13 +8,13 @@ class Ctrl_HomePage
public final function handle( Page $page )
{
session_start( );
- if ( array_key_exists( 'uid' , $_SESSION ) ) {
- return 'items';
- } elseif ( Loader::DAO( 'users' )->hasUsers( ) ) {
- return 'login';
- } else {
+ if ( ! Loader::DAO( 'users' )->hasUsers( ) ) {
return 'install';
}
+ if ( array_key_exists( 'uid' , $_SESSION ) ) {
+ return 'items';
+ }
+ return 'login';
}
}
@@ -51,6 +51,9 @@ class Ctrl_CheckSession
public function handle( Page $page )
{
session_start( );
+ if ( ! Loader::DAO( 'users' )->hasUsers( ) ) {
+ return 'install';
+ }
if ( array_key_exists( $this->sessionKey , $_SESSION ) ) {
return null;
}