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

Minor - cosmetic changes

Browse Source
skala
Julio Montoya 13 years ago
parent 2e73b8b1dc
commit bf8dd64e1b
1 changed files with 52 additions and 81 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. 93
      main/admin/usergroup_user_import.php

93
main/admin/usergroup_user_import.php
Unescape View File

@ -1,50 +1,50 @@
<?php <?php
/* For licensing terms, see /license.txt */ /* For licensing terms, see /license.txt */
/** /**
* @package chamilo.admin * @package chamilo.admin
*/ */
/** /**
* Code * Code
* This tool allows platform admins to update class-user relations by uploading * This tool allows platform admins to update class-user relations by uploading
* a CSVfile * a CSVfile
*/ */
/** /**
* Validates imported data. * Validates imported data.
*/ */
function validate_data($user_classes) { function validate_data($user_classes) {
global $purification_option_for_usernames; global $purification_option_for_usernames;
$errors = array (); $errors = array();
$classcodes = array (); $classcodes = array();
/*if (!isset($_POST['subscribe']) && !isset($_POST['subscribe'])) { /* if (!isset($_POST['subscribe']) && !isset($_POST['subscribe'])) {
$user_class['error'] = get_lang('SelectAnAction'); $user_class['error'] = get_lang('SelectAnAction');
$errors[] = $user_class; $errors[] = $user_class;
return $errors; return $errors;
}*/ } */
$usergroup = new UserGroup(); $usergroup = new UserGroup();
foreach ($user_classes as $index => $user_class) { foreach ($user_classes as $index => $user_class) {
$user_class['line'] = $index + 1; $user_class['line'] = $index + 1;
// 1. Check whether mandatory fields are set. // 1. Check whether mandatory fields are set.
$mandatory_fields = array ('UserName', 'ClassName'); $mandatory_fields = array('UserName', 'ClassName');
foreach ($mandatory_fields as $key => $field) { foreach ($mandatory_fields as $key => $field) {
if (!isset ($user_class[$field]) || strlen($user_class[$field]) == 0) { if (!isset($user_class[$field]) || strlen($user_class[$field]) == 0) {
$user_class['error'] = get_lang($field.'Mandatory'); $user_class['error'] = get_lang($field . 'Mandatory');
$errors[] = $user_class; $errors[] = $user_class;
} }
} }
// 2. Check whether classcode exists. // 2. Check whether classcode exists.
if (isset ($user_class['ClassName']) && strlen($user_class['ClassName']) != 0) { if (isset($user_class['ClassName']) && strlen($user_class['ClassName']) != 0) {
// 2.1 Check whether code has been allready used in this CVS-file. // 2.1 Check whether code has been allready used in this CVS-file.
if (!isset ($classcodes[$user_class['ClassName']])) { if (!isset($classcodes[$user_class['ClassName']])) {
// 2.1.1 Check whether code exists in DB // 2.1.1 Check whether code exists in DB
$exists = $usergroup->usergroup_exists($user_class['ClassName']); $exists = $usergroup->usergroup_exists($user_class['ClassName']);
if (!$exists) { if (!$exists) {
$user_class['error'] = get_lang('CodeDoesNotExists').': '.$user_class['ClassName']; $user_class['error'] = get_lang('CodeDoesNotExists') . ': ' . $user_class['ClassName'];
$errors[] = $user_class; $errors[] = $user_class;
} else { } else {
$classcodes[$user_class['CourseCode']] = 1; $classcodes[$user_class['CourseCode']] = 1;
@ -56,14 +56,14 @@ function validate_data($user_classes) {
if (!UserManager::is_username_empty($user_class['UserName'])) { if (!UserManager::is_username_empty($user_class['UserName'])) {
// 3.1. Check whether username is too long. // 3.1. Check whether username is too long.
if (UserManager::is_username_too_long($user_class['UserName'])) { if (UserManager::is_username_too_long($user_class['UserName'])) {
$user_class['error'] = get_lang('UserNameTooLong').': '.$user_class['UserName']; $user_class['error'] = get_lang('UserNameTooLong') . ': ' . $user_class['UserName'];
$errors[] = $user_class; $errors[] = $user_class;
} }
$username = UserManager::purify_username($user_class['UserName'], $purification_option_for_usernames); $username = UserManager::purify_username($user_class['UserName'], $purification_option_for_usernames);
// 3.2. Check whether username exists. // 3.2. Check whether username exists.
if (UserManager::is_username_available($username)) { if (UserManager::is_username_available($username)) {
$user_class['error'] = get_lang('UnknownUser').': '.$username; $user_class['error'] = get_lang('UnknownUser') . ': ' . $username;
$errors[] = $user_class; $errors[] = $user_class;
} }
} }
@ -79,15 +79,15 @@ function save_data($users_classes) {
global $purification_option_for_usernames; global $purification_option_for_usernames;
// Table definitions. // Table definitions.
$user_table = Database :: get_main_table(TABLE_MAIN_USER); $user_table = Database :: get_main_table(TABLE_MAIN_USER);
$usergroup = new UserGroup(); $usergroup = new UserGroup();
// Data parsing: purification + conversion (UserName, ClassName) --> (user_is, class_id) // Data parsing: purification + conversion (UserName, ClassName) --> (user_is, class_id)
$csv_data = array (); $csv_data = array();
if (!empty($users_classes)) { if (!empty($users_classes)) {
foreach ($users_classes as $user_class) { foreach ($users_classes as $user_class) {
$sql1 = "SELECT user_id FROM $user_table WHERE username = '".Database::escape_string(UserManager::purify_username($user_class['UserName'], $purification_option_for_usernames))."'"; $sql1 = "SELECT user_id FROM $user_table WHERE username = '" . Database::escape_string(UserManager::purify_username($user_class['UserName'], $purification_option_for_usernames)) . "'";
$res1 = Database::query($sql1); $res1 = Database::query($sql1);
$obj1 = Database::fetch_object($res1); $obj1 = Database::fetch_object($res1);
@ -110,42 +110,13 @@ function save_data($users_classes) {
$class_name = $user_data['class_name']; $class_name = $user_data['class_name'];
$user_list_name = $user_data['user_list_name']; $user_list_name = $user_data['user_list_name'];
$usergroup->subscribe_users_to_usergroup($class_id, $user_list); $usergroup->subscribe_users_to_usergroup($class_id, $user_list);
$message = Display::return_message(get_lang('Class') . ': ' . $class_name . '<br />', 'normal', false);
/* $message .= Display::return_message(get_lang('Users') . ': ' . implode(', ', $user_list_name));
$sql = "SELECT class_id FROM $class_user_table cu WHERE cu.user_id = $user_id";
$res = Database::query($sql);
while ($obj = Database::fetch_object($res)) {
$db_subscriptions[$obj->class_id] = 1;
}
$to_subscribe = array_diff(array_keys($csv_subscriptions), array_keys($db_subscriptions));
$to_unsubscribe = array_diff(array_keys($db_subscriptions), array_keys($csv_subscriptions));
// Subscriptions for new classes.
if ($_POST['subscribe']) {
foreach ($to_subscribe as $class_id) {
ClassManager::add_user($user_id, $class_id);
}
}
// Unsubscription from previous classes.
if ($_POST['unsubscribe']) {
foreach ($to_unsubscribe as $class_id) {
ClassManager::unsubscribe_user($user_id, $class_id);
}
}*/
$message = Display::return_message(get_lang('Class').': '.$class_name.'<br />', 'normal', false);
$message .= Display::return_message(get_lang('Users').': '.implode(', ', $user_list_name));
return $message; return $message;
} }
} }
} }
/** /**
@ -166,13 +137,13 @@ require_once '../inc/global.inc.php';
$this_section = SECTION_PLATFORM_ADMIN; $this_section = SECTION_PLATFORM_ADMIN;
api_protect_admin_script(true); api_protect_admin_script(true);
require_once api_get_path(LIBRARY_PATH).'fileManage.lib.php'; require_once api_get_path(LIBRARY_PATH) . 'fileManage.lib.php';
require_once api_get_path(LIBRARY_PATH).'import.lib.php'; require_once api_get_path(LIBRARY_PATH) . 'import.lib.php';
$tool_name = get_lang('AddUsersToAClass').' CSV'; $tool_name = get_lang('AddUsersToAClass') . ' CSV';
$interbreadcrumb[] = array ('url' => 'index.php', 'name' => get_lang('PlatformAdmin')); $interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
$interbreadcrumb[] = array ('url' => 'usergroups.php', 'name' => get_lang('Classes')); $interbreadcrumb[] = array('url' => 'usergroups.php', 'name' => get_lang('Classes'));
// Set this option to true to enforce strict purification for usenames. // Set this option to true to enforce strict purification for usenames.
$purification_option_for_usernames = false; $purification_option_for_usernames = false;
@ -203,7 +174,7 @@ if (isset($return) && $return) {
if (count($errors) != 0) { if (count($errors) != 0) {
$error_message = "\n"; $error_message = "\n";
foreach ($errors as $index => $error_class_user) { foreach ($errors as $index => $error_class_user) {
$error_message .= get_lang('Line').' '.$error_class_user['line'].': '.$error_class_user['error'].'</b>'; $error_message .= get_lang('Line') . ' ' . $error_class_user['line'] . ': ' . $error_class_user['error'] . '</b>';
$error_message .= "<br />"; $error_message .= "<br />";
} }
$error_message .= "\n"; $error_message .= "\n";
@ -211,7 +182,7 @@ if (count($errors) != 0) {
} }
$form->display(); $form->display();
?> ?>
<p><?php echo get_lang('CSVMustLookLike').' ('.get_lang('MandatoryFields').')'; ?> :</p> <p><?php echo get_lang('CSVMustLookLike') . ' (' . get_lang('MandatoryFields') . ')'; ?> :</p>
<pre> <pre>
<b>UserName</b>;<b>ClassName</b> <b>UserName</b>;<b>ClassName</b>
jdoe;class01 jdoe;class01

Write Preview
Loading…
Cancel
Save