|
@@ -26,11 +26,13 @@
|
|
|
* @package dokeos.admin
|
|
|
==============================================================================
|
|
|
*/
|
|
|
+
|
|
|
/**
|
|
|
- * validate the imported data
|
|
|
+ * Validates imported data.
|
|
|
*/
|
|
|
function validate_data($courses) {
|
|
|
global $_configuration;
|
|
|
+ global $purification_option_for_usernames;
|
|
|
$dbnamelength = strlen($_configuration['db_prefix']);
|
|
|
//Ensure the prefix + database name do not get over 40 characters
|
|
|
$maxlength = 40 - $dbnamelength;
|
|
@@ -39,30 +41,31 @@ function validate_data($courses) {
|
|
|
$coursecodes = array ();
|
|
|
foreach ($courses as $index => $course) {
|
|
|
$course['line'] = $index +1;
|
|
|
- //1. check if mandatory fields are set
|
|
|
+ // 1. Check whether mandatory fields are set.
|
|
|
$mandatory_fields = array ('Code', 'Title', 'CourseCategory', 'Teacher');
|
|
|
foreach ($mandatory_fields as $key => $field) {
|
|
|
- if (!isset ($course[$field]) || strlen($course[$field]) == 0)
|
|
|
- {
|
|
|
+ if (!isset($course[$field]) || strlen($course[$field]) == 0) {
|
|
|
$course['error'] = get_lang($field.'Mandatory');
|
|
|
$errors[] = $course;
|
|
|
}
|
|
|
}
|
|
|
- //2. check if code isn't in use
|
|
|
+ // 2. Check current course code.
|
|
|
if (isset ($course['Code']) && strlen($course['Code']) != 0) {
|
|
|
- //2.1 check if code allready used in this CVS-file
|
|
|
+ // 2.1 Check whether code has been allready used by this CVS-file.
|
|
|
if (isset ($coursecodes[$course['Code']])) {
|
|
|
$course['error'] = get_lang('CodeTwiceInFile');
|
|
|
$errors[] = $course;
|
|
|
- } elseif (api_strlen($course['Code']) > $maxlength) {
|
|
|
+ }
|
|
|
+ // 2.2 Check course code length.
|
|
|
+ elseif (api_strlen($course['Code']) > $maxlength) {
|
|
|
$course['error'] = get_lang('Max');
|
|
|
$errors[] = $course;
|
|
|
}
|
|
|
- //2.3 check if code allready used in DB
|
|
|
+ // 2.3 Check whether course code has been occupied.
|
|
|
else {
|
|
|
$course_table = Database :: get_main_table(TABLE_MAIN_COURSE);
|
|
|
$sql = "SELECT * FROM $course_table WHERE code = '".Database::escape_string($course['Code'])."'";
|
|
|
- $res = api_sql_query($sql, __FILE__, __LINE__);
|
|
|
+ $res = Database::query($sql, __FILE__, __LINE__);
|
|
|
if (Database::num_rows($res) > 0) {
|
|
|
$course['error'] = get_lang('CodeExists');
|
|
|
$errors[] = $course;
|
|
@@ -70,23 +73,20 @@ function validate_data($courses) {
|
|
|
}
|
|
|
$coursecodes[$course['Code']] = 1;
|
|
|
}
|
|
|
- //3. check if teacher exists
|
|
|
- if (isset ($course['Teacher']) && strlen($course['Teacher']) != 0)
|
|
|
- {
|
|
|
- if (UserManager :: is_username_available($course['Teacher']))
|
|
|
- {
|
|
|
- $course['error'] = get_lang('UnknownTeacher').' ('.$course['Teacher'].')';
|
|
|
+ // 3. Check whether teacher exists.
|
|
|
+ if (!UserManager::is_username_empty($course['Teacher'])) {
|
|
|
+ $teacher = UserManager::purify_username($course['Teacher'], $purification_option_for_usernames);
|
|
|
+ if (UserManager::is_username_available($teacher)) {
|
|
|
+ $course['error'] = get_lang('UnknownTeacher').' ('.$teacher.')';
|
|
|
$errors[] = $course;
|
|
|
}
|
|
|
}
|
|
|
- //4. check if category exists
|
|
|
- if (isset ($course['CourseCategory']) && strlen($course['CourseCategory']) != 0)
|
|
|
- {
|
|
|
+ // 4. Check whether course category exists.
|
|
|
+ if (isset ($course['CourseCategory']) && strlen($course['CourseCategory']) != 0) {
|
|
|
$category_table = Database :: get_main_table(TABLE_MAIN_CATEGORY);
|
|
|
- $sql = "SELECT * FROM $category_table WHERE code = '".mysql_real_escape_string($course['CourseCategory'])."'";
|
|
|
- $res = api_sql_query($sql, __FILE__, __LINE__);
|
|
|
- if (mysql_num_rows($res) == 0)
|
|
|
- {
|
|
|
+ $sql = "SELECT * FROM $category_table WHERE code = '".Database::escape_string($course['CourseCategory'])."'";
|
|
|
+ $res = Database::query($sql, __FILE__, __LINE__);
|
|
|
+ if (Database::num_rows($res) == 0) {
|
|
|
$course['error'] = get_lang('UnkownCategory').' ('.$course['CourseCategory'].')';
|
|
|
$errors[] = $course;
|
|
|
}
|
|
@@ -96,31 +96,24 @@ function validate_data($courses) {
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * Save the imported data
|
|
|
- * @param array List of courses info
|
|
|
+ * Saves imported data.
|
|
|
+ * @param array List of courses
|
|
|
*/
|
|
|
-function save_data($courses)
|
|
|
-{
|
|
|
+function save_data($courses) {
|
|
|
global $_configuration, $firstExpirationDelay;
|
|
|
+ global $purification_option_for_usernames;
|
|
|
$msg = '';
|
|
|
- $enabled_languages = api_get_languages();
|
|
|
- $enabled_languages = $enabled_languages["folder"];
|
|
|
- foreach($courses as $index => $course)
|
|
|
- {
|
|
|
- $course_language = $course['Language'];
|
|
|
- if (empty($course_language) || !in_array($course_language, $enabled_languages))
|
|
|
- {
|
|
|
- $course_language = api_get_setting('platformLanguage');
|
|
|
- }
|
|
|
- $keys = define_course_keys($course['Code'], "", $_configuration['db_prefix']);
|
|
|
+ foreach ($courses as $index => $course) {
|
|
|
+ $course_language = api_validate_language($course['Language']);
|
|
|
+ $keys = define_course_keys($course['Code'], '', $_configuration['db_prefix']);
|
|
|
$user_table = Database::get_main_table(TABLE_MAIN_USER);
|
|
|
- $sql = "SELECT user_id, ".(api_is_western_name_order(null, $course_language) ? "CONCAT(firstname,' ',lastname)" : "CONCAT(lastname,' ',firstname)")." AS name FROM $user_table WHERE username = '".Database::escape_string($course['Teacher'])."'";
|
|
|
- $res = api_sql_query($sql,__FILE__,__LINE__);
|
|
|
- $teacher = mysql_fetch_object($res);
|
|
|
- $visual_code = $keys["currentCourseCode"];
|
|
|
- $code = $keys["currentCourseId"];
|
|
|
- $db_name = $keys["currentCourseDbName"];
|
|
|
- $directory = $keys["currentCourseRepository"];
|
|
|
+ $sql = "SELECT user_id, ".(api_is_western_name_order(null, $course_language) ? "CONCAT(firstname,' ',lastname)" : "CONCAT(lastname,' ',firstname)")." AS name FROM $user_table WHERE username = '".Database::escape_string(UserManager::purify_username($course['Teacher'], $purification_option_for_usernames))."'";
|
|
|
+ $res = Database::query($sql,__FILE__,__LINE__);
|
|
|
+ $teacher = Database::fetch_object($res);
|
|
|
+ $visual_code = $keys['currentCourseCode'];
|
|
|
+ $code = $keys['currentCourseId'];
|
|
|
+ $db_name = $keys['currentCourseDbName'];
|
|
|
+ $directory = $keys['currentCourseRepository'];
|
|
|
$expiration_date = time() + $firstExpirationDelay;
|
|
|
prepare_course_repository($directory, $code);
|
|
|
update_Db_course($db_name);
|
|
@@ -133,13 +126,13 @@ function save_data($courses)
|
|
|
Display::display_normal_message($msg,false);
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
/**
|
|
|
* Read the CSV-file
|
|
|
* @param string $file Path to the CSV-file
|
|
|
* @return array All course-information read from the file
|
|
|
*/
|
|
|
-function parse_csv_data($file)
|
|
|
-{
|
|
|
+function parse_csv_data($file) {
|
|
|
$courses = Import :: csv_to_array($file);
|
|
|
return $courses;
|
|
|
}
|
|
@@ -148,43 +141,39 @@ $language_file = array ('admin', 'registration','create_course', 'document');
|
|
|
|
|
|
$cidReset = true;
|
|
|
|
|
|
-include ('../inc/global.inc.php');
|
|
|
+include '../inc/global.inc.php';
|
|
|
+
|
|
|
+$this_section = SECTION_PLATFORM_ADMIN;
|
|
|
api_protect_admin_script();
|
|
|
-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).'usermanager.lib.php');
|
|
|
-require_once (api_get_path(CONFIGURATION_PATH).'add_course.conf.php');
|
|
|
-require_once (api_get_path(LIBRARY_PATH).'add_course.lib.inc.php');
|
|
|
-require_once (api_get_path(LIBRARY_PATH).'formvalidator/FormValidator.class.php');
|
|
|
-$formSent = 0;
|
|
|
-$errorMsg = '';
|
|
|
+
|
|
|
+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).'usermanager.lib.php';
|
|
|
+require_once api_get_path(CONFIGURATION_PATH).'add_course.conf.php';
|
|
|
+require_once api_get_path(LIBRARY_PATH).'add_course.lib.inc.php';
|
|
|
+require_once api_get_path(LIBRARY_PATH).'formvalidator/FormValidator.class.php';
|
|
|
+
|
|
|
$defined_auth_sources[] = PLATFORM_AUTH_SOURCE;
|
|
|
-if (is_array($extAuthSource))
|
|
|
-{
|
|
|
+if (is_array($extAuthSource)) {
|
|
|
$defined_auth_sources = array_merge($defined_auth_sources, array_keys($extAuthSource));
|
|
|
}
|
|
|
|
|
|
$tool_name = get_lang('ImportCourses').' CSV';
|
|
|
|
|
|
-$interbreadcrumb[] = array ("url" => 'index.php', "name" => get_lang('PlatformAdmin'));
|
|
|
+$interbreadcrumb[] = array ('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
|
|
|
|
|
|
set_time_limit(0);
|
|
|
Display :: display_header($tool_name);
|
|
|
|
|
|
-if ($_POST['formSent'])
|
|
|
-{
|
|
|
- if(empty($_FILES['import_file']['tmp_name']))
|
|
|
- {
|
|
|
+if ($_POST['formSent']) {
|
|
|
+ if (empty($_FILES['import_file']['tmp_name'])) {
|
|
|
$error_message = get_lang('UplUploadFailed');
|
|
|
Display :: display_error_message($error_message, false);
|
|
|
- }
|
|
|
- else
|
|
|
- {
|
|
|
+ } else {
|
|
|
$file_type = $_POST['file_type'];
|
|
|
$courses = parse_csv_data($_FILES['import_file']['tmp_name']);
|
|
|
$errors = validate_data($courses);
|
|
|
- if (count($errors) == 0)
|
|
|
- {
|
|
|
+ if (count($errors) == 0) {
|
|
|
//$users = complete_missing_data($courses);
|
|
|
save_data($courses);
|
|
|
//header('Location: user_list.php?action=show_message&message='.urlencode(get_lang('FileImported')));
|
|
@@ -193,11 +182,9 @@ if ($_POST['formSent'])
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-if (count($errors) != 0)
|
|
|
-{
|
|
|
+if (count($errors) != 0) {
|
|
|
$error_message = '<ul>';
|
|
|
- foreach ($errors as $index => $error_course)
|
|
|
- {
|
|
|
+ foreach ($errors as $index => $error_course) {
|
|
|
$error_message .= '<li>'.get_lang('Line').' '.$error_course['line'].': <b>'.$error_course['error'].'</b>: ';
|
|
|
$error_message .= $error_course['Code'].' '.$error_course['Title'];
|
|
|
$error_message .= '</li>';
|
|
@@ -239,11 +226,4 @@ BIO0015;Biology;BIO;username;english
|
|
|
|
|
|
<?php
|
|
|
|
|
|
-
|
|
|
-/*
|
|
|
-==============================================================================
|
|
|
- FOOTER
|
|
|
-==============================================================================
|
|
|
-*/
|
|
|
Display :: display_footer();
|
|
|
-?>
|