Merged changes from stable branch up to 2.3.23.

[fa-stable.git] / admin / db / users_db.inc

diff --git a/admin/db/users_db.inc b/admin/db/users_db.inc
index 767dad30339d1363a6d1b2e1d3797683b457c036..8e215a20222f736330edd537fd070fb7cbbe56a5 100644 (file)
--- a/admin/db/users_db.inc
+++ b/admin/db/users_db.inc
@@ -101,6 +101,17 @@ 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");
+
+       return db_fetch($result);
+}
+
+//-----------------------------------------------------------------------------------------------
+
 function delete_user($id)
 {
        $sql="DELETE FROM ".TB_PREF."users WHERE id=".db_escape($id);
@@ -160,9 +171,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'"); 
@@ -210,4 +221,3 @@ function show_users_online()
        return "$users ".($users == 1 ? _("user online") : _("users online"));
 
 }
-?>