X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=admin%2Fdb%2Fusers_db.inc;h=52b02411ffde046fb3a9f38b0e3ef83c97163d66;hb=0bb9ce50f39b09b93005c45a49d9c47c4521267c;hp=7dfd7256a2a23a60fbd08a54a21f4abd97941d5f;hpb=0b63d898491b6577a5a5bf90e771dca0dcbbcf1f;p=fa-stable.git

diff --git a/admin/db/users_db.inc b/admin/db/users_db.inc
index 7dfd7256..52b02411 100644
--- a/admin/db/users_db.inc
+++ b/admin/db/users_db.inc
@@ -107,6 +107,9 @@ function get_user_by_email($email)
 
 	$result = db_query($sql, "could not get user for email $email");
 
+	if (db_num_rows($result) != 1)
+		return false;
+
 	return db_fetch($result);
 }
 
@@ -119,23 +122,6 @@ function delete_user($id)
 	db_query($sql, "could not delete user $id");
 }
 
-//-----------------------------------------------------------------------------------------------
-//
-//	Obsolete, to be removed in 2.4. This function as been spleet into get_user_auth/get_user_by_login
-//	in FA 2.3.6
-//
-function get_user_for_login($user_id, $password)
-{
-	set_global_connection();
-
-// do not exclude inactive records or you lost access after source upgrade
-// on sites using pre 2.2 database
-	$sql = "SELECT * FROM ".TB_PREF."users WHERE user_id = ".db_escape($user_id)." AND"
-		." password=".db_escape($password);
-
-	return db_query($sql, "could not get validate user login for $user_id");
-}
-
 //-----------------------------------------------------------------------------------------------
 
 function get_user_auth($user_id, $password)
@@ -171,9 +157,9 @@ function check_user_activity($id)
 //-----------------------------------------------------------------------------------------------
 function show_users_online()
 {
-	global $show_users_online, $db, $GetText;
-	
-	if (!isset($show_users_online) || $show_users_online == 0 || !defined('TB_PREF') || 
+	global $db, $GetText, $SysPrefs;
+
+	if (!isset($SysPrefs->show_users_online) || $SysPrefs->show_users_online == 0 || !defined('TB_PREF') || 
 		!isset($GetText) || !isset($db))
 		return "";
 	$result = db_query("SHOW TABLES LIKE '".TB_PREF."useronline'");	
@@ -221,4 +207,3 @@ function show_users_online()
 	return "$users ".($users == 1 ? _("user online") : _("users online"));
 
 }
-?>