X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=admin%2Fdb%2Fusers_db.inc;h=52b02411ffde046fb3a9f38b0e3ef83c97163d66;hb=26d7ae434469ae407f209ae3c0d3955b29107d95;hp=3d7645cee375d1d0e75ad3a2d6a4efc1a4428d86;hpb=67ec1888ea14a50f6df62e0599e50d209e7b0c6c;p=fa-stable.git

diff --git a/admin/db/users_db.inc b/admin/db/users_db.inc
index 3d7645ce..52b02411 100644
--- a/admin/db/users_db.inc
+++ b/admin/db/users_db.inc
@@ -21,7 +21,7 @@ function add_user($user_id, $real_name, $password, $phone, $email, $role_id,
 		.", ".db_escape($pos).",".db_escape($profile).",".db_escape($rep_popup)
 		." )";
 
-	db_query($sql, "could not add user for $user_id");
+	return db_query($sql, "could not add user for $user_id");
 }
 
 //-----------------------------------------------------------------------------------------------
@@ -31,7 +31,7 @@ function update_user_password($id, $user_id, $password)
 	$sql = "UPDATE ".TB_PREF."users SET password=".db_escape($password) . ",
 		user_id = ".db_escape($user_id). " WHERE id=".db_escape($id);
 
-	db_query($sql, "could not update user password for $user_id");
+	return db_query($sql, "could not update user password for $user_id");
 }
 
 //-----------------------------------------------------------------------------------------------
@@ -49,7 +49,7 @@ function update_user($id, $user_id, $real_name, $phone, $email, $role_id,
 		pos=".db_escape($pos).",
 		user_id = " . db_escape($user_id)
 		. " WHERE id=" . db_escape($id);
-	db_query($sql, "could not update user for $user_id");
+	return db_query($sql, "could not update user for $user_id");
 }
 
 //-----------------------------------------------------------------------------------------------
@@ -89,8 +89,7 @@ function get_user($id)
 }
 
 //-----------------------------------------------------------------------------------------------
-//	This function is necessary for admin prefs update after upgrade from 2.1
-//
+
 function get_user_by_login($user_id)
 {
 	$sql = "SELECT * FROM ".TB_PREF."users WHERE user_id=".db_escape($user_id);
@@ -102,6 +101,20 @@ function get_user_by_login($user_id)
 
 //-----------------------------------------------------------------------------------------------
 
+function get_user_by_email($email)
+{
+	$sql = "SELECT * FROM ".TB_PREF."users WHERE email=".db_escape($email);
+
+	$result = db_query($sql, "could not get user for email $email");
+
+	if (db_num_rows($result) != 1)
+		return false;
+
+	return db_fetch($result);
+}
+
+//-----------------------------------------------------------------------------------------------
+
 function delete_user($id)
 {
 	$sql="DELETE FROM ".TB_PREF."users WHERE id=".db_escape($id);
@@ -111,16 +124,13 @@ function delete_user($id)
 
 //-----------------------------------------------------------------------------------------------
 
-function get_user_for_login($user_id, $password)
+function get_user_auth($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");
+	return db_num_rows(db_query($sql, "could not get validate user login for $user_id")) != 0;
 }
 
 //-----------------------------------------------------------------------------------------------
@@ -147,10 +157,10 @@ function check_user_activity($id)
 //-----------------------------------------------------------------------------------------------
 function show_users_online()
 {
-	global $show_users_online, $db;
-	
-	if (!isset($show_users_online) || $show_users_online == 0 || !defined('TB_PREF') || 
-		!isset($_SESSION['get_text']) || !isset($db))
+	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'");	
 	if (db_num_rows($result) == 1)
@@ -184,7 +194,7 @@ function show_users_online()
 		}
 
 		// Add user to database
-		db_query("INSERT INTO ".TB_PREF."useronline (timestamp, ip, file) VALUES ('". $timestamp ."','". $ip ."','". $_SERVER['PHP_SELF'] ."')");
+		db_query("INSERT INTO ".TB_PREF."useronline (timestamp, ip, file) VALUES ('". $timestamp ."',". db_escape($ip) .",". db_escape($_SERVER['PHP_SELF']) .")");
 		//Remove users that were not online within $timeoutseconds.
 		db_query("DELETE FROM ".TB_PREF."useronline WHERE timestamp<". $timeout);
 
@@ -197,4 +207,3 @@ function show_users_online()
 	return "$users ".($users == 1 ? _("user online") : _("users online"));
 
 }
-?>
\ No newline at end of file