|
@@ -486,10 +486,10 @@ class UserManager
|
|
|
return false;
|
|
|
}
|
|
|
$sql = "SELECT * FROM $table_course_user
|
|
|
- WHERE status = '1' AND user_id = '".$user_id."'";
|
|
|
+ WHERE status = '1' AND id = '".$user_id."'";
|
|
|
$res = Database::query($sql);
|
|
|
while ($course = Database::fetch_object($res)) {
|
|
|
- $sql = "SELECT user_id FROM $table_course_user
|
|
|
+ $sql = "SELECT id FROM $table_course_user
|
|
|
WHERE status='1' AND c_id ='".Database::escape_string($course->c_id)."'";
|
|
|
$res2 = Database::query($sql);
|
|
|
if (Database::num_rows($res2) == 1) {
|
|
@@ -593,7 +593,7 @@ class UserManager
|
|
|
Database::query($sql);
|
|
|
|
|
|
// Delete user from database
|
|
|
- $sql = "DELETE FROM $table_user WHERE user_id = '".$user_id."'";
|
|
|
+ $sql = "DELETE FROM $table_user WHERE id = '".$user_id."'";
|
|
|
Database::query($sql);
|
|
|
|
|
|
// Delete user from the admin table
|
|
@@ -709,7 +709,7 @@ class UserManager
|
|
|
$ids = array_map('intval', $ids);
|
|
|
$ids = implode(',', $ids);
|
|
|
|
|
|
- $sql = "UPDATE $table_user SET active = 0 WHERE user_id IN ($ids)";
|
|
|
+ $sql = "UPDATE $table_user SET active = 0 WHERE id IN ($ids)";
|
|
|
$r = Database::query($sql);
|
|
|
if ($r !== false) {
|
|
|
Event::addEvent(LOG_USER_DISABLE, LOG_USER_ID, $ids);
|
|
@@ -739,7 +739,7 @@ class UserManager
|
|
|
$ids = array_map('intval', $ids);
|
|
|
$ids = implode(',', $ids);
|
|
|
|
|
|
- $sql = "UPDATE $table_user SET active = 1 WHERE user_id IN ($ids)";
|
|
|
+ $sql = "UPDATE $table_user SET active = 1 WHERE id IN ($ids)";
|
|
|
$r = Database::query($sql);
|
|
|
if ($r !== false) {
|
|
|
Event::addEvent(LOG_USER_ENABLE,LOG_USER_ID,$ids);
|
|
@@ -764,7 +764,7 @@ class UserManager
|
|
|
return false;
|
|
|
$sql = "UPDATE $table_user SET
|
|
|
openid='".Database::escape_string($openid)."'";
|
|
|
- $sql .= " WHERE user_id='$user_id'";
|
|
|
+ $sql .= " WHERE id= $user_id";
|
|
|
return Database::query($sql);
|
|
|
}
|
|
|
|
|
@@ -963,7 +963,7 @@ class UserManager
|
|
|
}
|
|
|
$user_id = intval($user_id);
|
|
|
$table_user = Database :: get_main_table(TABLE_MAIN_USER);
|
|
|
- $sql = "UPDATE $table_user SET active = '$active' WHERE user_id = '$user_id';";
|
|
|
+ $sql = "UPDATE $table_user SET active = '$active' WHERE id = $user_id";
|
|
|
$r = Database::query($sql);
|
|
|
$ev = LOG_USER_DISABLE;
|
|
|
if ($active == 1) {
|
|
@@ -1231,7 +1231,7 @@ class UserManager
|
|
|
$ids = implode(',', $ids);
|
|
|
|
|
|
$tbl_user = Database::get_main_table(TABLE_MAIN_USER);
|
|
|
- $sql = "SELECT * FROM $tbl_user WHERE user_id IN ($ids)";
|
|
|
+ $sql = "SELECT * FROM $tbl_user WHERE id IN ($ids)";
|
|
|
if (!is_null($active)) {
|
|
|
$sql .= ' AND active='.($active ? '1' : '0');
|
|
|
}
|
|
@@ -1371,7 +1371,7 @@ class UserManager
|
|
|
if (empty($userInfo)) {
|
|
|
$user_table = Database:: get_main_table(TABLE_MAIN_USER);
|
|
|
$sql = "SELECT email, picture_uri FROM $user_table
|
|
|
- WHERE user_id=".$id;
|
|
|
+ WHERE id=".$id;
|
|
|
$res = Database::query($sql);
|
|
|
|
|
|
if (!Database::num_rows($res)) {
|
|
@@ -2582,7 +2582,7 @@ class UserManager
|
|
|
INNER JOIN $tbl_session as session
|
|
|
ON session.id = session_course_user.session_id
|
|
|
LEFT JOIN $tbl_user as user
|
|
|
- ON user.user_id = session_course_user.user_id OR session.id_coach = user.user_id
|
|
|
+ ON user.id = session_course_user.user_id OR session.id_coach = user.id
|
|
|
WHERE
|
|
|
session_course_user.session_id = $id_session AND (
|
|
|
(session_course_user.user_id = $user_id AND session_course_user.status = 2)
|
|
@@ -2624,7 +2624,7 @@ class UserManager
|
|
|
INNER JOIN $tbl_course AS course
|
|
|
ON course.id = session_course_user.c_id AND session_course_user.session_id = $session_id
|
|
|
INNER JOIN $tbl_session as session ON session_course_user.session_id = session.id
|
|
|
- LEFT JOIN $tbl_user as user ON user.user_id = session_course_user.user_id
|
|
|
+ LEFT JOIN $tbl_user as user ON user.id = session_course_user.user_id
|
|
|
WHERE session_course_user.user_id = $user_id
|
|
|
ORDER BY i";
|
|
|
|
|
@@ -2779,7 +2779,7 @@ class UserManager
|
|
|
$username = trim($username);
|
|
|
$username = Database::escape_string($username);
|
|
|
$t_user = Database::get_main_table(TABLE_MAIN_USER);
|
|
|
- $sql = "SELECT user_id FROM $t_user WHERE username = '$username'";
|
|
|
+ $sql = "SELECT id FROM $t_user WHERE username = '$username'";
|
|
|
$res = Database::query($sql);
|
|
|
if ($res === false) {
|
|
|
return false;
|
|
@@ -2788,7 +2788,7 @@ class UserManager
|
|
|
return false;
|
|
|
}
|
|
|
$row = Database::fetch_array($res);
|
|
|
- return $row['user_id'];
|
|
|
+ return $row['id'];
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -3015,7 +3015,7 @@ class UserManager
|
|
|
}
|
|
|
if (!empty($access_url_id) && $access_url_id == intval($access_url_id)) {
|
|
|
$sql .= ", $t_a a ";
|
|
|
- $sql2 .= " AND a.access_url_id = $access_url_id AND u.user_id = a.user_id ";
|
|
|
+ $sql2 .= " AND a.access_url_id = $access_url_id AND u.id = a.user_id ";
|
|
|
}
|
|
|
$sql = $sql.$sql2;
|
|
|
$res = Database::query($sql);
|
|
@@ -3073,12 +3073,12 @@ class UserManager
|
|
|
$content = api_utf8_decode($content);
|
|
|
$email_administrator = Database::escape_string($email_administrator);
|
|
|
//message in inbox
|
|
|
- $sql_message_outbox = 'SELECT user_id from '.$table_user.' WHERE email="'.$email_administrator.'" ';
|
|
|
+ $sql_message_outbox = 'SELECT id from '.$table_user.' WHERE email="'.$email_administrator.'" ';
|
|
|
//$num_row_query = Database::num_rows($sql_message_outbox);
|
|
|
$res_message_outbox = Database::query($sql_message_outbox);
|
|
|
$array_users_administrator = array();
|
|
|
while ($row_message_outbox = Database::fetch_array($res_message_outbox, 'ASSOC')) {
|
|
|
- $array_users_administrator[] = $row_message_outbox['user_id'];
|
|
|
+ $array_users_administrator[] = $row_message_outbox['id'];
|
|
|
}
|
|
|
//allow to insert messages in outbox
|
|
|
for ($i = 0; $i < count($array_users_administrator); $i++) {
|
|
@@ -3417,13 +3417,13 @@ class UserManager
|
|
|
INNER JOIN $table_admin as admin
|
|
|
ON (admin.user_id=url.user_id)
|
|
|
INNER JOIN $table_user u
|
|
|
- ON (u.user_id=admin.user_id)
|
|
|
+ ON (u.id=admin.user_id)
|
|
|
WHERE access_url_id ='".$access_url_id."'";
|
|
|
} else {
|
|
|
$sql = "SELECT admin.user_id, username, firstname, lastname, email, active
|
|
|
FROM $table_admin as admin
|
|
|
INNER JOIN $table_user u
|
|
|
- ON (u.user_id=admin.user_id)";
|
|
|
+ ON (u.id=admin.user_id)";
|
|
|
}
|
|
|
$result = Database::query($sql);
|
|
|
$return = array();
|
|
@@ -3470,17 +3470,17 @@ class UserManager
|
|
|
// all the information of the field
|
|
|
|
|
|
if ($getCount) {
|
|
|
- $select = "SELECT count(DISTINCT u.user_id) count";
|
|
|
+ $select = "SELECT count(DISTINCT u.id) count";
|
|
|
} else {
|
|
|
- $select = "SELECT DISTINCT u.user_id, u.username, firstname, lastname, email, tag, picture_uri";
|
|
|
+ $select = "SELECT DISTINCT u.id, u.username, firstname, lastname, email, tag, picture_uri";
|
|
|
}
|
|
|
|
|
|
$sql = " $select
|
|
|
FROM $user_table u
|
|
|
INNER JOIN $access_url_rel_user_table url_rel_user
|
|
|
- ON (u.user_id = url_rel_user.user_id)
|
|
|
+ ON (u.id = url_rel_user.user_id)
|
|
|
LEFT JOIN $table_user_tag_values uv
|
|
|
- ON (u.user_id AND uv.user_id AND uv.user_id = url_rel_user.user_id)
|
|
|
+ ON (u.id AND uv.user_id AND uv.user_id = url_rel_user.user_id)
|
|
|
LEFT JOIN $table_user_tag ut ON (uv.tag_id = ut.id)
|
|
|
WHERE
|
|
|
($where_field tag LIKE '".Database::escape_string($tag."%")."') OR
|
|
@@ -3514,8 +3514,8 @@ class UserManager
|
|
|
return $row['count'];
|
|
|
}
|
|
|
while ($row = Database::fetch_array($result, 'ASSOC')) {
|
|
|
- if (isset($return[$row['user_id']]) &&
|
|
|
- !empty($return[$row['user_id']]['tag'])
|
|
|
+ if (isset($return[$row['id']]) &&
|
|
|
+ !empty($return[$row['id']]['tag'])
|
|
|
) {
|
|
|
$url = Display::url(
|
|
|
$row['tag'],
|
|
@@ -3524,7 +3524,7 @@ class UserManager
|
|
|
);
|
|
|
$row['tag'] = $url;
|
|
|
}
|
|
|
- $return[$row['user_id']] = $row;
|
|
|
+ $return[$row['id']] = $row;
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -3595,10 +3595,10 @@ class UserManager
|
|
|
}
|
|
|
|
|
|
if (is_array($finalResult) && count($finalResult)>0) {
|
|
|
- $whereFilter = " AND u.user_id IN ('".implode("','", $finalResult)."') ";
|
|
|
+ $whereFilter = " AND u.id IN ('".implode("','", $finalResult)."') ";
|
|
|
} else {
|
|
|
//no results
|
|
|
- $whereFilter = " AND u.user_id = -1 ";
|
|
|
+ $whereFilter = " AND u.id = -1 ";
|
|
|
}
|
|
|
|
|
|
return $whereFilter;
|
|
@@ -3809,10 +3809,10 @@ class UserManager
|
|
|
$orderBy .= " ORDER BY lastname, firstname ";
|
|
|
}
|
|
|
|
|
|
- $sql = "SELECT u.user_id, username, u.firstname, u.lastname
|
|
|
+ $sql = "SELECT u.id, username, u.firstname, u.lastname
|
|
|
FROM $tblUser u
|
|
|
- INNER JOIN $tblUserRelUser uru ON (uru.friend_user_id = u.user_id)
|
|
|
- INNER JOIN $tblUserRelAccessUrl a ON (a.user_id = u.user_id)
|
|
|
+ INNER JOIN $tblUserRelUser uru ON (uru.friend_user_id = u.id)
|
|
|
+ INNER JOIN $tblUserRelAccessUrl a ON (a.user_id = u.id)
|
|
|
WHERE
|
|
|
access_url_id = ".api_get_current_access_url_id()." AND
|
|
|
uru.user_id = '$userId' AND
|
|
@@ -3931,16 +3931,16 @@ class UserManager
|
|
|
$userConditions .= ' AND u.status = '.intval($userStatus);
|
|
|
}
|
|
|
|
|
|
- $select = " SELECT DISTINCT u.user_id, u.username, u.lastname, u.firstname, u.email ";
|
|
|
+ $select = " SELECT DISTINCT u.id user_id, u.username, u.lastname, u.firstname, u.email ";
|
|
|
if ($getOnlyUserId) {
|
|
|
- $select = " SELECT DISTINCT u.user_id";
|
|
|
+ $select = " SELECT DISTINCT u.id user_id";
|
|
|
}
|
|
|
|
|
|
$masterSelect = "SELECT DISTINCT * FROM ";
|
|
|
|
|
|
if ($getCount) {
|
|
|
- $masterSelect = "SELECT COUNT(DISTINCT(user_id)) as count FROM ";
|
|
|
- $select = " SELECT DISTINCT(u.user_id) ";
|
|
|
+ $masterSelect = "SELECT COUNT(DISTINCT(u.id)) as count FROM ";
|
|
|
+ $select = " SELECT DISTINCT(u.id) user_id";
|
|
|
}
|
|
|
|
|
|
if (!is_null($active)) {
|
|
@@ -3999,7 +3999,7 @@ class UserManager
|
|
|
"UNION ALL (
|
|
|
$select
|
|
|
FROM $tbl_user u
|
|
|
- INNER JOIN $tbl_session_rel_user sru ON (sru.user_id = u.user_id)
|
|
|
+ INNER JOIN $tbl_session_rel_user sru ON (sru.user_id = u.id)
|
|
|
WHERE
|
|
|
sru.session_id IN (
|
|
|
SELECT DISTINCT(s.id) FROM $tbl_session s INNER JOIN
|
|
@@ -4021,7 +4021,7 @@ class UserManager
|
|
|
UNION ALL(
|
|
|
$select
|
|
|
FROM $tbl_user u
|
|
|
- INNER JOIN $tbl_course_user cu ON (cu.user_id = u.user_id)
|
|
|
+ INNER JOIN $tbl_course_user cu ON (cu.user_id = u.id)
|
|
|
WHERE cu.c_id IN (
|
|
|
SELECT DISTINCT(c_id) FROM $tbl_course_user
|
|
|
WHERE user_id = $userId AND status = ".COURSEMANAGER."
|
|
@@ -4042,8 +4042,8 @@ class UserManager
|
|
|
(
|
|
|
$select
|
|
|
FROM $tbl_user u
|
|
|
- INNER JOIN $tbl_user_rel_user uru ON (uru.user_id = u.user_id)
|
|
|
- LEFT JOIN $tbl_user_rel_access_url a ON (a.user_id = u.user_id)
|
|
|
+ INNER JOIN $tbl_user_rel_user uru ON (uru.user_id = u.id)
|
|
|
+ LEFT JOIN $tbl_user_rel_access_url a ON (a.user_id = u.id)
|
|
|
$join
|
|
|
WHERE
|
|
|
access_url_id = ".api_get_current_access_url_id()."
|
|
@@ -4174,8 +4174,8 @@ class UserManager
|
|
|
|
|
|
$sql = "SELECT user_id FROM $tbl_user_rel_user
|
|
|
WHERE
|
|
|
- user_id='$user_id' AND
|
|
|
- friend_user_id='$hr_dept_id' AND
|
|
|
+ user_id = $user_id AND
|
|
|
+ friend_user_id = $hr_dept_id AND
|
|
|
relation_type = ".USER_RELATION_TYPE_RRHH;
|
|
|
$rs = Database::query($sql);
|
|
|
if (Database::num_rows($rs) > 0) {
|
|
@@ -4200,9 +4200,9 @@ class UserManager
|
|
|
$courseCode = $courseInfo['code'];
|
|
|
|
|
|
if ($session == 0 || is_null($session)) {
|
|
|
- $sql = 'SELECT u.user_id FROM '.$table_user.' u
|
|
|
+ $sql = 'SELECT u.id uid FROM '.$table_user.' u
|
|
|
INNER JOIN '.$table_course_user.' ru
|
|
|
- ON ru.user_id=u.user_id
|
|
|
+ ON ru.user_id = u.id
|
|
|
WHERE
|
|
|
ru.status = 1 AND
|
|
|
ru.c_id = "'.$courseId.'" ';
|
|
@@ -4210,23 +4210,23 @@ class UserManager
|
|
|
$num_rows = Database::num_rows($rs);
|
|
|
if ($num_rows == 1) {
|
|
|
$row = Database::fetch_array($rs);
|
|
|
- return $row['user_id'];
|
|
|
+ return $row['uid'];
|
|
|
} else {
|
|
|
$my_num_rows = $num_rows;
|
|
|
- $my_user_id = Database::result($rs, $my_num_rows - 1, 'user_id');
|
|
|
+ $my_user_id = Database::result($rs, $my_num_rows - 1, 'uid');
|
|
|
return $my_user_id;
|
|
|
}
|
|
|
} elseif ($session > 0) {
|
|
|
- $sql = 'SELECT u.user_id FROM '.$table_user.' u
|
|
|
+ $sql = 'SELECT u.id uid FROM '.$table_user.' u
|
|
|
INNER JOIN '.$table_session_course_user.' sru
|
|
|
- ON sru.user_id=u.user_id
|
|
|
+ ON sru.user_id=u.id
|
|
|
WHERE
|
|
|
sru.c_id="'.$courseId.'" AND
|
|
|
sru.status=2';
|
|
|
$rs = Database::query($sql);
|
|
|
$row = Database::fetch_array($rs);
|
|
|
|
|
|
- return $row['user_id'];
|
|
|
+ return $row['uid'];
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -4315,7 +4315,7 @@ class UserManager
|
|
|
}
|
|
|
$sql = "SELECT tc.path_certificate,tc.cat_id,tgc.course_code,tgc.name
|
|
|
FROM $table_certificate tc, $table_gradebook_category tgc
|
|
|
- WHERE tgc.id = tc.cat_id AND tc.user_id='$user_id'
|
|
|
+ WHERE tgc.id = tc.cat_id AND tc.user_id = $user_id
|
|
|
ORDER BY tc.date_certificate DESC limit 5";
|
|
|
|
|
|
$rs = Database::query($sql);
|
|
@@ -4344,8 +4344,8 @@ class UserManager
|
|
|
|
|
|
$sql = "SELECT session_id FROM $tbl_session_course_rel_user
|
|
|
WHERE
|
|
|
- session_id=$session_id AND
|
|
|
- c_id='$courseId' AND
|
|
|
+ session_id = $session_id AND
|
|
|
+ c_id = $courseId AND
|
|
|
user_id = $user_id AND
|
|
|
status = 2 ";
|
|
|
$res = Database::query($sql);
|
|
@@ -4751,7 +4751,7 @@ EOF;
|
|
|
$user_id = intval($user_id);
|
|
|
|
|
|
if (!self::is_admin($user_id)) {
|
|
|
- $sql = "INSERT INTO $table_admin SET user_id = '".$user_id."'";
|
|
|
+ $sql = "INSERT INTO $table_admin SET user_id = $user_id";
|
|
|
Database::query($sql);
|
|
|
}
|
|
|
}
|
|
@@ -4764,7 +4764,7 @@ EOF;
|
|
|
$table_admin = Database :: get_main_table(TABLE_MAIN_ADMIN);
|
|
|
$user_id = intval($user_id);
|
|
|
if (self::is_admin($user_id)) {
|
|
|
- $sql = "DELETE FROM $table_admin WHERE user_id = '".$user_id."'";
|
|
|
+ $sql = "DELETE FROM $table_admin WHERE user_id = user_id";
|
|
|
Database::query($sql);
|
|
|
}
|
|
|
}
|
|
@@ -4881,7 +4881,7 @@ EOF;
|
|
|
$user = Database::get_main_table(TABLE_MAIN_USER);
|
|
|
$officialCode = Database::escape_string($officialCode);
|
|
|
|
|
|
- $sql = "SELECT DISTINCT user_id
|
|
|
+ $sql = "SELECT DISTINCT id
|
|
|
FROM $user
|
|
|
WHERE official_code = '$officialCode'
|
|
|
";
|
|
@@ -4889,7 +4889,7 @@ EOF;
|
|
|
|
|
|
$users = array();
|
|
|
while ($row = Database::fetch_array($result)) {
|
|
|
- $users[] = $row['user_id'];
|
|
|
+ $users[] = $row['id'];
|
|
|
}
|
|
|
return $users;
|
|
|
}
|