Adding status in query, avoiding a PHP warning message

main/auth/conditional_login/conditional_login.php

@@ -18,15 +18,14 @@ require_once api_get_path(LIBRARY_PATH).'usermanager.lib.php';
   Please implements the functions of the $dc_conditions array. Each of these fucntion will take a user array (user_id, username, password (crypted), auth_sourcen, active, expiration_date)
  */
 function dc_check_phone_number($user){
-  $uInfo = UserManager::get_user_info_by_id($user['user_id']);
-  if ( empty($uInfo['phone'])) {
-    return true;
-  }
-  return false;
+    $uInfo = UserManager::get_user_info_by_id($user['user_id']);
+    if ( empty($uInfo['phone'])) {
+        return true;
+    }
+    return false;
 }
 
 function dc_check_first_login($user){
-  $uInfo = UserManager::get_user_info_by_id($user['user_id']);
-  return(($uInfo['extra']['already_logged_in'] === 'false'));
-}
-?>
+    $uInfo = UserManager::get_user_info_by_id($user['user_id']);
+    return(($uInfo['extra']['already_logged_in'] === 'false'));
+}

main/inc/lib/conditionallogin.lib.php

@@ -5,23 +5,23 @@
 
 class ConditionalLogin {
 
-  public static function check_conditions($user) {
-		if (file_exists(api_get_path(SYS_PATH).'main/auth/conditional_login/conditional_login.php')) {
-			include_once api_get_path(SYS_PATH).'main/auth/conditional_login/conditional_login.php';
-			if (isset($dc_conditions)){
-				foreach ($dc_conditions as $dc_condition) {
-					if ($dc_condition['conditional_function']($user)) {
-						$_SESSION['conditional_login']['uid'] = $user['user_id'];
-						$_SESSION['conditional_login']['can_login'] = false;
-						header("Location:". $dc_condition['url']);
-						exit();
-					}
-				}
-			}
-		}
-  }
+    public static function check_conditions($user) {
+        if (file_exists(api_get_path(SYS_PATH).'main/auth/conditional_login/conditional_login.php')) {
+            include_once api_get_path(SYS_PATH).'main/auth/conditional_login/conditional_login.php';
+            if (isset($dc_conditions)){
+                foreach ($dc_conditions as $dc_condition) { 
+                    if (isset($dc_condition['conditional_function']) && $dc_condition['conditional_function']($user)) {
+                        $_SESSION['conditional_login']['uid'] = $user['user_id'];
+                        $_SESSION['conditional_login']['can_login'] = false;
+                        header("Location:". $dc_condition['url']);
+                        exit();
+                    }
+                }
+            }
+        }
+    }
 
-	public static function login(){
+	public static function login() {
 		require_once api_get_path(LIBRARY_PATH).'loginredirection.lib.php';
 	    $_SESSION['conditional_login']['can_login'] = true;
 		LoginRedirection::redirect();

main/inc/local.inc.php

@@ -249,7 +249,7 @@ if (!empty($_SESSION['_user']['user_id']) && ! ($login || $logout)) {
 
 		//lookup the user in the main database
 		$user_table = Database::get_main_table(TABLE_MAIN_USER);
-		$sql = "SELECT user_id, username, password, auth_source, active, expiration_date FROM $user_table
+		$sql = "SELECT user_id, username, password, auth_source, active, expiration_date, status FROM $user_table
 			    WHERE username = '".Database::escape_string($login)."'";
 		$result = Database::query($sql);
 
@@ -369,11 +369,12 @@ if (!empty($_SESSION['_user']['user_id']) && ! ($login || $logout)) {
 										}
 									}
 								}
-                            } else {                                
+                            } else {
 								ConditionalLogin::check_conditions($uData);
                                 $_user['user_id'] = $uData['user_id'];
                                 $_user['status']  = $uData['status'];
-                                session_regenerate_id();                                
+                                
+                                session_regenerate_id();                                                           
                                 api_session_register('_user');
                                 event_login();                                
 							}