projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[0003795] Fixed incorrect GL postings for cash purchase invoices.
[fa-stable.git]
/
admin
/
db
/
users_db.inc
diff --git
a/admin/db/users_db.inc
b/admin/db/users_db.inc
index 267029c96f2c2bd685fbbd60f6b5bd5d316c82de..52b02411ffde046fb3a9f38b0e3ef83c97163d66 100644
(file)
--- a/
admin/db/users_db.inc
+++ b/
admin/db/users_db.inc
@@
-101,28
+101,25
@@
function get_user_by_login($user_id)
//-----------------------------------------------------------------------------------------------
//-----------------------------------------------------------------------------------------------
-function
delete_user($id
)
+function
get_user_by_email($email
)
{
{
- $sql
="DELETE FROM ".TB_PREF."users WHERE id=".db_escape($id
);
+ $sql
= "SELECT * FROM ".TB_PREF."users WHERE email=".db_escape($email
);
- db_query($sql, "could not delete user $id");
+ $result = db_query($sql, "could not get user for email $email");
+
+ if (db_num_rows($result) != 1)
+ return false;
+
+ return db_fetch($result);
}
//-----------------------------------------------------------------------------------------------
}
//-----------------------------------------------------------------------------------------------
-//
-// 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);
+function delete_user($id)
+{
+ $sql="DELETE FROM ".TB_PREF."users WHERE id=".db_escape($id);
-
return db_query($sql, "could not get validate user login for $user_
id");
+
db_query($sql, "could not delete user $
id");
}
//-----------------------------------------------------------------------------------------------
}
//-----------------------------------------------------------------------------------------------
@@
-160,9
+157,9
@@
function check_user_activity($id)
//-----------------------------------------------------------------------------------------------
function show_users_online()
{
//-----------------------------------------------------------------------------------------------
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'");
!isset($GetText) || !isset($db))
return "";
$result = db_query("SHOW TABLES LIKE '".TB_PREF."useronline'");
@@
-197,7
+194,7
@@
function show_users_online()
}
// Add user to database
}
// 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);
//Remove users that were not online within $timeoutseconds.
db_query("DELETE FROM ".TB_PREF."useronline WHERE timestamp<". $timeout);
@@
-210,4
+207,3
@@
function show_users_online()
return "$users ".($users == 1 ? _("user online") : _("users online"));
}
return "$users ".($users == 1 ? _("user online") : _("users online"));
}
-?>
\ No newline at end of file