chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Adding user.id field

Browse Source
1.10.x
Julio Montoya 10 years ago
parent d451c63629
commit 153d7c8e9f
4 changed files with 55 additions and 33 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 36
      main/inc/lib/usermanager.lib.php
  2. 5
      main/install/db_main.sql
  3. 6
      main/install/migrate-db-1.9.0-1.10.0-pre.sql
  4. 9
      main/install/update-db-1.9.0-1.10.0.inc.php

36
main/inc/lib/usermanager.lib.php
Unescape View File

@ -1,5 +1,8 @@
<?php
/* For licensing terms, see /license.txt */
use Chamilo\UserBundle\Entity\User;
/**
*
* Class UserManager
@ -57,7 +60,9 @@ class UserManager
* @param array Extra fields
* @param string Encrypt method used if password is given encrypted. Set to an empty string by default
* @return mixed new user id - if the new user creation succeeds, false otherwise
* @desc The function tries to retrieve $_user['user_id'] from the global space. If it exists, $_user['user_id'] is the creator id. If a problem arises, it stores the error message in global $api_failureList
* @desc The function tries to retrieve user id from the session.
* If it exists, the current user id is the creator id. If a problem arises,
* it stores the error message in global $api_failureList
* @assert ('Sam','Gamegie',5,'sam@example.com','jo','jo') > 1
* @assert ('Pippin','Took',null,null,'jo','jo') === false
*/
@ -80,11 +85,12 @@ class UserManager
$encrypt_method = '',
$send_mail = false
) {
$currentUserId = api_get_user_id();
$hook = HookCreateUser::create();
if (!empty($hook)) {
$hook->notifyCreateUser(HOOK_EVENT_TYPE_PRE);
}
global $_user, $_configuration;
global $_configuration;
$original_password = $password;
$access_url_id = 1;
@ -129,8 +135,8 @@ class UserManager
$language = api_get_setting('platformLanguage');
}
if ($_user['user_id']) {
$creator_id = intval($_user['user_id']);
if (!empty($currentUserId)) {
$creator_id = $currentUserId;
} else {
$creator_id = '';
}
@ -140,8 +146,6 @@ class UserManager
return api_set_failure('login-pass already taken');
}
//$password = "PLACEHOLDER";
if (empty($encrypt_method)) {
$password = api_get_encrypted_password($password);
} else {
@ -156,7 +160,6 @@ class UserManager
}
}
$current_date = api_get_utc_datetime();
$sql = "INSERT INTO $table_user
SET lastname = '".Database::escape_string(trim($lastName))."',
@ -178,8 +181,10 @@ class UserManager
$result = Database::query($sql);
if ($result) {
//echo "id returned";
$return = Database::insert_id();
$sql = "UPDATE $table_user SET user_id = $return WHERE id = $return";
Database::query($sql);
if (api_get_multiple_access_url()) {
UrlManager::add_user_to_url($return, api_get_current_access_url_id());
} else {
@ -383,7 +388,7 @@ class UserManager
}
// Delete the personal course categories
$course_cat_table = Database::get_user_personal_table(TABLE_USER_COURSE_CATEGORY);
$course_cat_table = Database::get_main_table(TABLE_USER_COURSE_CATEGORY);
$sql = "DELETE FROM $course_cat_table WHERE user_id = '".$user_id."'";
Database::query($sql);
@ -396,7 +401,7 @@ class UserManager
Database::query($sql);
// Delete the personal agenda-items from this user
$agenda_table = Database :: get_user_personal_table(TABLE_PERSONAL_AGENDA);
$agenda_table = Database :: get_main_table(TABLE_PERSONAL_AGENDA);
$sql = "DELETE FROM $agenda_table WHERE user = '".$user_id."'";
Database::query($sql);
@ -665,10 +670,12 @@ class UserManager
expiration_date='".Database::escape_string($expiration_date)."',
active='".Database::escape_string($active)."',
hr_dept_id=".intval($hr_dept_id);
if (!is_null($creator_id)) {
$sql .= ", creator_id='".intval($creator_id)."'";
}
$sql .= " WHERE user_id='$user_id'";
$sql .= " WHERE id = '$user_id'";
$return = Database::query($sql);
if ($change_active == 1 && $return) {
if ($active == 1) {
@ -678,6 +685,7 @@ class UserManager
}
Event::addEvent($event_title, LOG_USER_ID, $user_id);
}
if (is_array($extra) && count($extra) > 0) {
$res = true;
foreach ($extra as $fname => $fvalue) {
@ -2564,7 +2572,7 @@ class UserManager
}
// Courses in which we subscribed out of any session
$tbl_user_course_category = Database :: get_user_personal_table(TABLE_USER_COURSE_CATEGORY);
$tbl_user_course_category = Database :: get_main_table(TABLE_USER_COURSE_CATEGORY);
$sql = "SELECT
course.code,
@ -3846,7 +3854,7 @@ class UserManager
$tbl_course = Database :: get_main_table(TABLE_MAIN_COURSE);
$tbl_course_field = Database :: get_main_table(TABLE_MAIN_COURSE_FIELD);
$tbl_course_field_value = Database :: get_main_table(TABLE_MAIN_COURSE_FIELD_VALUES);
$tbl_user_course_category = Database :: get_user_personal_table(TABLE_USER_COURSE_CATEGORY);
$tbl_user_course_category = Database :: get_main_table(TABLE_USER_COURSE_CATEGORY);
//we filter the courses from the URL
$join_access_url = $where_access_url = '';
@ -4579,7 +4587,7 @@ class UserManager
*/
public static function delete_inactive_student($student_id, $years = 2, $warning_message = false, $return_timestamp = false)
{
$tbl_track_login = Database :: get_statistic_table(TABLE_STATISTIC_TRACK_E_LOGIN);
$tbl_track_login = Database :: get_main_table(TABLE_STATISTIC_TRACK_E_LOGIN);
$sql = 'SELECT login_date FROM '.$tbl_track_login.'
WHERE login_user_id = '.intval($student_id).'
ORDER BY login_date DESC LIMIT 0,1';

5
main/install/db_main.sql
Unescape View File

@ -20,7 +20,8 @@
DROP TABLE IF EXISTS user;
CREATE TABLE IF NOT EXISTS user (
user_id int unsigned NOT NULL auto_increment,
id int unsigned NOT NULL auto_increment,
user_id int unsigned NOT NULL,
lastname varchar(60) default NULL,
firstname varchar(60) default NULL,
username varchar(100) NOT NULL default '',
@ -883,7 +884,7 @@ VALUES
('tool_visible_by_default_at_creation','quiz','checkbox','Tools','true','ToolVisibleByDefaultAtCreationTitle','ToolVisibleByDefaultAtCreationComment',NULL,'Quiz', 1),
('tool_visible_by_default_at_creation','gradebook','checkbox','Tools','true','ToolVisibleByDefaultAtCreationTitle','ToolVisibleByDefaultAtCreationComment',NULL,'Gradebook', 1),
('prevent_session_admins_to_manage_all_users', NULL, 'radio', 'Session', 'false', 'PreventSessionAdminsToManageAllUsersTitle', 'PreventSessionAdminsToManageAllUsersComment', NULL, NULL, 1),
('chamilo_database_version', NULL, 'textfield',NULL, '1.10.0.12','DatabaseVersion','', NULL, NULL, 0);
('chamilo_database_version', NULL, 'textfield',NULL, '1.10.0.13','DatabaseVersion','', NULL, NULL, 0);
UNLOCK TABLES;
/*!40000 ALTER TABLE settings_current ENABLE KEYS */;

6
main/install/migrate-db-1.9.0-1.10.0-pre.sql
Unescape View File

@ -63,8 +63,12 @@ ALTER TABLE track_e_course_access ADD COLUMN user_ip varchar(39) NOT NULL defaul
ALTER TABLE track_e_online CHANGE COLUMN login_ip user_ip varchar(39) NOT NULL DEFAULT '';
ALTER TABLE track_e_login CHANGE COLUMN login_ip user_ip varchar(39) NOT NULL DEFAULT '';
ALTER TABLE user MODIFY COLUMN user_id int NOT NULL;
ALTER TABLE user DROP PRIMARY KEY;
ALTER TABLE user ADD COLUMN id int NOT NULL PRIMARY KEY AUTO_INCREMENT;
-- Do not move this query
UPDATE settings_current SET selected_value = '1.10.0.12' WHERE variable = 'chamilo_database_version';
UPDATE settings_current SET selected_value = '1.10.0.13' WHERE variable = 'chamilo_database_version';
-- xxCOURSExx

9
main/install/update-db-1.9.0-1.10.0.inc.php
Unescape View File

@ -121,6 +121,15 @@ if (defined('SYSTEM_INSTALLATION')) {
iDatabase::query($sql);
}
}
$res = iDatabase::query("SELECT user_id FROM $dbNameForm.user");
$result = iDatabase::query($sql);
$users = Database::store_result($result);
foreach ($users as $user) {
$userId = $user['user_id'];
$sql = "UPDATE $dbNameForm.user SET id = $userId WHERE user_id = $userId";
iDatabase::query($sql);
}
}
}

Write Preview
Loading…
Cancel
Save