| '.get_lang('Course').' | '; - $t_head .= ''.cut(get_lang('AvgTimeSpentInTheCourse'), 6, true).' | '; - $t_head .= ''.cut(get_lang('AvgStudentsProgress'), 6, true).' | '; - $t_head .= ''.cut(get_lang('AvgCourseScore'), 6, true).' | '; - //$t_head .= ''.get_lang('AvgExercisesScore').' | ';
- $t_head .= ' '.cut(get_lang('AvgMessages'), 6, true).' | '; - $t_head .= ''.cut(get_lang('AvgAssignments'), 6, true).' | '; - $t_head .= ''.get_lang('TotalExercisesScoreObtained').' | '; - //$t_head .= ''.get_lang('TotalExercisesScorePossible').' | ';
- $t_head .= ' '.cut(get_lang('TotalExercisesAnswered'), 6, true).' | '; - //$t_head .= ''.get_lang('TotalExercisesScorePercentage').' | ';
- //$t_head .= ' '.get_lang('FirstLogin').' | ';
- $t_head .= ' '.get_lang('LatestLogin').' | '; - $t_head .= '
|---|
| '.get_lang('Course').' | '; - $return .= ''.get_lang('AvgTimeSpentInTheCourse').' | '; - $return .= ''.get_lang('AvgStudentsProgress').' | '; - $return .= ''.get_lang('AvgCourseScore').' | '; - $return .= ''.get_lang('AvgExercisesScore').' | '; - $return .= ''.get_lang('AvgMessages').' | '; - $return .= ''.get_lang('AvgAssignments').' | '; - $return .= ''.get_lang('TotalExercisesScoreObtained').' | '; - $return .= ''.get_lang('TotalExercisesScorePossible').' | '; - $return .= ''.get_lang('TotalExercisesAnswered').' | '; - $return .= ''.get_lang('TotalExercisesScorePercentage').' | '; - $return .= ''.get_lang('FirstLogin').' | '; - $return .= ''.get_lang('LatestLogin').' | '; - $return .= '
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| '.cut($row[0], 20, true).' | '; - // time spent in the course - $return .= ''.api_time_to_hms(Tracking :: get_time_spent_on_the_course($user_id, $row[0])).' | ';
- // student progress in course
- $return .= ' '.round(Tracking :: get_avg_student_progress($user_id, $row[0]), 2).' | ';
- // student score
- $return .= ' '.round(Tracking :: get_avg_student_score($user_id, $row[0]), 2).' | ';
- // student tes score
- //$return .= ' '.round(Tracking :: get_avg_student_exercise_score ($user_id, $row[0]),2).'% | ';
- // student messages
- $return .= ' '.Tracking :: count_student_messages($user_id, $row[0]).' | ';
- // student assignments
- $return .= ' '.Tracking :: count_student_assignments($user_id, $row[0]).' | ';
- // student exercises results (obtained score, maximum score, number of exercises answered, score percentage)
- $exercises_results = exercises_results($user_id, $row[0]);
- $return .= ' '.(is_null($exercises_results['percentage']) ? '' : $exercises_results['score_obtained'].'/'.$exercises_results['score_possible'].' ( '.$exercises_results['percentage'].'% )').' | ';
- //$return .= ' '.$exercises_results['score_possible'].' | ';
- $return .= ' '.$exercises_results['questions_answered'].' | ';
- //$return .= ' '.$exercises_results['percentage'].'% | ';
- // first connection
- //$return .= ' '.Tracking :: get_first_connection_date_on_the_course ($user_id, $row[0]).' | '; - // last connection - $return .= ''.Tracking :: get_last_connection_date_on_the_course ($user_id, $row[0]).' | ';
- $return .= '
- '.$message.'
- '.$message.'
.'2rightarrow.gif)
| '.get_lang('Course').' | '; + $return .= ''.get_lang('AvgTimeSpentInTheCourse').' | '; + $return .= ''.get_lang('AvgStudentsProgress').' | '; + $return .= ''.get_lang('AvgCourseScore').' | '; + $return .= ''.get_lang('AvgExercisesScore').' | '; + $return .= ''.get_lang('AvgMessages').' | '; + $return .= ''.get_lang('AvgAssignments').' | '; + $return .= ''.get_lang('TotalExercisesScoreObtained').' | '; + $return .= ''.get_lang('TotalExercisesScorePossible').' | '; + $return .= ''.get_lang('TotalExercisesAnswered').' | '; + $return .= ''.get_lang('TotalExercisesScorePercentage').' | '; + $return .= ''.get_lang('FirstLogin').' | '; + $return .= ''.get_lang('LatestLogin').' | '; + $return .= '
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| '.cut($row[0], 20, true).' | '; + // time spent in the course + $return .= ''.api_time_to_hms(Tracking :: get_time_spent_on_the_course($user_id, $row[0])).' | ';
+ // student progress in course
+ $return .= ' '.round(Tracking :: get_avg_student_progress($user_id, $row[0]), 2).' | ';
+ // student score
+ $return .= ' '.round(Tracking :: get_avg_student_score($user_id, $row[0]), 2).' | ';
+ // student tes score
+ //$return .= ' '.round(Tracking :: get_avg_student_exercise_score ($user_id, $row[0]),2).'% | ';
+ // student messages
+ $return .= ' '.Tracking :: count_student_messages($user_id, $row[0]).' | ';
+ // student assignments
+ $return .= ' '.Tracking :: count_student_assignments($user_id, $row[0]).' | ';
+ // student exercises results (obtained score, maximum score, number of exercises answered, score percentage)
+ $exercises_results = MySpace::exercises_results($user_id, $row[0]);
+ $return .= ' '.(is_null($exercises_results['percentage']) ? '' : $exercises_results['score_obtained'].'/'.$exercises_results['score_possible'].' ( '.$exercises_results['percentage'].'% )').' | ';
+ //$return .= ' '.$exercises_results['score_possible'].' | ';
+ $return .= ' '.$exercises_results['questions_answered'].' | ';
+ //$return .= ' '.$exercises_results['percentage'].'% | ';
+ // first connection
+ //$return .= ' '.Tracking :: get_first_connection_date_on_the_course ($user_id, $row[0]).' | '; + // last connection + $return .= ''.Tracking :: get_last_connection_date_on_the_course ($user_id, $row[0]).' | ';
+ $return .= '
| '.get_lang('Course').' | '; + $t_head .= ''.cut(get_lang('AvgTimeSpentInTheCourse'), 6, true).' | '; + $t_head .= ''.cut(get_lang('AvgStudentsProgress'), 6, true).' | '; + $t_head .= ''.cut(get_lang('AvgCourseScore'), 6, true).' | '; + //$t_head .= ''.get_lang('AvgExercisesScore').' | ';
+ $t_head .= ' '.cut(get_lang('AvgMessages'), 6, true).' | '; + $t_head .= ''.cut(get_lang('AvgAssignments'), 6, true).' | '; + $t_head .= ''.get_lang('TotalExercisesScoreObtained').' | '; + //$t_head .= ''.get_lang('TotalExercisesScorePossible').' | ';
+ $t_head .= ' '.cut(get_lang('TotalExercisesAnswered'), 6, true).' | '; + //$t_head .= ''.get_lang('TotalExercisesScorePercentage').' | ';
+ //$t_head .= ' '.get_lang('FirstLogin').' | ';
+ $t_head .= ' '.get_lang('LatestLogin').' | '; + $t_head .= '
|---|
- '.$message.'
- '.$message.'
"; + $sql = "SELECT creator_id FROM $table_user WHERE username='$username' "; + + $rs = Database::query($sql); + $creator_id = Database::result($rs, 0, 0); + // check if we are the creators or not + if ($creator_id != '') { + if ($creator_id != api_get_user_id()) { + $user['error'] = get_lang('UserAlreadyRegisteredByOtherCreator'); + $errors[] = $user; + } + } + } + return $errors; + } + + /** + * Validates imported data. + * @param list of users + */ + function validate_data($users, $id_session = null) { + $errors = array(); + $usernames = array(); + $new_users = array(); + foreach ($users as $index => $user) { + // 1. Check whether mandatory fields are set. + $mandatory_fields = array('LastName', 'FirstName'); + if (api_get_setting('registration', 'email') == 'true') { + $mandatory_fields[] = 'Email'; + } + + foreach ($mandatory_fields as $key => $field) { + if (!isset ($user[$field]) || strlen($user[$field]) == 0) { + $user['error'] = get_lang($field.'Mandatory'); + $errors[] = $user; + } + } + // 2. Check whether the username is too long. + if (UserManager::is_username_too_long($user['UserName'])) { + $user['error'] = get_lang('UserNameTooLong'); + $errors[] = $user; + } + + $user['UserName'] = trim($user['UserName']); + + if (empty($user['UserName'])) { + $user['UserName'] = UserManager::create_username($user['FirstName'], $user['LastName']); + } + $new_users[] = $user; + } + $results = array('errors' => $errors, 'users' => $new_users); + return $results; + } + + /** + * Adds missing user-information (which isn't required, like password, etc). + */ + function complete_missing_data($user) { + // 1. Generate a password if it is necessary. + if (!isset ($user['Password']) || strlen($user['Password']) == 0) { + $user['Password'] = api_generate_password(); + } + return $user; + } + + /** + * Saves imported data. + */ + function save_data($users, $course_list, $id_session) { + $tbl_session = Database::get_main_table(TABLE_MAIN_SESSION); + $tbl_session_rel_course = Database::get_main_table(TABLE_MAIN_SESSION_COURSE); + $tbl_session_rel_course_rel_user = Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER); + $tbl_session_rel_user = Database::get_main_table(TABLE_MAIN_SESSION_USER); + + $id_session = intval($id_session); + $sendMail = $_POST['sendMail'] ? 1 : 0; + + // Adding users to the platform. + $new_users = array(); + foreach ($users as $index => $user) { + $user = MySpace::complete_missing_data($user); + // coach only will registered users + $default_status = '5'; + if ($user['create'] == '1') { + $user['id'] = UserManager :: create_user($user['FirstName'], $user['LastName'], $default_status, $user['Email'], $user['UserName'], $user['Password'], $user['OfficialCode'], api_get_setting('PlatformLanguage'), $user['PhoneNumber'], ''); + $user['added_at_platform'] = 1; + } else { + $user['id'] = $user['create']; + $user['added_at_platform'] = 0; + } + $new_users[] = $user; + } + // Update user list. + $users = $new_users; + + // Inserting users. + $super_list = array(); + foreach ($course_list as $enreg_course) { + $nbr_users = 0; + $new_users = array(); + $enreg_course = Database::escape_string($enreg_course); + foreach ($users as $index => $user) { + $userid = intval($user['id']); + $sql = "INSERT IGNORE INTO $tbl_session_rel_course_rel_user(id_session,course_code,id_user) VALUES('$id_session','$enreg_course','$userid')"; + $course_session = array('course' => $enreg_course, 'added' => 1); + //$user['added_at_session'] = $course_session; + Database::query($sql); + if (Database::affected_rows()) { + $nbr_users++; + } + $new_users[] = $user; + } + $super_list[] = $new_users; + + //update the nbr_users field + $sql_select = "SELECT COUNT(id_user) as nbUsers FROM $tbl_session_rel_course_rel_user WHERE id_session='$id_session' AND course_code='$enreg_course'"; + $rs = Database::query($sql_select); + list($nbr_users) = Database::fetch_array($rs); + $sql_update = "UPDATE $tbl_session_rel_course SET nbr_users=$nbr_users WHERE id_session='$id_session' AND course_code='$enreg_course'"; + Database::query($sql_update); + + $sql_update = "UPDATE $tbl_session SET nbr_users= '$nbr_users' WHERE id='$id_session'"; + Database::query($sql_update); + } + // We don't delete the users (thoughts while dreaming) + //$sql_delete = "DELETE FROM $tbl_session_rel_user WHERE id_session = '$id_session'"; + //Database::query($sql_delete); + + $new_users = array(); + foreach ($users as $index => $user) { + $userid = $user['id']; + $sql_insert = "INSERT IGNORE INTO $tbl_session_rel_user(id_session, id_user) VALUES('$id_session','$userid')"; + Database::query($sql_insert); + $user['added_at_session'] = 1; + $new_users[] = $user; + } + + $users = $new_users; + $registered_users = get_lang('FileImported').'
Import file results :
'; + // Sending emails. + $addedto = ''; + if ($sendMail) { + $i = 0; + foreach ($users as $index => $user) { + $emailto = api_get_person_name($user['FirstName'], $user['LastName'], null, PERSON_NAME_EMAIL_ADDRESS).' <'.$user['Email'].'>'; + $emailsubject = '['.api_get_setting('siteName').'] '.get_lang('YourReg').' '.api_get_setting('siteName'); + $emailbody = get_lang('Dear').' '.api_get_person_name($user['FirstName'], $user['LastName']).",\n\n".get_lang('YouAreReg')." ".api_get_setting('siteName')." ".get_lang('WithTheFollowingSettings')."\n\n".get_lang('Username')." : $user[UserName]\n".get_lang('Pass')." : $user[Password]\n\n".get_lang('Address')." ".api_get_setting('siteName')." ".get_lang('Is')." : ".api_get_path('WEB_PATH')." \n\n".get_lang('Problem')."\n\n".get_lang('Formula').",\n\n".api_get_person_name(api_get_setting('administratorName'), api_get_setting('administratorSurname'))."\n".get_lang('Manager')." ".api_get_setting('siteName')."\nT. ".api_get_setting('administratorTelephone')."\n".get_lang('Email')." : ".api_get_setting('emailAdministrator').""; + $emailheaders = 'From: '.api_get_person_name(api_get_setting('administratorName'), api_get_setting('administratorSurname'), null, PERSON_NAME_EMAIL_ADDRESS).' <'.api_get_setting('emailAdministrator').">\n"; + $emailheaders .= 'Reply-To: '.api_get_setting('emailAdministrator'); + @api_send_mail($emailto, $emailsubject, $emailbody, $emailheaders); + + if (($user['added_at_platform'] == 1 && $user['added_at_session'] == 1) || $user['added_at_session'] == 1) { + if ($user['added_at_platform'] == 1) { + $addedto = get_lang('UserCreatedPlatform'); + } else { + $addedto = ' '; + } + + if ($user['added_at_session'] == 1) { + $addedto .= get_lang('UserInSession'); + } + $registered_users .= "".api_get_person_name($user['FirstName'], $user['LastName'])." - ".$addedto.'
'; + } else { + $addedto = get_lang('UserNotAdded'); + $registered_users .= "".api_get_person_name($user['FirstName'], $user['LastName'])." - ".$addedto.'
'; + } + } + } else { + $i = 0; + foreach ($users as $index => $user) { + if (($user['added_at_platform'] == 1 && $user['added_at_session'] == 1) || $user['added_at_session'] == 1) { + if ($user['added_at_platform'] == 1) { + $addedto = get_lang('UserCreatedPlatform'); + } else { + $addedto = ' '; + } + + if ($user['added_at_session'] == 1) { + $addedto .= ' '.get_lang('UserInSession'); + } + + $registered_users .= "".api_get_person_name($user['FirstName'], $user['LastName'])." - ".$addedto.'
'; + } else { + $addedto = get_lang('UserNotAdded'); + $registered_users .= "".api_get_person_name($user['FirstName'], $user['LastName'])." - ".$addedto.'
'; + } + } + } + + header('Location: course.php?id_session='.$id_session.'&action=show_message&message='.urlencode($registered_users)); + exit (); + + //header('Location: resume_session.php?id_session='.$id_session); + } + + /** + * Reads CSV-file. + * @param string $file Path to the CSV-file + * @return array All userinformation read from the file + */ + function parse_csv_data($file) { + $users = Import :: csv_to_array($file); + foreach ($users as $index => $user) { + if (isset ($user['Courses'])) { + $user['Courses'] = explode('|', trim($user['Courses'])); + } + $users[$index] = $user; + } + return $users; + } + + /** + * XML-parser: the handler at the beginning of element. + */ + function element_start($parser, $data) { + $data = api_utf8_decode($data); + global $user; + global $current_tag; + switch ($data) { + case 'Contact' : + $user = array (); + break; + default : + $current_tag = $data; + } + } + + /** + * XML-parser: the handler at the end of element. + */ + function element_end($parser, $data) { + $data = api_utf8_decode($data); + global $user; + global $users; + global $current_value; + global $purification_option_for_usernames; + $user[$data] = $current_value; + switch ($data) { + case 'Contact' : + $user['UserName'] = UserManager::purify_username($user['UserName'], $purification_option_for_usernames); + $users[] = $user; + break; + default : + $user[$data] = $current_value; + break; + } + } + + /** + * XML-parser: the handler for character data. + */ + function character_data($parser, $data) { + $data = trim(api_utf8_decode($data)); + global $current_value; + $current_value = $data; + } + + /** + * Reads XML-file. + * @param string $file Path to the XML-file + * @return array All userinformation read from the file + */ + function parse_xml_data($file) { + global $current_tag; + global $current_value; + global $user; + global $users; + $users = array (); + $parser = xml_parser_create('UTF-8'); + xml_set_element_handler($parser, array('MySpace','element_start'), array('MySpace','element_end')); + xml_set_character_data_handler($parser, "character_data"); + 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; } - return $message; -} +} \ No newline at end of file diff --git a/main/mySpace/user_import.php b/main/mySpace/user_import.php index c52f12f2e1..984325292f 100755 --- a/main/mySpace/user_import.php +++ b/main/mySpace/user_import.php @@ -27,429 +27,6 @@ * Created on 26 julio 2008 by Julio Montoya gugli100@gmail.com ============================================================================== */ - -/** - * Checks if a username exist in the DB otherwise it create a "double" - * i.e. if we look into for jmontoya but the user's name already exist we create the user jmontoya2 - * the return array will be array(username=>'jmontoya', sufix='2') - * @param string firstname - * @param string lastname - * @param string username - * @return array with the username, the sufix - * @author Julio Montoya Armas - */ -function make_username($firstname, $lastname, $username, $language = null, $encoding = null) { - $table_user = Database::get_main_table(TABLE_MAIN_USER); - $tbl_session_rel_course_rel_user = Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER); - // if username exist - if (!UserManager::is_username_available($username) || empty($username)) { - $i = 0; - while (1) { - if ($i == 0) { - $sufix = ''; - } else { - $sufix = $i; - } - $desired_username = UserManager::create_username($firstname, $lastname, $language, $encoding); - if (UserManager::is_username_available($desired_username.$sufix)) { - break; - } else { - $i++; - } - } - $username_array = array('username' => $desired_username , 'sufix' => $sufix); - return $username_array; - } else { - $username_array = array('username' => $username, 'sufix' => ''); - return $username_array; - } -} - -/** - * Checks if there are repeted users in a given array - * @param array $usernames list of the usernames in the uploaded file - * @param array $user_array['username'] and $user_array['sufix'] where sufix is the number part in a login i.e -> jmontoya2 - * @return array with the $usernames array and the $user_array array - * @author Julio Montoya Armas - */ -function check_user_in_array($usernames, $user_array) { - $user_list = array_keys($usernames); - $username = $user_array['username'].$user_array['sufix']; - - if (in_array($username, $user_list)) { - $user_array['sufix'] += $usernames[$username]; - $usernames[$username]++; - } else { - $usernames[$username] = 1; - } - $result_array = array($usernames, $user_array); - return $result_array; -} - -/** - * Checks whether a username has been already subscribed in a session. - * @param string a given username - * @param array the array with the course list codes - * @param the session id - * @return 0 if the user is not subscribed otherwise it returns the user_id of the given username - * @author Julio Montoya Armas - */ -function user_available_in_session($username, $course_list, $id_session) { - $table_user = Database::get_main_table(TABLE_MAIN_USER); - $tbl_session_rel_course_rel_user = Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER); - $id_session = intval($id_session); - $username = Database::escape_string($username); - foreach($course_list as $enreg_course) { - $sql_select = " SELECT u.user_id FROM $tbl_session_rel_course_rel_user rel INNER JOIN $table_user u - ON (rel.id_user=u.user_id) - WHERE rel.id_session='$id_session' AND u.status='5' AND u.username ='$username' AND rel.course_code='$enreg_course'"; - $rs = Database::query($sql_select); - if (Database::num_rows($rs) > 0) { - return Database::result($rs, 0, 0); - } else { - return 0; - } - } -} - -/** -This function checks whether some users in the uploaded file repeated and creates unique usernames if necesary. -A case: Within the file there is an user repeted twice (Julio Montoya / Julio Montoya) and the username fields are empty. -Then, this function would create unique usernames based on the first and the last name. Two users wiould be created - jmontoya and jmontoya2. -Of course, if in the database there is a user with the name jmontoya, the newly created two users registered would be jmontoya2 and jmontoya3. -@param $users list of users -@author Julio Montoya Armas -*/ -function check_all_usernames($users, $course_list, $id_session) { - $table_user = Database::get_main_table(TABLE_MAIN_USER); - $usernames = array(); - $new_users = array(); - foreach ($users as $index => $user) { - $desired_username = array(); - if (empty($user['UserName'])) { - $desired_username = make_username($user['FirstName'], $user['LastName'], ''); - $pre_username = $desired_username['username'].$desired_username['sufix']; - $user['UserName'] = $pre_username; - $user['create'] = '1'; - } else { - if (UserManager::is_username_available($user['UserName'])) { - $desired_username = make_username($user['FirstName'], $user['LastName'], $user['UserName']); - $user['UserName'] = $desired_username['username'].$desired_username['sufix']; - $user['create'] = '1'; - } else { - $is_session_avail = user_available_in_session($user['UserName'], $course_list, $id_session); - if ($is_session_avail == 0) { - $user_name = $user['UserName']; - $sql_select = "SELECT user_id FROM $table_user WHERE username ='$user_name' "; - $rs = Database::query($sql_select); - $user['create'] = Database::result($rs, 0, 0); // This should be the ID because the user exists. - } else { - $user['create'] = $is_session_avail; - } - } - } - // Usernames is the current list of users in the file. - $result_array = check_user_in_array($usernames, $desired_username); - $usernames = $result_array[0]; - $desired_username = $result_array[1]; - $user['UserName'] = $desired_username['username'].$desired_username['sufix']; - $new_users[] = $user; - } - return $new_users; -} - -/** - * This functions checks whether there are users that are already registered in the DB by different creator than the current coach. - * @param string a given username - * @param array the array with the course list codes - * @param the session id - * @author Julio Montoya Armas - */ -function get_user_creator($users, $course_list, $id_session) { - $errors = array(); - foreach ($users as $index => $user) { - // database table definition - $table_user = Database::get_main_table(TABLE_MAIN_USER); - $tbl_session_rel_course_rel_user = Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER); - $username = Database::escape_string($user['UserName']); - //echo "
"; - $sql = "SELECT creator_id FROM $table_user WHERE username='$username' "; - - $rs = Database::query($sql); - $creator_id = Database::result($rs, 0, 0); - // check if we are the creators or not - if ($creator_id != '') { - if ($creator_id != api_get_user_id()) { - $user['error'] = get_lang('UserAlreadyRegisteredByOtherCreator'); - $errors[] = $user; - } - } - } - return $errors; -} - -/** - * Validates imported data. - * @param list of users - */ -function validate_data($users, $id_session = null) { - $errors = array(); - $usernames = array(); - $new_users = array(); - foreach ($users as $index => $user) { - // 1. Check whether mandatory fields are set. - $mandatory_fields = array('LastName', 'FirstName'); - if (api_get_setting('registration', 'email') == 'true') { - $mandatory_fields[] = 'Email'; - } - - foreach ($mandatory_fields as $key => $field) { - if (!isset ($user[$field]) || strlen($user[$field]) == 0) { - $user['error'] = get_lang($field.'Mandatory'); - $errors[] = $user; - } - } - // 2. Check whether the username is too long. - if (UserManager::is_username_too_long($user['UserName'])) { - $user['error'] = get_lang('UserNameTooLong'); - $errors[] = $user; - } - - $user['UserName'] = trim($user['UserName']); - - if (empty($user['UserName'])) { - $user['UserName'] = UserManager::create_username($user['FirstName'], $user['LastName']); - } - $new_users[] = $user; - } - $results = array('errors' => $errors, 'users' => $new_users); - return $results; -} - -/** - * Adds missing user-information (which isn't required, like password, etc). - */ -function complete_missing_data($user) { - // 1. Generate a password if it is necessary. - if (!isset ($user['Password']) || strlen($user['Password']) == 0) { - $user['Password'] = api_generate_password(); - } - return $user; -} - -/** - * Saves imported data. - */ -function save_data($users, $course_list, $id_session) { - $tbl_session = Database::get_main_table(TABLE_MAIN_SESSION); - $tbl_session_rel_course = Database::get_main_table(TABLE_MAIN_SESSION_COURSE); - $tbl_session_rel_course_rel_user = Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER); - $tbl_session_rel_user = Database::get_main_table(TABLE_MAIN_SESSION_USER); - - $id_session = intval($id_session); - $sendMail = $_POST['sendMail'] ? 1 : 0; - - // Adding users to the platform. - $new_users = array(); - foreach ($users as $index => $user) { - $user = complete_missing_data($user); - // coach only will registered users - $default_status = '5'; - if ($user['create'] == '1') { - $user['id'] = UserManager :: create_user($user['FirstName'], $user['LastName'], $default_status, $user['Email'], $user['UserName'], $user['Password'], $user['OfficialCode'], api_get_setting('PlatformLanguage'), $user['PhoneNumber'], ''); - $user['added_at_platform'] = 1; - } else { - $user['id'] = $user['create']; - $user['added_at_platform'] = 0; - } - $new_users[] = $user; - } - // Update user list. - $users = $new_users; - - // Inserting users. - $super_list = array(); - foreach ($course_list as $enreg_course) { - $nbr_users = 0; - $new_users = array(); - $enreg_course = Database::escape_string($enreg_course); - foreach ($users as $index => $user) { - $userid = intval($user['id']); - $sql = "INSERT IGNORE INTO $tbl_session_rel_course_rel_user(id_session,course_code,id_user) VALUES('$id_session','$enreg_course','$userid')"; - $course_session = array('course' => $enreg_course, 'added' => 1); - //$user['added_at_session'] = $course_session; - Database::query($sql); - if (Database::affected_rows()) { - $nbr_users++; - } - $new_users[] = $user; - } - $super_list[] = $new_users; - - //update the nbr_users field - $sql_select = "SELECT COUNT(id_user) as nbUsers FROM $tbl_session_rel_course_rel_user WHERE id_session='$id_session' AND course_code='$enreg_course'"; - $rs = Database::query($sql_select); - list($nbr_users) = Database::fetch_array($rs); - $sql_update = "UPDATE $tbl_session_rel_course SET nbr_users=$nbr_users WHERE id_session='$id_session' AND course_code='$enreg_course'"; - Database::query($sql_update); - - $sql_update = "UPDATE $tbl_session SET nbr_users= '$nbr_users' WHERE id='$id_session'"; - Database::query($sql_update); - } - // We don't delete the users (thoughts while dreaming) - //$sql_delete = "DELETE FROM $tbl_session_rel_user WHERE id_session = '$id_session'"; - //Database::query($sql_delete); - - $new_users = array(); - foreach ($users as $index => $user) { - $userid = $user['id']; - $sql_insert = "INSERT IGNORE INTO $tbl_session_rel_user(id_session, id_user) VALUES('$id_session','$userid')"; - Database::query($sql_insert); - $user['added_at_session'] = 1; - $new_users[] = $user; - } - - $users = $new_users; - $registered_users = get_lang('FileImported').'
Import file results :
'; - // Sending emails. - $addedto = ''; - if ($sendMail) { - $i = 0; - foreach ($users as $index => $user) { - $emailto = api_get_person_name($user['FirstName'], $user['LastName'], null, PERSON_NAME_EMAIL_ADDRESS).' <'.$user['Email'].'>'; - $emailsubject = '['.api_get_setting('siteName').'] '.get_lang('YourReg').' '.api_get_setting('siteName'); - $emailbody = get_lang('Dear').' '.api_get_person_name($user['FirstName'], $user['LastName']).",\n\n".get_lang('YouAreReg')." ".api_get_setting('siteName')." ".get_lang('WithTheFollowingSettings')."\n\n".get_lang('Username')." : $user[UserName]\n".get_lang('Pass')." : $user[Password]\n\n".get_lang('Address')." ".api_get_setting('siteName')." ".get_lang('Is')." : ".api_get_path('WEB_PATH')." \n\n".get_lang('Problem')."\n\n".get_lang('Formula').",\n\n".api_get_person_name(api_get_setting('administratorName'), api_get_setting('administratorSurname'))."\n".get_lang('Manager')." ".api_get_setting('siteName')."\nT. ".api_get_setting('administratorTelephone')."\n".get_lang('Email')." : ".api_get_setting('emailAdministrator').""; - $emailheaders = 'From: '.api_get_person_name(api_get_setting('administratorName'), api_get_setting('administratorSurname'), null, PERSON_NAME_EMAIL_ADDRESS).' <'.api_get_setting('emailAdministrator').">\n"; - $emailheaders .= 'Reply-To: '.api_get_setting('emailAdministrator'); - @api_send_mail($emailto, $emailsubject, $emailbody, $emailheaders); - - if (($user['added_at_platform'] == 1 && $user['added_at_session'] == 1) || $user['added_at_session'] == 1) { - if ($user['added_at_platform'] == 1) { - $addedto = get_lang('UserCreatedPlatform'); - } else { - $addedto = ' '; - } - - if ($user['added_at_session'] == 1) { - $addedto .= get_lang('UserInSession'); - } - $registered_users .= "".api_get_person_name($user['FirstName'], $user['LastName'])." - ".$addedto.'
'; - } else { - $addedto = get_lang('UserNotAdded'); - $registered_users .= "".api_get_person_name($user['FirstName'], $user['LastName'])." - ".$addedto.'
'; - } - } - } else { - $i = 0; - foreach ($users as $index => $user) { - if (($user['added_at_platform'] == 1 && $user['added_at_session'] == 1) || $user['added_at_session'] == 1) { - if ($user['added_at_platform'] == 1) { - $addedto = get_lang('UserCreatedPlatform'); - } else { - $addedto = ' '; - } - - if ($user['added_at_session'] == 1) { - $addedto .= ' '.get_lang('UserInSession'); - } - - $registered_users .= "".api_get_person_name($user['FirstName'], $user['LastName'])." - ".$addedto.'
'; - } else { - $addedto = get_lang('UserNotAdded'); - $registered_users .= "".api_get_person_name($user['FirstName'], $user['LastName'])." - ".$addedto.'
'; - } - } - } - - header('Location: course.php?id_session='.$id_session.'&action=show_message&message='.urlencode($registered_users)); - exit (); - - //header('Location: resume_session.php?id_session='.$id_session); -} - -/** - * Reads CSV-file. - * @param string $file Path to the CSV-file - * @return array All userinformation read from the file - */ -function parse_csv_data($file) { - $users = Import :: csv_to_array($file); - foreach ($users as $index => $user) { - if (isset ($user['Courses'])) { - $user['Courses'] = explode('|', trim($user['Courses'])); - } - $users[$index] = $user; - } - return $users; -} - -/** - * XML-parser: the handler at the beginning of element. - */ -function element_start($parser, $data) { - $data = api_utf8_decode($data); - global $user; - global $current_tag; - switch ($data) { - case 'Contact' : - $user = array (); - break; - default : - $current_tag = $data; - } -} - -/** - * XML-parser: the handler at the end of element. - */ -function element_end($parser, $data) { - $data = api_utf8_decode($data); - global $user; - global $users; - global $current_value; - global $purification_option_for_usernames; - $user[$data] = $current_value; - switch ($data) { - case 'Contact' : - $user['UserName'] = UserManager::purify_username($user['UserName'], $purification_option_for_usernames); - $users[] = $user; - break; - default : - $user[$data] = $current_value; - break; - } -} - -/** - * XML-parser: the handler for character data. - */ -function character_data($parser, $data) { - $data = trim(api_utf8_decode($data)); - global $current_value; - $current_value = $data; -} - -/** - * Reads XML-file. - * @param string $file Path to the XML-file - * @return array All userinformation read from the file - */ -function parse_xml_data($file) { - global $current_tag; - global $current_value; - global $user; - global $users; - $users = array (); - $parser = xml_parser_create('UTF-8'); - xml_set_element_handler($parser, 'element_start', 'element_end'); - xml_set_character_data_handler($parser, "character_data"); - 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; -} - - /* ============================================================================== Main script @@ -460,6 +37,7 @@ $language_file = array ('admin', 'registration', 'index', 'trad4all', 'tracking' $cidReset = true; require '../inc/global.inc.php'; +require_once 'myspace.lib.php'; $this_section = SECTION_PLATFORM_ADMIN; // TODO: Platform admin section? @@ -514,12 +92,12 @@ if ($_POST['formSent'] && $_FILES['import_file']['size'] !== 0) { $file_type = $_POST['file_type']; $id_session = intval($_POST['id_session']); if ($file_type == 'csv') { - $users = parse_csv_data($_FILES['import_file']['tmp_name']); + $users = MySpace::parse_csv_data($_FILES['import_file']['tmp_name']); } else { - $users = parse_xml_data($_FILES['import_file']['tmp_name']); + $users = MySpace::parse_xml_data($_FILES['import_file']['tmp_name']); } if (count($users) > 0) { - $results = validate_data($users); + $results = MySpace::validate_data($users); $errors = $results['errors']; $users = $results['users']; @@ -533,10 +111,10 @@ if ($_POST['formSent'] && $_FILES['import_file']['size'] !== 0) { while ($row = Database::fetch_array($result)) { $course_list[] = $row['course_code']; } - $errors = get_user_creator($users, $course_list, $id_session); - $users = check_all_usernames($users, $course_list, $id_session); + $errors = MySpace::get_user_creator($users, $course_list, $id_session); + $users = MySpace::check_all_usernames($users, $course_list, $id_session); if (count($errors) == 0) { - save_data($users, $course_list, $id_session); + MySpace::save_data($users, $course_list, $id_session); } } else { header('Location: course.php?id_session='.$id_session.'&action=error_message&message='.urlencode(get_lang('NoSessionId'))); diff --git a/tests/main/newscorm/openoffice_document.class.test.php b/tests/main/newscorm/openoffice_document.class.test.php new file mode 100644 index 0000000000..138c63ed61 --- /dev/null +++ b/tests/main/newscorm/openoffice_document.class.test.php @@ -0,0 +1,8 @@ + diff --git a/tests/main/newscorm/openoffice_presentation.class.test.php b/tests/main/newscorm/openoffice_presentation.class.test.php new file mode 100644 index 0000000000..be00609caa --- /dev/null +++ b/tests/main/newscorm/openoffice_presentation.class.test.php @@ -0,0 +1,38 @@ +assertTrue(is_numeric($res)); + //ob_end_clean(); + //var_dump($res); + } + + public function testAddCommandParameters() { + //ob_start(); + $res = OpenofficePresentation::add_command_parameters(); + $this->assertTrue(is_numeric($res)); + //ob_end_clean(); + //var_dump($res); + } + + public function testSetSlideSize() { + //ob_start(); + $res = OpenofficePresentation::set_slide_size($width = '400',$height = '500'); + $this->assertTrue(is_numeric($res)); + //ob_end_clean(); + //var_dump($res); + } + + public function testAddDocsToVisio() { + //ob_start(); + $res = OpenofficePresentation::add_docs_to_visio($files=array()); + $this->assertTrue(is_numeric($res)); + //ob_end_clean(); + //var_dump($res); + }*/ +} +?> diff --git a/tests/main/newscorm/openoffice_text.class.test.php b/tests/main/newscorm/openoffice_text.class.test.php new file mode 100644 index 0000000000..47e32a1b55 --- /dev/null +++ b/tests/main/newscorm/openoffice_text.class.test.php @@ -0,0 +1,50 @@ +assertTrue(is_bool($res)); + //ob_end_clean(); + //var_dump($res); + } +/* + public function testDealPerChapter() { + //ob_start(); + $obj = new OpenofficeText($split_steps=false, $course_code=null, $resource_id=null,$user_id=null); + $res = $obj->dealPerChapter($header = 'Header', $content = 'Content'); + $this->assertTrue(is_null($res)); + //ob_end_clean(); + //var_dump($res); + } + + public function testDalPerPage() { + //ob_start(); + $obj = new OpenofficeText($split_steps=false, $course_code=null, $resource_id=null,$user_id=null); + $res = $obj->dealPerPage($header = 'Header', $body= 'Body'); + $this->assertTrue(is_null($res)); + //ob_end_clean(); + //var_dump($res); + } +*/ + public function testAddCommandParameters() { + //ob_start(); + $res = OpenofficeText::add_command_parameters(); + $this->assertTrue(is_string($res)); + //ob_end_clean(); + //var_dump($res); + } + + public function testFormatPageContent() { + //ob_start(); + $res = OpenofficeText::format_page_content($header = 'Header', $content = 'Content'); + $this->assertTrue(is_string($res)); + //ob_end_clean(); + //var_dump($res); + } +} +?> \ No newline at end of file diff --git a/tests/main/newscorm/openoffice_text_document.class.test.php b/tests/main/newscorm/openoffice_text_document.class.test.php new file mode 100644 index 0000000000..b485fbc950 --- /dev/null +++ b/tests/main/newscorm/openoffice_text_document.class.test.php @@ -0,0 +1,47 @@ +make_lp($files=array()); + $this->assertTrue(is_bool($res)); + //ob_end_clean(); + //var_dump($res); + } + + public function testDealPerChapter() { + //ob_start(); + $res = OpenOfficeTextDocument::dealPerChapter($header = 'Header', $content = 'Content'); + $this->assertTrue(is_null($res)); + //ob_end_clean(); + //var_dump($res); + } + + public function testDealPerPage() { + //ob_start(); + $res = OpenOfficeTextDocument::dealPerPage($header = 'Header',$body = 'Content'); + $this->assertTrue(is_null($res)); + //ob_end_clean(); + //var_dump($res); + } + + public function testAddCommandParameters() { + //ob_start(); + $res = OpenOfficeTextDocument::add_command_parameters(); + $this->assertTrue(is_string($res)); + //ob_end_clean(); + //var_dump($res); + } + + public function testFormatPageContent() { + //ob_start(); + $res = OpenOfficeTextDocument::format_page_content($header = 'Header', $content = 'Content'); + $this->assertTrue(is_string($res)); + //ob_end_clean(); + //var_dump($res); + } */ +} +?> \ No newline at end of file diff --git a/tests/test_suite.php b/tests/test_suite.php index 52ad12e188..f525831649 100755 --- a/tests/test_suite.php +++ b/tests/test_suite.php @@ -48,112 +48,115 @@ require_once 'simpletest/autorun.php'; class TestsSuite extends TestSuite { function TestsSuite() { $this->TestSuite('All tests suite'); -/* $this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/lib/database.lib.test.php'); - $this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/lib/add_course.lib.inc.test.php'); - $this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/lib/course.lib.test.php'); - $this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/banner.lib.test.php'); - $this->addFile(api_get_path(SYS_TEST_PATH).'/main/admin/calendar.lib.test.php'); - $this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/lib/surveymanager.lib.test.php'); - $this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/lib/session_handler.class.test.php'); - $this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/lib/sessionmanager.lib.test.php'); - $this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/lib/classmanager.lib.test.php'); - $this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/lib/export.lib.inc.test.php'); - $this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/lib/legal.lib.test.php'); - $this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/lib/mail.lib.inc.test.php'); - $this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/lib/message.lib.test.php'); - $this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/lib/online.inc.test.php'); - $this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/lib/security.lib.test.php'); - $this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/lib/specific_fields_manager.lib.test.php'); - $this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/lib/social.lib.test.php'); - $this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/lib/sortabletable.class.test.php'); - $this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/lib/statsUtils.lib.inc.test.php'); - $this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/lib/tablesort.lib.test.php'); - $this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/lib/text.lib.test.php'); - $this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/lib/tracking.lib.test.php'); - $this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/lib/blog.lib.test.php'); - $this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/lib/urlmanager.lib.test.php'); - $this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/lib/stats.lib.inc.test.php'); - $this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/course_document.lib.test.php'); - $this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/tool_navigation_menu.inc.test.php'); - $this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/lib/display.lib.test.php'); - $this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/lib/document.lib.test.php'); - $this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/lib/events.lib.inc.test.php'); - $this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/lib/fileDisplay.lib.test.php'); - $this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/lib/fileManage.lib.test.php'); - $this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/lib/geometry.lib.test.php'); - $this->addFile(api_get_path(SYS_TEST_PATH).'/main/admin/statistics/statistics.lib.test.php'); - $this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/lib/access_url_edit_courses_to_url_functions.lib.test.php'); - $this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/lib/access_url_edit_sessions_to_url_functions.lib.test.php'); - $this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/lib/access_url_edit_users_to_url_functions.lib.test.php'); - $this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/lib/add_courses_to_sessions_functions.lib.test.php'); - $this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/lib/add_many_session_to_category_functions.lib.test.php'); - //$this->addFile(api_get_path(SYS_TEST_PATH).'/main/admin/access_urls.test.php'); - $this->addFile(api_get_path(SYS_TEST_PATH).'/main/admin/sub_language.class.test.php'); - $this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/lib/add_courses_to_sessions_functions.lib.test.php'); - $this->addFile(api_get_path(SYS_TEST_PATH).'/main/auth/lost_password.lib.test.php'); - $this->addFile(api_get_path(SYS_TEST_PATH).'/main/auth/openid/xrds.lib.test.php'); - $this->addFile(api_get_path(SYS_TEST_PATH).'/main/chat/chat_functions.lib.test.php'); - $this->addFile(api_get_path(SYS_TEST_PATH).'/main/conference/get_translation.lib.test.php'); - $this->addFile(api_get_path(SYS_TEST_PATH).'/main/exercice/hotpotatoes.lib.test.php'); - $this->addFile(api_get_path(SYS_TEST_PATH).'/main/newscorm/scorm.lib.test.php'); - $this->addFile(api_get_path(SYS_TEST_PATH).'/main/survey/survey.lib.test.php'); - $this->addFile(api_get_path(SYS_TEST_PATH).'/main/user/userInfoLib.test.php'); - $this->addFile(api_get_path(SYS_TEST_PATH).'/main/webservices/user_import/import.lib.test.php'); - $this->addFile(api_get_path(SYS_TEST_PATH).'/main/work/work.lib.test.php'); - $this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/lib/glossary.lib.test.php'); - $this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/lib/notebook.lib.test.php'); - $this->addFile(api_get_path(SYS_TEST_PATH).'/main/permissions/permissions_functions.inc.test.php'); - $this->addFile(api_get_path(SYS_TEST_PATH).'/main/resourcelinker/resourcelinker.inc.test.php'); - $this->addFile(api_get_path(SYS_TEST_PATH).'/main/survey/survey.lib.test.php'); - $this->addFile(api_get_path(SYS_TEST_PATH).'/main/dropbox/dropbox_class.inc.test.php'); - $this->addFile(api_get_path(SYS_TEST_PATH).'/main/dropbox/dropbox_functions.inc.test.php'); - $this->addFile(api_get_path(SYS_TEST_PATH).'/main/search/search_suggestions.test.php'); - $this->addFile(api_get_path(SYS_TEST_PATH).'/main/exercice/export/qti2/qti2_classes.test.php'); - $this->addFile(api_get_path(SYS_TEST_PATH).'/main/exercice/export/scorm/scorm_classes.test.php'); - $this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/lib/usermanager.lib.test.php'); - $this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/lib/groupmanager.lib.test.php'); - $this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/lib/image.lib.test.php'); - $this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/lib/import.lib.test.php'); - $this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/lib/internationalization.lib.test.php'); - $this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/lib/system_announcements.lib.test.php'); - $this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/lib/fileUpload.lib.test.php'); - $this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/lib/main_api.lib.test.php');//this file delete the course - $this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/lib/debug.lib.inc.test.php');//this file need be to the finish of the tests +/* $this->addTestFile(dirname(__FILE__).'/main/inc/lib/database.lib.test.php'); + $this->addTestFile(dirname(__FILE__).'/main/inc/lib/add_course.lib.inc.test.php'); + $this->addTestFile(dirname(__FILE__).'/main/inc/lib/course.lib.test.php'); + $this->addTestFile(dirname(__FILE__).'/main/inc/banner.lib.test.php'); + $this->addTestFile(dirname(__FILE__).'/main/admin/calendar.lib.test.php'); + $this->addTestFile(dirname(__FILE__).'/main/inc/lib/surveymanager.lib.test.php'); + $this->addTestFile(dirname(__FILE__).'/main/inc/lib/session_handler.class.test.php'); + $this->addTestFile(dirname(__FILE__).'/main/inc/lib/sessionmanager.lib.test.php'); + $this->addTestFile(dirname(__FILE__).'/main/inc/lib/classmanager.lib.test.php'); + $this->addTestFile(dirname(__FILE__).'/main/inc/lib/export.lib.inc.test.php'); + $this->addTestFile(dirname(__FILE__).'/main/inc/lib/legal.lib.test.php'); + $this->addTestFile(dirname(__FILE__).'/main/inc/lib/mail.lib.inc.test.php'); + $this->addTestFile(dirname(__FILE__).'/main/inc/lib/message.lib.test.php'); + $this->addTestFile(dirname(__FILE__).'/main/inc/lib/online.inc.test.php'); + $this->addTestFile(dirname(__FILE__).'/main/inc/lib/security.lib.test.php'); + $this->addTestFile(dirname(__FILE__).'/main/inc/lib/specific_fields_manager.lib.test.php'); + $this->addTestFile(dirname(__FILE__).'/main/inc/lib/social.lib.test.php'); + $this->addTestFile(dirname(__FILE__).'/main/inc/lib/sortabletable.class.test.php'); + $this->addTestFile(dirname(__FILE__).'/main/inc/lib/statsUtils.lib.inc.test.php'); + $this->addTestFile(dirname(__FILE__).'/main/inc/lib/tablesort.lib.test.php'); + $this->addTestFile(dirname(__FILE__).'/main/inc/lib/text.lib.test.php'); + $this->addTestFile(dirname(__FILE__).'/main/inc/lib/tracking.lib.test.php'); + $this->addTestFile(dirname(__FILE__).'/main/inc/lib/blog.lib.test.php'); + $this->addTestFile(dirname(__FILE__).'/main/inc/lib/urlmanager.lib.test.php'); + $this->addTestFile(dirname(__FILE__).'/main/inc/lib/stats.lib.inc.test.php'); + $this->addTestFile(dirname(__FILE__).'/main/inc/course_document.lib.test.php'); + $this->addTestFile(dirname(__FILE__).'/main/inc/tool_navigation_menu.inc.test.php'); + $this->addTestFile(dirname(__FILE__).'/main/inc/lib/display.lib.test.php'); + $this->addTestFile(dirname(__FILE__).'/main/inc/lib/document.lib.test.php'); + $this->addTestFile(dirname(__FILE__).'/main/inc/lib/events.lib.inc.test.php'); + $this->addTestFile(dirname(__FILE__).'/main/inc/lib/fileDisplay.lib.test.php'); + $this->addTestFile(dirname(__FILE__).'/main/inc/lib/fileManage.lib.test.php'); + $this->addTestFile(dirname(__FILE__).'/main/inc/lib/geometry.lib.test.php'); + $this->addTestFile(dirname(__FILE__).'/main/admin/statistics/statistics.lib.test.php'); + $this->addTestFile(dirname(__FILE__).'/main/inc/lib/access_url_edit_courses_to_url_functions.lib.test.php'); + $this->addTestFile(dirname(__FILE__).'/main/inc/lib/access_url_edit_sessions_to_url_functions.lib.test.php'); + $this->addTestFile(dirname(__FILE__).'/main/inc/lib/access_url_edit_users_to_url_functions.lib.test.php'); + $this->addTestFile(dirname(__FILE__).'/main/inc/lib/add_courses_to_sessions_functions.lib.test.php'); + $this->addTestFile(dirname(__FILE__).'/main/inc/lib/add_many_session_to_category_functions.lib.test.php'); + //$this->addTestFile(dirname(__FILE__).'/main/admin/access_urls.test.php'); + $this->addTestFile(dirname(__FILE__).'/main/admin/sub_language.class.test.php'); + $this->addTestFile(dirname(__FILE__).'/main/inc/lib/add_courses_to_sessions_functions.lib.test.php'); + $this->addTestFile(dirname(__FILE__).'/main/auth/lost_password.lib.test.php'); + $this->addTestFile(dirname(__FILE__).'/main/auth/openid/xrds.lib.test.php'); + $this->addTestFile(dirname(__FILE__).'/main/chat/chat_functions.lib.test.php'); + $this->addTestFile(dirname(__FILE__).'/main/conference/get_translation.lib.test.php'); + $this->addTestFile(dirname(__FILE__).'/main/exercice/hotpotatoes.lib.test.php'); + $this->addTestFile(dirname(__FILE__).'/main/newscorm/scorm.lib.test.php'); + $this->addTestFile(dirname(__FILE__).'/main/survey/survey.lib.test.php'); + $this->addTestFile(dirname(__FILE__).'/main/user/userInfoLib.test.php'); + $this->addTestFile(dirname(__FILE__).'/main/webservices/user_import/import.lib.test.php'); + $this->addTestFile(dirname(__FILE__).'/main/work/work.lib.test.php'); + $this->addTestFile(dirname(__FILE__).'/main/inc/lib/glossary.lib.test.php'); + $this->addTestFile(dirname(__FILE__).'/main/inc/lib/notebook.lib.test.php'); + $this->addTestFile(dirname(__FILE__).'/main/permissions/permissions_functions.inc.test.php'); + $this->addTestFile(dirname(__FILE__).'/main/resourcelinker/resourcelinker.inc.test.php'); + $this->addTestFile(dirname(__FILE__).'/main/survey/survey.lib.test.php'); + $this->addTestFile(dirname(__FILE__).'/main/dropbox/dropbox_class.inc.test.php'); + $this->addTestFile(dirname(__FILE__).'/main/dropbox/dropbox_functions.inc.test.php'); + $this->addTestFile(dirname(__FILE__).'/main/search/search_suggestions.test.php'); + $this->addTestFile(dirname(__FILE__).'/main/exercice/export/qti2/qti2_classes.test.php'); + $this->addTestFile(dirname(__FILE__).'/main/exercice/export/scorm/scorm_classes.test.php'); + $this->addTestFile(dirname(__FILE__).'/main/inc/lib/usermanager.lib.test.php'); + $this->addTestFile(dirname(__FILE__).'/main/inc/lib/groupmanager.lib.test.php'); + $this->addTestFile(dirname(__FILE__).'/main/inc/lib/image.lib.test.php'); + $this->addTestFile(dirname(__FILE__).'/main/inc/lib/import.lib.test.php'); + $this->addTestFile(dirname(__FILE__).'/main/inc/lib/internationalization.lib.test.php'); + $this->addTestFile(dirname(__FILE__).'/main/inc/lib/system_announcements.lib.test.php'); + $this->addTestFile(dirname(__FILE__).'/main/inc/lib/fileUpload.lib.test.php'); + $this->addTestFile(dirname(__FILE__).'/main/inc/lib/main_api.lib.test.php');//this file delete the course + $this->addTestFile(dirname(__FILE__).'/main/inc/lib/debug.lib.inc.test.php');//this file need be to the finish of the tests */ /**This file was removed, now the functions was moved to install.lib*/ //require_once $maindir.'install/install_upgrade.lib.php'; - //$this->addFile(api_get_path(SYS_TEST_PATH).'/main/install/install_upgrade.lib.test.php'); + //$this->addTestFile(dirname(__FILE__).'/main/install/install_upgrade.lib.test.php'); /**This files has metadata*/ - //$this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/lib/xht.lib.test.php'); - //$this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/lib/xmd.lib.test.php'); + //$this->addTestFile(dirname(__FILE__).'/main/inc/lib/xht.lib.test.php'); + //$this->addTestFile(dirname(__FILE__).'/main/inc/lib/xmd.lib.test.php'); /**This files are not used and is not finished implement*/ - //$this->addFile(api_get_path(SYS_TEST_PATH).'/main/exercice/export/qti/qti_classes.test.php'); - //$this->addFile(api_get_path(SYS_TEST_PATH).'/main/exercice/export/qti2/qti2_export.test.php'); - //$this->addFile(api_get_path(SYS_TEST_PATH).'/main/exercice/export/exercise_import.inc.test.php'); - //$this->addFile(api_get_path(SYS_TEST_PATH).'/main/exercice/export/scorm/scorm_export.test.php'); + //$this->addTestFile(dirname(__FILE__).'/main/exercice/export/qti/qti_classes.test.php'); + //$this->addTestFile(dirname(__FILE__).'/main/exercice/export/qti2/qti2_export.test.php'); + //$this->addTestFile(dirname(__FILE__).'/main/exercice/export/exercise_import.inc.test.php'); + //$this->addTestFile(dirname(__FILE__).'/main/exercice/export/scorm/scorm_export.test.php'); /**EXERCISES**/ - //$this->addFile(api_get_path(SYS_TEST_PATH).'/main/exercice/answer.class.test.php'); - //$this->addFile(api_get_path(SYS_TEST_PATH).'/main/exercice/exercise_result.class.test.php'); - //$this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/lib/exercise_show_functions.lib.test.php'); - //$this->addFile(api_get_path(SYS_TEST_PATH).'/main/exercice/exercise.class.test.php'); + //$this->addTestFile(dirname(__FILE__).'/main/exercice/answer.class.test.php'); + //$this->addTestFile(dirname(__FILE__).'/main/exercice/exercise_result.class.test.php'); + //$this->addTestFile(dirname(__FILE__).'/main/inc/lib/exercise_show_functions.lib.test.php'); + //$this->addTestFile(dirname(__FILE__).'/main/exercice/exercise.class.test.php'); /**This files have problem with class and call objects*/ - //$this->addFile(api_get_path(SYS_TEST_PATH).'/main/exercice/exercise.lib.test.php'); - //$this->addFile(api_get_path(SYS_TEST_PATH).'/main/exercice/fill_blanks.class.test.php'); - //$this->addFile(api_get_path(SYS_TEST_PATH).'/main/exercice/freeanswer.class.test.php'); + //$this->addTestFile(dirname(__FILE__).'/main/exercice/exercise.lib.test.php'); + //$this->addTestFile(dirname(__FILE__).'/main/exercice/fill_blanks.class.test.php'); + //$this->addTestFile(dirname(__FILE__).'/main/exercice/freeanswer.class.test.php'); /**FORUM*/ - //$this->addFile(api_get_path(SYS_TEST_PATH).'main/forum/forumfunction.inc.test.php'); + //$this->addFile(dirname(__FILE__).'/main/forum/forumfunction.inc.test.php'); + // $this->addFile(api_get_path(SYS_TEST_PATH).'main/forum/forumfunction.inc.test.php'); - /**GRADEBOOK*/ - //$this->addFile(api_get_path(SYS_TEST_PATH).'main/gradebook/lib/be/attendancelink.class.test.php'); - //$this->addFile(api_get_path(SYS_TEST_PATH).'main/gradebook/lib/be/category.class.test.php'); + //$this->addTestFile(dirname(__FILE__).'/main/inc/lib/main_api.lib.test.php'); + //$this->addTestFile(dirname(__FILE__).'/main/inc/lib/debug.lib.inc.test.php'); + + $this->addTestFile(dirname(__FILE__).'/main/newscorm/openoffice_presentation.class.test.php'); + } }