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 unique email validation option see BT#8676

Browse Source
1.9.x
Julio Montoya 11 years ago
parent eb9c3cad2e
commit acdc14c479
2 changed files with 73 additions and 32 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. 95
      main/admin/user_import.php
  2. 10
      main/admin/user_list.php

95
main/admin/user_import.php
Unescape View File

@ -9,7 +9,7 @@
* Validate the imported data.
*/
$language_file = array ('admin', 'registration');
$language_file = array('admin', 'registration');
$cidReset = true;
require '../inc/global.inc.php';
@ -22,7 +22,12 @@ require_once api_get_path(LIBRARY_PATH).'import.lib.php';
// Set this option to true to enforce strict purification for usenames.
$purification_option_for_usernames = false;
function validate_data($users)
/**
* @param array $users
* @param bool $checkUniqueEmail
* @return array
*/
function validate_data($users, $checkUniqueEmail = false)
{
global $defined_auth_sources;
$errors = array();
@ -44,7 +49,6 @@ function validate_data($users)
$errors[] = $user;
}
}
// 2. Check username, first, check whether it is empty.
if (!UserManager::is_username_empty($user['UserName'])) {
// 2.1. Check whether username is too long.
@ -58,12 +62,21 @@ function validate_data($users)
$errors[] = $user;
}
$usernames[$user['UserName']] = 1;
// 2.3. Check whether username is allready occupied.
// 2.3. Check whether username is already occupied.
if (!UserManager::is_username_available($user['UserName'])) {
$user['error'] = get_lang('UserNameNotAvailable');
$errors[] = $user;
}
if ($checkUniqueEmail) {
$userFromEmail = api_get_user_info_from_email($user['Email']);
if (!empty($userFromEmail)) {
$user['error'] = get_lang('EmailUsedTwice');
$errors[] = $user;
}
}
}
// 3. Check status.
if (isset($user['Status']) && !api_status_exists($user['Status'])) {
$user['error'] = get_lang('WrongStatus');
@ -123,9 +136,11 @@ function complete_missing_data($user)
if (empty($user['AuthSource'])) {
$user['AuthSource'] = PLATFORM_AUTH_SOURCE;
}
if (empty($user['ExpiryDate'])) {
if (empty($user['ExpiryDate'])) {
$user['ExpiryDate'] = '0000-00-00 00:00:00';
}
return $user;
}
@ -142,9 +157,9 @@ function save_data($users)
if (!isset($inserted_in_course)) {
$inserted_in_course = array();
}
require_once api_get_path(LIBRARY_PATH).'mail.lib.inc.php';
$usergroup = new UserGroup();
$send_mail = $_POST['sendMail'] ? true : false;
if (is_array($users)) {
foreach ($users as $user) {
$user = complete_missing_data($user);
@ -304,13 +319,13 @@ function parse_xml_data($file)
xml_parser_set_option($parser, XML_OPTION_CASE_FOLDING, false);
xml_parse($parser, api_utf8_encode_xml(file_get_contents($file)));
xml_parser_free($parser);
return $users;
}
$this_section = SECTION_PLATFORM_ADMIN;
api_protect_admin_script(true, null, 'login');
$defined_auth_sources[] = PLATFORM_AUTH_SOURCE;
if (is_array($extAuthSource)) {
@ -325,24 +340,29 @@ $extra_fields = UserManager::get_extra_fields(0, 0, 5, 'ASC', true);
$user_id_error = array();
$error_message = '';
if (isset($_POST['formSent']) && $_POST['formSent'] AND $_FILES['import_file']['size'] !== 0) {
if (isset($_POST['formSent']) && $_POST['formSent'] AND
$_FILES['import_file']['size'] !== 0
) {
$file_type = $_POST['file_type'];
Security::clear_token();
$tok = Security::get_token();
$allowed_file_mimetype = array('csv', 'xml');
$error_kind_file = false;
$checkUniqueEmail = isset($_POST['check_unique_email']) ?
$_POST['check_unique_email'] :null;
$uploadInfo = pathinfo($_FILES['import_file']['name']);
$ext_import_file = $uploadInfo['extension'];
if (in_array($ext_import_file, $allowed_file_mimetype)) {
if (strcmp($file_type, 'csv') === 0 && $ext_import_file == $allowed_file_mimetype[0]) {
$users = parse_csv_data($_FILES['import_file']['tmp_name']);
$errors = validate_data($users);
$errors = validate_data($users, $checkUniqueEmail);
$error_kind_file = false;
} elseif (strcmp($file_type, 'xml') === 0 && $ext_import_file == $allowed_file_mimetype[1]) {
$users = parse_xml_data($_FILES['import_file']['tmp_name']);
$errors = validate_data($users);
$errors = validate_data($users, $checkUniqueEmail);
$error_kind_file = false;
} else {
$error_kind_file = true;
@ -386,10 +406,15 @@ if (isset($_POST['formSent']) && $_POST['formSent'] AND $_FILES['import_file']['
if (count($errors) != 0) {
$warning_message = '<ul>';
foreach ($errors as $index => $error_user) {
$email = isset($error_user['Email']) ? ' - '.$error_user['Email'] :
null;
$warning_message .= '<li><b>'.$error_user['error'].'</b>: ';
$warning_message .=
'<strong>'.$error_user['UserName'].'</strong>&nbsp;('.
api_get_person_name($error_user['FirstName'], $error_user['LastName']).')';
'<strong>'.$error_user['UserName'].'</strong> - '.
api_get_person_name(
$error_user['FirstName'],
$error_user['LastName']).'
'.$email;
$warning_message .= '</li>';
}
$warning_message .= '</ul>';
@ -406,8 +431,8 @@ if (isset($_POST['formSent']) && $_POST['formSent'] AND $_FILES['import_file']['
header('Location: '.api_get_path(WEB_CODE_PATH).'admin/user_list.php?action=show_message&warn='.urlencode($warning_message).'&message='.urlencode($see_message_import).'&sec_token='.$tok);
exit;
}
}
Display :: display_header($tool_name);
if (!empty($error_message)) {
@ -418,28 +443,38 @@ $form = new FormValidator('user_import','post','user_import.php');
$form->addElement('header', '', $tool_name);
$form->addElement('hidden', 'formSent');
$form->addElement('file', 'import_file', get_lang('ImportFileLocation'));
$group = array();
$group[] = $form->createElement(
'radio',
'file_type',
'',
'CSV (<a href="example.csv" target="_blank">'.get_lang('ExampleCSVFile').'</a>)',
'csv'
);
$group[] = $form->createElement(
'radio',
'file_type',
null,
'XML (<a href="example.xml" target="_blank">'.get_lang('ExampleXMLFile').'</a>)',
'xml'
$group = array(
$form->createElement(
'radio',
'file_type',
'',
'CSV (<a href="example.csv" target="_blank">'.get_lang('ExampleCSVFile').'</a>)',
'csv'
),
$form->createElement(
'radio',
'file_type',
null,
'XML (<a href="example.xml" target="_blank">'.get_lang('ExampleXMLFile').'</a>)',
'xml'
)
);
$form->addGroup($group, '', get_lang('FileType'), '<br/>');
$group = array();
$group[] = $form->createElement('radio', 'sendMail', '', get_lang('Yes'), 1);
$group[] = $form->createElement('radio', 'sendMail', null, get_lang('No'), 0);
$group = array(
$form->createElement('radio', 'sendMail', '', get_lang('Yes'), 1),
$form->createElement('radio', 'sendMail', null, get_lang('No'), 0)
);
$form->addGroup($group, '', get_lang('SendMailToUsers'), '<br/>');
$form->addElement(
'checkbox',
'check_unique_email',
'',
get_lang('CheckUniqueEmail')
);
$form->addElement('style_submit_button', 'submit', get_lang('Import'), 'class="save"');
$defaults['formSent'] = 1;
$defaults['sendMail'] = 0;

10
main/admin/user_list.php
Unescape View File

@ -655,10 +655,16 @@ if (!empty($action)) {
case 'show_message' :
if (!empty($_GET['warn'])) {
// to prevent too long messages
if ($_GET['warn'] == 'session_message'){
if ($_GET['warn'] == 'session_message') {
$_GET['warn'] = $_SESSION['session_message_import_users'];
}
$message .= Display::return_message(Security::remove_XSS($_GET['warn']), 'warning', false);
if (isset($_GET['warn']) && !empty($_GET['warn'])) {
$message .= Display::return_message(
Security::remove_XSS($_GET['warn']),
'warning',
false
);
}
}
if (!empty($_GET['message'])) {
$message .= Display::return_message(stripslashes($_GET['message']), 'confirmation');

Write Preview
Loading…
Cancel
Save