diff --git a/main/admin/course_user_import_by_email.php b/main/admin/course_user_import_by_email.php index 79e461d760..c0dde5a93b 100755 --- a/main/admin/course_user_import_by_email.php +++ b/main/admin/course_user_import_by_email.php @@ -99,8 +99,8 @@ function save_data($users_courses) foreach ($to_subscribe as $courseId) { $courseInfo = api_get_course_info_by_id($courseId); $course_code = $courseInfo['code']; - if (CourseManager :: course_exists($course_code)) { - $course_info = CourseManager::get_course_information($course_code); + if (CourseManager::course_exists($course_code)) { + $course_info = api_get_course_info($course_code); $inserted_in_course[$course_code] = $course_info['title']; CourseManager::subscribe_user( @@ -117,9 +117,9 @@ function save_data($users_courses) foreach ($to_unsubscribe as $courseId) { $courseInfo = api_get_course_info_by_id($courseId); $course_code = $courseInfo['code']; - if (CourseManager :: course_exists($course_code)) { + if (CourseManager::course_exists($course_code)) { CourseManager::unsubscribe_user($user_id, $course_code); - $course_info = CourseManager::get_course_information($course_code); + $course_info = api_get_course_info($course_code); CourseManager::unsubscribe_user($user_id, $course_code); $inserted_in_course[$course_info['code']] = $course_info['title']; } @@ -137,7 +137,7 @@ function save_data($users_courses) */ function parse_csv_data($file) { - $courses = Import :: csvToArray($file); + $courses = Import::csv_reader($file); return $courses; } @@ -198,7 +198,7 @@ if ($form->validate()) { } // Displaying the header. -Display :: display_header($tool_name); +Display::display_header($tool_name); if (count($errors) != 0) { $error_message = ''; - Display :: display_error_message($error_message, false); + echo Display::return_message($error_message, 'error', false); } // Displaying the form. @@ -229,4 +229,4 @@ echo STUDENT.': '.get_lang('Student').'
'; parameters_form)) { - $this->parameters_form = FormValidator::create($parameters); + $this->parameters_form = new FormValidator( + $parameters['name'], + $parameters['method'], + null, + null, + $parameters['attributes'] + ); } return $this->parameters_form; @@ -104,7 +110,7 @@ class ZombieReport implements Countable return ''; } - $result = $form->return_form(); + $result = $form->returnForm(); if ($return) { return $result; } else { @@ -312,9 +318,9 @@ class ZombieReport implements Countable $result = $this->display_parameters($return); if ($this->perform_action()) { if ($return) { - $result .= Display::return_confirmation_message(get_lang('Done')); + $result .= Display::return_message(get_lang('Done'), 'confirmation'); } else { - Display::display_confirmation_message(get_lang('Done')); + echo Display::return_message(get_lang('Done'), 'confirmation'); } } $result .= $this->display_data($return); diff --git a/main/survey/survey.download.inc.php b/main/survey/survey.download.inc.php index 60ae32de0b..45009b7fce 100755 --- a/main/survey/survey.download.inc.php +++ b/main/survey/survey.download.inc.php @@ -14,7 +14,7 @@ function check_download_survey($course, $invitation, $doc_url) { // Getting all the course information - $_course = CourseManager::get_course_information($course); + $_course = api_get_course_info($course); $course_id = $_course['real_id']; // Database table definitions @@ -30,16 +30,16 @@ function check_download_survey($course, $invitation, $doc_url) invitation_code = '".Database::escape_string($invitation)."'"; $result = Database::query($sql); if (Database::num_rows($result) < 1) { - Display :: display_error_message(get_lang('WrongInvitationCode'), false); - Display :: display_footer(); + echo Display::return_message(get_lang('WrongInvitationCode'), 'error', false); + Display::display_footer(); exit; } $survey_invitation = Database::fetch_assoc($result); // Now we check if the user already filled the survey if ($survey_invitation['answered'] == 1) { - Display :: display_error_message(get_lang('YouAlreadyFilledThisSurvey'), false); - Display :: display_footer(); + echo Display::return_message(get_lang('YouAlreadyFilledThisSurvey'), 'error', false); + Display::display_footer(); exit; } @@ -102,8 +102,8 @@ function check_download_survey($course, $invitation, $doc_url) )"; $result = Database::query($sql); if (Database::num_rows($result) == 0) { - Display :: display_error_message(get_lang('WrongInvitationCode'), false); - Display :: display_footer(); + echo Display::return_message(get_lang('WrongInvitationCode'), 'error', false); + Display::display_footer(); exit; } diff --git a/main/tracking/question_course_report.php b/main/tracking/question_course_report.php index 63113435e8..71bd5c65c7 100755 --- a/main/tracking/question_course_report.php +++ b/main/tracking/question_course_report.php @@ -14,9 +14,9 @@ $this_section = "session_my_space"; $is_allowedToTrack = $is_courseAdmin || $is_platformAdmin || $is_courseCoach || $is_sessionAdmin; if (!$is_allowedToTrack) { - Display :: display_header(null); + Display::display_header(null); api_not_allowed(); - Display :: display_footer(); + Display::display_footer(); } $export_to_xls = false; @@ -45,13 +45,13 @@ function load_courses() { $session_id = isset($_REQUEST['session_id']) ? intval($_REQUEST['session_id']) : null; if (empty($session_id)) { - $temp_course_list = CourseManager :: get_courses_list(); + $temp_course_list = CourseManager::get_courses_list(); } else { $temp_course_list = SessionManager::get_course_list_by_session_id($session_id); } foreach ($temp_course_list as $temp_course_item) { - $course_item = CourseManager ::get_course_information($temp_course_item['code']); + $course_item = api_get_course_info($temp_course_item['code']); $course_select_list[$temp_course_item['code']] = $course_item['title']; } @@ -148,7 +148,7 @@ if (!empty($course_info)) { } if (!$export_to_xls) { - Display :: display_header(get_lang("MySpace")); + Display::display_header(get_lang("MySpace")); echo '
'; if ($global) { echo MySpace::getTopMenu(); @@ -171,7 +171,7 @@ if (!$export_to_xls) { $form->display(); if (empty($course_code)) { - Display::display_warning_message(get_lang('PleaseSelectACourse')); + echo Display::return_message(get_lang('PleaseSelectACourse'), 'warning'); } } @@ -215,7 +215,7 @@ if (!empty($main_question_list) && is_array($main_question_list)) { $html_result .= ''; } else { if (!empty($course_code)) { - Display::display_warning_message(get_lang('NoResults')); + echo Display::return_message(get_lang('NoResults'), 'warning'); } } @@ -223,4 +223,4 @@ if (!$export_to_xls) { echo $html_result; } -Display :: display_footer(); +Display::display_footer(); diff --git a/plugin/search_course/lib/register_course_widget.class.php b/plugin/search_course/lib/register_course_widget.class.php index bd5f11365c..fb47a1ce87 100755 --- a/plugin/search_course/lib/register_course_widget.class.php +++ b/plugin/search_course/lib/register_course_widget.class.php @@ -77,12 +77,12 @@ class RegisterCourseWidget if ($this->subscribe_user($course_code, $registration_code)) { - Display::display_confirmation_message(get_lang('EnrollToCourseSuccessful')); + echo Display::return_message(get_lang('EnrollToCourseSuccessful'), 'confirmation'); return; } if (!empty($registration_code)) { - Display::display_error_message(get_lang('CourseRegistrationCodeIncorrect')); + echo Display::return_message(get_lang('CourseRegistrationCodeIncorrect'), 'error'); } $this->display_form($course_code); return true; @@ -99,7 +99,7 @@ class RegisterCourseWidget */ function subscribe_user($course_code, $registration_code = '', $user_id = null) { - $course = $this->retrieve_course($course_code); + $course = api_get_course_info($course_code); $course_regisration_code = $course['registration_code']; if (!empty($course_regisration_code) && $registration_code != $course_regisration_code) { @@ -125,7 +125,7 @@ class RegisterCourseWidget { global $stok; - $course = $this->retrieve_course($course_code); + $course = api_get_course_info($course_code); $self = $_SERVER['REQUEST_URI']; $course_code = $course['code']; $course_visual_code = $course['visual_code']; @@ -144,19 +144,4 @@ class RegisterCourseWidget EOT; echo $result; } - - /** - * DB functions - DB functions - DB functions - */ - - /** - * - * @param type $course_code - * @return type - */ - function retrieve_course($course_code) - { - return CourseManager::get_course_information($course_code); - } - }