Adding status in query, avoiding a PHP warning message

main/auth/conditional_login/conditional_login.php

@@ -29,4 +29,3 @@ function dc_check_first_login($user){
     $uInfo = UserManager::get_user_info_by_id($user['user_id']);
     return(($uInfo['extra']['already_logged_in'] === 'false'));
 }
-?>

main/inc/lib/conditionallogin.lib.php

@@ -10,7 +10,7 @@ class ConditionalLogin {
             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)) {
+                    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']);

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);
 
@@ -373,6 +373,7 @@ if (!empty($_SESSION['_user']['user_id']) && ! ($login || $logout)) {
 								ConditionalLogin::check_conditions($uData);
                                 $_user['user_id'] = $uData['user_id'];
                                 $_user['status']  = $uData['status'];
+                                
                                 session_regenerate_id();                                                           
                                 api_session_register('_user');
                                 event_login();