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

Issue #306 - Platform admin, session and user import tools again: Updating logic about usernames. Fixing a mistake of mine.

Browse Source
skala
Ivan Tcholakov 16 years ago
parent bf33ebf6cc
commit 1be6407cf3
2 changed files with 41 additions and 24 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. 48
      main/admin/session_import.php
  2. 17
      main/admin/user_import.php

48
main/admin/session_import.php
Unescape View File

@ -38,6 +38,10 @@ $tool_name = get_lang('ImportSessionListXMLCSV');
$interbreadcrumb[] = array('url' => 'index.php','name' => get_lang('AdministrationTools'));
set_time_limit(0);
// Set this option to true to enforce strict purification for usenames.
$purification_option_for_usernames = false;
$inserted_in_course = array();
if ($_POST['formSent']) {
@ -81,9 +85,10 @@ if ($_POST['formSent']) {
$user_name_dist = $username;
$username = UserManager::cut_username($username);
$was_cut = true;
} else {
$username = UserManager::purify_username($username, $purification_option_for_usernames);
}
$user_exists = UserManager::is_username_available($username);
if ($user_exists) {
if (UserManager::is_username_available($username)) {
if ($was_cut) {
$error_msg .= get_lang('UsernameTooLongWasCut').' '.get_lang('From').' '.$user_name_dist.' '.get_lang('To').' '.$username.' <br />';
}
@ -172,7 +177,7 @@ if ($_POST['formSent']) {
foreach ($root->Courses->Course as $courseNode) {
$course_code = trim(api_utf8_decode($courseNode->CourseCode));
$title = trim(api_utf8_decode($courseNode->CourseTitle));
$description = api_utf8_decode($courseNode->CourseDescription);
$description = trim(api_utf8_decode($courseNode->CourseDescription));
$language = trim(api_utf8_decode($courseNode->CourseLanguage));
$username = trim(api_utf8_decode($courseNode->CourseTeacher));
@ -198,12 +203,19 @@ if ($_POST['formSent']) {
$title = $keys['currentCourseCode'];
}
prepare_course_repository($current_course_repository, $current_course_id);
update_Db_course($current_course_db_name);
$pictures_array = fill_course_repository($current_course_repository);
fill_Db_course($current_course_db_name, $current_course_repository, 'english', $pictures_array); // TODO: Hard-coded language id 'english'.
register_course($current_course_id, $current_course_code, $current_course_repository, $current_course_db_name, "$lastname $firstname", $course['unit_code'], addslashes($course['FR']['title']), $language, $user_id); // TODO: Hard-coded language 'FR'.
// Modified by Ivan Tcholakov, 10-MAR-2009.
//update_Db_course($current_course_db_name);
update_Db_course($current_course_db_name, $language);
//
// Modified by Ivan Tcholakov, 10-MAR-2009.
//$pictures_array = fill_course_repository($current_course_repository);
$pictures_array = fill_course_repository($current_course_repository, false);
//
// Modified by Ivan Tcholakov, 10-MAR-2009.
//fill_Db_course($current_course_db_name, $current_course_repository, 'french');
fill_Db_course($current_course_db_name, $current_course_repository, $language, array(), false);
//
register_course($current_course_id, $current_course_code, $current_course_repository, $current_course_db_name, "$lastname $firstname", $course['unit_code'], addslashes($course['FR']['title']), $language, $user_id);
$sql = "INSERT INTO ".$tbl_course." SET
code = '".$current_course_id."',
db_name = '".$current_course_db_name."',
@ -247,7 +259,7 @@ if ($_POST['formSent']) {
$user_counter = 0;
$session_name = trim(api_utf8_decode($node_session->SessionName));
$coach = trim(api_utf8_decode($node_session->Coach));
$coach = UserManager::purify_username(api_utf8_decode($node_session->Coach), $purification_option_for_usernames);
if (!empty($coach)) {
$coach_id = UserManager::get_user_id_from_username($coach);
@ -359,8 +371,8 @@ if ($_POST['formSent']) {
}
// Adding users to the new session.
foreach ($node_session->User as $node_user){
$username = UserManager::cut_username(api_utf8_decode($node_user));
foreach ($node_session->User as $node_user) {
$username = UserManager::purify_username(api_utf8_decode($node_user), $purification_option_for_usernames);
$user_id = UserManager::get_user_id_from_username($username);
if ($user_id !== false) {
$sql = "INSERT IGNORE INTO $tbl_session_user SET
@ -379,7 +391,7 @@ if ($_POST['formSent']) {
// If the course exists we continue.
$course_info = CourseManager::get_course_information($course_code);
// Searching the coach.
$coach = UserManager::cut_username(api_utf8_decode($node_course->Coach));
$coach = UserManager::purify_username(api_utf8_decode($node_course->Coach), $purification_option_for_usernames);
if (!empty($coach)) {
$coach_id = UserManager::get_user_id_from_username($coach);
if ($coach_id === false) {
@ -401,14 +413,14 @@ if ($_POST['formSent']) {
$course_counter++;
$users_in_course_counter = 0;
foreach ($node_course->User as $node_user) {
$username = UserManager::cut_username(api_utf8_decode($node_user));
$username = UserManager::purify_username(api_utf8_decode($node_user), $purification_option_for_usernames);
$user_id = UserManager::get_user_id_from_username($username);
if ($user_id !== false) {
// Adding to session_rel_user table.
$sql = "INSERT IGNORE INTO $tbl_session_user SET
id_user='$user_id',
id_session = '$session_id'";
$rs_user = Database::query($sql,__FILE__,__LINE__);
$rs_user = Database::query($sql, __FILE__, __LINE__);
$user_counter++;
// Adding to session_rel_user_rel_course table.
$sql = "INSERT IGNORE INTO $tbl_session_course_user SET
@ -435,7 +447,7 @@ if ($_POST['formSent']) {
if ($vcourse['code'] == $course_code) {
// Ignore, this has already been inserted.
} else {
$coach = UserManager::cut_username(api_utf8_decode($node_course->Coach));
$coach = UserManager::purify_username(api_utf8_decode($node_course->Coach), $purification_option_for_usernames);
if (!empty($coach)) {
$coach_id = UserManager::get_user_id_from_username($coach);
if ($user_id === false) {
@ -455,7 +467,7 @@ if ($_POST['formSent']) {
$course_counter++;
$users_in_course_counter = 0;
foreach ($node_course->User as $node_user) {
$username = UserManager::cut_username(api_utf8_decode($node_user));
$username = UserManager::purify_username(api_utf8_decode($node_user), $purification_option_for_usernames);
$user_id = UserManager::get_user_id_from_username($username);
if ($user_id !== false) {
$sql = "INSERT IGNORE INTO $tbl_session_user SET
@ -702,7 +714,7 @@ if ($_POST['formSent']) {
id_session='$session_id'";
$rs_course = Database::query($sql_course, __FILE__, __LINE__);
if (Database::affected_rows()){
if (Database::affected_rows()) {
$course_counter++;
$users = api_substr($course , api_strpos($course,'[', 1) + 1, api_strpos($course,']', 1));
$users = explode('|', $enreg['Users']);

17
main/admin/user_import.php
Unescape View File

@ -17,6 +17,9 @@ $language_file = array ('admin', 'registration');
require '../inc/global.inc.php';
require_once api_get_path(LIBRARY_PATH).'mail.lib.inc.php';
// Set this option to true to enforce strict purification for usenames.
$purification_option_for_usernames = false;
function validate_data($users) {
global $defined_auth_sources;
$errors = array();
@ -34,15 +37,15 @@ function validate_data($users) {
}
}
// 2. Check username.
if (UserManager::is_username_empty($user['UserName'])) {
if (!UserManager::is_username_empty($user['UserName'])) {
// 2.1. Check if no username was used twice in import file.
if (isset ($usernames[$user['UserName']])) {
if (isset($usernames[$user['UserName']])) {
$user['error'] = get_lang('UserNameUsedTwice');
$errors[] = $user;
}
$usernames[$user['UserName']] = 1;
// 2.2. Check if username isn't allready in use in database.
if (!UserManager :: is_username_available($user['UserName'])) {
if (!UserManager::is_username_available($user['UserName'])) {
$user['error'] = get_lang('UserNameNotAvailable');
$errors[] = $user;
}
@ -53,7 +56,7 @@ function validate_data($users) {
}
}
// 3. Check status.
if (isset ($user['Status']) && !api_status_exists($user['Status'])) {
if (isset($user['Status']) && !api_status_exists($user['Status'])) {
$user['error'] = get_lang('WrongStatus');
$errors[] = $user;
}
@ -212,8 +215,10 @@ function element_end($parser, $data) {
global $user;
global $users;
global $current_value;
global $purification_option_for_usernames;
switch ($data) {
case 'Contact' :
$user['UserName'] = UserManager::purify_username($user['UserName'], $purification_option_for_usernames);
if ($user['Status'] == '5') {
$user['Status'] = STUDENT;
}
@ -232,7 +237,7 @@ function element_end($parser, $data) {
* XML-parser: handle character data
*/
function character_data($parser, $data) {
$data = api_utf8_decode($data);
$data = trim(api_utf8_decode($data));
global $current_value;
$current_value = $data;
}
@ -340,7 +345,7 @@ if ($_POST['formSent'] AND $_FILES['import_file']['size'] !== 0) {
$error_message = '<ul>';
foreach ($errors as $index => $error_user) {
$error_message .= '<li><b>'.$error_user['error'].'</b>: ';
$error_message .= $error_user['UserName'].'&nbsp;('.api_get_person_name($error_user['FirstName'], $error_user['LastName']).')';
$error_message .= '<strong>'.$error_user['UserName'].'</strong>&nbsp;('.api_get_person_name($error_user['FirstName'], $error_user['LastName']).')';
$error_message .= '</li>';
}
$error_message .= '</ul>';

Write Preview
Loading…
Cancel
Save