* @package chamilo.admin.openbadges
*/
+use \ChamiloSession as Session;
+
$cidReset = true;
require_once '../inc/global.inc.php';
@@ -15,6 +17,12 @@ if (!api_is_platform_admin() || api_get_setting('allow_skills_tool') !== 'true')
$this_section = SECTION_PLATFORM_ADMIN;
+$errorMessage = null;
+
+if (Session::has('errorMessage')) {
+ $errorMessage = Session::read('errorMessage');
+}
+
$objSkill = new Skill();
$skills = $objSkill->get_all();
@@ -30,9 +38,12 @@ $interbreadcrumb = array(
);
$tpl = new Template(get_lang('Skills'));
+$tpl->assign('errorMessage', $errorMessage);
$tpl->assign('platformAdminEmail', get_setting('emailAdministrator'));
$tpl->assign('skills', $skills);
$contentTemplate = $tpl->get_template('skill/badge_list.tpl');
$tpl->display($contentTemplate);
+
+Session::erase('errorMessage');
diff --git a/main/admin/skills_wheel.php b/main/admin/skills_wheel.php
index 539a0b1dca..4965a9a751 100755
--- a/main/admin/skills_wheel.php
+++ b/main/admin/skills_wheel.php
@@ -46,6 +46,7 @@ $tpl->assign('wheel_url', $url);
$url = api_get_path(WEB_AJAX_PATH).'skill.ajax.php?1=1';
$tpl->assign('url', $url);
+$tpl->assign('isAdministration', true);
$content = $tpl->fetch('default/skill/skill_wheel.tpl');
$tpl->assign('content', $content);
diff --git a/main/admin/special_exports.php b/main/admin/special_exports.php
index 54b2ebce83..5f6a754374 100755
--- a/main/admin/special_exports.php
+++ b/main/admin/special_exports.php
@@ -190,7 +190,7 @@ function create_zip(){
}
function rename_zip($FileZip) {
- event_download(($FileZip['PATH'] == '/')?'full_export_'.date('Ymd').'.zip (folder)': basename($FileZip['PATH']).'.zip (folder)');
+ Event::event_download(($FileZip['PATH'] == '/')?'full_export_'.date('Ymd').'.zip (folder)': basename($FileZip['PATH']).'.zip (folder)');
$name = ($FileZip['PATH']=='/')? 'full_export_'.date('Ymd').'.zip':basename($FileZip['PATH']).'.zip';
if(file_exists($FileZip['PATH_TEMP_ARCHIVE'].'/'.$name)){ unlink($FileZip['PATH_TEMP_ARCHIVE'].'/'.$name); }
if(file_exists($FileZip['TEMP_FILE_ZIP'])) {
diff --git a/main/admin/statistics/index.php b/main/admin/statistics/index.php
index 4624b1587f..d1d0652338 100755
--- a/main/admin/statistics/index.php
+++ b/main/admin/statistics/index.php
@@ -1,6 +1,6 @@
$name) {
$name = str_replace(get_lang('Department'), "", $name);
- $teachers[$name] = Statistics::count_users(1, $code, $_GET['count_invisible_courses']);
- $students[$name] = Statistics::count_users(5, $code, $_GET['count_invisible_courses']);
+ $teachers[$name] = Statistics::count_users(1, $code, $countInvisible);
+ $students[$name] = Statistics::count_users(5, $code, $countInvisible);
}
// docents for each course category
Statistics::print_stats(get_lang('Teachers'), $teachers);
diff --git a/main/admin/sub_language.php b/main/admin/sub_language.php
index e30bda04c1..8919cdba3d 100755
--- a/main/admin/sub_language.php
+++ b/main/admin/sub_language.php
@@ -10,7 +10,6 @@ $language_file = 'admin';
$cidReset = true;
$this_script = 'sub_language';
require_once '../inc/global.inc.php';
-require_once 'sub_language.class.php';
$this_section = SECTION_PLATFORM_ADMIN;
api_protect_admin_script();
diff --git a/main/admin/sub_language_add.php b/main/admin/sub_language_add.php
index 1a9431583d..9895c32a1d 100755
--- a/main/admin/sub_language_add.php
+++ b/main/admin/sub_language_add.php
@@ -10,7 +10,7 @@
$language_file = 'admin';
$cidReset = true;
require_once '../inc/global.inc.php';
-require_once 'sub_language.class.php';
+
$this_section = SECTION_PLATFORM_ADMIN;
api_protect_admin_script();
diff --git a/main/admin/sub_language_ajax.inc.php b/main/admin/sub_language_ajax.inc.php
index c9cad48ef1..88f9e03056 100755
--- a/main/admin/sub_language_ajax.inc.php
+++ b/main/admin/sub_language_ajax.inc.php
@@ -4,13 +4,9 @@
* Sub language AJAX script to update variables
* @package chamilo.admin.sub_language
*/
-/**
- * Init
- */
$language_file = 'admin';
$this_script = 'sub_language';
require_once '../inc/global.inc.php';
-require_once 'sub_language.class.php';
api_protect_admin_script();
@@ -53,6 +49,6 @@ if (isset($new_language) && isset($language_variable) && isset($file_id)) {
echo $path_folder.' '.get_lang('IsNotWritable').'
'.api_ucwords(get_lang('ErrorsFound')).':
'.$variables_with_problems;
} else {
echo get_lang('Saved');
- }
+ }
}
diff --git a/main/admin/system_announcements.php b/main/admin/system_announcements.php
index 3ca48f2b59..a435755e2d 100755
--- a/main/admin/system_announcements.php
+++ b/main/admin/system_announcements.php
@@ -142,11 +142,7 @@ if ($action_todo) {
}
$form->addElement('select', 'lang',get_lang('Language'), $language_list_with_keys);
- if (api_get_setting('wcag_anysurfer_public_pages')=='true') {
- $form->addElement('textarea', 'content', get_lang('Content'));
- } else {
- $form->add_html_editor('content', get_lang('Content'), true, false, array('ToolbarSet' => 'PortalNews', 'Width' => '100%', 'Height' => '300'));
- }
+ $form->add_html_editor('content', get_lang('Content'), true, false, array('ToolbarSet' => 'PortalNews', 'Width' => '100%', 'Height' => '300'));
$form->addDateRangePicker('range', get_lang('StartTimeWindow'), true, array('id' => 'date_range'));
$group = array();
@@ -182,13 +178,8 @@ if ($action_todo) {
$class='save';
$form->addElement('hidden', 'action', 'edit');
}
-
$form->addElement('checkbox', 'send_email_test', null, get_lang('SendOnlyAnEmailToMySelfToTest'));
-
$form->addElement('style_submit_button', 'submit', $text, 'class="'.$class.'"');
- if (api_get_setting('wcag_anysurfer_public_pages') == 'true') {
- $values['content'] = WCAG_Rendering::HTML_to_text($values['content']);
- }
$form->setDefaults($values);
if ($form->validate()) {
@@ -205,9 +196,6 @@ if ($action_todo) {
if ($values['lang'] == 'all') {
$values['lang'] = null;
}
- if (api_get_setting('wcag_anysurfer_public_pages') == 'true') {
- //$values['content'] = WCAG_Rendering::text_to_HTML($values['content']);
- }
$sendMail = isset($values['send_mail']) ? $values['send_mail'] : null;
@@ -262,13 +250,7 @@ if ($action_todo) {
}
$show_announcement_list = true;
} else {
- if (api_get_setting('wcag_anysurfer_public_pages') == 'true') {
- echo '';
- }
$form->display();
- if (api_get_setting('wcag_anysurfer_public_pages') == 'true') {
- echo '
';
- }
$show_announcement_list = false;
}
}
diff --git a/main/admin/teacher_time_report.php b/main/admin/teacher_time_report.php
index 4acfe5bac7..74d757d319 100644
--- a/main/admin/teacher_time_report.php
+++ b/main/admin/teacher_time_report.php
@@ -65,17 +65,14 @@ $timeReport = new TeacherTimeReport();
if (!empty($selectedCourse)) {
$withFilter = true;
-
$course = api_get_course_info($selectedCourse);
-
$reportTitle = sprintf(get_lang('TimeReportForCourseX'), $course['title']);
-
$teachers = CourseManager::get_teacher_list_from_course_code($selectedCourse);
foreach ($teachers as $teacher) {
$totalTime = UserManager::getExpendedTimeInCourses(
$teacher['user_id'],
- $selectedCourse,
+ $course['real_id'],
0,
$selectedFrom,
$selectedUntil
@@ -108,7 +105,7 @@ if (!empty($selectedCourse)) {
foreach ($coaches as $coach) {
$totalTime = UserManager::getExpendedTimeInCourses(
$coach['user_id'],
- $selectedCourse,
+ $course['real_id'],
$session['id'],
$selectedFrom,
$selectedUntil
@@ -163,7 +160,7 @@ if (!empty($selectedSession)) {
foreach ($coaches as $coach) {
$totalTime = UserManager::getExpendedTimeInCourses(
$coach['user_id'],
- $course['code'],
+ $course['id'],
$selectedSession,
$selectedFrom,
$selectedUntil
@@ -210,7 +207,7 @@ if (!empty($selectedTeacher)) {
$totalTime = UserManager::getExpendedTimeInCourses(
$selectedTeacher,
- $course['code'],
+ $course['real_id'],
0,
$selectedFrom,
$selectedUntil
@@ -242,7 +239,7 @@ if (!empty($selectedTeacher)) {
$totalTime = UserManager::getExpendedTimeInCourses(
$selectedTeacher,
- $course['course_code'],
+ $course['real_id'],
$session['id'],
$selectedFrom,
$selectedUntil
diff --git a/main/admin/user_add.php b/main/admin/user_add.php
index a27ab12c74..e7bf123c1d 100755
--- a/main/admin/user_add.php
+++ b/main/admin/user_add.php
@@ -235,7 +235,7 @@ $form->addGroup($group, 'mail', get_lang('SendMailToNewUser'), ' ');
$form->addElement('radio', 'radio_expiration_date', get_lang('ExpirationDate'), get_lang('NeverExpires'), 0);
$group = array ();
$group[] = $form->createElement('radio', 'radio_expiration_date', null, get_lang('On'), 1);
-$group[] = $form->createElement('datepicker', 'expiration_date', null, array('form_name' => $form->getAttribute('name'), 'onchange' => 'javascript: enable_expiration_date();'));
+$group[] = $form->createElement('DatePicker', 'expiration_date', null, array('form_name' => $form->getAttribute('name'), 'onchange' => 'javascript: enable_expiration_date();'));
$form->addGroup($group, 'max_member_group', null, '', false);
// Active account or inactive account
$form->addElement('radio', 'active', get_lang('ActiveAccount'), get_lang('Active'), 1);
diff --git a/main/admin/user_edit.php b/main/admin/user_edit.php
index df7d89927f..820a153c2d 100755
--- a/main/admin/user_edit.php
+++ b/main/admin/user_edit.php
@@ -263,7 +263,7 @@ if (!$user_data['platform_admin']) {
$form->addElement('radio', 'radio_expiration_date', get_lang('ExpirationDate'), get_lang('NeverExpires'), 0);
$group = array ();
$group[] = $form->createElement('radio', 'radio_expiration_date', null, get_lang('On'), 1);
- $group[] = $form->createElement('datepicker', 'expiration_date', null, array('form_name' => $form->getAttribute('name'), 'onchange' => 'javascript: enable_expiration_date();'));
+ $group[] = $form->createElement('DatePickerDate', 'expiration_date', null, array('form_name' => $form->getAttribute('name'), 'onchange' => 'javascript: enable_expiration_date();'));
$form->addGroup($group, 'max_member_group', null, '', false);
// Active account or inactive account
diff --git a/main/admin/user_information.php b/main/admin/user_information.php
index ec8c7abb6e..cac91dbfd8 100755
--- a/main/admin/user_information.php
+++ b/main/admin/user_information.php
@@ -188,7 +188,7 @@ if (count($sessions) > 0) {
$timeSpent = api_time_to_hms(
Tracking :: get_time_spent_on_the_course(
$user['user_id'],
- $courseInfo['code'],
+ $courseInfo['real_id'],
$id_session
)
);
@@ -286,19 +286,21 @@ if (Database::num_rows($res) > 0) {
$data = array();
$courseToolInformationTotal = null;
while ($course = Database::fetch_object($res)) {
+ $courseInfo = api_get_course_info($course->code);
$courseToolInformation = null;
$tools = ''.Display::return_icon('synthese_view.gif', get_lang('Overview')).''.
''.Display::return_icon('course_home.gif', get_lang('CourseHomepage')).'' .
''.Display::return_icon('edit.gif', get_lang('Edit')).'';
if ($course->status == STUDENT) {
- $tools .= ''.Display::return_icon('delete.png', get_lang('Delete')).'';
+ $tools .= ''.
+ Display::return_icon('delete.png', get_lang('Delete')).'';
}
$timeSpent = api_time_to_hms(
Tracking :: get_time_spent_on_the_course(
$user['user_id'],
- $course->code,
+ $courseInfo['real_id'],
0
)
);
@@ -308,7 +310,7 @@ if (Database::num_rows($res) > 0) {
$course->id,
0
);
- $courseInfo = api_get_course_info($course->code);
+
$row = array(
Display::url($course->code, $courseInfo['course_public_url']),
$course->title,
diff --git a/main/admin/user_list.php b/main/admin/user_list.php
index 7775ce65f9..0d57dc0aa4 100755
--- a/main/admin/user_list.php
+++ b/main/admin/user_list.php
@@ -324,7 +324,7 @@ function login_user($user_id) {
$main_user_table = Database::get_main_table(TABLE_MAIN_USER);
$main_admin_table = Database::get_main_table(TABLE_MAIN_ADMIN);
- $track_e_login_table = Database::get_statistic_table(TABLE_STATISTIC_TRACK_E_LOGIN);
+ $track_e_login_table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_LOGIN);
unset($_user['user_id']); // uid not in session ? prevent any hacking
diff --git a/main/admin/user_move_stats.php b/main/admin/user_move_stats.php
index 3f106be35c..ce0604e1a9 100755
--- a/main/admin/user_move_stats.php
+++ b/main/admin/user_move_stats.php
@@ -116,10 +116,10 @@ if (isset($_REQUEST['load_ajax'])) {
$course_info = api_get_course_info($origin_course_code);
$course_id = $course_info['real_id'];
- $TABLETRACK_EXERCICES = Database::get_statistic_table(TABLE_STATISTIC_TRACK_E_EXERCICES);
- $TBL_TRACK_ATTEMPT = Database::get_statistic_table(TABLE_STATISTIC_TRACK_E_ATTEMPT);
- $TBL_TRACK_E_COURSE_ACCESS = Database::get_statistic_table(TABLE_STATISTIC_TRACK_E_COURSE_ACCESS);
- $TBL_TRACK_E_LAST_ACCESS = Database::get_statistic_table(TABLE_STATISTIC_TRACK_E_LASTACCESS);
+ $TABLETRACK_EXERCICES = Database::get_main_table(TABLE_STATISTIC_TRACK_E_EXERCICES);
+ $TBL_TRACK_ATTEMPT = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ATTEMPT);
+ $TBL_TRACK_E_COURSE_ACCESS = Database::get_main_table(TABLE_STATISTIC_TRACK_E_COURSE_ACCESS);
+ $TBL_TRACK_E_LAST_ACCESS = Database::get_main_table(TABLE_STATISTIC_TRACK_E_LASTACCESS);
$TBL_LP_VIEW = Database::get_course_table(TABLE_LP_VIEW);
$TBL_NOTEBOOK = Database::get_course_table(TABLE_NOTEBOOK);
@@ -127,9 +127,9 @@ if (isset($_REQUEST['load_ajax'])) {
$TBL_STUDENT_PUBLICATION_ASSIGNMENT = Database::get_course_table(TABLE_STUDENT_PUBLICATION_ASSIGNMENT);
$TBL_ITEM_PROPERTY = Database::get_course_table(TABLE_ITEM_PROPERTY);
- $TBL_DROPBOX_FILE = Database::get_course_table(TABLE_DROPBOX_FILE);
- $TBL_DROPBOX_POST = Database::get_course_table(TABLE_DROPBOX_POST);
- $TBL_AGENDA = Database::get_course_table(TABLE_AGENDA);
+ $TBL_DROPBOX_FILE = Database::get_course_table(TABLE_DROPBOX_FILE);
+ $TBL_DROPBOX_POST = Database::get_course_table(TABLE_DROPBOX_POST);
+ $TBL_AGENDA = Database::get_course_table(TABLE_AGENDA);
//1. track_e_exercises
//ORIGINAL COURSE
@@ -161,7 +161,8 @@ if (isset($_REQUEST['load_ajax'])) {
if (!$update_database) {
- $sql = "SELECT * FROM $TABLETRACK_EXERCICES WHERE exe_cours_id = '$origin_course_code' AND session_id = $new_session_id AND exe_user_id = $user_id ";
+ $sql = "SELECT * FROM $TABLETRACK_EXERCICES
+ WHERE exe_cours_id = '$origin_course_code' AND session_id = $new_session_id AND exe_user_id = $user_id ";
$res = Database::query($sql);
$list = array();
while($row = Database::fetch_array($res,'ASSOC')) {
@@ -188,8 +189,8 @@ if (isset($_REQUEST['load_ajax'])) {
//Nothing to do because there are not relationship with a session
//3. track_e_course_access
-
- $sql = "SELECT * FROM $TBL_TRACK_E_COURSE_ACCESS WHERE course_code = '$origin_course_code' AND session_id = $origin_session_id AND user_id = $user_id ";
+ $sql = "SELECT * FROM $TBL_TRACK_E_COURSE_ACCESS
+ WHERE c_id = '$course_id' AND session_id = $origin_session_id AND user_id = $user_id ";
$res = Database::query($sql);
$list = array();
while($row = Database::fetch_array($res,'ASSOC')) {
@@ -204,14 +205,12 @@ if (isset($_REQUEST['load_ajax'])) {
$res = Database::query($sql);
if ($debug) var_dump($res);
$result_message[$TBL_TRACK_E_COURSE_ACCESS]++;
- } else {
- //$result_message[$TBL_TRACK_E_COURSE_ACCESS][$id] = $data;
}
}
-
//4. track_e_lastaccess
- $sql = "SELECT access_id FROM $TBL_TRACK_E_LAST_ACCESS WHERE access_cours_code = '$origin_course_code' AND access_session_id = $origin_session_id AND access_user_id = $user_id ";
+ $sql = "SELECT access_id FROM $TBL_TRACK_E_LAST_ACCESS
+ WHERE c_id = '$course_id' AND access_session_id = $origin_session_id AND access_user_id = $user_id ";
$res = Database::query($sql);
$list = array();
while($row = Database::fetch_array($res,'ASSOC')) {
@@ -231,7 +230,8 @@ if (isset($_REQUEST['load_ajax'])) {
//5. lp_item_view
//CHECK ORIGIN
- $sql = "SELECT * FROM $TBL_LP_VIEW WHERE user_id = $user_id AND session_id = $origin_session_id AND c_id = $course_id ";
+ $sql = "SELECT * FROM $TBL_LP_VIEW
+ WHERE user_id = $user_id AND session_id = $origin_session_id AND c_id = $course_id ";
$res = Database::query($sql);
//Getting the list of LPs in the new session
@@ -581,10 +581,11 @@ $htmlHeadXtra[] = '';
function get_courses_list_by_user_id_based_in_exercises($user_id) {
- $TABLETRACK_EXERCICES = Database::get_statistic_table(TABLE_STATISTIC_TRACK_E_EXERCICES);
+ $TABLETRACK_EXERCICES = Database::get_main_table(TABLE_STATISTIC_TRACK_E_EXERCICES);
$user_id = intval($user_id);
//$sql = "SELECT DISTINCT exe_user_id, exe_cours_id as code, session_id as id_session FROM $TABLETRACK_EXERCICES WHERE exe_user_id = $user_id GROUP BY exe_user_id, exe_cours_id ORDER by exe_user_id, exe_cours_id ASC";
- $sql = "SELECT DISTINCT exe_user_id, exe_cours_id as code, session_id as id_session FROM $TABLETRACK_EXERCICES WHERE exe_user_id = $user_id ORDER by exe_user_id, exe_cours_id ASC";
+ $sql = "SELECT DISTINCT exe_user_id, exe_cours_id as code, session_id as id_session
+ FROM $TABLETRACK_EXERCICES WHERE exe_user_id = $user_id ORDER by exe_user_id, exe_cours_id ASC";
$res = Database::query($sql);
$course_list = array();
diff --git a/main/announcements/announcements.php b/main/announcements/announcements.php
index b3bfa45332..31166ba6dd 100755
--- a/main/announcements/announcements.php
+++ b/main/announcements/announcements.php
@@ -9,8 +9,6 @@
* Announcements tool and also add the resource linker here. The database also needed refactoring
* as there was no title field (the title was merged into the content field)
* @package chamilo.announcements
- * @todo make AWACS out of the configuration settings
- * @todo this file is 1300+ lines without any functions -> needs to be split into
* multiple functions
*/
@@ -24,22 +22,23 @@ $use_anonymous = true;
// setting the global file that gets the general configuration, the databases, the languages, ...
require_once '../inc/global.inc.php';
+
+/* Sessions */
+
+$ctok = $_SESSION['sec_token'];
+$stok = Security::get_token();
+
$current_course_tool = TOOL_ANNOUNCEMENT;
-$this_section=SECTION_COURSES;
+$this_section = SECTION_COURSES;
$nameTools = get_lang('ToolAnnouncement');
-//session
-if(isset($_GET['id_session'])) {
- $_SESSION['id_session'] = intval($_GET['id_session']);
-}
-
/* ACCESS RIGHTS */
api_protect_course_script(true);
// Configuration settings
-$display_announcement_list = true;
-$display_form = false;
-$display_title_list = true;
+$display_announcement_list = true;
+$display_form = false;
+$display_title_list = true;
// Maximum title messages to display
$maximum = '12';
@@ -48,164 +47,94 @@ $maximum = '12';
$length = '36';
// Database Table Definitions
-$tbl_courses = Database::get_main_table(TABLE_MAIN_COURSE);
-$tbl_sessions = Database::get_main_table(TABLE_MAIN_SESSION);
-$tbl_announcement = Database::get_course_table(TABLE_ANNOUNCEMENT);
-$tbl_item_property = Database::get_course_table(TABLE_ITEM_PROPERTY);
-
-/* Libraries */
-
-$lib = api_get_path(LIBRARY_PATH); //avoid useless function calls
-require_once 'announcements.inc.php';
+$tbl_courses = Database::get_main_table(TABLE_MAIN_COURSE);
+$tbl_sessions = Database::get_main_table(TABLE_MAIN_SESSION);
+$tbl_announcement = Database::get_course_table(TABLE_ANNOUNCEMENT);
+$tbl_item_property = Database::get_course_table(TABLE_ITEM_PROPERTY);
$course_id = api_get_course_int_id();
$_course = api_get_course_info();
/* Tracking */
-event_access_tool(TOOL_ANNOUNCEMENT);
-
-/* POST TO */
-$safe_emailTitle = isset($_POST['emailTitle']) ? $_POST['emailTitle'] : null;
-$safe_newContent = isset($_POST['newContent']) ? $_POST['newContent'] : null;
-
-$content_to_modify = $title_to_modify = '';
-
-if (!empty($_POST['To'])) {
- if (api_get_session_id()!=0 &&
- api_is_allowed_to_session_edit(false, true) == false
- ) {
- api_not_allowed(true);
- }
- $display_form = true;
-
- $form_elements = array(
- 'emailTitle' => $safe_emailTitle,
- 'newContent' => $safe_newContent,
- 'id' => $_POST['id'],
- 'emailoption' => $_POST['email_ann']
- );
- $_SESSION['formelements'] = $form_elements;
-
- $form_elements = $_SESSION['formelements'];
- $title_to_modify = $form_elements["emailTitle"];
- $content_to_modify = $form_elements["newContent"];
- $announcement_to_modify = $form_elements["id"];
-}
-
-/*
- Show/hide user/group form
-*/
-
-$setting_select_groupusers = true;
-if (empty($_POST['To']) and !isset($_SESSION['select_groupusers'])) {
- $_SESSION['select_groupusers'] = "hide";
-}
-$select_groupusers_status = isset($_SESSION['select_groupusers']) ? $_SESSION['select_groupusers']:null;
-if (!empty($_POST['To']) and ($select_groupusers_status=="hide")) {
- $_SESSION['select_groupusers'] = "show";
-}
-if (!empty($_POST['To']) and ($select_groupusers_status=="show")) {
- $_SESSION['select_groupusers'] = "hide";
-}
+Event::event_access_tool(TOOL_ANNOUNCEMENT);
+$announcement_id = isset($_GET['id']) ? intval($_GET['id']) : null;
$origin = isset($_GET['origin']) ? Security::remove_XSS($_GET['origin']) : null;
+$action = isset($_GET['action']) ? Security::remove_XSS($_GET['action']) : 'list';
-/* Action handling */
-
-// display the form
-if (((!empty($_GET['action']) && $_GET['action'] == 'add') && $_GET['origin'] == "") ||
- (!empty($_GET['action']) && $_GET['action'] == 'edit') || !empty($_POST['To'])
-) {
- if (api_get_session_id()!=0 && api_is_allowed_to_session_edit(false,true) == false) {
- api_not_allowed(true);
- }
- $display_form = true;
-}
+$announcement_number = AnnouncementManager::getNumberAnnouncements();
-// clear all resources
-if ((empty($originalresource) || ($originalresource!=='no')) and (!empty($action) && $action=='add')) {
- $_SESSION['formelements']=null;
-}
-
-$htmlHeadXtra[] = AnnouncementManager::to_javascript();
-
-/* Filter user/group */
-
-if(!empty($_GET['toolgroup'])){
- if($_GET['toolgroup'] == strval(intval($_GET['toolgroup']))){
- //check is integer
- $toolgroup = intval($_GET['toolgroup']);
- $_SESSION['select_groupusers'] = 'hide';
- } else {
- $toolgroup = 0;
- }
- Session::write("toolgroup", $toolgroup);
-}
-
-/* Sessions */
-
-$ctok = $_SESSION['sec_token'];
-$stok = Security::get_token();
-$to = null;
-$email_ann = null;
-
-if (!empty($_SESSION['formelements']) and
- !empty($_GET['originalresource']) and
- $_GET['originalresource'] == 'no'
-) {
- $form_elements = $_SESSION['formelements'];
- $title_to_modify = $form_elements['emailTitle'];
- $content_to_modify = $form_elements['newContent'];
- $announcement_to_modify = $form_elements['id'];
- $to = $form_elements['to'];
- $email_ann = $form_elements['emailoption'];
-}
+$homeUrl = api_get_self().'?action=list&'.api_get_cidreq();
+$content = null;
-if (!empty($_GET['remind_inactive'])) {
- $to[] = 'USER:'.intval($_GET['remind_inactive']);
-}
-
-$group_id = api_get_group_id();
+switch ($action) {
+ case 'move':
+ /* Move announcement up/down */
+ if (isset($_GET['sec_token']) && $ctok == $_GET['sec_token']) {
+ if (!empty($_GET['down'])) {
+ $thisAnnouncementId = intval($_GET['down']);
+ $sortDirection = "DESC";
+ }
-if (!empty($group_id)) {
- $group_properties = GroupManager :: get_group_properties($group_id);
- $interbreadcrumb[] = array("url" => "../group/group.php", "name" => get_lang('Groups'));
- $interbreadcrumb[] = array("url"=>"../group/group_space.php?gidReq=".$group_id, "name"=> get_lang('GroupSpace').' '.$group_properties['name']);
-}
+ if (!empty($_GET['up'])) {
+ $thisAnnouncementId = intval($_GET['up']);
+ $sortDirection = "ASC";
+ }
+ }
-$announcement_id = isset($_GET['id']) ? intval($_GET['id']) : null;
-$message = null;
+ if (!empty($sortDirection)) {
+ if (!in_array(trim(strtoupper($sortDirection)), array('ASC', 'DESC'))) {
+ $sortDirection='ASC';
+ }
-if (empty($_GET['origin']) or $_GET['origin'] !== 'learnpath') {
- //we are not in the learning path
- Display::display_header($nameTools,get_lang('Announcements'));
-}
+ $announcementInfo = AnnouncementManager::get_by_id($course_id, $thisAnnouncementId);
-if (api_is_allowed_to_edit(false,true) OR
- (api_get_course_setting('allow_user_edit_announcement') && !api_is_anonymous())
-) {
- /*
- Change visibility of announcement
- */
- // $_GET['isStudentView']<>"false" is added to prevent that the visibility
- // is changed after you do the following:
- // change visibility -> studentview -> course manager view
- if (!isset($_GET['isStudentView']) || $_GET['isStudentView']!='false') {
- if (isset($_GET['id']) AND $_GET['id'] AND isset($_GET['action']) AND $_GET['action']=="showhide") {
- if (api_get_session_id()!=0 && api_is_allowed_to_session_edit(false,true)==false) {
- api_not_allowed();
- }
- if (!api_is_course_coach() || api_is_element_in_the_session(TOOL_ANNOUNCEMENT, $_GET['id'])) {
- if ($ctok == $_GET['sec_token']) {
- AnnouncementManager::change_visibility_announcement($_course, $_GET['id']);
- $message = get_lang('VisibilityChanged');
+ $sql = "SELECT DISTINCT announcement.id, announcement.display_order
+ FROM $tbl_announcement announcement,
+ $tbl_item_property itemproperty
+ WHERE
+ announcement.c_id = $course_id AND
+ itemproperty.c_id = $course_id AND
+ itemproperty.ref = announcement.id AND
+ itemproperty.tool = '".TOOL_ANNOUNCEMENT."' AND
+ itemproperty.visibility <> 2
+ ORDER BY display_order $sortDirection";
+ $result = Database::query($sql);
+ $thisAnnouncementOrderFound = false;
+ $thisAnnouncementOrder = null;
+
+ while (list($announcementId, $announcementOrder) = Database::fetch_row($result)) {
+ if ($thisAnnouncementOrderFound) {
+ $nextAnnouncementId = $announcementId;
+ $nextAnnouncementOrder = $announcementOrder;
+ $sql = "UPDATE $tbl_announcement SET display_order = '$nextAnnouncementOrder'
+ WHERE c_id = $course_id AND id = $thisAnnouncementId";
+ Database::query($sql);
+ $sql = "UPDATE $tbl_announcement SET display_order = '$thisAnnouncementOrder'
+ WHERE c_id = $course_id AND id = $nextAnnouncementId";
+
+ Database::query($sql);
+ break;
+ }
+ // STEP 1 : FIND THE ORDER OF THE ANNOUNCEMENT
+ if ($announcementId == $thisAnnouncementId) {
+ $thisAnnouncementOrder = $announcementOrder;
+ $thisAnnouncementOrderFound = true;
}
}
+ Display::addFlash(Display::return_message(get_lang('AnnouncementMoved')));
+ header('Location: '.$homeUrl);
+ exit;
}
- }
-
- /* Delete announcement */
- if (!empty($_GET['action']) && $_GET['action']=='delete' && isset($_GET['id'])) {
+ break;
+ case 'view':
+ $content = AnnouncementManager::display_announcement($announcement_id);
+ break;
+ case 'list':
+ $content = AnnouncementManager::getAnnouncements($stok, $announcement_number);
+ break;
+ case 'delete':
+ /* Delete announcement */
$id = intval($_GET['id']);
if (api_get_session_id()!=0 && api_is_allowed_to_session_edit(false, true) == false) {
api_not_allowed();
@@ -215,361 +144,353 @@ if (api_is_allowed_to_edit(false,true) OR
// tooledit : visibility = 2 : only visible for platform administrator
if ($ctok == $_GET['sec_token']) {
AnnouncementManager::delete_announcement($_course, $id);
-
- $id = null;
- $emailTitle = null;
- $newContent = null;
- $message = get_lang('AnnouncementDeleted');
+ Display::addFlash(Display::return_message(get_lang('AnnouncementDeleted')));
}
}
- }
-
- //delete attachment file
- if (isset($_GET['action']) && $_GET['action'] == 'delete_attachment') {
+ header('Location: '.$homeUrl);
+ exit;
+ break;
+ case 'delete_all':
+ if (api_is_allowed_to_edit()) {
+ AnnouncementManager::delete_all_announcements($_course);
+ Display::addFlash(Display::return_message(get_lang('AnnouncementDeletedAll')));
+ header('Location: '.$homeUrl);
+ exit;
+ }
+ break;
+ case 'delete_attachment':
$id = $_GET['id_attach'];
if ($ctok == $_GET['sec_token']) {
if (api_is_allowed_to_edit()) {
AnnouncementManager::delete_announcement_attachment_file($id);
}
}
- }
+ header('Location: '.$homeUrl);
+ exit;
+ break;
+ case 'showhide':
+ if (!isset($_GET['isStudentView']) || $_GET['isStudentView'] != 'false') {
+ if (isset($_GET['id']) AND $_GET['id']) {
+ if (api_get_session_id() != 0 &&
+ api_is_allowed_to_session_edit(false, true) == false) {
+ api_not_allowed();
+ }
- /* Delete all announcements */
- if (!empty($_GET['action']) and $_GET['action']=='delete_all') {
- if (api_is_allowed_to_edit()) {
- AnnouncementManager::delete_all_announcements($_course);
- $id = null;
- $emailTitle = null;
- $newContent = null;
- $message = get_lang('AnnouncementDeletedAll');
+ if (!api_is_course_coach() ||
+ api_is_element_in_the_session(TOOL_ANNOUNCEMENT, $_GET['id'])
+ ) {
+ if ($ctok == $_GET['sec_token']) {
+ AnnouncementManager::change_visibility_announcement(
+ $_course,
+ $_GET['id']
+ );
+ Display::addFlash(Display::return_message(get_lang('VisibilityChanged')));
+ header('Location: '.$homeUrl);
+ exit;
+ }
+ }
+ }
}
- }
-
- /* Modify announcement */
- if (!empty($_GET['action']) and $_GET['action']=='modify' AND isset($_GET['id'])) {
- if (api_get_session_id()!=0 && api_is_allowed_to_session_edit(false,true)==false) {
- api_not_allowed();
+ break;
+ case 'add':
+ case 'modify':
+ if (api_get_session_id() != 0 &&
+ api_is_allowed_to_session_edit(false, true) == false
+ ) {
+ api_not_allowed(true);
}
- $display_form = true;
-
- // RETRIEVE THE CONTENT OF THE ANNOUNCEMENT TO MODIFY
- $id = intval($_GET['id']);
-
- if (!api_is_course_coach() || api_is_element_in_the_session(TOOL_ANNOUNCEMENT, $id)) {
- $sql = "SELECT * FROM $tbl_announcement WHERE c_id = $course_id AND id = '$id'";
- $rs = Database::query($sql);
- $myrow = Database::fetch_array($rs);
- $last_id = $id;
- $userUpload = isset($_FILES['user_upload']) ? $_FILES['user_upload'] : null;
- $edit_attachment = AnnouncementManager::edit_announcement_attachment_file(
- $last_id,
- $userUpload,
- $file_comment
- );
+ // DISPLAY ADD ANNOUNCEMENT COMMAND
+ $id = isset($_GET['id']) ? intval($_GET['id']) : 0;
+ $url = api_get_self().'?action='.$action.'&id=' . $id . '&' . api_get_cidreq();
- if ($myrow) {
- $announcement_to_modify = $myrow['id'];
- $content_to_modify = $myrow['content'];
- $title_to_modify = $myrow['title'];
+ $form = new FormValidator(
+ 'f1',
+ 'post',
+ $url,
+ null,
+ array('enctype' => 'multipart/form-data')
+ );
- if ($originalresource!=="no") {
- $to = AnnouncementManager::load_edit_users("announcement", $announcement_to_modify);
+ if (empty($id)) {
+ $form_name = get_lang('AddAnnouncement');
+ } else {
+ $form_name = get_lang('ModifyAnnouncement');
+ }
+ $form->addElement('header', $form_name);
+
+ if (empty($group_id)) {
+ if (isset($_GET['remind_inactive'])) {
+ $email_ann = '1';
+ $content_to_modify = sprintf(
+ get_lang('RemindInactiveLearnersMailContent'),
+ api_get_setting('siteName'),
+ 7
+ );
+ $title_to_modify = sprintf(
+ get_lang('RemindInactiveLearnersMailSubject'),
+ api_get_setting('siteName')
+ );
+ } elseif (isset($_GET['remindallinactives']) && $_GET['remindallinactives'] == 'true') {
+ // we want to remind inactive users. The $_GET['since'] parameter
+ // determines which users have to be warned (i.e the users who have been inactive for x days or more
+ $since = isset($_GET['since']) ? intval($_GET['since']) : 6;
+ // getting the users who have to be reminded
+ $to = Tracking:: get_inactives_students_in_course(
+ api_get_course_int_id(),
+ $since,
+ api_get_session_id()
+ );
+ // setting the variables for the form elements: the users who need to receive the message
+ foreach ($to as &$user) {
+ $user = 'USER:' . $user;
+ }
+ // setting the variables for the form elements: the message has to be sent by email
+ $email_ann = '1';
+ // setting the variables for the form elements: the title of the email
+ $title_to_modify = sprintf(
+ get_lang('RemindInactiveLearnersMailSubject'),
+ api_get_setting('siteName')
+ );
+ // setting the variables for the form elements: the message of the email
+ $content_to_modify = sprintf(
+ get_lang('RemindInactiveLearnersMailContent'),
+ api_get_setting('siteName'),
+ $since
+ );
+ // when we want to remind the users who have never been active
+ // then we have a different subject and content for the announcement
+ if ($_GET['since'] == 'never') {
+ $title_to_modify = sprintf(
+ get_lang('RemindInactiveLearnersMailSubject'),
+ api_get_setting('siteName')
+ );
+ $content_to_modify = get_lang(
+ 'YourAccountIsActiveYouCanLoginAndCheckYourCourses'
+ );
}
- $display_announcement_list = false;
}
- if ($to=="everyone" OR !empty($group_id)) {
- $_SESSION['select_groupusers']="hide";
- } else {
- $_SESSION['select_groupusers']="show";
+ CourseManager::addUserGroupMultiSelect($form, array());
+ if (!isset($announcement_to_modify)) {
+ $announcement_to_modify = '';
}
+ $form->addElement(
+ 'checkbox',
+ 'email_ann',
+ null,
+ get_lang('EmailOption')
+ );
+ } else {
+ if (!isset($announcement_to_modify)) {
+ $announcement_to_modify = "";
+ }
+ CourseManager::addGroupMultiSelect($form, $group_id, array());
+ $form->addElement(
+ 'checkbox',
+ 'email_ann',
+ null,
+ get_lang('EmailOption')
+ );
}
- }
- /* Move announcement up/down */
- if (isset($_GET['sec_token']) && $ctok == $_GET['sec_token']) {
- if (!empty($_GET['down'])) {
- $thisAnnouncementId = intval($_GET['down']);
- $sortDirection = "DESC";
- }
+ $announcementInfo = AnnouncementManager::get_by_id($course_id, $id);
- if (!empty($_GET['up'])) {
- $thisAnnouncementId = intval($_GET['up']);
- $sortDirection = "ASC";
- }
- }
+ if (isset($announcementInfo) && !empty($announcementInfo)) {
+ $to = AnnouncementManager::load_edit_users("announcement", $id);
- if (!empty($sortDirection)) {
- if (!in_array(trim(strtoupper($sortDirection)), array('ASC', 'DESC'))) {
- $sortDirection='ASC';
+ $defaults = array(
+ 'title' => $announcementInfo['title'],
+ 'content' => $announcementInfo['content'],
+ 'id' => $announcementInfo['id'],
+ 'users' => $to
+ );
+ } else {
+ $defaults = array();
}
- $sql = "SELECT announcement.id, announcement.display_order
- FROM $tbl_announcement announcement,
- $tbl_item_property itemproperty
- WHERE
- announcement.c_id = $course_id AND
- itemproperty.c_id = $course_id AND
- itemproperty.ref=announcement.id AND
- itemproperty.tool='".TOOL_ANNOUNCEMENT."' AND
- itemproperty.visibility<>2
- ORDER BY display_order $sortDirection";
- $result = Database::query($sql);
-
- while (list ($announcementId, $announcementOrder) = Database::fetch_row($result)) {
- // STEP 2 : FOUND THE NEXT ANNOUNCEMENT ID AND ORDER.
- // COMMIT ORDER SWAP ON THE DB
- if ($thisAnnouncementOrderFound) {
- $nextAnnouncementId = $announcementId;
- $nextAnnouncementOrder = $announcementOrder;
- Database::query("UPDATE $tbl_announcement SET display_order = '$nextAnnouncementOrder' WHERE c_id = $course_id AND id = '$thisAnnouncementId'");
- Database::query("UPDATE $tbl_announcement SET display_order = '$thisAnnouncementOrder' WHERE c_id = $course_id AND id = '$nextAnnouncementId.'");
- break;
- }
- // STEP 1 : FIND THE ORDER OF THE ANNOUNCEMENT
- if ($announcementId == $thisAnnouncementId) {
- $thisAnnouncementOrder = $announcementOrder;
- $thisAnnouncementOrderFound = true;
- }
+ $form->addElement('text', 'title', get_lang('EmailTitle'));
+ $form->addElement('hidden', 'id');
+ $form->add_html_editor(
+ 'content',
+ get_lang('Description'),
+ false,
+ false,
+ array('ToolbarSet' => 'Announcements')
+ );
+
+ $form->addElement('file', 'user_upload', get_lang('AddAnAttachment'));
+ $form->addElement('textarea', 'file_comment', get_lang('FileComment'));
+ $form->addElement('hidden', 'sec_token', $stok);
+
+ if (api_get_session_id() == 0) {
+ $form->addCheckBox('send_to_users_in_session', null, get_lang('SendToUsersInSessions'));
}
- // show message
- $message = get_lang('AnnouncementMoved');
- }
- /* Submit announcement */
+ $form->addButton('save', get_lang('ButtonPublishAnnouncement'));
+ $form->setDefaults($defaults);
- $emailTitle = (!empty($_POST['emailTitle'])?$safe_emailTitle:'');
- $newContent = (!empty($_POST['newContent'])?$safe_newContent:'');
- $submitAnnouncement = isset($_POST['submitAnnouncement'])?$_POST['submitAnnouncement']:0;
+ $content = $form->return_form();
- $id = 0;
- if (!empty($_POST['id'])) {
- $id=intval($_POST['id']);
- }
+ if ($form->validate()) {
+ $data = $form->getSubmitValues();
- if ($submitAnnouncement && empty($emailTitle)) {
- $error_message = get_lang('TitleIsRequired');
- $content_to_modify = $newContent;
- } else if ($submitAnnouncement) {
- $sendToUsersInSession = isset($_POST['send_to_users_in_session']) ? true : false;
-
- if (isset($id) && $id) {
- // there is an Id => the announcement already exists => update mode
- if ($ctok == $_POST['sec_token']) {
- $file_comment = $_POST['file_comment'];
- $file = $_FILES['user_upload'];
- AnnouncementManager::edit_announcement(
- $id,
- $emailTitle,
- $newContent,
- $_POST['selectedform'],
- $file,
- $file_comment,
- $sendToUsersInSession
- );
+ $sendToUsersInSession = isset($data['send_to_users_in_session']) ? true : false;
- /* MAIL FUNCTION */
- if ($_POST['email_ann'] && empty($_POST['onlyThoseMails'])) {
- AnnouncementManager::send_email($id, $sendToUsersInSession);
- }
- $message = get_lang('AnnouncementModified');
- }
- } else {
- //insert mode
- if ($ctok == $_POST['sec_token']) {
- $file = $_FILES['user_upload'];
- $file_comment = $_POST['file_comment'];
- if (!empty($group_id)) {
- $insert_id = AnnouncementManager::add_group_announcement(
- $safe_emailTitle,
- $safe_newContent,
- array('GROUP:' . $group_id),
- $_POST['selectedform'],
- $file,
- $file_comment,
- $sendToUsersInSession
- );
- } else {
- $insert_id = AnnouncementManager::add_announcement(
- $safe_emailTitle,
- $safe_newContent,
+ if (isset($id) && $id) {
+ // there is an Id => the announcement already exists => update mode
+ if ($ctok == $_POST['sec_token']) {
+ $file_comment = $_POST['file_comment'];
+ $file = $_FILES['user_upload'];
+
+ AnnouncementManager::edit_announcement(
+ $id,
+ $data['title'],
+ $data['content'],
$_POST['selectedform'],
$file,
$file_comment,
$sendToUsersInSession
);
- }
- //store_resources($_SESSION['source_type'],$insert_id);
- $_SESSION['select_groupusers']="hide";
- $message = get_lang('AnnouncementAdded');
- /* MAIL FUNCTION */
- if ($_POST['email_ann'] && empty($_POST['onlyThoseMails'])) {
- AnnouncementManager::send_email($insert_id, $sendToUsersInSession);
+ /* MAIL FUNCTION */
+ if ($_POST['email_ann'] && empty($_POST['onlyThoseMails'])) {
+ AnnouncementManager::send_email($id, $sendToUsersInSession);
+ }
+ Display::addFlash(Display::return_message(get_lang('AnnouncementModified'), 'success'));
+ header('Location: '.$homeUrl);
+ exit;
}
+ } else {
+ // Insert mode
+ if ($ctok == $_POST['sec_token']) {
+ $file = $_FILES['user_upload'];
+ $file_comment = $data['file_comment'];
+
+ if (empty($group_id)) {
+ $insert_id = AnnouncementManager::add_announcement(
+ $data['title'],
+ $data['content'],
+ $data['users'],
+ $file,
+ $file_comment,
+ $sendToUsersInSession
+ );
+ } else {
+ $insert_id = AnnouncementManager::add_group_announcement(
+ $data['title'],
+ $data['content'],
+ array('GROUP:' . $group_id),
+ $data['users'],
+ $file,
+ $file_comment,
+ $sendToUsersInSession
+ );
+ }
+ Display::addFlash(
+ Display::return_message(
+ get_lang('AnnouncementAdded'),
+ 'success'
+ )
+ );
- } // end condition token
- } // isset
-
- // UNSET VARIABLES
- unset($form_elements);
- $_SESSION['formelements']=null;
-
- $newContent = null;
- $emailTitle = null;
-
- unset($emailTitle);
- unset($newContent);
- unset($content_to_modify);
- unset($title_to_modify);
+ /* MAIL FUNCTION */
+ if (isset($data['email_ann']) && $data['email_ann']) {
+ AnnouncementManager::send_email($insert_id, $sendToUsersInSession);
+ }
+ header('Location: '.$homeUrl);
+ exit;
- } // if $submit Announcement
+ } // end condition token
+ }
+ }
+ break;
}
-/* Tool introduction */
-
-if (empty($_GET['origin']) || $_GET['origin'] !== 'learnpath') {
- Display::display_introduction_section(TOOL_ANNOUNCEMENT);
+if (!empty($_GET['remind_inactive'])) {
+ $to[] = 'USER:'.intval($_GET['remind_inactive']);
}
+/*
+if (api_is_allowed_to_edit(false,true) OR
+ (api_get_course_setting('allow_user_edit_announcement') && !api_is_anonymous())
+) {
-/* DISPLAY LEFT COLUMN */
-
-//condition for the session
-$session_id = api_get_session_id();
-$condition_session = api_get_session_condition($session_id, true, true);
-
-if (api_is_allowed_to_edit(false,true)) {
- // check teacher status
- if (empty($_GET['origin']) or $_GET['origin'] !== 'learnpath') {
-
- if (api_get_group_id() == 0) {
- $group_condition = "";
- } else {
- $group_condition = " AND (ip.to_group_id='".api_get_group_id()."' OR ip.to_group_id = 0)";
+ //
+ if (!empty($_GET['action']) and $_GET['action']=='modify' AND isset($_GET['id'])) {
+ if (api_get_session_id()!=0 && api_is_allowed_to_session_edit(false,true)==false) {
+ api_not_allowed();
}
- $sql = "SELECT announcement.*, ip.visibility, ip.to_group_id, ip.insert_user_id
- FROM $tbl_announcement announcement, $tbl_item_property ip
- WHERE announcement.c_id = $course_id AND
- ip.c_id = $course_id AND
- announcement.id = ip.ref AND
- ip.tool = 'announcement' AND
- ip.visibility <> '2'
- $group_condition
- $condition_session
- GROUP BY ip.ref
- ORDER BY display_order DESC
- LIMIT 0,$maximum";
- }
-} else {
- // students only get to see the visible announcements
- if (empty($_GET['origin']) or $_GET['origin'] !== 'learnpath') {
- $group_memberships = GroupManager::get_group_ids($_course['real_id'], $_user['user_id']);
- if ((api_get_course_setting('allow_user_edit_announcement') && !api_is_anonymous())) {
+ // RETRIEVE THE CONTENT OF THE ANNOUNCEMENT TO MODIFY
+ $id = intval($_GET['id']);
- if (api_get_group_id() == 0) {
- $cond_user_id = " AND (ip.lastedit_user_id = '".api_get_user_id()."' OR ( ip.to_user_id='".$_user['user_id']."'" .
- "OR ip.to_group_id IN (0, ".implode(", ", $group_memberships)."))) ";
- } else {
- $cond_user_id = " AND (ip.lastedit_user_id = '".api_get_user_id()."'
- OR ip.to_group_id IN (0, ".api_get_group_id()."))";
- }
- } else {
- if (api_get_group_id() == 0) {
- $cond_user_id = " AND ( ip.to_user_id='".$_user['user_id']."'" .
- "OR ip.to_group_id IN (0, ".implode(", ", $group_memberships).")) ";
- } else {
- $cond_user_id = " AND ( ip.to_user_id='".$_user['user_id']."'" .
- "OR ip.to_group_id IN (0, ".api_get_group_id().")) ";
- }
- }
+ if (!api_is_course_coach() || api_is_element_in_the_session(TOOL_ANNOUNCEMENT, $id)) {
+ $sql = "SELECT * FROM $tbl_announcement WHERE c_id = $course_id AND id = '$id'";
+ $rs = Database::query($sql);
+ $myrow = Database::fetch_array($rs);
+ $last_id = $id;
+ $userUpload = isset($_FILES['user_upload']) ? $_FILES['user_upload'] : null;
+ $edit_attachment = AnnouncementManager::edit_announcement_attachment_file(
+ $last_id,
+ $userUpload,
+ $file_comment
+ );
- // the user is member of several groups => display personal announcements AND his group announcements AND the general announcements
- if (is_array($group_memberships) && count($group_memberships)>0) {
- $sql = "SELECT announcement.*, ip.visibility, ip.to_group_id, ip.insert_user_id
- FROM $tbl_announcement announcement, $tbl_item_property ip
- WHERE
- announcement.c_id = $course_id AND
- ip.c_id = $course_id AND
- announcement.id = ip.ref AND
- ip.tool='announcement'
- AND ip.visibility='1'
- $cond_user_id
- $condition_session
- GROUP BY ip.ref
- ORDER BY display_order DESC
- LIMIT 0, $maximum";
- } else {
- // the user is not member of any group
- // this is an identified user => show the general announcements AND his personal announcements
- if ($_user['user_id']) {
-
- if ((api_get_course_setting('allow_user_edit_announcement') && !api_is_anonymous())) {
- $cond_user_id = " AND (ip.lastedit_user_id = '".api_get_user_id()."' OR ( ip.to_user_id='".$_user['user_id']."' OR ip.to_group_id='0')) ";
- } else {
- $cond_user_id = " AND ( ip.to_user_id='".$_user['user_id']."' OR ip.to_group_id='0') ";
- }
- $sql="SELECT announcement.*, ip.visibility, ip.to_group_id, ip.insert_user_id
- FROM $tbl_announcement announcement, $tbl_item_property ip
- WHERE
- announcement.c_id = $course_id AND
- ip.c_id = $course_id AND
- announcement.id = ip.ref
- AND ip.tool='announcement'
- AND ip.visibility='1'
- $cond_user_id
- $condition_session
- GROUP BY ip.ref
- ORDER BY display_order DESC
- LIMIT 0, $maximum";
- } else {
+ if ($myrow) {
+ $announcement_to_modify = $myrow['id'];
+ $content_to_modify = $myrow['content'];
+ $title_to_modify = $myrow['title'];
- if (api_get_course_setting('allow_user_edit_announcement')) {
- $cond_user_id = " AND (ip.lastedit_user_id = '".api_get_user_id()."' OR ip.to_group_id='0') ";
- } else {
- $cond_user_id = " AND ip.to_group_id='0' ";
+ if ($originalresource!=="no") {
+ $to = AnnouncementManager::load_edit_users("announcement", $announcement_to_modify);
}
-
- // the user is not identiefied => show only the general announcements
- $sql="SELECT announcement.*, ip.visibility, ip.to_group_id, ip.insert_user_id
- FROM $tbl_announcement announcement, $tbl_item_property ip
- WHERE
- announcement.c_id = $course_id AND
- ip.c_id = $course_id AND
- announcement.id = ip.ref
- AND ip.tool='announcement'
- AND ip.visibility='1'
- AND ip.to_group_id='0'
- $condition_session
- GROUP BY ip.ref
- ORDER BY display_order DESC
- LIMIT 0,$maximum";
+ $display_announcement_list = false;
}
}
}
+}*/
+
+$htmlHeadXtra[] = AnnouncementManager::to_javascript();
+
+$group_id = api_get_group_id();
+
+if (!empty($group_id)) {
+ $group_properties = GroupManager :: get_group_properties($group_id);
+ $interbreadcrumb[] = array("url" => "../group/group.php?".api_get_cidreq(), "name" => get_lang('Groups'));
+ $interbreadcrumb[] = array("url"=>"../group/group_space.php?".api_get_cidreq(), "name"=> get_lang('GroupSpace').' '.$group_properties['name']);
}
-$result = Database::query($sql);
-$announcement_number = Database::num_rows($result);
-/*
- ADD ANNOUNCEMENT / DELETE ALL
-*/
+if (empty($_GET['origin']) or $_GET['origin'] !== 'learnpath') {
+ //we are not in the learning path
+ Display::display_header($nameTools,get_lang('Announcements'));
+}
+// Tool introduction
+if (empty($_GET['origin']) || $_GET['origin'] !== 'learnpath') {
+ Display::display_introduction_section(TOOL_ANNOUNCEMENT);
+}
+
+// Actions
$show_actions = false;
-if ((api_is_allowed_to_edit(false,true) OR (api_get_course_setting('allow_user_edit_announcement') && !api_is_anonymous())) and (empty($_GET['origin']) or $_GET['origin'] !== 'learnpath')) {
+if ((api_is_allowed_to_edit(false,true) OR
+ (api_get_course_setting('allow_user_edit_announcement') && !api_is_anonymous())) and
+ (empty($_GET['origin']) or $_GET['origin'] !== 'learnpath')
+) {
echo '';
if (isset($_GET['action']) && in_array($_GET['action'], array('add', 'modify','view'))) {
- echo "
".Display::return_icon('back.png',get_lang('Back'),'',ICON_SIZE_MEDIUM)."";
+ echo "
".
+ Display::return_icon('back.png',get_lang('Back'),'',ICON_SIZE_MEDIUM)."";
} else {
- echo "
".Display::return_icon('new_announce.png',get_lang('AddAnnouncement'),'',ICON_SIZE_MEDIUM)."";
+ echo "
".
+ Display::return_icon('new_announce.png',get_lang('AddAnnouncement'),'',ICON_SIZE_MEDIUM)."";
}
$show_actions = true;
} else {
if (in_array($_GET['action'], array('view'))) {
echo '
';
}
}
@@ -582,509 +503,16 @@ if (api_is_allowed_to_edit() && $announcement_number > 1) {
echo "
".
Display::return_icon('delete_announce.png',get_lang('AnnouncementDeleteAll'),'',ICON_SIZE_MEDIUM)."";
}
- } // if announcementNumber > 1
+ }
}
if ($show_actions)
echo '
';
-
- if ((isset($_GET['action']) && isset($_GET['id']) && is_array($to))||isset($_GET['remindallinactives'])||isset($_GET['remind_inactive'])) {
- echo '';
- }
-
-} // end of displayform for announcement creation/edition
-
-/**
- * Announcements list display
- */
-$course_id = api_get_course_int_id();
-
-//if ($display_announcement_list && !$surveyid) {
-if ($display_announcement_list) {
- // by default we use the id of the current user. The course administrator can see the announcement of other users by using the user / group filter
- //$user_id=$_user['user_id'];
- if (isset($_SESSION['user'])) {
- //$user_id=$_SESSION['user'];
- }
- $user_id = api_get_user_id();
-
- if (isset($_SESSION['group'])) {
- //$group_id=$_SESSION['group'];
- }
- $group_id = api_get_group_id();
-
- $group_memberships = GroupManager::get_group_ids($course_id, api_get_user_id());
-
- //$is_group_member = GroupManager :: is_tutor(api_get_user_id());
-
- if (api_is_allowed_to_edit(false,true) OR (api_get_course_setting('allow_user_edit_announcement') && !api_is_anonymous())) {
- // A.1. you are a course admin with a USER filter
- // => see only the messages of this specific user + the messages of the group (s)he is member of.
- if (!empty($_SESSION['user'])) {
-
- if (is_array($group_memberships) && count($group_memberships) > 0 ) {
- $sql = "SELECT announcement.*, ip.visibility, ip.to_group_id, ip.insert_user_id, ip.insert_date
- FROM $tbl_announcement announcement, $tbl_item_property ip
- WHERE announcement.c_id = $course_id AND
- ip.c_id = $course_id AND
- announcement.id = ip.ref AND
- ip.tool = 'announcement' AND
- (ip.to_user_id=$user_id OR ip.to_group_id IN (0, ".implode(", ", $group_memberships).") )
- $condition_session
-
- ORDER BY display_order DESC";
-
- } else {
- $sql = "SELECT announcement.*, ip.visibility, ip.to_group_id, ip.insert_user_id, ip.insert_date
- FROM $tbl_announcement announcement, $tbl_item_property ip
- WHERE announcement.c_id = $course_id AND
- ip.c_id = $course_id AND
- announcement.id = ip.ref AND
- ip.tool ='announcement' AND
- (ip.to_user_id = $user_id OR ip.to_group_id='0') AND
- ip.visibility='1'
- $condition_session
- ORDER BY display_order DESC";
-
- }
- } elseif (api_get_group_id() != 0 ) {
- // A.2. you are a course admin with a GROUP filter
- // => see only the messages of this specific group
- $sql="SELECT announcement.*, ip.visibility, ip.to_group_id, ip.insert_user_id, ip.insert_date
- FROM $tbl_announcement announcement, $tbl_item_property ip
- WHERE announcement.c_id = $course_id AND
- ip.c_id = $course_id AND
- announcement.id = ip.ref
- AND ip.tool='announcement'
- AND ip.visibility<>'2'
- AND (ip.to_group_id=$group_id OR ip.to_group_id='0')
- $condition_session
- GROUP BY ip.ref
- ORDER BY display_order DESC";
- } else {
-
- // A.3 you are a course admin without any group or user filter
- // A.3.a you are a course admin without user or group filter but WITH studentview
- // => see all the messages of all the users and groups without editing possibilities
-
- if (isset($isStudentView) and $isStudentView=="true") {
- $sql="SELECT
- announcement.*, ip.visibility, ip.to_group_id, ip.insert_user_id, ip.insert_date
- FROM $tbl_announcement announcement, $tbl_item_property ip
- WHERE announcement.c_id = $course_id AND
- ip.c_id = $course_id AND
- announcement.id = ip.ref
- AND ip.tool='announcement'
- AND ip.visibility='1'
- $condition_session
- GROUP BY ip.ref
- ORDER BY display_order DESC";
- } else {
- // A.3.a you are a course admin without user or group filter and WTIHOUT studentview (= the normal course admin view)
- // => see all the messages of all the users and groups with editing possibilities
- $sql = "SELECT announcement.*, ip.visibility, ip.to_group_id, ip.insert_user_id, ip.insert_date
- FROM $tbl_announcement announcement, $tbl_item_property ip
- WHERE announcement.c_id = $course_id AND
- ip.c_id = $course_id AND
- announcement.id = ip.ref
- AND ip.tool='announcement'
- AND (ip.visibility='0' or ip.visibility='1')
- $condition_session
- GROUP BY ip.ref
- ORDER BY display_order DESC";
- }
- }
- } else {
- //STUDENT
-
- if (is_array($group_memberships) && count($group_memberships)>0) {
- if ((api_get_course_setting('allow_user_edit_announcement') && !api_is_anonymous())) {
- if (api_get_group_id() == 0) {
- //No group
- $cond_user_id = " AND (ip.lastedit_user_id = '".api_get_user_id()."' OR ( ip.to_user_id='".$_user['user_id']."'" .
- " OR ip.to_group_id IN (0, ".implode(", ", $group_memberships)."))) ";
- } else {
- $cond_user_id = " AND (ip.lastedit_user_id = '".api_get_user_id()."'
- OR ip.to_group_id IN (0, ".api_get_group_id()."))";
- }
- //$cond_user_id = " AND (ip.lastedit_user_id = '".api_get_user_id()."' OR (ip.to_user_id=$user_id OR ip.to_group_id IN (0, ".implode(", ", $group_memberships).") )) ";
-
- } else {
- if (api_get_group_id() == 0) {
- $cond_user_id = " AND (ip.to_user_id=$user_id OR ip.to_group_id IN (0, ".implode(", ", $group_memberships).")) ";
- } else {
- $cond_user_id = " AND (ip.to_user_id=$user_id OR ip.to_group_id IN (0, ".api_get_group_id()."))";
- }
- }
-
- $sql = "SELECT announcement.*, ip.visibility, ip.to_group_id, ip.insert_user_id, ip.insert_date
- FROM $tbl_announcement announcement, $tbl_item_property ip
- WHERE announcement.c_id = $course_id AND
- ip.c_id = $course_id AND
- announcement.id = ip.ref
- AND ip.tool='announcement'
- $cond_user_id
- $condition_session
- AND ip.visibility='1'
- ORDER BY display_order DESC";
- } else {
- if ($_user['user_id']) {
- if ((api_get_course_setting('allow_user_edit_announcement') && !api_is_anonymous())) {
- $cond_user_id = " AND (ip.lastedit_user_id = '".api_get_user_id()."' OR (ip.to_user_id='".$_user['user_id']."' OR ip.to_group_id='0')) ";
- } else {
- $cond_user_id = " AND (ip.to_user_id='".$_user['user_id']."' OR ip.to_group_id='0') ";
- }
-
- $sql = "SELECT announcement.*, ip.visibility, ip.to_group_id, ip.insert_user_id, ip.insert_date
- FROM $tbl_announcement announcement, $tbl_item_property ip
- WHERE
- announcement.c_id = $course_id AND
- ip.c_id = $course_id AND
- announcement.id = ip.ref AND
- ip.tool='announcement'
- $cond_user_id
- $condition_session
- AND ip.visibility='1'
- AND announcement.session_id IN(0,".api_get_session_id().")
- ORDER BY display_order DESC";
- } else {
-
- if ((api_get_course_setting('allow_user_edit_announcement') && !api_is_anonymous())) {
- $cond_user_id = " AND (ip.lastedit_user_id = '".api_get_user_id()."' OR ip.to_group_id='0' ) ";
- } else {
- $cond_user_id = " AND ip.to_group_id='0' ";
- }
-
- $sql = "SELECT announcement.*, ip.visibility, ip.to_group_id, ip.insert_user_id, ip.insert_date
- FROM $tbl_announcement announcement, $tbl_item_property ip
- WHERE
- announcement.c_id = $course_id AND
- ip.c_id = $course_id AND
- announcement.id = ip.ref
- AND ip.tool='announcement'
- $cond_user_id
- $condition_session
- AND ip.visibility='1'
- AND announcement.session_id IN(0,".api_get_session_id().")";
- }
- }
- }
-
- $result = Database::query($sql);
- $num_rows = Database::num_rows($result);
-
- // DISPLAY: NO ITEMS
-
- if (!isset($_GET['action']) || !in_array($_GET['action'], array('add', 'modify','view')))
- if ($num_rows == 0) {
- if ((api_is_allowed_to_edit(false,true) OR (api_get_course_setting('allow_user_edit_announcement') && !api_is_anonymous())) and (empty($_GET['origin']) or $_GET['origin'] !== 'learnpath')) {
- echo '';
- echo '
'.get_lang('Announcements').'
';
- echo Display::return_icon('valves.png', '', array(), 64);
- echo '
';
- echo Display::url(get_lang('AddAnnouncement'), api_get_self()."?".api_get_cidreq()."&action=add&origin=".$origin, array('class' => 'btn'));
- echo '
';
- echo '
';
- $ths = Display::tag('th', get_lang('Title'));
- $ths .= Display::tag('th', get_lang('By') );
- $ths .= Display::tag('th', get_lang('LastUpdateDate') );
- if (api_is_allowed_to_edit(false,true) OR (api_is_course_coach() && api_is_element_in_the_session(TOOL_ANNOUNCEMENT,$myrow['id']))
- OR (api_get_course_setting('allow_user_edit_announcement') && !api_is_anonymous())) {
- $ths .= Display::tag('th', get_lang('Modify'));
- }
-
- echo Display::tag('tr', $ths);
- $displayed = array();
-
- while ($myrow = Database::fetch_array($result, 'ASSOC')) {
- if (!in_array($myrow['id'], $displayed)) {
- $sent_to_icon = '';
- // the email icon
- if ($myrow['email_sent'] == '1') {
- $sent_to_icon = ' '.Display::return_icon('email.gif', get_lang('AnnounceSentByEmail'));
- }
-
- $title = $myrow['title'].$sent_to_icon;
-
- /* DATE */
- $last_post_datetime = $myrow['end_date'];
-
- $item_visibility = api_get_item_visibility($_course, TOOL_ANNOUNCEMENT, $myrow['id'], $session_id);
- $myrow['visibility'] = $item_visibility;
-
- // the styles
- if ($myrow['visibility'] == '0') {
- $style='invisible';
- } else {
- $style = '';
- }
-
- echo '';
-
- // show attachment list
- $attachment_list = array();
- $attachment_list = AnnouncementManager::get_attachment($myrow['id']);
-
- $attachment_icon = '';
- if (count($attachment_list)>0) {
- $attachment_icon = ' '.Display::return_icon('attachment.gif',get_lang('Attachment'));
- }
-
- /* TITLE */
- $title = Display::url($title.$attachment_icon, api_get_self().'?'.api_get_cidreq().'&action=view&id='.$myrow['id']);
- echo Display::tag('td', Security::remove_XSS($title), array('class' => 'announcements-list-line-title '.$style));
-
- $user_info = api_get_user_info($myrow['insert_user_id']);
- $username = sprintf(get_lang("LoginX"), $user_info['username']);
- $username_span = Display::tag('span', api_get_person_name($user_info['firstName'], $user_info['lastName']), array('title'=>$username));
- echo Display::tag('td', $username_span, array('class' => 'announcements-list-line-by-user'));
- echo Display::tag('td', api_convert_and_format_date($myrow['insert_date'], DATE_TIME_FORMAT_LONG), array('class' => 'announcements-list-line-datetime'));
-
- // we can edit if : we are the teacher OR the element belongs to the session we are coaching OR the option to allow users to edit is on
- $modify_icons = '';
- if (api_is_allowed_to_edit(false,true) OR (api_is_course_coach() && api_is_element_in_the_session(TOOL_ANNOUNCEMENT, $myrow['id']))
- OR (api_get_course_setting('allow_user_edit_announcement') && !api_is_anonymous())) {
-
- $modify_icons = "".Display::return_icon('edit.png', get_lang('Edit'),'',ICON_SIZE_SMALL)."";
- if ($myrow['visibility']==1) {
- $image_visibility="visible";
- $alt_visibility=get_lang('Hide');
- } else {
- $image_visibility="invisible";
- $alt_visibility=get_lang('Visible');
- }
- $modify_icons .= "".
- Display::return_icon($image_visibility.'.png', $alt_visibility,'',ICON_SIZE_SMALL)."";
-
- // DISPLAY MOVE UP COMMAND only if it is not the top announcement
- if ($iterator != 1) {
- $modify_icons .= "".Display::return_icon('up.gif', get_lang('Up'))."";
- } else {
- $modify_icons .= Display::return_icon('up_na.gif', get_lang('Up'));
- }
- if ($iterator < $bottomAnnouncement) {
- $modify_icons .= "".Display::return_icon('down.gif', get_lang('Down'))."";
- } else {
- $modify_icons .= Display::return_icon('down_na.gif', get_lang('Down'));
- }
- if (api_is_allowed_to_edit(false,true)) {
- $modify_icons .= "".
- Display::return_icon('delete.png', get_lang('Delete'),'',ICON_SIZE_SMALL).
- "";
- }
- $iterator ++;
- echo Display::tag('td', $modify_icons, array('class' => 'announcements-list-line-actions'));
- }
- echo "
";
- }
- $displayed[]=$myrow['id'];
- } // end while
- echo "
";
- }
-} // end: if ($displayAnnoucementList)
-
-
-if (isset($_GET['action']) && $_GET['action'] == 'view') {
- AnnouncementManager::display_announcement($announcement_id);
-}
/* FOOTER */
if (empty($_GET['origin']) or $_GET['origin'] !== 'learnpath') {
diff --git a/main/announcements/download.php b/main/announcements/download.php
index d68fe2811a..7f558c8285 100755
--- a/main/announcements/download.php
+++ b/main/announcements/download.php
@@ -53,7 +53,7 @@ if (is_dir($full_file_name)) {
$tbl_announcement_attachment = Database::get_course_table(TABLE_ANNOUNCEMENT_ATTACHMENT);
// launch event
-event_download($doc_url);
+Event::event_download($doc_url);
$course_id = api_get_course_int_id();
diff --git a/main/announcements/resources/js/main.js b/main/announcements/resources/js/main.js
index 3e056d61de..78ca6b89e3 100755
--- a/main/announcements/resources/js/main.js
+++ b/main/announcements/resources/js/main.js
@@ -34,8 +34,6 @@ $(function() {
}
}
});
-
-
});
});
diff --git a/main/attendance/attendance_controller.php b/main/attendance/attendance_controller.php
index 0e111238e7..777a7013cb 100755
--- a/main/attendance/attendance_controller.php
+++ b/main/attendance/attendance_controller.php
@@ -565,7 +565,7 @@ class AttendanceController
) . '&action=calendar_logins'
);
$form->addDateRangePicker('range', get_lang('Range'));
- $form->add_button('submit', get_lang('submit'));
+ $form->addButton('submit', get_lang('submit'));
if ($form->validate()) {
$values = $form->getSubmitValues();
diff --git a/main/attendance/attendance_sheet.php b/main/attendance/attendance_sheet.php
index d74b70ae5b..7678e0cc0e 100755
--- a/main/attendance/attendance_sheet.php
+++ b/main/attendance/attendance_sheet.php
@@ -345,7 +345,11 @@ if (api_is_allowed_to_edit(null, true) ||
echo '';
}
} else {
- echo '';
+ $calendarClass = null;
+ if (isset($calendar)) {
+ $calendarClass = "checkboxes_col_".$calendar['id'];
+ }
+ echo ' | ';
echo ' ';
echo '
diff --git a/main/attendance/layout.php b/main/attendance/layout.php
index dbc7537e24..ce84eb845f 100755
--- a/main/attendance/layout.php
+++ b/main/attendance/layout.php
@@ -18,7 +18,7 @@ Display :: display_header('');
Display::display_introduction_section($tool);
// Tracking
-event_access_tool($tool);
+Event::event_access_tool($tool);
// Display
echo $content;
diff --git a/main/auth/external_login/ldap.inc.php b/main/auth/external_login/ldap.inc.php
index d504a0a921..9b3f6e9f63 100755
--- a/main/auth/external_login/ldap.inc.php
+++ b/main/auth/external_login/ldap.inc.php
@@ -48,7 +48,7 @@ function extldap_connect()
$ds = ldap_connect($host);
}
if (!$ds) {
- $port = isset($extldap_config['port']) ? $ldap_config['port'] : 389;
+ $port = isset($extldap_config['port']) ? $extldap_config['port'] : 389;
error_log('EXTLDAP ERROR : cannot connect to '.$extldap_config['host'].':'.$port);
} else {
break;
diff --git a/main/auth/external_login/login.ldap.php b/main/auth/external_login/login.ldap.php
index d94c9eb392..e130db5efc 100755
--- a/main/auth/external_login/login.ldap.php
+++ b/main/auth/external_login/login.ldap.php
@@ -65,8 +65,7 @@ if ($ldap_user !== false) {
Session::write('_user', $_user);
$uidReset = true;
$logging_in = true;
- event_login();
- error_log("Calling event_login");
+ Event::event_login();
} else {
error_log('extldap_authenticate error');
$loginFailed = true;
diff --git a/main/auth/external_login/login.ws.php b/main/auth/external_login/login.ws.php
index a801c772f5..748c145159 100755
--- a/main/auth/external_login/login.ws.php
+++ b/main/auth/external_login/login.ws.php
@@ -27,8 +27,7 @@ if ($isValid === 1) {
Session::write('_user', $_user);
$uidReset = true;
$logging_in = true;
- event_login();
- //error_log('Calling event_login');
+ Event::event_login();
} else {
//error_log('WS authentication error - user not approved by external WS');
$loginFailed = true;
diff --git a/main/auth/external_login/newUser.ldap.php b/main/auth/external_login/newUser.ldap.php
index d59137805e..f422fbd366 100755
--- a/main/auth/external_login/newUser.ldap.php
+++ b/main/auth/external_login/newUser.ldap.php
@@ -2,38 +2,38 @@
// External login module : LDAP
/**
- * This file is included by main/inc/local.inc.php when extldap is activated, a user try to login
+ * This file is included by main/inc/local.inc.php when extldap is activated, a user try to login
* and chamilo does not find his user
- * Variables that can be used :
+ * Variables that can be used :
* - $login : string containing the username posted by the user
* - $password : string containing the password posted by the user
*
* Please configure the exldap module in main/auth/external_login/ldap.conf.php
- *
- * If login succeeds, we have to add the user in the chamilo database and then
- * we have 2 choices :
- * 1. - set $loginFailed to false,
- * - set $_SESSION['_user']['user_id'] with the dokeos user_id
+ *
+ * If login succeeds, we have to add the user in the chamilo database and then
+ * we have 2 choices :
+ * 1. - set $loginFailed to false,
+ * - set $_SESSION['_user']['user_id'] with the dokeos user_id
* - set $uidReset to true
* - let the script local.inc.php continue
*
- * 2. - set $_SESSION['_user']['user_id'] with the dokeos user_id
+ * 2. - set $_SESSION['_user']['user_id'] with the dokeos user_id
* - set $_SESSION['_user']['uidReset'] to true
* - upgrade user info in dokeos database if needeed
* - redirect to any page and let local.inc.php do the magic
- *
+ *
* If login fails we have also 2 choices :
- * 1. - unset $_user['user_id']
- * - set $loginFailed=true
+ * 1. - unset $_user['user_id']
+ * - set $loginFailed=true
* - set $uidReset = false
* User wil then have the user password incorrect message
*
- * 2. We redirect the user to index.php with appropriate message :
- * Possible messages are :
+ * 2. We redirect the user to index.php with appropriate message :
+ * Possible messages are :
* - index.php?loginFailed=1&error=access_url_inactive
* - index.php?loginFailed=1&error=account_expired
* - index.php?loginFailed=1&error=account_inactive
- * - index.php?loginFailed=1&error=user_password_incorrect
+ * - index.php?loginFailed=1&error=user_password_incorrect
* - index.php?loginFailed=1&error=unrecognize_sso_origin');
* */
@@ -55,13 +55,13 @@ if ($ldap_user !== false) {
$_user['uidReset'] = true;
Session::write('_user', $_user);
$uidReset = true;
- // Is user admin?
+ // Is user admin?
if ($chamilo_user['admin'] === true) {
$is_platformAdmin = true;
Database::query("INSERT INTO admin values ('$chamilo_uid')");
}
}
- event_login();
+ Event::event_login();
} else {
$loginFailed = true;
$uidReset = false;
diff --git a/main/auth/external_login/newUser.php b/main/auth/external_login/newUser.php
index cd4a825ca7..71a8ab8903 100755
--- a/main/auth/external_login/newUser.php
+++ b/main/auth/external_login/newUser.php
@@ -46,7 +46,7 @@ if ($user !== false && ($chamilo_uid = external_add_user($user)) !== false) {
// Can user create course
$is_allowedCreateCourse = (bool) (($user['status'] == COURSEMANAGER) or (api_get_setting('drhCourseManagerRights') and $user['status'] == SESSIONADMIN));
- event_login();
+ Event::event_login();
} else {
$loginFailed = true;
unset($_user['user_id']);
diff --git a/main/auth/inscription.php b/main/auth/inscription.php
index 937e95981b..787dda0abd 100755
--- a/main/auth/inscription.php
+++ b/main/auth/inscription.php
@@ -601,7 +601,7 @@ if ($form->validate()) {
Session::write('is_allowedCreateCourse', $is_allowedCreateCourse);
// Stats
- event_login();
+ Event::event_login();
// last user login date is now
$user_last_login_datetime = 0; // used as a unix timestamp it will correspond to : 1 1 1970
diff --git a/main/auth/ldap/authldap.php b/main/auth/ldap/authldap.php
index b8fd83c6d7..31d15a2224 100755
--- a/main/auth/ldap/authldap.php
+++ b/main/auth/ldap/authldap.php
@@ -62,6 +62,7 @@ use \ChamiloSession as Session;
/**
* Code
*/
+require_once api_get_path(SYS_CODE_PATH).'auth/external_login/ldap.inc.php';
require 'ldap_var.inc.php';
/**
* Check login and password with LDAP
@@ -325,7 +326,9 @@ function ldap_set_version(&$resource) {
*/
function ldap_handle_bind(&$ldap_handler,&$ldap_bind) {
//error_log('Entering ldap_handle_bind(&$ldap_handler,&$ldap_bind)',0);
- global $ldap_rdn,$ldap_pass;
+ global $ldap_rdn,$ldap_pass, $extldap_config;
+ $ldap_rdn = $extldap_config['admin_dn'];
+ $ldap_pass = $extldap_config['admin_password'];
if (!empty($ldap_rdn) and !empty($ldap_pass)) {
//error_log('Trying authenticated login :'.$ldap_rdn.'/'.$ldap_pass,0);
$ldap_bind = ldap_bind($ldap_handler,$ldap_rdn,$ldap_pass);
@@ -352,21 +355,23 @@ function ldap_handle_bind(&$ldap_handler,&$ldap_bind) {
*/
function ldap_get_users() {
- global $ldap_basedn, $ldap_host, $ldap_port, $ldap_rdn, $ldap_pass;
+ global $ldap_basedn, $ldap_host, $ldap_port, $ldap_rdn, $ldap_pass, $ldap_search_dn, $extldap_user_correspondance;
- $keyword_firstname = trim(Database::escape_string($_GET['keyword_firstname']));
- $keyword_lastname = trim(Database::escape_string($_GET['keyword_lastname']));
- $keyword_username = trim(Database::escape_string($_GET['keyword_username']));
- $keyword_type = Database::escape_string($_GET['keyword_type']);
+ $keyword_firstname = isset($_GET['keyword_firstname']) ? trim(Database::escape_string($_GET['keyword_firstname'])): '';
+ $keyword_lastname = isset($_GET['keyword_lastname']) ? trim(Database::escape_string($_GET['keyword_lastname'])) : '';
+ $keyword_username = isset($_GET['keyword_username']) ? trim(Database::escape_string($_GET['keyword_username'])) : '';
+ $keyword_type = isset($_GET['keyword_type']) ? Database::escape_string($_GET['keyword_type']) : '';
$ldap_query=array();
if ($keyword_username != "") {
- $ldap_query[]="(uid=".$keyword_username."*)";
- } else if ($keyword_lastname!=""){
- $ldap_query[]="(sn=".$keyword_lastname."*)";
+ $ldap_query[] = str_replace('%username%', $keyword_username, $ldap_search_dn);
+ } else {
+ if ($keyword_lastname!=""){
+ $ldap_query[]="(".$extldap_user_correspondance['lastname']."=".$keyword_lastname."*)";
+ }
if ($keyword_firstname!="") {
- $ldap_query[]="(givenName=".$keyword_firstname."*)";
+ $ldap_query[]="(".$extldap_user_correspondance['firstname']."=".$keyword_firstname."*)";
}
}
if ($keyword_type !="" && $keyword_type !="all") {
@@ -380,7 +385,7 @@ function ldap_get_users() {
}
$str_query.=" )";
} else {
- $str_query=$ldap_query[0];
+ $str_query= count($ldap_query) > 0 ? $ldap_query[0] : null;
}
$ds = ldap_connect($ldap_host, $ldap_port);
@@ -421,6 +426,9 @@ function ldap_get_number_of_users() {
* @author Mustapha Alouani
*/
function ldap_get_user_data($from, $number_of_items, $column, $direction) {
+
+ global $extldap_user_correspondance;
+
$users = array();
$is_western_name_order = api_is_western_name_order();
if (isset($_GET['submit'])) {
@@ -434,17 +442,17 @@ function ldap_get_user_data($from, $number_of_items, $column, $direction) {
//$dn_array=ldap_explode_dn($info[$key]["dn"],1);
//$user[] = $dn_array[0]; // uid is first key
//$user[] = $dn_array[0]; // uid is first key
- $user[] = $info[$key]['uid'][0];
- $user[] = $info[$key]['uid'][0];
+ $user[] = $info[$key][$extldap_user_correspondance['username']][0];
+ $user[] = $info[$key][$extldap_user_correspondance['username']][0];
if ($is_western_name_order) {
- $user[] = api_convert_encoding($info[$key]['cn'][0], api_get_system_encoding(), 'UTF-8');
- $user[] = api_convert_encoding($info[$key]['sn'][0], api_get_system_encoding(), 'UTF-8');
+ $user[] = api_convert_encoding($info[$key][$extldap_user_correspondance['firstname']][0], api_get_system_encoding(), 'UTF-8');
+ $user[] = api_convert_encoding($info[$key][$extldap_user_correspondance['lastname']][0], api_get_system_encoding(), 'UTF-8');
} else {
- $user[] = api_convert_encoding($info[$key]['sn'][0], api_get_system_encoding(), 'UTF-8');
- $user[] = api_convert_encoding($info[$key]['cn'][0], api_get_system_encoding(), 'UTF-8');
+ $user[] = api_convert_encoding($info[$key][$extldap_user_correspondance['firstname']][0], api_get_system_encoding(), 'UTF-8');
+ $user[] = api_convert_encoding($info[$key][$extldap_user_correspondance['lastname']][0], api_get_system_encoding(), 'UTF-8');
}
$user[] = $info[$key]['mail'][0];
- $outab[] = $info[$key]['eduPersonPrimaryAffiliation'][0]; // Ici "student"
+ $user[] = $info[$key][$extldap_user_correspondance['username']][0];
$users[] = $user;
}
} else {
@@ -462,9 +470,12 @@ function ldap_get_user_data($from, $number_of_items, $column, $direction) {
* @author Mustapha Alouani
*/
function modify_filter($user_id,$url_params, $row) {
- $url_params_id="id[]=".$row[0];
+ $query_string="id[]=".$row[0];
+ if (!empty($_GET['id_session'])){
+ $query_string .= '&id_session='.Security::remove_XSS($_GET['id_session']);
+ }
//$url_params_id="id=".$row[0];
- $result .= ''.Display::return_icon('add_user.gif', get_lang('AddUsers')).'';
+ $result = ''.Display::return_icon('add_user.gif', get_lang('AddUsers')).'';
return $result;
}
@@ -474,26 +485,9 @@ function modify_filter($user_id,$url_params, $row) {
* @author Mustapha Alouani
*/
function ldap_add_user($login) {
- global $ldap_basedn, $ldap_host, $ldap_port, $ldap_rdn, $ldap_pass;
- $ds = ldap_connect($ldap_host, $ldap_port);
- ldap_set_version($ds);
- $user_id = 0;
- if ($ds) {
- $str_query="(uid=".$login.")";
- $r = false;
- $res = ldap_handle_bind($ds, $r);
- $sr = ldap_search($ds, $ldap_basedn, $str_query);
- //echo "Number of results is : ".ldap_count_entries($ds,$sr)."";
- $info = ldap_get_entries($ds, $sr);
-
- for ($key = 0; $key < $info['count']; $key ++) {
- $user_id = ldap_add_user_by_array($info[$key]);
- }
-
- } else {
- Display :: display_error_message(get_lang('LDAPConnectionError'));
+ if ($ldap_user = extldap_authenticate($login, 'nopass', true)) {
+ return extldap_add_user_by_array($ldap_user);
}
- return $user_id;
}
function ldap_add_user_by_array($data, $update_if_exists = true) {
diff --git a/main/auth/ldap/ldap_var.inc.php b/main/auth/ldap/ldap_var.inc.php
index 5ff295e59f..60f39b637d 100755
--- a/main/auth/ldap/ldap_var.inc.php
+++ b/main/auth/ldap/ldap_var.inc.php
@@ -23,24 +23,24 @@
* Configuration settings
*/
// your ldap server
-$ldap_host = api_get_setting('ldap_main_server_address');
+$ldap_host = $extldap_config['host'][0];
// your ldap server's port number
-$ldap_port = api_get_setting('ldap_main_server_port');
+$ldap_port = @$extldap_config['port'] ?: null;
//domain
-$ldap_basedn = api_get_setting('ldap_domain');
+$ldap_basedn = $extldap_config['base_dn'];
//search term for students
-$ldap_search_dn = api_get_setting('ldap_search_string');
+$ldap_search_dn = $extldap_config['user_search'];
//additional server params for use of replica in case of problems
-$ldap_host2 = api_get_setting('ldap_replicate_server_address');
-$ldap_port2 = api_get_setting('ldap_replicate_server_port');
+$ldap_host2 = count($extldap_config['host']) > 1 ? $extldap_config['host'][1] : null;
+$ldap_port2 = $extldap_config['port'];
//protocol version - set to 3 for LDAP 3
-$ldap_version = api_get_setting('ldap_version');
+$ldap_version = $extldap_config['protocol_version'];
//non-anonymous LDAP mode
-$ldap_rdn = api_get_setting('ldap_authentication_login');
-$ldap_pass = api_get_setting('ldap_authentication_password');
+$ldap_rdn = $extldap_config['admin_dn'];
+$ldap_pass = $extldap_config['admin_password'];
$ldap_pass_placeholder = "PLACEHOLDER";
diff --git a/main/auth/ldap/login.php b/main/auth/ldap/login.php
index 5906a37243..5df705e0c9 100755
--- a/main/auth/ldap/login.php
+++ b/main/auth/ldap/login.php
@@ -34,7 +34,7 @@ if ($loginLdapSucces)
$_user['user_id'] = $uData['user_id'];
Session::write('_uid',$_uid);
// Jand: copied from event_login in events.lib.php to enable login statistics:
- event_login();
+ Event::event_login();
}
else
{
diff --git a/main/auth/my_progress.php b/main/auth/my_progress.php
index abfd81aa05..5963053df2 100755
--- a/main/auth/my_progress.php
+++ b/main/auth/my_progress.php
@@ -65,7 +65,7 @@ if (!empty($course_user_list)) {
if ($count == $last_item) {
$last = ''.get_lang('Last').'';
}
- $course_info = api_get_course_info($result['course_code']);
+ $course_info = api_get_course_info_by_id($result['c_id']);
$course_image = ' ';
$dates .= ' '.api_get_utc_datetime($login).'';
$issues .= '
diff --git a/main/auth/shibboleth/lib/shibboleth_session.class.php b/main/auth/shibboleth/lib/shibboleth_session.class.php
index 849da6a27e..4dcfdf35f8 100755
--- a/main/auth/shibboleth/lib/shibboleth_session.class.php
+++ b/main/auth/shibboleth/lib/shibboleth_session.class.php
@@ -80,14 +80,14 @@ class ShibbolethSession
$_SESSION['noredirection'] = true;
//must be called before 'init_local.inc.php'
- event_login();
+ Event::event_login();
//used in 'init_local.inc.php' this is BAD but and should be changed
$loginFailed = false;
$uidReset = true;
$gidReset = true;
- $cidReset = false; //FALSE !!
+ $cidReset = false; //FALSE !!
$mainDbName = Database :: get_main_database();
$includePath = api_get_path(INCLUDE_PATH);
@@ -98,4 +98,4 @@ class ShibbolethSession
return $_user;
}
-}
\ No newline at end of file
+}
diff --git a/main/auth/sso/sso.Drupal.class.php b/main/auth/sso/sso.Drupal.class.php
index d2214f0802..e5c8d51cf1 100755
--- a/main/auth/sso/sso.Drupal.class.php
+++ b/main/auth/sso/sso.Drupal.class.php
@@ -4,7 +4,7 @@ use \ChamiloSession as Session;
/* For licensing terms, see /license.txt */
/**
- * This file contains the necessary elements to implement a Single Sign On
+ * This file contains the necessary elements to implement a Single Sign On
* mechanism with an external Drupal application (on which the Chamilo module
* 7.x-1.0-alpha3 or above must be implemented)
*
@@ -16,7 +16,7 @@ use \ChamiloSession as Session;
*
* @package chamilo.auth.sso
*/
-
+
/**
* The SSO class allows for management of remote Single Sign On resources
*/
@@ -44,9 +44,9 @@ class ssoDrupal {
$this->master_url = $this->protocol.$this->domain.$this->auth_uri;
$this->target = api_get_path(WEB_PATH);
}
-
+
/**
- * Unlogs the user from the remote server
+ * Unlogs the user from the remote server
*/
public function logout() {
header('Location: '.$this->deauth_url);
@@ -69,7 +69,7 @@ class ssoDrupal {
header('Location: '.$this->master_url.$params);
exit;
}
-
+
/**
* Validates the received active connection data with the database
* @return bool Return the loginFailed variable value to local.inc.php
@@ -100,29 +100,29 @@ class ssoDrupal {
//Check the user's password
if ($uData['auth_source'] == PLATFORM_AUTH_SOURCE) {
- if ($sso['secret'] === sha1($uData['username'].$sso_challenge.api_get_security_key())
+ if ($sso['secret'] === sha1($uData['username'].$sso_challenge.api_get_security_key())
&& ($sso['username'] == $uData['username'])) {
//Check if the account is active (not locked)
if ($uData['active']=='1') {
// check if the expiration date has not been reached
- if ($uData['expiration_date'] > date('Y-m-d H:i:s') OR $uData['expiration_date']=='0000-00-00 00:00:00') {
-
+ if ($uData['expiration_date'] > date('Y-m-d H:i:s') OR $uData['expiration_date']=='0000-00-00 00:00:00') {
+
//If Multiple URL is enabled
if (api_get_multiple_access_url()) {
//Check the access_url configuration setting if the user is registered in the access_url_rel_user table
//Getting the current access_url_id of the platform
$current_access_url_id = api_get_current_access_url_id();
- // my user is subscribed in these
+ // my user is subscribed in these
//sites: $my_url_list
$my_url_list = api_get_access_url_from_user($uData['user_id']);
} else {
$current_access_url_id = 1;
$my_url_list = array(1);
}
-
+
$my_user_is_admin = UserManager::is_admin($uData['user_id']);
-
+
if ($my_user_is_admin === false) {
if (is_array($my_url_list) && count($my_url_list) > 0 ) {
if (in_array($current_access_url_id, $my_url_list)) {
@@ -130,7 +130,7 @@ class ssoDrupal {
$_user['user_id'] = $uData['user_id'];
$_user = api_get_user_info($_user['user_id']);
Session::write('_user', $_user);
- event_login();
+ Event::event_login();
// Redirect to homepage
$sso_target = isset($sso['target']) ? $sso['target'] : api_get_path(WEB_PATH) .'.index.php';
header('Location: '. $sso_target);
@@ -143,7 +143,7 @@ class ssoDrupal {
exit;
}
} else {
- // there is no URL in the multiple
+ // there is no URL in the multiple
// urls list for this user
$loginFailed = true;
Session::erase('_uid');
@@ -153,23 +153,23 @@ class ssoDrupal {
} else {
//Only admins of the "main" (first) Chamilo
// portal can login wherever they want
- if (in_array(1, $my_url_list)) {
- //Check if this admin is admin on the
+ if (in_array(1, $my_url_list)) {
+ //Check if this admin is admin on the
// principal portal
$_user['user_id'] = $uData['user_id'];
$_user = api_get_user_info($_user['user_id']);
$is_platformAdmin = $uData['status'] == COURSEMANAGER;
Session::write('is_platformAdmin', $is_platformAdmin);
Session::write('_user', $_user);
- event_login();
+ Event::event_login();
} else {
- //Secondary URL admin wants to login
+ //Secondary URL admin wants to login
// so we check as a normal user
if (in_array($current_access_url_id, $my_url_list)) {
$_user['user_id'] = $uData['user_id'];
$_user = api_get_user_info($_user['user_id']);
Session::write('_user',$_user);
- event_login();
+ Event::event_login();
} else {
$loginFailed = true;
Session::erase('_uid');
@@ -177,7 +177,7 @@ class ssoDrupal {
exit;
}
}
- }
+ }
} else {
// user account expired
$loginFailed = true;
@@ -215,7 +215,7 @@ class ssoDrupal {
}
return $loginFailed;
}
-
+
/**
* Decode the cookie (this function may vary depending on the
* Single Sign On implementation
@@ -230,7 +230,7 @@ class ssoDrupal {
* Generate the URL for profile editing for a any user or the current user
* @param int $userId Optional. The user id
* @param boolean $asAdmin Optional. Whether get the URL for the platform admin
- * @return string If the URL is obtained return the drupal_user_id. Otherwise return false
+ * @return string If the URL is obtained return the drupal_user_id. Otherwise return false
*/
public function generateProfileEditingURL($userId = 0, $asAdmin = false)
{
@@ -243,18 +243,19 @@ class ssoDrupal {
$userExtraFieldValue = new ExtraFieldValue('user');
$drupalUserIdData = $userExtraFieldValue->get_values_by_handler_and_field_variable($userId, 'drupal_user_id');
+ // If this is an administrator, allow him to make some changes in
+ // the Chamilo profile
+ if ($asAdmin && api_is_platform_admin(true)) {
+ return api_get_path(WEB_CODE_PATH) . "admin/user_edit.php?user_id=$userId";
+ }
+ // If the user doesn't match a Drupal user, give the normal profile
+ // link
if ($drupalUserIdData === false) {
- if ($asAdmin && api_is_platform_admin(true)) {
- return api_get_path(WEB_CODE_PATH) . "admin/user_edit.php?user_id=$userId";
- }
-
return api_get_path(WEB_CODE_PATH) . 'auth/profile.php';
}
-
+ // In all other cases, generate a link to the Drupal profile edition
$drupalUserId = $drupalUserIdData['field_value'];
-
$url = "{$this->protocol}{$this->domain}/user/{$drupalUserId}/edit";
-
return $url;
}
diff --git a/main/auth/sso/sso.class.php b/main/auth/sso/sso.class.php
index ab827d00cd..f70e037e59 100755
--- a/main/auth/sso/sso.class.php
+++ b/main/auth/sso/sso.class.php
@@ -4,11 +4,11 @@ use \ChamiloSession as Session;
/* For licensing terms, see /license.txt */
/**
- * This file contains the necessary elements to implement a Single Sign On
- * mechanism with an arbitrary external web application (given some light
+ * This file contains the necessary elements to implement a Single Sign On
+ * mechanism with an arbitrary external web application (given some light
* development there) and is based on the Drupal-Chamilo module implementation.
* To develop a new authentication mechanism, please extend this class and
- * overwrite its method, then modify the corresponding calling code in
+ * overwrite its method, then modify the corresponding calling code in
* main/inc/local.inc.php
* @package chamilo.auth.sso
*/
@@ -40,16 +40,16 @@ class sso {
$this->master_url = $this->protocol.$this->domain.$this->auth_uri;
$this->target = api_get_path(WEB_PATH);
}
-
+
/**
- * Unlogs the user from the remote server
+ * Unlogs the user from the remote server
*/
public function logout()
{
header('Location: '.$this->deauth_url);
exit;
}
-
+
/**
* Sends the user to the master URL for a check of active connection
*/
@@ -68,7 +68,7 @@ class sso {
header('Location: '.$this->master_url.$params);
exit;
}
-
+
/**
* Validates the received active connection data with the database
* @return bool Return the loginFailed variable value to local.inc.php
@@ -79,10 +79,10 @@ class sso {
$loginFailed = false;
//change the way we recover the cookie depending on how it is formed
$sso = $this->decode_cookie($_GET['sso_cookie']);
-
+
//error_log('check_user');
//error_log('sso decode cookie: '.print_r($sso,1));
-
+
//lookup the user in the main database
$user_table = Database::get_main_table(TABLE_MAIN_USER);
$sql = "SELECT user_id, username, password, auth_source, active, expiration_date, status
@@ -97,7 +97,7 @@ class sso {
//This user's authentification is managed by Chamilo itself
// check the user's password
// password hash comes already parsed in sha1, md5 or none
-
+
/*
error_log($sso['secret']);
error_log($uData['password']);
@@ -125,7 +125,7 @@ class sso {
// check if the expiration date has not been reached
if ($uData['expiration_date'] > date('Y-m-d H:i:s')
or $uData['expiration_date']=='0000-00-00 00:00:00') {
-
+
//If Multiple URL is enabled
if (api_get_multiple_access_url()) {
//Check the access_url configuration setting if
@@ -139,9 +139,9 @@ class sso {
$current_access_url_id = 1;
$my_url_list = array(1);
}
-
+
$my_user_is_admin = UserManager::is_admin($uData['user_id']);
-
+
if ($my_user_is_admin === false) {
if (is_array($my_url_list) && count($my_url_list) > 0) {
if (in_array($current_access_url_id, $my_url_list)) {
@@ -149,7 +149,7 @@ class sso {
$_user['user_id'] = $uData['user_id'];
$_user = api_get_user_info($_user['user_id']);
Session::write('_user', $_user);
- event_login();
+ Event::event_login();
// Redirect to homepage
$sso_target = isset($sso['target']) ? $sso['target'] : api_get_path(WEB_PATH) .'.index.php';
header('Location: '. $sso_target);
@@ -180,7 +180,7 @@ class sso {
$is_platformAdmin = $uData['status'] == COURSEMANAGER;
Session::write('is_platformAdmin', $is_platformAdmin);
Session::write('_user', $_user);
- event_login();
+ Event::event_login();
} else {
//Secondary URL admin wants to login
// so we check as a normal user
@@ -188,7 +188,7 @@ class sso {
$_user['user_id'] = $uData['user_id'];
$_user = api_get_user_info($_user['user_id']);
Session::write('_user', $_user);
- event_login();
+ Event::event_login();
} else {
$loginFailed = true;
Session::erase('_uid');
@@ -243,7 +243,7 @@ class sso {
}
return $loginFailed;
}
-
+
/**
* Decode the cookie (this function may vary depending on the
* Single Sign On implementation
@@ -259,7 +259,7 @@ class sso {
* Generate the URL for profile editing for a any user or the current user
* @param int $userId Optional. The user id
* @param boolean $asAdmin Optional. Whether get the URL for the platform admin
- * @return string The SSO URL
+ * @return string The SSO URL
*/
public function generateProfileEditingURL($userId = 0, $asAdmin = false)
{
diff --git a/main/blog/blog.php b/main/blog/blog.php
index 28da6c62ce..ff11b8ed26 100755
--- a/main/blog/blog.php
+++ b/main/blog/blog.php
@@ -6,9 +6,6 @@
* @package chamilo.blogs
*/
-/**
- * INIT
- */
// name of the language file that needs to be included
$language_file = "blog";
require_once '../inc/global.inc.php';
@@ -22,18 +19,11 @@ if (empty($blog_id)) {
$this_section = SECTION_COURSES;
$current_course_tool = TOOL_BLOGS;
-
/* ACCESS RIGHTS */
// notice for unauthorized people.
api_protect_course_script(true);
-//session
-if(isset($_GET['id_session'])) {
- $_SESSION['id_session'] = intval($_GET['id_session']);
-}
-
$lib_path = api_get_path(LIBRARY_PATH);
-
$blog_table_attachment = Database::get_course_table(TABLE_BLOGS_ATTACHMENT);
$nameTools = get_lang('Blogs');
@@ -41,95 +31,146 @@ $DaysShort = api_get_week_days_short();
$DaysLong = api_get_week_days_long();
$MonthsLong = api_get_months_long();
-$current_page = $_GET['action'];
+$action = isset($_GET['action']) ? $_GET['action'] : null;
/*
PROCESSING
*/
-$safe_post_title = Security::remove_XSS($_POST['post_title']);
-$safe_post_file_comment = Security::remove_XSS($_POST['post_file_comment']);
-$safe_post_full_text = Security::remove_XSS(stripslashes(api_html_entity_decode($_POST['post_full_text'])), COURSEMANAGERLOWSECURITY);
-$safe_comment_text = Security::remove_XSS(stripslashes(api_html_entity_decode($_POST['comment_text'])), COURSEMANAGERLOWSECURITY);
-$safe_comment_title = Security::remove_XSS($_POST['comment_title']);
-$safe_task_name = Security::remove_XSS($_POST['task_name']);
-$safe_task_description = Security::remove_XSS($_POST['task_description']);
-
-if (!empty($_POST['new_post_submit']) AND !empty($_POST['post_title'])) {
- Blog :: create_post($safe_post_title, $safe_post_full_text, $safe_post_file_comment,$blog_id);
+$safe_post_file_comment = isset($_GET['post_file_comment']) ? Security::remove_XSS($_POST['post_file_comment']) : null;
+$safe_comment_text = isset($_GET['comment_text']) ? Security::remove_XSS(stripslashes(api_html_entity_decode($_POST['comment_text'])), COURSEMANAGERLOWSECURITY) : null;
+$safe_comment_title = isset($_GET['comment_title']) ? Security::remove_XSS($_POST['comment_title']) : null;
+$safe_task_name = isset($_GET['task_name']) ? Security::remove_XSS($_POST['task_name']) : null;
+$safe_task_description = isset($_GET['task_description']) ? Security::remove_XSS($_POST['task_description']) : null;
+
+if (!empty($_POST['new_post_submit'])) {
+ Blog:: create_post(
+ $_POST['title'],
+ $_POST['full_text'],
+ $_POST['post_file_comment'],
+ $blog_id
+ );
$return_message = array('type' => 'confirmation', 'message' => get_lang('BlogAdded'));
}
-if (!empty($_POST['edit_post_submit']))
-{
- $safe_post_title = Security::remove_XSS($_POST['post_title']);
- Blog :: edit_post($_POST['post_id'], $safe_post_title, $safe_post_full_text, $blog_id);
+if (!empty($_POST['edit_post_submit'])) {
+ Blog:: edit_post(
+ $_POST['post_id'],
+ $_POST['title'],
+ $_POST['full_text'],
+ $blog_id
+ );
$return_message = array('type' => 'confirmation', 'message' => get_lang('BlogEdited'));
}
-if (!empty($_POST['new_comment_submit']))
-{
- Blog :: create_comment($safe_comment_title, $safe_comment_text, $safe_post_file_comment,$blog_id, (int)$_GET['post_id'], $_POST['comment_parent_id']);
+
+if (!empty($_POST['new_comment_submit'])) {
+ Blog:: create_comment(
+ $_POST['title'],
+ $_POST['comment'],
+ $_POST['post_file_comment'],
+ $blog_id,
+ $_GET['post_id'],
+ $_POST['comment_parent_id']
+ );
$return_message = array('type' => 'confirmation', 'message' => get_lang('CommentAdded'));
}
-if (!empty($_POST['new_task_submit']))
-{
- Blog :: create_task($blog_id, $safe_task_name, $safe_task_description, $_POST['chkArticleDelete'], $_POST['chkArticleEdit'], $_POST['chkCommentsDelete'], $_POST['task_color']);
+if (!empty($_POST['new_task_submit'])) {
+ Blog:: create_task(
+ $blog_id,
+ $safe_task_name,
+ $safe_task_description,
+ $_POST['chkArticleDelete'],
+ $_POST['chkArticleEdit'],
+ $_POST['chkCommentsDelete'],
+ $_POST['task_color']
+ );
$return_message = array('type' => 'confirmation', 'message' => get_lang('TaskCreated'));
}
-if (isset($_POST['edit_task_submit']))
-{
- Blog :: edit_task($_POST['blog_id'], $_POST['task_id'], $safe_task_name, $safe_task_description, $_POST['chkArticleDelete'], $_POST['chkArticleEdit'],$_POST['chkCommentsDelete'], $_POST['task_color']);
- $return_message = array('type' => 'confirmation', 'message' => get_lang('TaskEdited'));
+if (isset($_POST['edit_task_submit'])) {
+ Blog:: edit_task(
+ $_POST['blog_id'],
+ $_POST['task_id'],
+ $safe_task_name,
+ $safe_task_description,
+ $_POST['chkArticleDelete'],
+ $_POST['chkArticleEdit'],
+ $_POST['chkCommentsDelete'],
+ $_POST['task_color']
+ );
+ $return_message = array(
+ 'type' => 'confirmation',
+ 'message' => get_lang('TaskEdited')
+ );
}
-if (!empty($_POST['assign_task_submit']))
-{
- Blog :: assign_task($blog_id, $_POST['task_user_id'], $_POST['task_task_id'], $_POST['task_year']."-".$_POST['task_month']."-".$_POST['task_day']);
- $return_message = array('type' => 'confirmation', 'message' => get_lang('TaskAssigned'));
+
+if (!empty($_POST['assign_task_submit'])) {
+ Blog:: assign_task(
+ $blog_id,
+ $_POST['task_user_id'],
+ $_POST['task_task_id'],
+ $_POST['task_year'] . "-" . $_POST['task_month'] . "-" . $_POST['task_day']
+ );
+ $return_message = array(
+ 'type' => 'confirmation',
+ 'message' => get_lang('TaskAssigned')
+ );
}
-if (isset($_POST['assign_task_edit_submit']))
-{
- Blog :: edit_assigned_task($blog_id, $_POST['task_user_id'], $_POST['task_task_id'], $_POST['task_year']."-".$_POST['task_month']."-".$_POST['task_day'], $_POST['old_user_id'], $_POST['old_task_id'], $_POST['old_target_date']);
- $return_message = array('type' => 'confirmation', 'message' => get_lang('AssignedTaskEdited'));
+if (isset($_POST['assign_task_edit_submit'])) {
+ Blog:: edit_assigned_task(
+ $blog_id,
+ $_POST['task_user_id'],
+ $_POST['task_task_id'],
+ $_POST['task_year'] . "-" . $_POST['task_month'] . "-" . $_POST['task_day'],
+ $_POST['old_user_id'],
+ $_POST['old_task_id'],
+ $_POST['old_target_date']
+ );
+ $return_message = array(
+ 'type' => 'confirmation',
+ 'message' => get_lang('AssignedTaskEdited')
+ );
}
-if (!empty($_POST['new_task_execution_submit']))
-{
- Blog :: create_comment($safe_comment_title, $safe_comment_text, $blog_id, (int)$_GET['post_id'], $_POST['comment_parent_id'], $_POST['task_id']);
- $return_message = array('type' => 'confirmation', 'message' => get_lang('CommentCreated'));
+if (!empty($_POST['new_task_execution_submit'])) {
+ Blog:: create_comment(
+ $safe_comment_title,
+ $safe_comment_text,
+ $blog_id,
+ (int)$_GET['post_id'],
+ $_POST['comment_parent_id'],
+ $_POST['task_id']
+ );
+ $return_message = array(
+ 'type' => 'confirmation',
+ 'message' => get_lang('CommentCreated')
+ );
}
-if (!empty($_POST['register']))
-{
+if (!empty($_POST['register'])) {
if (is_array($_POST['user'])) {
- foreach ($_POST['user'] as $index => $user_id)
- {
+ foreach ($_POST['user'] as $index => $user_id) {
Blog :: set_user_subscribed((int)$_GET['blog_id'], $user_id);
}
}
}
-if (!empty($_POST['unregister']))
-{
+if (!empty($_POST['unregister'])) {
if (is_array($_POST['user'])) {
- foreach ($_POST['user'] as $index => $user_id)
- {
+ foreach ($_POST['user'] as $index => $user_id) {
Blog :: set_user_unsubscribed((int)$_GET['blog_id'], $user_id);
}
}
}
-if (!empty($_GET['register']))
-{
+if (!empty($_GET['register'])) {
Blog :: set_user_subscribed((int)$_GET['blog_id'], (int)$_GET['user_id']);
$return_message = array('type' => 'confirmation', 'message' => get_lang('UserRegistered'));
$flag = 1;
}
-if (!empty($_GET['unregister']))
-{
+if (!empty($_GET['unregister'])) {
Blog :: set_user_unsubscribed((int)$_GET['blog_id'], (int)$_GET['user_id']);
}
if (isset($_GET['action']) && $_GET['action'] == 'manage_tasks') {
- if (isset($_GET['do']) && $_GET['do'] == 'delete')
- {
+ if (isset($_GET['do']) && $_GET['do'] == 'delete') {
Blog :: delete_task($blog_id, (int)$_GET['task_id']);
$return_message = array('type' => 'confirmation', 'message' => get_lang('TaskDeleted'));
}
@@ -138,54 +179,40 @@ if (isset($_GET['action']) && $_GET['action'] == 'manage_tasks') {
Blog :: delete_assigned_task($blog_id, intval($_GET['task_id']), intval($_GET['user_id']));
$return_message = array('type' => 'confirmation', 'message' => get_lang('TaskAssignmentDeleted'));
}
-
}
if (isset($_GET['action']) && $_GET['action'] == 'view_post') {
$task_id = (isset ($_GET['task_id']) && is_numeric($_GET['task_id'])) ? $_GET['task_id'] : 0;
- if (isset($_GET['do']) && $_GET['do'] == 'delete_comment')
- {
- if (api_is_allowed('BLOG_'.$blog_id, 'article_comments_delete', $task_id))
- {
+ if (isset($_GET['do']) && $_GET['do'] == 'delete_comment') {
+ if (api_is_allowed('BLOG_'.$blog_id, 'article_comments_delete', $task_id)) {
Blog :: delete_comment($blog_id, (int)$_GET['post_id'],(int)$_GET['comment_id']);
$return_message = array('type' => 'confirmation', 'message' => get_lang('CommentDeleted'));
- }
- else
- {
+ } else {
$error = true;
$message = get_lang('ActionNotAllowed');
}
}
- if (isset($_GET['do']) && $_GET['do'] == 'delete_article')
- {
- if (api_is_allowed('BLOG_'.$blog_id, 'article_delete', $task_id))
- {
+ if (isset($_GET['do']) && $_GET['do'] == 'delete_article') {
+ if (api_is_allowed('BLOG_'.$blog_id, 'article_delete', $task_id)) {
Blog :: delete_post($blog_id, (int)$_GET['article_id']);
- $current_page = ''; // Article is gone, go to blog home
+ $action = ''; // Article is gone, go to blog home
$return_message = array('type' => 'confirmation', 'message' => get_lang('BlogDeleted'));
- }
- else
- {
+ } else {
$error = true;
$message = get_lang('ActionNotAllowed');
}
}
- if (isset($_GET['do']) && $_GET['do'] == 'rate')
- {
- if (isset($_GET['type']) && $_GET['type'] == 'post')
- {
- if (api_is_allowed('BLOG_'.$blog_id, 'article_rate'))
- {
+ if (isset($_GET['do']) && $_GET['do'] == 'rate') {
+ if (isset($_GET['type']) && $_GET['type'] == 'post') {
+ if (api_is_allowed('BLOG_'.$blog_id, 'article_rate')) {
Blog :: add_rating('post', $blog_id, (int)$_GET['post_id'], (int)$_GET['rating']);
$return_message = array('type' => 'confirmation', 'message' => get_lang('RatingAdded'));
}
}
- if (isset($_GET['type']) && $_GET['type'] == 'comment')
- {
- if (api_is_allowed('BLOG_'.$blog_id, 'article_comments_add'))
- {
+ if (isset($_GET['type']) && $_GET['type'] == 'comment') {
+ if (api_is_allowed('BLOG_'.$blog_id, 'article_comments_add')) {
Blog :: add_rating('comment', $blog_id, (int)$_GET['comment_id'], (int)$_GET['rating']);
$return_message = array('type' => 'confirmation', 'message' => get_lang('RatingAdded'));
}
@@ -198,7 +225,7 @@ if (isset($_GET['action']) && $_GET['action'] == 'view_post') {
$htmlHeadXtra[] = '';
// Set bredcrumb
-switch ($current_page) {
+switch ($action) {
case 'new_post' :
$nameTools = get_lang('NewPost');
$interbreadcrumb[] = array ('url' => "blog.php?blog_id=$blog_id", "name" => Blog :: get_blog_title($blog_id));
@@ -244,7 +271,6 @@ if (!empty($return_message)) {
}
}
-
// actions
echo '';
?>
@@ -256,9 +282,8 @@ echo ' ';
echo ' ';
// Tool introduction
-Display::display_introduction_section(TOOL_BLOG);
+Display::display_introduction_section(TOOL_BLOGS);
-//Display::display_header($nameTools,'Blogs');
?>
@@ -309,7 +334,7 @@ if (isset($error)) {
}
if (isset($flag) && $flag == '1') {
- $current_page = "manage_tasks";
+ $action = "manage_tasks";
Blog :: display_assign_task_form($blog_id);
}
@@ -338,13 +363,13 @@ if (isset ($_GET['task_id']) && is_numeric($_GET['task_id'])) {
$user_task = true;
}
-switch ($current_page) {
- case 'new_post' :
+switch ($action) {
+ case 'new_post':
if (api_is_allowed('BLOG_'.$blog_id, 'article_add', $user_task ? $task_id : 0)) {
// we show the form if
// 1. no post data
// 2. there is post data and the required field is empty
- if (!$_POST OR (!empty($_POST) AND empty($_POST['post_title']))) {
+ if (!$_POST OR (!empty($_POST) AND empty($_POST['title']))) {
// if there is post data there is certainly an error in the form
if ($_POST) {
Display::display_error_message(get_lang('FormHasErrorsPleaseComplete'));
diff --git a/main/blog/blog_admin.php b/main/blog/blog_admin.php
index 5853833dcf..337d800c9e 100755
--- a/main/blog/blog_admin.php
+++ b/main/blog/blog_admin.php
@@ -1,13 +1,12 @@
'blog_admin.php?'.$my_url,
- 'name' => $current_section
- );
+ /*$interbreadcrumb[] = array(
+ 'url' => 'blog_admin.php?' . $my_url,
+ 'name' => $current_section
+ );*/
Display::display_header('');
- } else {
}
echo ' ';
- /*
- PROCESSING..
- */
- $get_blog_name = Security::remove_XSS($_POST['blog_name']);
- $get_blog_subtitle = Security::remove_XSS($_POST['blog_subtitle']);
- $get_blog_id = Security::remove_XSS($_POST['blog_id']);
-
if (!empty($_POST['new_blog_submit']) AND !empty($_POST['blog_name'])) {
- if (strlen(trim($_POST['blog_name']))>0) {
- Blog::create_blog($get_blog_name,$get_blog_subtitle);
+ if (isset($_POST['blog_name'])) {
+ Blog::create_blog($_POST['blog_name'], $_POST['blog_subtitle']);
Display::display_confirmation_message(get_lang('BlogStored'));
}
}
if (!empty($_POST['edit_blog_submit']) AND !empty($_POST['blog_name'])) {
if (strlen(trim($_POST['blog_name']))>0) {
- Blog::edit_blog($get_blog_id,$get_blog_name,$get_blog_subtitle);
+ Blog::edit_blog($_POST['blog_id'], $_POST['blog_name'], $_POST['blog_subtitle']);
Display::display_confirmation_message(get_lang('BlogEdited'));
}
}
@@ -96,11 +88,11 @@ if (api_is_allowed_to_edit()) {
/*if ($_POST){
Display::display_error_message(get_lang('FormHasErrorsPleaseComplete'));
}*/
- if (strlen($_POST['blog_name'])==0) {
+ /*if (strlen($_POST['blog_name'])==0) {
if (count($_POST)>0) {
Display::display_error_message(get_lang('FormHasErrorsPleaseComplete'));
}
- }
+ }*/
Blog::display_new_blog_form();
}
}
diff --git a/main/blog/download.php b/main/blog/download.php
index 722642f867..821fb68573 100755
--- a/main/blog/download.php
+++ b/main/blog/download.php
@@ -51,7 +51,7 @@ $tbl_blogs_attachment = Database::get_course_table(TABLE_BLOGS_ATTACHMENT);
$course_id = api_get_course_int_id();
// launch event
-event_download($doc_url);
+Event::event_download($doc_url);
$sql = 'SELECT filename FROM '.$tbl_blogs_attachment.'
WHERE c_id = '.$course_id.' AND path LIKE BINARY "'.Database::escape_string($doc_url).'"';
diff --git a/main/calendar/agenda.php b/main/calendar/agenda.php
index f7ea78924d..67f9750b8e 100755
--- a/main/calendar/agenda.php
+++ b/main/calendar/agenda.php
@@ -63,7 +63,7 @@ function plus_repeated_event() {
// setting the name of the tool
$nameTools = get_lang('Agenda');
-event_access_tool(TOOL_CALENDAR_EVENT);
+Event::event_access_tool(TOOL_CALENDAR_EVENT);
// permission stuff - also used by loading from global in agenda.inc.php
$is_allowed_to_edit = api_is_allowed_to_edit(false, true) OR (api_get_course_setting('allow_user_edit_agenda') && !api_is_anonymous());
diff --git a/main/calendar/download.php b/main/calendar/download.php
index 459c573f04..b5722adc1e 100755
--- a/main/calendar/download.php
+++ b/main/calendar/download.php
@@ -67,7 +67,7 @@ if (is_dir($full_file_name)) {
$tbl_agenda_attachment = Database::get_course_table(TABLE_AGENDA_ATTACHMENT);
// launch event
-event_download($doc_url);
+Event::event_download($doc_url);
$sql='SELECT filename FROM '.$tbl_agenda_attachment.'
WHERE c_id = '.$course_id.' AND path LIKE BINARY "'.Database::escape_string($doc_url).'"';
diff --git a/main/chat/chat.php b/main/chat/chat.php
index 347d0d8f0a..b99a9135b1 100755
--- a/main/chat/chat.php
+++ b/main/chat/chat.php
@@ -6,7 +6,6 @@
* @package chamilo.chat
*/
-$language_file = array('chat');
require_once '../inc/global.inc.php';
$current_course_tool = TOOL_CHAT;
$this_section = SECTION_COURSES;
@@ -26,7 +25,7 @@ if ($origin != 'whoisonline') {
/* TRACKING */
-event_access_tool(TOOL_CHAT);
+Event::event_access_tool(TOOL_CHAT);
header('Content-Type: text/html; charset='.api_get_system_encoding());
/*
diff --git a/main/chat/chat_chat.php b/main/chat/chat_chat.php
index d01589593d..4e46ed1f31 100755
--- a/main/chat/chat_chat.php
+++ b/main/chat/chat_chat.php
@@ -10,7 +10,6 @@
define('FRAME', 'chat');
-$language_file = array('chat');
require_once '../inc/global.inc.php';
$course = $_GET['cidReq'];
diff --git a/main/chat/chat_hidden.php b/main/chat/chat_hidden.php
index e0eb4ddaf4..28e9779970 100755
--- a/main/chat/chat_hidden.php
+++ b/main/chat/chat_hidden.php
@@ -10,8 +10,6 @@
define('FRAME', 'hidden');
-$language_file = array('chat');
-
require_once '../inc/global.inc.php';
require_once 'chat_functions.lib.php';
diff --git a/main/chat/chat_message.php b/main/chat/chat_message.php
index 1f0a1274e3..c78356aefc 100755
--- a/main/chat/chat_message.php
+++ b/main/chat/chat_message.php
@@ -10,7 +10,6 @@
*/
define('FRAME', 'message');
-$language_file = array('chat');
require_once '../inc/global.inc.php';
require_once api_get_path(SYS_CODE_PATH).'chat/chat_functions.lib.php';
diff --git a/main/chat/chat_whoisonline.php b/main/chat/chat_whoisonline.php
index 73f134c8d4..319f46847e 100755
--- a/main/chat/chat_whoisonline.php
+++ b/main/chat/chat_whoisonline.php
@@ -8,7 +8,6 @@
*/
define('FRAME', 'online');
-$language_file = array('chat');
require_once '../inc/global.inc.php';
diff --git a/main/course_description/add.php b/main/course_description/add.php
index 98b5b2c03f..12a7acb49d 100755
--- a/main/course_description/add.php
+++ b/main/course_description/add.php
@@ -54,12 +54,7 @@ $form->addElement('hidden', 'description_type',$description_type);
$form->addElement('hidden', 'sec_token',$token);
$form->add_textfield('title', get_lang('Title'), true, array('size'=>'width: 350px;'));
$form->applyFilter('title','html_filter');
-
-if (api_get_setting('wcag_anysurfer_public_pages')=='true') {
- WCAG_rendering::prepare_admin_form($description_content, $form);
-} else {
- $form->add_html_editor('contentDescription', get_lang('Content'), true, false, array('ToolbarSet' => 'TrainingDescription', 'Width' => '100%', 'Height' => '200'));
-}
+$form->add_html_editor('contentDescription', get_lang('Content'), true, false, array('ToolbarSet' => 'TrainingDescription', 'Width' => '100%', 'Height' => '200'));
$form->addElement('style_submit_button', null, get_lang('Save'), 'class="save"');
// display default questions
@@ -68,10 +63,4 @@ if (isset ($question[$description_type])) {
$message .= $question[$description_type];
Display::display_normal_message($message, false);
}
-if (api_get_setting('wcag_anysurfer_public_pages')=='true') {
- echo (WCAG_Rendering::editor_header());
-}
$form->display();
-if (api_get_setting('wcag_anysurfer_public_pages')=='true') {
- echo (WCAG_Rendering::editor_footer());
-}
diff --git a/main/course_description/ajax_controller.class.php b/main/course_description/ajax_controller.class.php
index 38fb17e197..f64a9ffd4a 100755
--- a/main/course_description/ajax_controller.class.php
+++ b/main/course_description/ajax_controller.class.php
@@ -19,14 +19,14 @@ use Header;
/**
* Ajax controller. Dispatch request and perform required action.
- *
- * - delete category/link
- *
+ *
+ * - delete category/link
+ *
* Usage:
- *
+ *
* $controller = AjaxController::instance();
* $controller->run();
- *
+ *
* @author Laurent Opprecht for the Univesity of Genevas
* @license /license.txt
*/
@@ -38,7 +38,7 @@ class AjaxController extends \Controller
/**
* Return the instance of the controller.
- *
+ *
* @return \CourseDescription\AjaxController
*/
public static function instance()
@@ -52,15 +52,15 @@ class AjaxController extends \Controller
protected function __construct()
{
-
+
}
/**
- * Prepare the environment. Set up breadcrumps and raise tracking event.
+ * Prepare the environment. Set up breadcrumps and raise tracking event.
*/
protected function prolog()
{
- event_access_tool(TOOL_COURSE_DESCRIPTION);
+ Event::event_access_tool(TOOL_COURSE_DESCRIPTION);
}
public function is_allowed_to_edit()
@@ -79,7 +79,7 @@ class AjaxController extends \Controller
}
return true;
}
-
+
public function authorize()
{
$authorize = api_protect_course_script();
@@ -102,7 +102,7 @@ class AjaxController extends \Controller
}
/**
- *
+ *
*/
public function delete()
{
@@ -120,7 +120,7 @@ class AjaxController extends \Controller
$this->response($success);
}
/**
- *
+ *
*/
public function delete_by_course()
{
@@ -128,11 +128,11 @@ class AjaxController extends \Controller
$this->forbidden();
return;
}
-
+
$course = (object) array();
$course->c_id = Request::get_c_id();
$course->session_id = Request::get_session_id();
-
+
$success = CourseDescription::repository()->remove_by_course($course);
$this->response($success);
@@ -149,7 +149,7 @@ class AjaxController extends \Controller
}
/**
- * Action exists but implementation is missing.
+ * Action exists but implementation is missing.
*/
public function missing()
{
@@ -158,9 +158,9 @@ class AjaxController extends \Controller
/**
* Display a standard json responce.
- *
+ *
* @param bool $success
- * @param string $message
+ * @param string $message
* @param object $data
*/
public function response($success = false, $message = '', $data = null)
diff --git a/main/course_description/controller.class.php b/main/course_description/controller.class.php
index f646f34f6c..f25b71c621 100755
--- a/main/course_description/controller.class.php
+++ b/main/course_description/controller.class.php
@@ -13,18 +13,18 @@ use Javascript;
/**
* Controller for course description. Dispatch request and peform required action.
- *
+ *
* - list course description for course
* - add a new course description to a course/session
* - edit a course session
* - delete a course session
- *
+ *
* Usage:
- *
+ *
* $controller = CourseDescriptionController::instance();
* $controller->run();
- *
- * @package chamilo.course_description
+ *
+ * @package chamilo.course_description
* @author Christian Fasanando
* @author Laurent Opprecht for the Univesity of Genevas
* @license see /license.txt
@@ -42,8 +42,8 @@ class Controller extends \Controller
/**
* Return the instance of the controller.
- *
- * @return CourseDescriptionController
+ *
+ * @return CourseDescriptionController
*/
public static function instance()
{
@@ -56,13 +56,13 @@ class Controller extends \Controller
protected function __construct()
{
-
+
}
/**
- * Action to perform.
+ * Action to perform.
* Returns the request parameter.
- *
+ *
* @return string
*/
public function get_action()
@@ -95,8 +95,8 @@ class Controller extends \Controller
/**
* Whether the call is authorized or not.
- *
- * @return boolean
+ *
+ * @return boolean
*/
public function authorize()
{
@@ -114,7 +114,7 @@ class Controller extends \Controller
}
/**
- * Prepare the environment. Set up breadcrumps and raise tracking event.
+ * Prepare the environment. Set up breadcrumps and raise tracking event.
*/
protected function prolog()
{
@@ -135,12 +135,12 @@ class Controller extends \Controller
$current_course_tool = TOOL_COURSE_DESCRIPTION;
// Tracking
- event_access_tool(TOOL_COURSE_DESCRIPTION);
+ Event::event_access_tool(TOOL_COURSE_DESCRIPTION);
}
/**
* Javascript used by the controller
- *
+ *
* @return string
*/
public function javascript()
@@ -156,10 +156,10 @@ class Controller extends \Controller
/**
* Returns a url for an action that the controller can process
- *
+ *
* @param string $action
* @param array $params
- * @return string
+ * @return string
*/
public function url($action = '', $params = array())
{
@@ -185,8 +185,8 @@ class Controller extends \Controller
/**
* List course descriptions.
- *
- * @param array messages
+ *
+ * @param array messages
*/
public function listing()
{
@@ -203,7 +203,7 @@ class Controller extends \Controller
}
/**
- * Performs the edit action.
+ * Performs the edit action.
*/
public function edit()
{
@@ -211,7 +211,7 @@ class Controller extends \Controller
$this->forbidden();
return;
}
-
+
$id = Request::get_id();
$c_id = Request::get_c_id();
@@ -223,13 +223,13 @@ class Controller extends \Controller
if ($form->validate()) {
$success = $repo->save($description);
-
- $message = $success ? get_lang('DescriptionUpdated') : get_lang('Error');
+
+ $message = $success ? get_lang('CourseDescriptionUpdated') : get_lang('Error');
$home = $this->url(self::ACTION_DEFAULT);
Redirect::go($home);
}
-
+
$data = (object) array();
$data->form = $form;
$this->render('edit', $data);
@@ -285,7 +285,7 @@ class Controller extends \Controller
/**
* Performs the delete action.
- *
+ *
* @todo: could be worth to require a security token in the url and check it. Currently confirmation is done through javascript confirmation only.
*/
public function delete()
@@ -344,7 +344,7 @@ class Controller extends \Controller
$path = $file->tmp_name;
$reader = new CsvReader($path);
$descriptions = $reader->get_items();
-
+
$c_id = Request::get_c_id();
$session_id = Request::get_session_id();
$course = (object) array();
@@ -364,10 +364,10 @@ class Controller extends \Controller
/**
* Render a template using data. Adds a few common parameters to the data array.
- *
+ *
* @see /main/template/default/course_description/
* @param string $template
- * @param array $data
+ * @param array $data
*/
protected function render($template, $data)
{
diff --git a/main/course_description/course_description_controller.php b/main/course_description/course_description_controller.php
index e642204b15..323d6c87e8 100755
--- a/main/course_description/course_description_controller.php
+++ b/main/course_description/course_description_controller.php
@@ -45,7 +45,7 @@ class CourseDescriptionController
$data['descriptions'] = array($data['descriptions']);
}
foreach ($data['descriptions'] as $description) {
- if (strpos($description, '= ADD_BLOCK) {
$course_description->set_description_type($description_type);
diff --git a/main/course_description/course_description_form.class.php b/main/course_description/course_description_form.class.php
index a3b09f670e..2546b778e1 100755
--- a/main/course_description/course_description_form.class.php
+++ b/main/course_description/course_description_form.class.php
@@ -70,14 +70,14 @@ class CourseDescriptionForm extends \FormValidator
$defaults['title'] = $description->title;
$defaults['content'] = $description->content;
- $this->add_header($description->get_title());
- $this->add_hidden('description_type', $description->get_description_type());
- $this->add_hidden('c_id', $description->c_id);
- $this->add_hidden('id', $description->id);
+ $this->addHeader($description->get_title());
+ $this->addHidden('description_type', $description->get_description_type());
+ $this->addHidden('c_id', $description->c_id);
+ $this->addHidden('id', $description->id);
$this->add_textfield('title', get_lang('Title'), true, array('size' => 'width: 350px;'));
$this->applyFilter('title', 'html_filter');
$this->add_html_editor('content', get_lang('Content'), true, false, array('ToolbarSet' => 'TrainingDescription', 'Width' => '100%', 'Height' => '200'));
- $this->add_button('save', get_lang('Save'), 'class="save"');
+ $this->addButton('save', get_lang('Save'), 'class="save"');
$this->setDefaults($defaults);
}
diff --git a/main/course_description/edit.php b/main/course_description/edit.php
index 07addda21d..707c29f8d1 100755
--- a/main/course_description/edit.php
+++ b/main/course_description/edit.php
@@ -11,7 +11,7 @@
api_protect_course_script(true);
$original_id = $id;
-if (!$error) {
+if (empty($error)) {
$token = Security::get_token();
}
// display categories
@@ -58,17 +58,16 @@ $form->addElement('hidden', 'description_type',$description_type);
$form->addElement('hidden', 'sec_token',$token);
$form->add_textfield('title', get_lang('Title'), true, array('size'=>'50'));
$form->applyFilter('title','html_filter');
-
-if (api_get_setting('wcag_anysurfer_public_pages')=='true') {
- WCAG_rendering::prepare_admin_form($description_content, $form);
-} else {
- $form->add_html_editor('contentDescription', get_lang('Content'), true, false, array('ToolbarSet' => 'TrainingDescription', 'Width' => '100%', 'Height' => '200'));
-}
+$form->add_html_editor('contentDescription', get_lang('Content'), true, false, array('ToolbarSet' => 'TrainingDescription', 'Width' => '100%', 'Height' => '200'));
$form->addElement('style_submit_button', null, get_lang('Save'), 'class="save"');
// Set some default values
-$default['title'] = Security::remove_XSS($description_title);
-$default['contentDescription'] = Security::remove_XSS($description_content,COURSEMANAGERLOWSECURITY);
+if (!empty($description_title)) {
+ $default['title'] = Security::remove_XSS($description_title);
+}
+if (!empty($description_content)) {
+ $default['contentDescription'] = Security::remove_XSS($description_content,COURSEMANAGERLOWSECURITY);
+}
$default['description_type'] = $description_type;
$form->setDefaults($default);
@@ -78,12 +77,4 @@ if (isset ($question[$description_type])) {
$message .= $question[$description_type];
Display::display_normal_message($message, false);
}
-
-if (api_get_setting('wcag_anysurfer_public_pages')=='true') {
- echo (WCAG_Rendering::editor_header());
-}
-
$form->display();
-if (api_get_setting('wcag_anysurfer_public_pages')=='true') {
- echo (WCAG_Rendering::editor_footer());
-}
diff --git a/main/course_description/index.php b/main/course_description/index.php
index af445e2b6e..ec2816f848 100755
--- a/main/course_description/index.php
+++ b/main/course_description/index.php
@@ -7,9 +7,6 @@
* @package chamilo.course_description
*/
-// name of the language file that needs to be included
-$language_file = array ('course_description', 'accessibility');
-
// including files
require_once '../inc/global.inc.php';
$current_course_tool = TOOL_COURSE_DESCRIPTION;
diff --git a/main/course_description/layout.php b/main/course_description/layout.php
index 66bbadba8c..44c484a293 100755
--- a/main/course_description/layout.php
+++ b/main/course_description/layout.php
@@ -2,7 +2,7 @@
/* For licensing terms, see /license.txt */
/**
-* Layout (principal view) used for structuring other views
+* Layout (principal view) used for structuring other views
* @author Christian Fasanando
* @package chamilo.course_description
*/
@@ -17,10 +17,10 @@ Display :: display_header('');
Display::display_introduction_section(TOOL_COURSE_DESCRIPTION);
// Tracking
-event_access_tool(TOOL_COURSE_DESCRIPTION);
+Event::event_access_tool(TOOL_COURSE_DESCRIPTION);
// Display
echo $content;
// Footer
-Display :: display_footer();
\ No newline at end of file
+Display :: display_footer();
diff --git a/main/course_description/listing.php b/main/course_description/listing.php
index fb114839a8..226a5b0fcb 100755
--- a/main/course_description/listing.php
+++ b/main/course_description/listing.php
@@ -60,7 +60,7 @@ if (isset($descriptions) && count($descriptions) > 0) {
$description['title'] = $description['title'].' '.api_get_session_image(api_get_session_id(), $user_info['status']);
//delete
- echo '';
+ echo '';
echo Display::return_icon('delete.png', get_lang('Delete'), array('style' => 'vertical-align:middle;float:right;'),ICON_SIZE_SMALL);
echo ' ';
diff --git a/main/course_description/upload_file_form.class.php b/main/course_description/upload_file_form.class.php
index 63cc3fb25f..f0021715e0 100755
--- a/main/course_description/upload_file_form.class.php
+++ b/main/course_description/upload_file_form.class.php
@@ -14,7 +14,7 @@ use Chamilo;
/**
* Form to upload a file.
- *
+ *
* @license /licence.txt
* @author Laurent Opprecht
*/
@@ -28,19 +28,19 @@ class UploadFileForm extends \FormValidator
/**
*
- *
+ *
*/
function init()
{
$form_name = get_lang('UploadFile');
- $this->add_header($form_name);
+ $this->addHeader($form_name);
$label = get_lang('File');
$this->add_file('file', $label);
$this->addRule('file', get_lang('ThisFieldIsRequired'), 'required');
//$this->add_checkbox('replace', '', get_lang('ReplaceExistingEntries'));
- $this->add_button('save', get_lang('Save'), array('class' => 'btn save'));
+ $this->addButton('save', get_lang('Save'), array('class' => 'btn save'));
// $label = get_lang('CSVMustLookLike');
// $label = "$label";
diff --git a/main/course_home/course_home.php b/main/course_home/course_home.php
index 9ede3a0b6c..3a7269fd2b 100755
--- a/main/course_home/course_home.php
+++ b/main/course_home/course_home.php
@@ -183,7 +183,7 @@ api_protect_course_script(true);
/* STATISTICS */
if (!isset($coursesAlreadyVisited[$course_code])) {
- event_access_course();
+ Event::accessCourse();
$coursesAlreadyVisited[$course_code] = 1;
Session::write('coursesAlreadyVisited', $coursesAlreadyVisited);
}
diff --git a/main/course_info/infocours.php b/main/course_info/infocours.php
index 3d988d7731..d250704491 100755
--- a/main/course_info/infocours.php
+++ b/main/course_info/infocours.php
@@ -22,9 +22,6 @@ $this_section = SECTION_COURSES;
$nameTools = get_lang('ModifInfo');
-/* Libraries */
-require_once api_get_path(INCLUDE_PATH).'conf/course_info.conf.php';
-
api_protect_course_script(true);
api_block_anonymous_users();
$_course = api_get_course_info();
diff --git a/main/course_info/start.php b/main/course_info/start.php
index b5413f0d47..3a374c2deb 100644
--- a/main/course_info/start.php
+++ b/main/course_info/start.php
@@ -3,7 +3,7 @@
use \ChamiloSession as Session;
-$language_file = array('create_course', 'registration','admin','exercice', 'course_description', 'course_info');
+$language_file = array('create_course', 'registration','admin','exercice', 'course_info');
require_once '../inc/global.inc.php';
diff --git a/main/course_progress/index.php b/main/course_progress/index.php
index 9747361014..6f678a8f42 100755
--- a/main/course_progress/index.php
+++ b/main/course_progress/index.php
@@ -8,7 +8,7 @@
*/
// name of the language file that needs to be included
-$language_file = array('course_description', 'userInfo', 'admin');
+$language_file = array('userInfo', 'admin');
// including files
require_once '../inc/global.inc.php';
@@ -94,72 +94,7 @@ $default_thematic_plan_title = $thematic->get_default_thematic_plan_title();
$htmlHeadXtra[] = '';
diff --git a/main/course_progress/layout.php b/main/course_progress/layout.php
index d63d8d4380..277763460b 100755
--- a/main/course_progress/layout.php
+++ b/main/course_progress/layout.php
@@ -2,7 +2,7 @@
/* For licensing terms, see /license.txt */
/**
-* Layout (principal view) used for structuring other views
+* Layout (principal view) used for structuring other views
* @author Christian Fasanando
* @package chamilo.course_progress
*/
@@ -18,10 +18,10 @@ Display :: display_header('');
Display::display_introduction_section($tool);
// Tracking
-event_access_tool($tool);
+Event::event_access_tool($tool);
// Display
echo $content;
// Footer
-Display :: display_footer();
\ No newline at end of file
+Display :: display_footer();
diff --git a/main/course_progress/layout_no_header.php b/main/course_progress/layout_no_header.php
index a9d36c3a08..2309c5d35b 100755
--- a/main/course_progress/layout_no_header.php
+++ b/main/course_progress/layout_no_header.php
@@ -7,7 +7,7 @@ api_protect_course_script(true);
Display :: display_reduced_header();
// Tracking
-event_access_tool($tool);
+Event::event_access_tool($tool);
// Display
diff --git a/main/course_progress/thematic.php b/main/course_progress/thematic.php
index fad5f7fa88..e32a81cb23 100755
--- a/main/course_progress/thematic.php
+++ b/main/course_progress/thematic.php
@@ -13,6 +13,8 @@ api_protect_course_script(true);
$token = Security::get_token();
$url_token = "&sec_token=".$token;
+$user_info = api_get_user_info();
+$param_gradebook = '&'.api_get_cidreq();
if (api_is_allowed_to_edit(null, true)) {
echo '';
@@ -20,27 +22,37 @@ if (api_is_allowed_to_edit(null, true)) {
switch ($action) {
case 'thematic_add' :
case 'thematic_import_select' :
- echo ' '.Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('ThematicDetails'),'',ICON_SIZE_MEDIUM).'';
+ echo ' '.
+ Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('ThematicDetails'),'',ICON_SIZE_MEDIUM).'';
break;
case 'thematic_list' :
- echo ' '.Display::return_icon('new_course_progress.png',get_lang('NewThematicSection'),'',ICON_SIZE_MEDIUM).'';
+ echo ' '.
+ Display::return_icon('new_course_progress.png',get_lang('NewThematicSection'),'',ICON_SIZE_MEDIUM).'';
break;
case 'thematic_details' :
- echo ' '.Display::return_icon('new_course_progress.png',get_lang('NewThematicSection'),'',ICON_SIZE_MEDIUM).'';
- echo ' '.Display::return_icon('import_csv.png',get_lang('ImportThematic'),'',ICON_SIZE_MEDIUM).'';
- echo ' '.Display::return_icon('export_csv.png',get_lang('ExportThematic'),'', ICON_SIZE_MEDIUM).'';
- echo ' '.Display::return_icon('pdf.png',get_lang('ExportToPDF'),'', ICON_SIZE_MEDIUM).'';
+ echo ' '.
+ Display::return_icon('new_course_progress.png',get_lang('NewThematicSection'),'',ICON_SIZE_MEDIUM).'';
+ echo ' '.
+ Display::return_icon('import_csv.png',get_lang('ImportThematic'),'',ICON_SIZE_MEDIUM).'';
+ echo ' '.
+ Display::return_icon('export_csv.png',get_lang('ExportThematic'),'', ICON_SIZE_MEDIUM).'';
+ echo ' '.
+ Display::return_icon('pdf.png',get_lang('ExportToPDF'),'', ICON_SIZE_MEDIUM).'';
break;
default :
- echo ' '.Display::return_icon('new_course_progress.png',get_lang('NewThematicSection'),'',ICON_SIZE_MEDIUM).'';
-
+ echo ' '.
+ Display::return_icon('new_course_progress.png',get_lang('NewThematicSection'),'',ICON_SIZE_MEDIUM).'';
}
echo '
'.sprintf(get_lang('NowYouShouldAddThematicPlanXAndThematicAdvanceX'),$link_to_thematic_plan, $link_to_thematic_advance), false);
+ $link_to_thematic_plan = ''.
+ Display::return_icon('lesson_plan.png', get_lang('ThematicPlan'), array('style'=>'vertical-align:middle;float:none;'),ICON_SIZE_SMALL).'';
+ $link_to_thematic_advance = ''.
+ Display::return_icon('lesson_plan_calendar.png', get_lang('ThematicAdvance'), array('style'=>'vertical-align:middle;float:none;'),ICON_SIZE_SMALL).'';
+ Display::display_confirmation_message(
+ get_lang('ThematicSectionHasBeenCreatedSuccessfull').'
'.sprintf(get_lang('NowYouShouldAddThematicPlanXAndThematicAdvanceX'),$link_to_thematic_plan, $link_to_thematic_advance),
+ false
+ );
}
// display title
@@ -74,13 +91,11 @@ if ($action == 'thematic_list') {
echo '
';
}
- // display thematic data
-
+ // Display thematic data
if (!empty($thematic_data)) {
// display progress
echo ''.get_lang('Progress').': '.$total_average_of_advances.' %';
-
echo '';
echo '| '.get_lang('Thematic').' | '.get_lang('ThematicPlan').' | '.get_lang('ThematicAdvance').' |
|---|
';
foreach ($thematic_data as $thematic) {
@@ -94,17 +109,14 @@ if ($action == 'thematic_list') {
}
//@todo add a validation in order to load or not course thematics in the session thematic
- /*
- if (api_get_session_id() == $thematic['session_id']) {
- $session_star = api_get_session_image(api_get_session_id(), $user_info['status']);
- } else {
- continue;
- } */
echo '';
$actions_first_col = '';
if (api_is_allowed_to_edit(null, true)) {
// Thematic title
- $actions_first_col = Display::url(Display::return_icon('cd.gif', get_lang('Copy')), 'index.php?'.api_get_cidreq().'&action=thematic_copy&thematic_id='.$my_thematic_id.$param_gradebook.$url_token);
+ $actions_first_col = Display::url(
+ Display::return_icon('cd.gif', get_lang('Copy')),
+ 'index.php?'.api_get_cidreq().'&action=thematic_copy&thematic_id='.$my_thematic_id.$param_gradebook.$url_token
+ );
if (api_get_session_id() == 0 ) {
if ($thematic['display_order'] > 1) {
@@ -112,7 +124,7 @@ if ($action == 'thematic_list') {
} else {
$actions_first_col .= ' '.Display::return_icon('up_na.png',' ','',ICON_SIZE_SMALL);
}
- if ($thematic['display_order'] < $thematic['max_thematic_item']) {
+ if (isset($thematic['max_thematic_item']) && $thematic['display_order'] < $thematic['max_thematic_item']) {
$actions_first_col .= ' '.Display::return_icon('down.png',get_lang('Down'),'',ICON_SIZE_SMALL).'';
} else {
$actions_first_col .= ' '.Display::return_icon('down_na.png',' ','',ICON_SIZE_SMALL);
@@ -152,7 +164,8 @@ if ($action == 'thematic_list') {
//if (api_is_allowed_to_edit(null, true) && api_get_session_id() == $thematic['session_id']) {
if (api_is_allowed_to_edit(null, true)) {
- echo '';
+ echo '';
}
//if (api_is_allowed_to_edit(null, true) && api_get_session_id() == $thematic['session_id']) {
@@ -172,7 +185,10 @@ if ($action == 'thematic_list') {
Display::return_icon('delete.png',get_lang('Delete'),'',ICON_SIZE_SMALL).'';
//Links
- $edit_link = Display::div(Display::div($edit_link , array('id'=>'thematic_advance_tools_'.$thematic_advance['id'], 'class'=>'thematic_advance_actions')), array('style'=>'height:20px;'));
+ $edit_link = Display::div(
+ Display::div($edit_link , array('id'=>'thematic_advance_tools_'.$thematic_advance['id'], 'class'=>'thematic_advance_actions')),
+ array('style'=>'height:20px;')
+ );
}
$thematic_advance_item = isset($thematic_advance_div[$thematic['id']][$thematic_advance['id']]) ? $thematic_advance_div[$thematic['id']][$thematic_advance['id']] : null;
@@ -256,7 +272,7 @@ if ($action == 'thematic_list') {
}
// error messages
- if ($error) {
+ if (isset($error)) {
Display::display_error_message(get_lang('FormHasErrorsPleaseComplete'),false);
}
if ($show_form)
diff --git a/main/course_progress/thematic_advance.php b/main/course_progress/thematic_advance.php
index 3a47139c97..6c352340d2 100755
--- a/main/course_progress/thematic_advance.php
+++ b/main/course_progress/thematic_advance.php
@@ -47,7 +47,7 @@ if ($action == 'thematic_advance_add' || $action == 'thematic_advance_edit') {
$form->addElement('html', '');
}
- $form->addElement('datepicker', 'custom_start_date', get_lang('StartDate'), array('form_name'=>'thematic_advance'));
+ $form->addElement('DatePicker', 'custom_start_date', get_lang('StartDate'), array('form_name'=>'thematic_advance'));
$form->addElement('html', ' ');
if (isset($thematic_advance_data['attendance_id']) && $thematic_advance_data['attendance_id'] == 0) {
diff --git a/main/coursecopy/classes/CourseRestorer.class.php b/main/coursecopy/classes/CourseRestorer.class.php
index ded898c1bc..c7bf87b65e 100755
--- a/main/coursecopy/classes/CourseRestorer.class.php
+++ b/main/coursecopy/classes/CourseRestorer.class.php
@@ -1132,7 +1132,13 @@ class CourseRestorer
$resources = $this->course->resources;
foreach ($resources[RESOURCE_EVENT] as $id => $event) {
// check resources inside html from fckeditor tool and copy correct urls into recipient course
- $event->content = DocumentManager::replace_urls_inside_content_html_from_copy_course($event->content, $this->course->code, $this->course->destination_path, $this->course->backup_path, $this->course->info['path']);
+ $event->content = DocumentManager::replace_urls_inside_content_html_from_copy_course(
+ $event->content,
+ $this->course->code,
+ $this->course->destination_path,
+ $this->course->backup_path,
+ $this->course->info['path']
+ );
$sql = "INSERT INTO ".$table." SET
c_id = ".$this->destination_course_id." ,
@@ -1203,7 +1209,13 @@ class CourseRestorer
}
// check resources inside html from fckeditor tool and copy correct urls into recipient course
- $description_content = DocumentManager::replace_urls_inside_content_html_from_copy_course($cd->content, $this->course->code, $this->course->destination_path, $this->course->backup_path, $this->course->info['path']);
+ $description_content = DocumentManager::replace_urls_inside_content_html_from_copy_course(
+ $cd->content,
+ $this->course->code,
+ $this->course->destination_path,
+ $this->course->backup_path,
+ $this->course->info['path']
+ );
$condition_session = "";
if (!empty($session_id)) {
@@ -1229,7 +1241,13 @@ class CourseRestorer
foreach ($resources[RESOURCE_ANNOUNCEMENT] as $id => $announcement) {
// check resources inside html from fckeditor tool and copy correct urls into recipient course
- $announcement->content = DocumentManager::replace_urls_inside_content_html_from_copy_course($announcement->content, $this->course->code, $this->course->destination_path, $this->course->backup_path, $this->course->info['path']);
+ $announcement->content = DocumentManager::replace_urls_inside_content_html_from_copy_course(
+ $announcement->content,
+ $this->course->code,
+ $this->course->destination_path,
+ $this->course->backup_path,
+ $this->course->info['path']
+ );
$sql = "INSERT INTO ".$table." " ."SET
c_id = ".$this->destination_course_id." ,
@@ -2359,7 +2377,13 @@ class CourseRestorer
}
// check resources inside html from fckeditor tool and copy correct urls into recipient course
- $glossary->description = DocumentManager::replace_urls_inside_content_html_from_copy_course($glossary->description, $this->course->code, $this->course->destination_path, $this->course->backup_path, $this->course->info['path']);
+ $glossary->description = DocumentManager::replace_urls_inside_content_html_from_copy_course(
+ $glossary->description,
+ $this->course->code,
+ $this->course->destination_path,
+ $this->course->backup_path,
+ $this->course->info['path']
+ );
$sql = "INSERT INTO " . $table_glossary . " SET
c_id = " . $this->destination_course_id . " ,
@@ -2403,24 +2427,29 @@ class CourseRestorer
$resources = $this->course->resources;
foreach ($resources[RESOURCE_WIKI] as $id => $wiki) {
- //$wiki = new Wiki($obj->page_id, $obj->reflink, $obj->title, $obj->content, $obj->user_id, $obj->group_id, $obj->dtime);
// the sql statement to insert the groups from the old course to the new course
// check resources inside html from fckeditor tool and copy correct urls into recipient course
- $wiki->content = DocumentManager::replace_urls_inside_content_html_from_copy_course($wiki->content, $this->course->code, $this->course->destination_path, $this->course->backup_path, $this->course->info['path']);
+ $wiki->content = DocumentManager::replace_urls_inside_content_html_from_copy_course(
+ $wiki->content,
+ $this->course->code,
+ $this->course->destination_path,
+ $this->course->backup_path,
+ $this->course->info['path']
+ );
$sql = "INSERT INTO $table_wiki (c_id, page_id, reflink, title, content, user_id, group_id, dtime, progress, version, session_id) VALUES (
- ".$this->destination_course_id." ,
- '".self::DBUTF8escapestring($wiki->page_id)."',
- '".self::DBUTF8escapestring($wiki->reflink)."',
- '".self::DBUTF8escapestring($wiki->title)."',
- '".self::DBUTF8escapestring($wiki->content)."',
- '".intval($wiki->user_id)."',
- '".intval($wiki->group_id)."',
- '".self::DBUTF8escapestring($wiki->dtime)."',
- '".self::DBUTF8escapestring($wiki->progress)."',
- '".intval($wiki->version)."',
- '".(!empty($session_id)?intval($session_id):0)."')";
+ ".$this->destination_course_id." ,
+ '".self::DBUTF8escapestring($wiki->page_id)."',
+ '".self::DBUTF8escapestring($wiki->reflink)."',
+ '".self::DBUTF8escapestring($wiki->title)."',
+ '".self::DBUTF8escapestring($wiki->content)."',
+ '".intval($wiki->user_id)."',
+ '".intval($wiki->group_id)."',
+ '".self::DBUTF8escapestring($wiki->dtime)."',
+ '".self::DBUTF8escapestring($wiki->progress)."',
+ '".intval($wiki->version)."',
+ '".(!empty($session_id)?intval($session_id):0)."')";
Database::query($sql);
$new_id = Database::insert_id();
$this->course->resources[RESOURCE_WIKI][$id]->destination_id = $new_id;
@@ -2450,7 +2479,13 @@ class CourseRestorer
foreach ($resources[RESOURCE_THEMATIC] as $id => $thematic) {
// check resources inside html from fckeditor tool and copy correct urls into recipient course
- $thematic->content = DocumentManager::replace_urls_inside_content_html_from_copy_course($thematic->content, $this->course->code, $this->course->destination_path, $this->course->backup_path, $this->course->info['path']);
+ $thematic->content = DocumentManager::replace_urls_inside_content_html_from_copy_course(
+ $thematic->content,
+ $this->course->code,
+ $this->course->destination_path,
+ $this->course->backup_path,
+ $this->course->info['path']
+ );
$thematic->params['c_id'] = $this->destination_course_id;
$thematic->params['id'] = null;
$last_id = Database::insert($table_thematic, $thematic->params, false);
@@ -2499,7 +2534,13 @@ class CourseRestorer
foreach ($resources[RESOURCE_ATTENDANCE] as $id => $obj) {
// check resources inside html from fckeditor tool and copy correct urls into recipient course
- $obj->params['description'] = DocumentManager::replace_urls_inside_content_html_from_copy_course($obj->params['description'], $this->course->code, $this->course->destination_path, $this->course->backup_path, $this->course->info['path']);
+ $obj->params['description'] = DocumentManager::replace_urls_inside_content_html_from_copy_course(
+ $obj->params['description'],
+ $this->course->code,
+ $this->course->destination_path,
+ $this->course->backup_path,
+ $this->course->info['path']
+ );
$obj->params['id'] = null;
$obj->params['c_id'] = $this->destination_course_id;
diff --git a/main/create_course/add_course.php b/main/create_course/add_course.php
index 95b419178f..b9ccb4a850 100755
--- a/main/create_course/add_course.php
+++ b/main/create_course/add_course.php
@@ -14,7 +14,7 @@
use \ChamiloSession as Session;
// Name of the language file that needs to be included.
-$language_file = array('create_course', 'registration','admin','exercice', 'course_description', 'course_info');
+$language_file = array('create_course', 'registration','admin','exercice', 'course_info');
// Flag forcing the "current course" reset.
$cidReset = true;
@@ -33,9 +33,6 @@ if (api_get_setting('course_validation') == 'true' && !api_is_platform_admin())
$course_validation_feature = true;
}
-// Require additional libraries.
-require_once api_get_path(CONFIGURATION_PATH).'course_info.conf.php';
-
$htmlHeadXtra[] = '';
//I'm in the certification module?
@@ -183,9 +96,9 @@ if (!empty($sessionId) && empty($document_data)) {
if (empty($document_data)) {
if (api_is_in_group()) {
- $group_properties = GroupManager::get_group_properties($groupId);
- $document_id = DocumentManager::get_document_id($_course, $group_properties['directory']);
- $document_data = DocumentManager::get_document_data_by_id($document_id, api_get_course_id());
+ $group_properties = GroupManager::get_group_properties($groupId);
+ $document_id = DocumentManager::get_document_id($_course, $group_properties['directory']);
+ $document_data = DocumentManager::get_document_data_by_id($document_id, api_get_course_id());
$dir = $document_data['path'];
$folder_id = $document_data['id'];
} else {
@@ -240,9 +153,6 @@ for ($i = 0; $i < ($count_dir); $i++) {
$relative_url .= '../';
}
-/* We do this in order to avoid the condition in html_editor.php ==> if
- ($this -> fck_editor->Config['CreateDocumentWebDir']=='' || $this -> fck_editor->Config['CreateDocumentDir']== '')*
-*/
if ($relative_url== '') {
$relative_url = '/';
}
@@ -281,7 +191,7 @@ if (!$is_certificate_mode) {
$req_gid = null;
if (api_is_in_group()) {
$req_gid = '&gidReq='.api_get_group_id();
- $interbreadcrumb[] = array ("url" => "../group/group_space.php?gidReq=".api_get_group_id(), "name" => get_lang('GroupSpace'));
+ $interbreadcrumb[] = array ("url" => "../group/group_space.php?".api_get_cidreq(), "name" => get_lang('GroupSpace'));
$noPHP_SELF = true;
$to_group_id = api_get_group_id();
$path = explode('/', $dir);
@@ -300,14 +210,13 @@ if (!$is_allowed_in_course) {
if (!($is_allowed_to_edit ||
$_SESSION['group_member_with_upload_rights'] ||
- is_my_shared_folder($userId, $dir, api_get_session_id()))
+ DocumentManager::is_my_shared_folder($userId, $dir, api_get_session_id()))
) {
api_not_allowed(true);
}
/* Header */
-
-event_access_tool(TOOL_DOCUMENT);
+Event::event_access_tool(TOOL_DOCUMENT);
$display_dir = $dir;
if (isset($group_properties)) {
@@ -363,11 +272,6 @@ function document_exists($filename) {
api_get_session_id(),
api_get_group_id()
);
- /*$filename = addslashes(trim($filename));
- $filename = Security::remove_XSS($filename);
- $filename = replace_dangerous_char($filename);
- $filename = disable_dangerous_file($filename);
- return !file_exists($filepath.$filename.'.html');*/
}
// Add group to the form
@@ -393,7 +297,7 @@ $folders = DocumentManager::get_all_document_folders($_course, $to_group_id, $is
// If we are not in the certificates creation, display a folder chooser for the
// new document created
-if (!$is_certificate_mode && !is_my_shared_folder($userId, $dir, $current_session_id)) {
+if (!$is_certificate_mode && !DocumentManager::is_my_shared_folder($userId, $dir, $current_session_id)) {
$folders = DocumentManager::get_all_document_folders($_course, $to_group_id, $is_allowed_to_edit);
$parent_select = $form->addElement('select', 'curdirpath', array(null, get_lang('DestinationDirectory')));
@@ -404,19 +308,19 @@ if (!$is_certificate_mode && !is_my_shared_folder($userId, $dir, $current_sessio
if (is_array($folders)) {
$escaped_folders = array();
foreach ($folders as $key => & $val) {
- //Hide some folders
+ // Hide some folders
if ($val=='/HotPotatoes_files' || $val=='/certificates' || basename($val)=='css'){
continue;
}
- //Admin setting for Hide/Show the folders of all users
+ // Admin setting for Hide/Show the folders of all users
if (api_get_setting('show_users_folders') == 'false' && (strstr($val, '/shared_folder') || strstr($val, 'shared_folder_session_'))){
continue;
}
- //Admin setting for Hide/Show Default folders to all users
+ // Admin setting for Hide/Show Default folders to all users
if (api_get_setting('show_default_folders') == 'false' && ($val=='/images' || $val=='/flash' || $val=='/audio' || $val=='/video' || strstr($val, '/images/gallery') || $val=='/video/flv')){
continue;
}
- //Admin setting for Hide/Show chat history folder
+ // Admin setting for Hide/Show chat history folder
if (api_get_setting('show_chat_folder') == 'false' && $val=='/chat_files'){
continue;
}
diff --git a/main/document/create_draw.php b/main/document/create_draw.php
index c46f0b5ee5..00df18e726 100755
--- a/main/document/create_draw.php
+++ b/main/document/create_draw.php
@@ -97,7 +97,7 @@ if (!($is_allowed_to_edit || $_SESSION['group_member_with_upload_rights'] ||
/* Header */
-event_access_tool(TOOL_DOCUMENT);
+Event::event_access_tool(TOOL_DOCUMENT);
$display_dir = $dir;
if (isset ($group)) {
$display_dir = explode('/', $dir);
diff --git a/main/document/create_paint.php b/main/document/create_paint.php
index 944ff70b05..55db05a05c 100755
--- a/main/document/create_paint.php
+++ b/main/document/create_paint.php
@@ -97,7 +97,7 @@ if (!($is_allowed_to_edit || $_SESSION['group_member_with_upload_rights'] ||
}
/* Header */
-event_access_tool(TOOL_DOCUMENT);
+Event::event_access_tool(TOOL_DOCUMENT);
$display_dir = $dir;
if (isset ($group)) {
$display_dir = explode('/', $dir);
diff --git a/main/document/document.php b/main/document/document.php
index f1b9e0ce64..7695ffcc03 100755
--- a/main/document/document.php
+++ b/main/document/document.php
@@ -29,7 +29,7 @@
use \ChamiloSession as Session;
// Language files that need to be included
-$language_file = array('document', 'slideshow', 'gradebook', 'create_course');
+$language_file = array('document', 'gradebook', 'create_course');
require_once '../inc/global.inc.php';
$current_course_tool = TOOL_DOCUMENT;
$this_section = SECTION_COURSES;
@@ -268,7 +268,7 @@ switch ($action) {
api_not_allowed();
}
// Launch event
- event_download($document_data['url']);
+ Event::event_download($document_data['url']);
// Check visibility of document and paths
if (!($is_allowed_to_edit || $group_member_with_upload_rights)
&& !DocumentManager::is_visible_by_id($document_id, $courseInfo, $sessionId, api_get_user_id())) {
@@ -314,7 +314,7 @@ switch ($action) {
require 'downloadfolder.inc.php';
}
// Launch event
- event_download($document_data['url']);
+ Event::event_download($document_data['url']);
exit;
}
break;
@@ -927,7 +927,7 @@ $(document).ready( function() {
';
// Lib for event log, stats & tracking & record of the access
-event_access_tool(TOOL_DOCUMENT);
+Event::event_access_tool(TOOL_DOCUMENT);
/* DISPLAY */
if ($groupId != 0) { // Add group name after for group documents
@@ -1285,15 +1285,14 @@ if ($is_allowed_to_edit ||
// Show them the form for the directory name
if (isset($_GET['createdir'])) {
- $dirForm = create_dir_form($document_id);
+ $dirForm = DocumentManager::create_dir_form($document_id);
}
}
/* VISIBILITY COMMANDS */
if ($is_allowed_to_edit) {
if ((isset($_GET['set_invisible']) && !empty($_GET['set_invisible'])) ||
- (isset($_GET['set_visible']) && !empty($_GET['set_visible'])) &&
- $_GET['set_visible'] != '*' && $_GET['set_invisible'] != '*'
+ (isset($_GET['set_visible']) && !empty($_GET['set_visible']))
) {
// Make visible or invisible?
if (isset($_GET['set_visible'])) {
@@ -1328,7 +1327,6 @@ if ($is_allowed_to_edit) {
null,
$sessionId)
) {
- //don't use ViMod because firt is load ViMdod (Gradebook). VisibilityChanged (trad4all)
$message = Display::return_message(get_lang('VisibilityChanged'), 'confirmation');
} else {
$message = Display::return_message(get_lang('ViModProb'), 'error');
diff --git a/main/document/document_lite.php b/main/document/document_lite.php
index 1117a2b3e0..1534e6abb5 100755
--- a/main/document/document_lite.php
+++ b/main/document/document_lite.php
@@ -12,7 +12,7 @@ exit;
// Language files that need to be included
-$language_file = array('document', 'slideshow', 'gradebook', 'create_course');
+$language_file = array('document', 'gradebook', 'create_course');
require_once '../inc/global.inc.php';
$this_section = SECTION_COURSES;
@@ -71,7 +71,7 @@ switch ($action) {
exit;
}
// Launch event
- event_download($document_data['url']);
+ Event::event_download($document_data['url']);
// Check visibility of document and paths
if (!($is_allowed_to_edit || $group_member_with_upload_rights) && !DocumentManager::is_visible_by_id($document_id, $course_info, api_get_session_id(), api_get_user_id())) {
api_not_allowed(true);
@@ -294,7 +294,7 @@ $(document).ready( function() {
// Lib for event log, stats & tracking & record of the access
-event_access_tool(TOOL_DOCUMENT);
+Event::event_access_tool(TOOL_DOCUMENT);
/* DISPLAY */
if ($to_group_id != 0) { // Add group name after for group documents
@@ -590,7 +590,7 @@ if ($is_allowed_to_edit) {
/* TEMPLATE ACTION */
//Only teacher and all users into their group
-if ($is_allowed_to_edit || $group_member_with_upload_rights || is_my_shared_folder(api_get_user_id(), $curdirpath, $session_id)){
+if ($is_allowed_to_edit || $group_member_with_upload_rights || DocumentManager::is_my_shared_folder(api_get_user_id(), $curdirpath, $session_id)){
if (isset($_GET['add_as_template']) && !isset($_POST['create_template'])) {
$document_id_for_template = intval($_GET['add_as_template']);
diff --git a/main/document/download.php b/main/document/download.php
index 927fca03ee..84217e0533 100755
--- a/main/document/download.php
+++ b/main/document/download.php
@@ -96,7 +96,7 @@ if (Security::check_abs_path($sys_course_path.$doc_url, $sys_course_path.'/')) {
exit; // You shouldn't be here anyway.
}
// Launch event
- event_download($doc_url);
+ Event::event_download($doc_url);
DocumentManager::file_send_for_download($full_file_name);
}
exit;
diff --git a/main/document/download_scorm.php b/main/document/download_scorm.php
index 4049cef767..dabed20051 100755
--- a/main/document/download_scorm.php
+++ b/main/document/download_scorm.php
@@ -6,7 +6,7 @@
* @package chamilo.document
*/
/**
- * Code
+ * Code
*/
session_cache_limiter('none');
@@ -53,12 +53,12 @@ $sys_course_path = api_get_path(SYS_COURSE_PATH).$_course['path'].'/scorm';
if (is_dir($sys_course_path.$doc_url)) {
api_not_allowed();
}
-
+
if (Security::check_abs_path($sys_course_path.$doc_url, $sys_course_path.'/')) {
$full_file_name = $sys_course_path.$doc_url;
// Launch event
- event_download($doc_url);
-
+ Event::event_download($doc_url);
+
DocumentManager::file_send_for_download($full_file_name);
}
-exit;
\ No newline at end of file
+exit;
diff --git a/main/document/downloadfolder.inc.php b/main/document/downloadfolder.inc.php
index 0933f572d6..080435518e 100755
--- a/main/document/downloadfolder.inc.php
+++ b/main/document/downloadfolder.inc.php
@@ -93,6 +93,11 @@ function fixDocumentNameCallback($p_event, &$p_header)
$documentData['to_group_id']
);
+ // Changes file.phps to file.php
+ $basename = basename($documentNameFixed);
+ $basenamePHPFixed = str_replace('.phps', '.php', $basename);
+ $documentNameFixed = str_replace($basename, $basenamePHPFixed, $basenamePHPFixed);
+
$p_header['stored_filename'] = $documentNameFixed;
return 1;
@@ -274,7 +279,7 @@ if (api_is_allowed_to_edit()) {
}
// Launch event
-event_download(($path == '/') ? 'documents.zip (folder)' : basename($path).'.zip (folder)');
+Event::event_download(($path == '/') ? 'documents.zip (folder)' : basename($path).'.zip (folder)');
// Start download of created file
$name = ($path == '/') ? 'documents.zip' : $documentInfo['title'].'.zip';
diff --git a/main/document/edit_document.php b/main/document/edit_document.php
index 497ef8fed3..7da1ee2880 100755
--- a/main/document/edit_document.php
+++ b/main/document/edit_document.php
@@ -178,7 +178,7 @@ if (!api_is_allowed_to_edit()) {
api_not_allowed(true);
}
-event_access_tool(TOOL_DOCUMENT);
+Event::event_access_tool(TOOL_DOCUMENT);
//TODO:check the below code and his funcionality
if (!is_allowed_to_edit()) {
diff --git a/main/document/edit_draw.php b/main/document/edit_draw.php
index 38a6f48d1d..c835f07696 100755
--- a/main/document/edit_draw.php
+++ b/main/document/edit_draw.php
@@ -115,7 +115,7 @@ if (!$is_allowedToEdit) {
api_not_allowed(true);
}
-event_access_tool(TOOL_DOCUMENT);
+Event::event_access_tool(TOOL_DOCUMENT);
Display :: display_header($nameTools, 'Doc');
echo '';
diff --git a/main/document/edit_paint.php b/main/document/edit_paint.php
index 5a6be5d6f0..bb01b519a3 100755
--- a/main/document/edit_paint.php
+++ b/main/document/edit_paint.php
@@ -120,7 +120,7 @@ if (!$is_allowedToEdit) {
api_not_allowed(true);
}
-event_access_tool(TOOL_DOCUMENT);
+Event::event_access_tool(TOOL_DOCUMENT);
Display :: display_header($nameTools, 'Doc');
echo ' ';
diff --git a/main/document/file.php b/main/document/file.php
index cb9cc7101a..34247e94e5 100755
--- a/main/document/file.php
+++ b/main/document/file.php
@@ -69,7 +69,7 @@ if (count($ids) == 1) {
Response::not_found();
}
- event_download(Uri::here());
+ Event::event_download(Uri::here());
DocumentManager::file_send_for_download($doc);
exit;
}
@@ -156,5 +156,5 @@ foreach ($files as $file) {
/**
* Send file for download
*/
-event_download(Uri::here());
+Event::event_download(Uri::here());
DocumentManager::file_send_for_download($temp_zip_path, false, get_lang('Documents') . '.zip');
diff --git a/main/document/record_audio.php b/main/document/record_audio.php
index 191f2d82dc..76558ba0af 100755
--- a/main/document/record_audio.php
+++ b/main/document/record_audio.php
@@ -86,9 +86,8 @@ if (!($is_allowed_to_edit || $_SESSION['group_member_with_upload_rights'] ||
api_not_allowed(true);
}
-
/* Header */
-event_access_tool(TOOL_DOCUMENT);
+Event::event_access_tool(TOOL_DOCUMENT);
$display_dir = $dir;
if (isset ($group)) {
diff --git a/main/document/record_audio_wami.php b/main/document/record_audio_wami.php
index ebe66ea63a..21d448a359 100755
--- a/main/document/record_audio_wami.php
+++ b/main/document/record_audio_wami.php
@@ -94,7 +94,7 @@ if (!($is_allowed_to_edit || $_SESSION['group_member_with_upload_rights'] ||
}
/* Header */
-event_access_tool(TOOL_DOCUMENT);
+Event::event_access_tool(TOOL_DOCUMENT);
$display_dir = $dir;
if (isset ($group)) {
diff --git a/main/document/save_pixlr.php b/main/document/save_pixlr.php
index f836a2850c..9fe49df5a8 100755
--- a/main/document/save_pixlr.php
+++ b/main/document/save_pixlr.php
@@ -12,7 +12,6 @@
* Code
*/
require_once '../inc/global.inc.php';
-require_once api_get_path(LIBRARY_PATH).'fileUpload.lib.php';
api_protect_course_script();
api_block_anonymous_users();
diff --git a/main/document/showinframesmin.php b/main/document/showinframesmin.php
index a52723afc6..70fdac007e 100755
--- a/main/document/showinframesmin.php
+++ b/main/document/showinframesmin.php
@@ -12,9 +12,6 @@
$language_file[] = 'document';
require_once '../inc/global.inc.php';
-require_once api_get_path(LIBRARY_PATH).'document.lib.php';
-require_once api_get_path(LIBRARY_PATH).'glossary.lib.php';
-require_once api_get_path(LIBRARY_PATH).'groupmanager.lib.php';
// Protection
api_protect_course_script();
diff --git a/main/document/slideshow.php b/main/document/slideshow.php
index 37e3309e66..9683a2e58d 100755
--- a/main/document/slideshow.php
+++ b/main/document/slideshow.php
@@ -8,7 +8,7 @@
*/
// Language files that need to be included
-$language_file = array('slideshow', 'document');
+$language_file = array('document');
require_once '../inc/global.inc.php';
api_protect_course_script();
diff --git a/main/document/slideshowoptions.php b/main/document/slideshowoptions.php
index 5aa1c34e01..e340149224 100755
--- a/main/document/slideshowoptions.php
+++ b/main/document/slideshowoptions.php
@@ -22,7 +22,7 @@
*/
// Language files that need to be included
-$language_file = array('slideshow', 'document');
+$language_file = array('document');
require_once '../inc/global.inc.php';
api_protect_course_script();
diff --git a/main/document/webcam_clip.php b/main/document/webcam_clip.php
index 88fc2b151b..4ab42e15d8 100755
--- a/main/document/webcam_clip.php
+++ b/main/document/webcam_clip.php
@@ -92,9 +92,8 @@ if (!($is_allowed_to_edit || $_SESSION['group_member_with_upload_rights'] ||
api_not_allowed(true);
}
-
/* Header */
-event_access_tool(TOOL_DOCUMENT);
+Event::event_access_tool(TOOL_DOCUMENT);
$display_dir = $dir;
if (isset ($group)) {
diff --git a/main/dropbox/dropbox_functions.inc.php b/main/dropbox/dropbox_functions.inc.php
index cd4170081e..ffd9fd38d6 100755
--- a/main/dropbox/dropbox_functions.inc.php
+++ b/main/dropbox/dropbox_functions.inc.php
@@ -1241,7 +1241,7 @@ function check_number_feedback($key, $array) {
/**
* Get the last access to a given tool of a given user
* @param $tool string the tool constant
- * @param $course_code the course_id
+ * @param $courseId the course_id
* @param $user_id the id of the user
* @return string last tool access date
*
@@ -1250,11 +1250,11 @@ function check_number_feedback($key, $array) {
*
* @todo consider moving this function to a more appropriate place.
*/
-function get_last_tool_access($tool, $course_code = '', $user_id='')
+function get_last_tool_access($tool, $courseId = null, $user_id = null)
{
// The default values of the parameters
- if (empty($course_code)) {
- $course_code = api_get_course_id();
+ if (empty($courseId)) {
+ $courseId = api_get_course_int_id();
}
if (empty($user_id)) {
$user_id = api_get_user_id();
@@ -1266,7 +1266,7 @@ function get_last_tool_access($tool, $course_code = '', $user_id='')
$sql = "SELECT access_date FROM $table_last_access
WHERE
access_user_id = ".intval($user_id)." AND
- access_cours_code='".Database::escape_string($course_code)."' AND
+ c_id='".intval($courseId)."' AND
access_tool='".Database::escape_string($tool)."'
ORDER BY access_date DESC
LIMIT 1";
diff --git a/main/dropbox/dropbox_submit.php b/main/dropbox/dropbox_submit.php
index c53823cf92..534e157420 100755
--- a/main/dropbox/dropbox_submit.php
+++ b/main/dropbox/dropbox_submit.php
@@ -16,7 +16,6 @@
* - UPLOAD NEW FILE
*/
if (isset($_POST['submitWork'])) {
- require_once api_get_path(LIBRARY_PATH) . 'fileUpload.lib.php';
$error = false;
$errormsg = '';
/**
diff --git a/main/dropbox/index.php b/main/dropbox/index.php
index 69753584ac..0a78a21a41 100755
--- a/main/dropbox/index.php
+++ b/main/dropbox/index.php
@@ -18,7 +18,7 @@ $viewReceivedCategory = isset($_GET['view_received_category']) ? Security::remov
$viewSentCategory = isset($_GET['view_sent_category']) ? Security::remove_XSS($_GET['view_sent_category']) : null;
// Do the tracking
-event_access_tool(TOOL_DROPBOX);
+Event::event_access_tool(TOOL_DROPBOX);
// This var is used to give a unique value to every page request. This is to prevent resubmiting data
$dropbox_unid = md5(uniqid(rand(), true));
diff --git a/main/exercice/Hpdownload.php b/main/exercice/Hpdownload.php
index c645981b62..76bcbea78a 100755
--- a/main/exercice/Hpdownload.php
+++ b/main/exercice/Hpdownload.php
@@ -20,7 +20,7 @@ $doc_url=str_replace(array('../','\\..','\\0','..\\'),array('','','',''),urldeco
$filename=basename($doc_url);
// launch event
-//event_download($doc_url);
+//Event::event_download($doc_url);
if (isset($_course['path'])) {
$course_path = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document';
$full_file_name = $course_path.Security::remove_XSS($doc_url);
@@ -34,7 +34,7 @@ if(!is_file($full_file_name)) {
}
if (!Security::check_abs_path($full_file_name, $course_path.'/')) {
- exit;
+ exit;
}
$extension=explode('.',$filename);
@@ -68,7 +68,6 @@ header('Last-Modified: '.gmdate('D, d M Y H:i:s',time()+10).' GMT');
*/
if ($content_type == 'text/html') {
- require_once api_get_path(LIBRARY_PATH).'fileUpload.lib.php';
$directory_name = dirname($full_file_name);
$dir=str_replace(array('\\',$_configuration['root_sys']."courses/".$_course['path'].'/document'),array('/',''),$directory_name);
diff --git a/main/exercice/admin.php b/main/exercice/admin.php
index 602aab1b26..d6be2de610 100755
--- a/main/exercice/admin.php
+++ b/main/exercice/admin.php
@@ -64,8 +64,6 @@ if (!$is_allowedToEdit) {
api_not_allowed(true);
}
-require_once api_get_path(LIBRARY_PATH).'fileUpload.lib.php';
-require_once api_get_path(LIBRARY_PATH).'document.lib.php';
/* stripslashes POST data */
if($_SERVER['REQUEST_METHOD'] == 'POST') {
foreach($_POST as $key=>$val) {
@@ -111,11 +109,17 @@ $cancelExercise = isset($cancelExercise) ? $cancelExercise : null;
$cancelAnswers = isset($cancelAnswers) ? $cancelAnswers : null;
$modifyIn = isset($modifyIn) ? $modifyIn : null;
$cancelQuestion = isset($cancelQuestion) ? $cancelQuestion : null;
+$_course = api_get_course_info();
/* Cleaning all incomplete attempts of the admin/teacher to avoid weird problems
when changing the exercise settings, number of questions, etc */
-delete_all_incomplete_attempts(api_get_user_id(), $exerciseId, api_get_course_id(), api_get_session_id());
+Event::delete_all_incomplete_attempts(
+ api_get_user_id(),
+ $exerciseId,
+ api_get_course_int_id(),
+ api_get_session_id()
+);
// get from session
$objExercise = isset($_SESSION['objExercise']) ? $_SESSION['objExercise'] : null;
@@ -183,8 +187,6 @@ if (!is_object($objExercise)) {
// Exercise can be edited in their course.
if ($objExercise->sessionId != $sessionId) {
api_not_allowed(true);
- /*header('Location: '.api_get_path(WEB_CODE_PATH).'exercice/exercice.php?'.api_get_cidreq());
- exit;*/
}
// doesn't select the exercise ID if we come from the question pool
@@ -213,7 +215,7 @@ if ($editQuestion || $newQuestion || $modifyQuestion || $modifyAnswers) {
}
// checks if the object exists
- if(is_object($objQuestion)) {
+ if (is_object($objQuestion)) {
// gets the question ID
$questionId = $objQuestion->selectId();
}
@@ -222,7 +224,7 @@ if ($editQuestion || $newQuestion || $modifyQuestion || $modifyAnswers) {
// if cancelling an exercise
if ($cancelExercise) {
// existing exercise
- if($exerciseId) {
+ if ($exerciseId) {
unset($modifyExercise);
} else {
// new exercise
@@ -235,14 +237,14 @@ if ($cancelExercise) {
// if cancelling question creation/modification
if ($cancelQuestion) {
// if we are creating a new question from the question pool
- if(!$exerciseId && !$questionId) {
+ if (!$exerciseId && !$questionId) {
// goes back to the question pool
header('Location: question_pool.php');
exit();
} else {
// goes back to the question viewing
- $editQuestion=$modifyQuestion;
- unset($newQuestion,$modifyQuestion);
+ $editQuestion = $modifyQuestion;
+ unset($newQuestion, $modifyQuestion);
}
}
@@ -272,6 +274,7 @@ if ($cancelAnswers) {
$editQuestion=$modifyAnswers;
unset($modifyAnswers);
}
+
$nameTools = null;
// modifies the query string that is used in the link of tool name
if ($editQuestion || $modifyQuestion || $newQuestion || $modifyAnswers) {
@@ -289,16 +292,16 @@ if (!empty($gradebook) && $gradebook=='view') {
);
}
-$interbreadcrumb[] = array("url" => "exercice.php","name" => get_lang('Exercices'));
+$interbreadcrumb[] = array("url" => "exercice.php?".api_get_cidreq(),"name" => get_lang('Exercices'));
if (isset($_GET['newQuestion']) || isset($_GET['editQuestion']) ) {
- $interbreadcrumb[] = array("url" => "admin.php?exerciseId=".$objExercise->id, "name" => $objExercise->name);
+ $interbreadcrumb[] = array("url" => "admin.php?exerciseId=".$objExercise->id.'&'.api_get_cidreq(), "name" => $objExercise->name);
} else {
$interbreadcrumb[] = array("url" => "#", "name" => $objExercise->name);
}
// shows a link to go back to the question pool
if (!$exerciseId && $nameTools != get_lang('ExerciseManagement')){
- $interbreadcrumb[]=array(
+ $interbreadcrumb[] = array(
"url" => api_get_path(WEB_CODE_PATH)."exercice/question_pool.php?fromExercise=$fromExercise&".api_get_cidreq(),
"name" => get_lang('QuestionPool')
);
@@ -306,7 +309,7 @@ if (!$exerciseId && $nameTools != get_lang('ExerciseManagement')){
// if the question is duplicated, disable the link of tool name
if ($modifyIn == 'thisExercise') {
- if($buttonBack) {
+ if ($buttonBack) {
$modifyIn='allExercises';
} else {
$noPHP_SELF=true;
@@ -329,8 +332,6 @@ function multiple_answer_true_false_onchange(variable) {
}
document.getElementById(weight_id).value = array_result[result];
}
-
-
';
$htmlHeadXtra[] = "
@@ -520,7 +521,6 @@ if ($newQuestion || $editQuestion) {
if ($newQuestion == 'yes') {
$objExercise->edit_exercise_in_lp = true;
}
-
require 'question_admin.inc.php';
}
diff --git a/main/exercice/calculated_answer.class.php b/main/exercice/calculated_answer.class.php
index e0d9881024..404b0db958 100644
--- a/main/exercice/calculated_answer.class.php
+++ b/main/exercice/calculated_answer.class.php
@@ -73,14 +73,6 @@ class CalculatedAnswer extends Question
document.getElementById("randomValue"+index).innerHTML = "'.get_lang("ExampleValue").': " + result;
}
- /*function FCKeditor_OnComplete(editorInstance) {
- if (window.attachEvent) {
- editorInstance.EditorDocument.attachEvent("onkeyup", updateBlanks) ;
- } else {
- editorInstance.EditorDocument.addEventListener("keyup", updateBlanks, true);
- }
- }*/
-
CKEDITOR.on("instanceCreated", function(e) {
if (e.editor.name === "answer") {
e.editor.on("change", updateBlanks);
diff --git a/main/exercice/exercice.php b/main/exercice/exercice.php
index 735ddc3b00..0aad704027 100755
--- a/main/exercice/exercice.php
+++ b/main/exercice/exercice.php
@@ -162,7 +162,7 @@ if ($origin != 'learnpath') {
Display :: display_reduced_header();
}
-event_access_tool(TOOL_QUIZ);
+Event::event_access_tool(TOOL_QUIZ);
// Tool introduction
Display :: display_introduction_section(TOOL_QUIZ);
@@ -183,7 +183,7 @@ if ($is_allowedToEdit) {
if ($check) {
// list des exercices dans un test
// we got variable $courseId $courseInfo session api_get_session_id()
- $exerciseList = get_all_exercises_for_course_id(
+ $exerciseList = ExerciseLib::get_all_exercises_for_course_id(
$courseInfo,
api_get_session_id(),
$courseId,
@@ -476,7 +476,6 @@ $offline_icon = Display::return_icon('offline.png', get_lang('Invisible'), array
$exercise_list = array();
$exercise_obj = new Exercise();
-//$list_ordered = $exercise_obj->get_exercise_list_ordered();
$list_ordered = null;
while ($row = Database :: fetch_array($result, 'ASSOC')) {
@@ -623,7 +622,13 @@ if (!empty($exercise_list)) {
$title = $cut_title;
}
- $count_exercise_not_validated = intval(count_exercise_result_not_validated($my_exercise_id, $course_code, $session_id));
+ $count_exercise_not_validated = intval(
+ Event::count_exercise_result_not_validated(
+ $my_exercise_id,
+ $courseId,
+ $session_id
+ )
+ );
$move = Display::return_icon('all_directions.png',get_lang('Move'), array('class'=>'moved', 'style'=>'margin-bottom:-0.5em;'));
$move = null;
@@ -744,7 +749,7 @@ if (!empty($exercise_list)) {
}
//Attempts
- //$attempts = get_count_exam_results($row['id']).' '.get_lang('Attempts');
+ //$attempts = ExerciseLib::get_count_exam_results($row['id']).' '.get_lang('Attempts');
//$item .= Display::tag('td',$attempts);
$item .= Display::tag('td', $number_of_questions);
} else {
@@ -803,7 +808,7 @@ if (!empty($exercise_list)) {
if ($num > 0) {
$row_track = Database :: fetch_array($qryres);
$attempt_text = get_lang('LatestAttempt').' : ';
- $attempt_text .= show_score($row_track['exe_result'], $row_track['exe_weighting']);
+ $attempt_text .= ExerciseLib::show_score($row_track['exe_result'], $row_track['exe_weighting']);
} else {
//No attempts
$attempt_text = get_lang('NotAttempted');
@@ -843,7 +848,7 @@ if (!empty($exercise_list)) {
if ($num > 0) {
$row_track = Database :: fetch_array($qryres);
$attempt_text = get_lang('LatestAttempt').' : ';
- $attempt_text .= show_score($row_track['exe_result'], $row_track['exe_weighting']);
+ $attempt_text .= ExerciseLib::show_score($row_track['exe_result'], $row_track['exe_weighting']);
} else {
$attempt_text = get_lang('NotAttempted');
}
@@ -986,7 +991,7 @@ if (isset($attribute['path']) && is_array($attribute['path'])) {
} else {
// Student only
if ($active == 1) {
- $attempt = getLatestHotPotatoResult(
+ $attempt = ExerciseLib::getLatestHotPotatoResult(
$path,
$userId,
api_get_course_int_id(),
@@ -999,7 +1004,7 @@ if (isset($attribute['path']) && is_array($attribute['path'])) {
if (!empty($attempt)) {
$actions = ' '.Display :: return_icon('test_results.png', get_lang('Results'), '', ICON_SIZE_SMALL).'';
$attemptText = get_lang('LatestAttempt').' : ';
- $attemptText .= show_score($attempt['exe_result'], $attempt['exe_weighting']).' ';
+ $attemptText .= ExerciseLib::show_score($attempt['exe_result'], $attempt['exe_weighting']).' ';
$attemptText .= $actions;
} else {
// No attempts.
diff --git a/main/exercice/exercise.class.php b/main/exercice/exercise.class.php
index 235cad7ad6..648c6686e6 100755
--- a/main/exercice/exercise.class.php
+++ b/main/exercice/exercise.class.php
@@ -1018,7 +1018,7 @@ class Exercise
$editor_config = array_merge($editor_config, $type);
}
- $form->addElement ('html',' ');
+ $form->addElement ('html',' ');
$form->add_html_editor('exerciseDescription', get_lang('ExerciseDescription'), false, false, $editor_config);
$form->addElement ('html',' ');
@@ -1571,8 +1571,8 @@ class Exercise
*/
public function clean_results($cleanLpTests = false, $cleanResultBeforeDate = null)
{
- $table_track_e_exercises = Database::get_statistic_table(TABLE_STATISTIC_TRACK_E_EXERCICES);
- $table_track_e_attempt = Database::get_statistic_table(TABLE_STATISTIC_TRACK_E_ATTEMPT);
+ $table_track_e_exercises = Database::get_main_table(TABLE_STATISTIC_TRACK_E_EXERCICES);
+ $table_track_e_attempt = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ATTEMPT);
$sql_where = ' AND
orig_lp_id = 0 AND
@@ -1625,7 +1625,7 @@ class Exercise
AND session_id = ".$session_id."";
Database::query($sql);
- event_system(
+ Event::addEvent(
LOG_EXERCISE_RESULT_DELETE,
LOG_EXERCISE_ID,
$this->id,
@@ -1710,7 +1710,7 @@ class Exercise
$lp_item_view_id = 0,
$status = 'incomplete'
) {
- $track_exercises = Database :: get_statistic_table(TABLE_STATISTIC_TRACK_E_EXERCICES);
+ $track_exercises = Database :: get_main_table(TABLE_STATISTIC_TRACK_E_EXERCICES);
if (empty($lp_id)) {
$lp_id = 0;
}
@@ -1758,7 +1758,7 @@ class Exercise
$questionList = array(),
$weight = 0
) {
- $track_exercises = Database :: get_statistic_table(TABLE_STATISTIC_TRACK_E_EXERCICES);
+ $track_exercises = Database :: get_main_table(TABLE_STATISTIC_TRACK_E_EXERCICES);
$safe_lp_id = intval($safe_lp_id);
$safe_lp_item_id = intval($safe_lp_item_id);
$safe_lp_item_view_id = intval($safe_lp_item_view_id);
@@ -1772,20 +1772,30 @@ class Exercise
if (empty($clock_expired_time)) {
$clock_expired_time = 0;
}
+
+ $questionList = array_map('intval', $questionList);
+
+ $params = array(
+ 'exe_exo_id' => $this->id ,
+ 'exe_user_id' => api_get_user_id(),
+ 'exe_cours_id' => api_get_course_id(),
+ 'c_id' => api_get_course_int_id(),
+ 'status' => 'incomplete',
+ 'session_id' => api_get_session_id(),
+ 'data_tracking' => implode(',', $questionList) ,
+ 'start_date' => api_get_utc_datetime(),
+ 'orig_lp_id' => $safe_lp_id,
+ 'orig_lp_item_id' => $safe_lp_item_id,
+ 'orig_lp_item_view_id' => $safe_lp_item_view_id,
+ 'exe_weighting'=> $weight,
+ );
+
if ($this->expired_time != 0) {
- $sql_fields = "expired_time_control, ";
- $sql_fields_values = "'"."$clock_expired_time"."',";
- } else {
- $sql_fields = "";
- $sql_fields_values = "";
+ $params['expired_time_control'] = $clock_expired_time;
}
- $questionList = array_map('intval', $questionList);
- $weight = Database::escape_string($weight);
- $sql = "INSERT INTO $track_exercises ($sql_fields exe_exo_id, exe_user_id, exe_cours_id, status,session_id, data_tracking, start_date, orig_lp_id, orig_lp_item_id, orig_lp_item_view_id, exe_weighting)
- VALUES($sql_fields_values '".$this->id."','" . api_get_user_id() . "','" . api_get_course_id() . "','incomplete','" . api_get_session_id() . "','" . implode(',', $questionList) . "', '" . api_get_utc_datetime() . "', '$safe_lp_id', '$safe_lp_item_id', '$safe_lp_item_view_id', '$weight')";
- Database::query($sql);
- $id = Database::insert_id();
+ $id = Database::insert($track_exercises, $params);
+
return $id;
}
@@ -2141,7 +2151,7 @@ class Exercise
$questionId = intval($questionId);
$exeId = intval($exeId);
- $TBL_TRACK_ATTEMPT = Database::get_statistic_table(TABLE_STATISTIC_TRACK_E_ATTEMPT);
+ $TBL_TRACK_ATTEMPT = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ATTEMPT);
$table_ans = Database::get_course_table(TABLE_QUIZ_ANSWER);
// Creates a temporary Question object
@@ -2192,7 +2202,7 @@ class Exercise
$nano = null;
if ($answerType == ORAL_EXPRESSION) {
- $exe_info = get_exercise_results_by_attempt($exeId);
+ $exe_info = Event::get_exercise_results_by_attempt($exeId);
$exe_info = isset($exe_info[$exeId]) ? $exe_info[$exeId] : null;
$params = array();
@@ -2682,7 +2692,8 @@ class Exercise
// for free answer
case FREE_ANSWER:
if ($from_database) {
- $query = "SELECT answer, marks FROM ".$TBL_TRACK_ATTEMPT." WHERE exe_id = '".$exeId."' AND question_id= '".$questionId."'";
+ $query = "SELECT answer, marks FROM ".$TBL_TRACK_ATTEMPT."
+ WHERE exe_id = '".$exeId."' AND question_id= '".$questionId."'";
$resq = Database::query($query);
$choice = Database::result($resq,0,'answer');
$choice = str_replace('\r\n', '', $choice);
@@ -2709,7 +2720,8 @@ class Exercise
break;
case ORAL_EXPRESSION:
if ($from_database) {
- $query = "SELECT answer, marks FROM ".$TBL_TRACK_ATTEMPT." WHERE exe_id = '".$exeId."' AND question_id= '".$questionId."'";
+ $query = "SELECT answer, marks FROM ".$TBL_TRACK_ATTEMPT."
+ WHERE exe_id = '".$exeId."' AND question_id= '".$questionId."'";
$resq = Database::query($query);
$choice = Database::result($resq,0,'answer');
$choice = str_replace('\r\n', '', $choice);
@@ -2809,7 +2821,7 @@ class Exercise
}
case HOT_SPOT :
if ($from_database) {
- $TBL_TRACK_HOTSPOT = Database::get_statistic_table(TABLE_STATISTIC_TRACK_E_HOTSPOT);
+ $TBL_TRACK_HOTSPOT = Database::get_main_table(TABLE_STATISTIC_TRACK_E_HOTSPOT);
$sql = "SELECT hotspot_correct
FROM $TBL_TRACK_HOTSPOT
WHERE
@@ -2847,7 +2859,7 @@ class Exercise
case HOT_SPOT_DELINEATION :
if ($from_database) {
// getting the user answer
- $TBL_TRACK_HOTSPOT = Database::get_statistic_table(TABLE_STATISTIC_TRACK_E_HOTSPOT);
+ $TBL_TRACK_HOTSPOT = Database::get_main_table(TABLE_STATISTIC_TRACK_E_HOTSPOT);
$query = "SELECT hotspot_correct, hotspot_coordinate
FROM $TBL_TRACK_HOTSPOT
WHERE
@@ -2949,11 +2961,7 @@ class Exercise
$user_array = substr($user_array,0,-1);
if ($next) {
- //$tbl_track_e_hotspot = Database::get_statistic_table(TABLE_STATISTIC_TRACK_E_HOTSPOT);
- // Save into db
- /* $sql = "INSERT INTO $tbl_track_e_hotspot (hotspot_user_id, hotspot_course_code, hotspot_exe_id, hotspot_question_id, hotspot_answer_id, hotspot_correct, hotspot_coordinate )
- VALUES ('".Database::escape_string($_user['user_id'])."', '".Database::escape_string($_course['id'])."', '".Database::escape_string($exeId)."', '".Database::escape_string($questionId)."', '".Database::escape_string($answerId)."', '".Database::escape_string($studentChoice)."', '".Database::escape_string($user_array)."')";
- $result = api_sql_query($sql,__FILE__,__LINE__);*/
+
$user_answer = $user_array;
// we compare only the delineation not the other points
@@ -3144,7 +3152,7 @@ class Exercise
case HOT_SPOT_DELINEATION:
$user_answer = $user_array;
if ($next) {
- //$tbl_track_e_hotspot = Database::get_statistic_table(TABLE_STATISTIC_TRACK_E_HOTSPOT);
+ //$tbl_track_e_hotspot = Database::get_main_table(TABLE_STATISTIC_TRACK_E_HOTSPOT);
// Save into db
/* $sql = "INSERT INTO $tbl_track_e_hotspot (hotspot_user_id, hotspot_course_code, hotspot_exe_id, hotspot_question_id, hotspot_answer_id, hotspot_correct, hotspot_coordinate )
VALUES ('".Database::escape_string($_user['user_id'])."', '".Database::escape_string($_course['id'])."', '".Database::escape_string($exeId)."', '".Database::escape_string($questionId)."', '".Database::escape_string($answerId)."', '".Database::escape_string($studentChoice)."', '".Database::escape_string($user_array)."')";
@@ -3461,24 +3469,24 @@ class Exercise
if ($final_answer == 0) {
$questionScore = 0;
}
- exercise_attempt($questionScore, 1, $quesId, $exeId, 0); // we always insert the answer_id 1 = delineation
+ Event::saveQuestionAttempt($questionScore, 1, $quesId, $exeId, 0); // we always insert the answer_id 1 = delineation
//in delineation mode, get the answer from $hotspot_delineation_result[1]
- exercise_attempt_hotspot($exeId,$quesId,1, $hotspot_delineation_result[1], $exerciseResultCoordinates[$quesId]);
+ Event::saveExerciseAttemptHotspot($exeId,$quesId,1, $hotspot_delineation_result[1], $exerciseResultCoordinates[$quesId]);
} else {
if ($final_answer==0) {
$questionScore = 0;
$answer=0;
- exercise_attempt($questionScore, $answer, $quesId, $exeId, 0);
+ Event::saveQuestionAttempt($questionScore, $answer, $quesId, $exeId, 0);
if (is_array($exerciseResultCoordinates[$quesId])) {
foreach($exerciseResultCoordinates[$quesId] as $idx => $val) {
- exercise_attempt_hotspot($exeId,$quesId,$idx,0,$val);
+ Event::saveExerciseAttemptHotspot($exeId,$quesId,$idx,0,$val);
}
}
} else {
- exercise_attempt($questionScore, $answer, $quesId, $exeId, 0);
+ Event::saveQuestionAttempt($questionScore, $answer, $quesId, $exeId, 0);
if (is_array($exerciseResultCoordinates[$quesId])) {
foreach($exerciseResultCoordinates[$quesId] as $idx => $val) {
- exercise_attempt_hotspot($exeId,$quesId,$idx,$choice[$idx],$val);
+ Event::saveExerciseAttemptHotspot($exeId,$quesId,$idx,$choice[$idx],$val);
}
}
}
@@ -3531,11 +3539,11 @@ class Exercise
$reply = array_keys($choice);
for ($i = 0; $i < sizeof($reply); $i++) {
$ans = $reply[$i];
- exercise_attempt($questionScore, $ans.':'.$choice[$ans], $quesId, $exeId, $i, $this->id);
+ Event::saveQuestionAttempt($questionScore, $ans.':'.$choice[$ans], $quesId, $exeId, $i, $this->id);
if ($debug) error_log('result =>'.$questionScore.' '.$ans.':'.$choice[$ans]);
}
} else {
- exercise_attempt($questionScore, 0, $quesId, $exeId, 0, $this->id);
+ Event::saveQuestionAttempt($questionScore, 0, $quesId, $exeId, 0, $this->id);
}
} elseif ($answerType == MULTIPLE_ANSWER || $answerType == GLOBAL_MULTIPLE_ANSWER) {
if ($choice != 0) {
@@ -3544,47 +3552,47 @@ class Exercise
if ($debug) error_log("reply ".print_r($reply, 1)."");
for ($i = 0; $i < sizeof($reply); $i++) {
$ans = $reply[$i];
- exercise_attempt($questionScore, $ans, $quesId, $exeId, $i, $this->id);
+ Event::saveQuestionAttempt($questionScore, $ans, $quesId, $exeId, $i, $this->id);
}
} else {
- exercise_attempt($questionScore, 0, $quesId, $exeId, 0, $this->id);
+ Event::saveQuestionAttempt($questionScore, 0, $quesId, $exeId, 0, $this->id);
}
} elseif ($answerType == MULTIPLE_ANSWER_COMBINATION) {
if ($choice != 0) {
$reply = array_keys($choice);
for ($i = 0; $i < sizeof($reply); $i++) {
$ans = $reply[$i];
- exercise_attempt($questionScore, $ans, $quesId, $exeId, $i, $this->id);
+ Event::saveQuestionAttempt($questionScore, $ans, $quesId, $exeId, $i, $this->id);
}
} else {
- exercise_attempt($questionScore, 0, $quesId, $exeId, 0, $this->id);
+ Event::saveQuestionAttempt($questionScore, 0, $quesId, $exeId, 0, $this->id);
}
} elseif ($answerType == MATCHING) {
if (isset($matching)) {
foreach ($matching as $j => $val) {
- exercise_attempt($questionScore, $val, $quesId, $exeId, $j, $this->id);
+ Event::saveQuestionAttempt($questionScore, $val, $quesId, $exeId, $j, $this->id);
}
}
} elseif ($answerType == FREE_ANSWER) {
$answer = $choice;
- exercise_attempt($questionScore, $answer, $quesId, $exeId, 0, $this->id);
+ Event::saveQuestionAttempt($questionScore, $answer, $quesId, $exeId, 0, $this->id);
} elseif ($answerType == ORAL_EXPRESSION) {
$answer = $choice;
- exercise_attempt($questionScore, $answer, $quesId, $exeId, 0, $this->id, $nano);
+ Event::saveQuestionAttempt($questionScore, $answer, $quesId, $exeId, 0, $this->id, $nano);
} elseif ($answerType == UNIQUE_ANSWER || $answerType == UNIQUE_ANSWER_NO_OPTION) {
$answer = $choice;
- exercise_attempt($questionScore, $answer, $quesId, $exeId, 0, $this->id);
+ Event::saveQuestionAttempt($questionScore, $answer, $quesId, $exeId, 0, $this->id);
// } elseif ($answerType == HOT_SPOT || $answerType == HOT_SPOT_DELINEATION) {
} elseif ($answerType == HOT_SPOT) {
- exercise_attempt($questionScore, $answer, $quesId, $exeId, 0, $this->id);
+ Event::saveQuestionAttempt($questionScore, $answer, $quesId, $exeId, 0, $this->id);
if (isset($exerciseResultCoordinates[$questionId]) && !empty($exerciseResultCoordinates[$questionId])) {
foreach ($exerciseResultCoordinates[$questionId] as $idx => $val) {
- exercise_attempt_hotspot($exeId,$quesId,$idx,$choice[$idx],$val,$this->id);
+ Event::saveExerciseAttemptHotspot($exeId,$quesId,$idx,$choice[$idx],$val,$this->id);
}
}
} else {
- exercise_attempt($questionScore, $answer, $quesId, $exeId, 0,$this->id);
+ Event::saveQuestionAttempt($questionScore, $answer, $quesId, $exeId, 0,$this->id);
}
}
@@ -3593,7 +3601,7 @@ class Exercise
}
if ($saved_results) {
- $stat_table = Database :: get_statistic_table(TABLE_STATISTIC_TRACK_E_EXERCICES);
+ $stat_table = Database :: get_main_table(TABLE_STATISTIC_TRACK_E_EXERCICES);
$sql = 'UPDATE ' . $stat_table . ' SET
exe_result = exe_result + ' . floatval($questionScore) . '
WHERE exe_id = ' . $exeId;
@@ -3962,9 +3970,10 @@ class Exercise
* @param int attempt id
* @return float exercise result
*/
- public function get_exercise_result($exe_id) {
+ public function get_exercise_result($exe_id)
+ {
$result = array();
- $track_exercise_info = get_exercise_track_exercise_info($exe_id);
+ $track_exercise_info = ExerciseLib::get_exercise_track_exercise_info($exe_id);
if (!empty($track_exercise_info)) {
$totalScore = 0;
@@ -4091,7 +4100,7 @@ class Exercise
if ($is_visible) {
if ($exerciseAttempts > 0) {
- $attempt_count = get_attempt_count_not_finished(
+ $attempt_count = Event::get_attempt_count_not_finished(
api_get_user_id(),
$this->id,
$lp_id,
@@ -4274,7 +4283,7 @@ class Exercise
public function get_stat_track_exercise_info_by_exe_id($exe_id)
{
- $track_exercises = Database :: get_statistic_table(TABLE_STATISTIC_TRACK_E_EXERCICES);
+ $track_exercises = Database :: get_main_table(TABLE_STATISTIC_TRACK_E_EXERCICES);
$exe_id = intval($exe_id);
$sql_track = "SELECT * FROM $track_exercises WHERE exe_id = $exe_id ";
$result = Database::query($sql_track);
@@ -4308,7 +4317,7 @@ class Exercise
$exercise_info = self::get_stat_track_exercise_info_by_exe_id($exe_id);
$question_id = intval($question_id);
$exe_id = intval($exe_id);
- $track_exercises = Database :: get_statistic_table(TABLE_STATISTIC_TRACK_E_EXERCICES);
+ $track_exercises = Database :: get_main_table(TABLE_STATISTIC_TRACK_E_EXERCICES);
if ($exercise_info) {
if (empty($exercise_info['questions_to_check'])) {
@@ -4546,7 +4555,7 @@ class Exercise
$ids = is_array($quizId) ? $quizId : array($quizId);
$ids = array_map('intval', $ids);
$ids = implode(',', $ids);
- $track_exercises = Database :: get_statistic_table(TABLE_STATISTIC_TRACK_E_EXERCICES);
+ $track_exercises = Database :: get_main_table(TABLE_STATISTIC_TRACK_E_EXERCICES);
if ($sessionId != 0) {
$sql = "SELECT * FROM $track_exercises te "
. "INNER JOIN c_quiz cq ON cq.id = te.exe_exo_id "
diff --git a/main/exercice/exercise.lib.php b/main/exercice/exercise.lib.php
deleted file mode 100755
index a05ecf1597..0000000000
--- a/main/exercice/exercise.lib.php
+++ /dev/null
@@ -1,2939 +0,0 @@
-
- * @version $Id: exercise.lib.php 22247 2009-07-20 15:57:25Z ivantcholakov $
- * Modified by Hubert Borderiou 2011-10-21 Question Category
- */
-
-/**
- * Shows a question
- *
- * @param int $questionId question id
- * @param bool $only_questions if true only show the questions, no exercise title
- * @param bool $origin i.e = learnpath
- * @param string $current_item current item from the list of questions
- * @param bool $show_title
- * @param bool $freeze
- * @param array $user_choice
- * @param bool $show_comment
- * @param bool $exercise_feedback
- * @param bool $show_answers
- * */
-function showQuestion(
- $questionId,
- $only_questions = false,
- $origin = false,
- $current_item = '',
- $show_title = true,
- $freeze = false,
- $user_choice = array(),
- $show_comment = false,
- $exercise_feedback = null,
- $show_answers = false
-) {
-
- // Text direction for the current language
- $is_ltr_text_direction = api_get_text_direction() != 'rtl';
-
- // Change false to true in the following line to enable answer hinting
- $debug_mark_answer = $show_answers; //api_is_allowed_to_edit() && false;
-
- // Reads question information
- if (!$objQuestionTmp = Question::read($questionId)) {
- // Question not found
- return false;
- }
-
- if ($exercise_feedback != EXERCISE_FEEDBACK_TYPE_END) {
- $show_comment = false;
- }
-
- $answerType = $objQuestionTmp->selectType();
- $pictureName = $objQuestionTmp->selectPicture();
- $s = '';
-
- if ($answerType != HOT_SPOT && $answerType != HOT_SPOT_DELINEATION) {
- // Question is not a hotspot
-
- if (!$only_questions) {
- $questionDescription = $objQuestionTmp->selectDescription();
- if ($show_title) {
- Testcategory::displayCategoryAndTitle($objQuestionTmp->id);
- echo Display::div(
- $current_item.'. '.$objQuestionTmp->selectTitle(),
- array('class'=>'question_title')
- );
- }
- if (!empty($questionDescription)) {
- echo Display::div($questionDescription, array('class'=>'question_description'));
- }
- }
-
- if (in_array($answerType, array(FREE_ANSWER, ORAL_EXPRESSION)) && $freeze) {
- return '';
- }
-
- echo ' ';
- // construction of the Answer object (also gets all answers details)
- $objAnswerTmp = new Answer($questionId);
-
- $nbrAnswers = $objAnswerTmp->selectNbrAnswers();
- $course_id = api_get_course_int_id();
- $quiz_question_options = Question::readQuestionOption($questionId, $course_id);
-
- // For "matching" type here, we need something a little bit special
- // because the match between the suggestions and the answers cannot be
- // done easily (suggestions and answers are in the same table), so we
- // have to go through answers first (elems with "correct" value to 0).
- $select_items = array();
- //This will contain the number of answers on the left side. We call them
- // suggestions here, for the sake of comprehensions, while the ones
- // on the right side are called answers
- $num_suggestions = 0;
-
- if ($answerType == MATCHING) {
- $s .= ' ';
- // Iterate through answers
- $x = 1;
- //mark letters for each answer
- $letter = 'A';
- $answer_matching = array();
- $cpt1 = array();
- for ($answerId = 1; $answerId <= $nbrAnswers; $answerId++) {
- $answerCorrect = $objAnswerTmp->isCorrect($answerId);
- $numAnswer = $objAnswerTmp->selectAutoId($answerId);
-
- $answer = $objAnswerTmp->selectAnswer($answerId);
- if ($answerCorrect == 0) {
- // options (A, B, C, ...) that will be put into the list-box
- // have the "correct" field set to 0 because they are answer
- $cpt1[$x] = $letter;
- $answer_matching[$x] = $objAnswerTmp->selectAnswerByAutoId($numAnswer);
- $x++;
- $letter++;
- }
- }
-
- $i = 1;
-
- $select_items[0]['id'] = 0;
- $select_items[0]['letter'] = '--';
- $select_items[0]['answer'] = '';
- foreach ($answer_matching as $id => $value) {
- $select_items[$i]['id'] = $value['id'];
- $select_items[$i]['letter'] = $cpt1[$id];
- $select_items[$i]['answer'] = $value['answer'];
- $i++;
- }
-
- $user_choice_array_position = array();
- if (!empty($user_choice)) {
- foreach ($user_choice as $item) {
- $user_choice_array_position[$item['position']] = $item['answer'];
- }
- }
- $num_suggestions = ($nbrAnswers - $x) + 1;
-
- } elseif ($answerType == FREE_ANSWER) {
- $fck_content = isset($user_choice[0]) && !empty($user_choice[0]['answer']) ? $user_choice[0]['answer']:null;
-
- $oFCKeditor = new CKeditor();
- $oFCKeditor->ToolbarSet = 'Test_Free_Answer';
- $oFCKeditor->Width = '100%';
- $oFCKeditor->Height = '200';
- $oFCKeditor->Value = $fck_content;
- $s .= $oFCKeditor->editor("choice[".$questionId."]", $oFCKeditor->Value);
- } elseif ($answerType == ORAL_EXPRESSION) {
- //Add nanog
- if (api_get_setting('enable_nanogong') == 'true') {
- //@todo pass this as a parameter
- global $exercise_stat_info, $exerciseId, $exe_id;
-
- if (!empty($exercise_stat_info)) {
- $params = array(
- 'exercise_id' => $exercise_stat_info['exe_exo_id'],
- 'exe_id' => $exercise_stat_info['exe_id'],
- 'question_id' => $questionId
- );
- } else {
- $params = array(
- 'exercise_id' => $exerciseId,
- 'exe_id' => 'temp_exe',
- 'question_id' => $questionId
- );
- }
- $nano = new Nanogong($params);
- echo $nano->show_button();
- }
-
- $oFCKeditor = new CKeditor();
- $oFCKeditor->ToolbarSet = 'TestFreeAnswer';
- $oFCKeditor->Width = '100%';
- $oFCKeditor->Height = '150';
- $oFCKeditor->ToolbarStartExpanded = false;
- $oFCKeditor->Value = '' ;
- $s .= $oFCKeditor->editor("choice[".$questionId."]", $oFCKeditor->Value);
- }
-
- // Now navigate through the possible answers, using the max number of
- // answers for the question as a limiter
- $lines_count = 1; // a counter for matching-type answers
-
- if ($answerType == MULTIPLE_ANSWER_TRUE_FALSE ||
- $answerType == MULTIPLE_ANSWER_COMBINATION_TRUE_FALSE
- ) {
- $header = Display::tag('th', get_lang('Options'));
- foreach ($objQuestionTmp->options as $item) {
- if ($answerType == MULTIPLE_ANSWER_TRUE_FALSE) {
- if (in_array($item, $objQuestionTmp->options)) {
- $header .= Display::tag('th', get_lang($item));
- } else {
- $header .= Display::tag('th', $item);
- }
- } else {
- $header .= Display::tag('th', $item);
- }
-
- }
- if ($show_comment) {
- $header .= Display::tag('th', get_lang('Feedback'));
- }
- $s .= '';
- $s .= Display::tag('tr', $header, array('style'=>'text-align:left;'));
- }
-
- if ($show_comment) {
- if (in_array(
- $answerType,
- array(MULTIPLE_ANSWER, MULTIPLE_ANSWER_COMBINATION, UNIQUE_ANSWER, UNIQUE_ANSWER_NO_OPTION, GLOBAL_MULTIPLE_ANSWER))
- ) {
- $header = Display::tag('th', get_lang('Options'));
- if ($exercise_feedback == EXERCISE_FEEDBACK_TYPE_END) {
- $header .= Display::tag('th', get_lang('Feedback'));
- }
- $s .= '';
- $s .= Display::tag('tr',$header, array('style'=>'text-align:left;'));
- }
- }
-
- $matching_correct_answer = 0;
- $user_choice_array = array();
- if (!empty($user_choice)) {
- foreach($user_choice as $item) {
- $user_choice_array[] = $item['answer'];
- }
- }
-
- for ($answerId=1; $answerId <= $nbrAnswers; $answerId++) {
- $answer = $objAnswerTmp->selectAnswer($answerId);
- $answerCorrect = $objAnswerTmp->isCorrect($answerId);
- $numAnswer = $objAnswerTmp->selectAutoId($answerId);
- $comment = $objAnswerTmp->selectComment($answerId);
-
- $attributes = array();
-
- // Unique answer
- if ($answerType == UNIQUE_ANSWER || $answerType == UNIQUE_ANSWER_NO_OPTION) {
- $input_id = 'choice-'.$questionId.'-'.$answerId;
- if (isset($user_choice[0]['answer']) && $user_choice[0]['answer'] == $numAnswer ) {
- $attributes = array('id' =>$input_id, 'checked'=>1, 'selected'=>1);
- } else {
- $attributes = array('id' =>$input_id);
- }
-
- if ($debug_mark_answer) {
- if ($answerCorrect) {
- $attributes['checked'] = 1;
- $attributes['selected'] = 1;
- }
- }
-
- $answer = Security::remove_XSS($answer, STUDENT);
- $s .= Display::input('hidden', 'choice2['.$questionId.']','0');
-
- $answer_input = '';
-
- if ($show_comment) {
- $s .= '| ';
- $s .= $answer_input;
- $s .= ' | ';
- $s .= '';
- $s .= $comment;
- $s .= ' | ';
- $s .= ' ';
- } else {
- $s .= $answer_input;
- }
-
- } elseif ($answerType == MULTIPLE_ANSWER ||
- $answerType == MULTIPLE_ANSWER_TRUE_FALSE ||
- $answerType == GLOBAL_MULTIPLE_ANSWER
- ) {
- $input_id = 'choice-'.$questionId.'-'.$answerId;
- $answer = Security::remove_XSS($answer, STUDENT);
-
- if (in_array($numAnswer, $user_choice_array)) {
- $attributes = array('id' =>$input_id, 'checked'=>1, 'selected'=>1);
- } else {
- $attributes = array('id' =>$input_id);
- }
-
- if ($debug_mark_answer) {
- if ($answerCorrect) {
- $attributes['checked'] = 1;
- $attributes['selected'] = 1;
- }
- }
-
- if ($answerType == MULTIPLE_ANSWER || $answerType == GLOBAL_MULTIPLE_ANSWER) {
- $s .= '';
-
- $answer_input = '';
-
- if ($show_comment) {
- $s .= '| ';
- $s .= $answer_input;
- $s .= ' | ';
- $s .= '';
- $s .= $comment;
- $s .= ' | ';
- $s .=' ';
- } else {
- $s .= $answer_input;
- }
- } elseif ($answerType == MULTIPLE_ANSWER_TRUE_FALSE) {
-
- $my_choice = array();
- if (!empty($user_choice_array)) {
- foreach ($user_choice_array as $item) {
- $item = explode(':', $item);
- $my_choice[$item[0]] = $item[1];
- }
- }
-
- $s .= '';
- $s .= Display::tag('td', $answer);
-
- if (!empty($quiz_question_options)) {
- foreach ($quiz_question_options as $id => $item) {
-
- if (isset($my_choice[$numAnswer]) && $id == $my_choice[$numAnswer]) {
- $attributes = array('checked'=>1, 'selected'=>1);
- } else {
- $attributes = array();
- }
-
- if ($debug_mark_answer) {
- if ($id == $answerCorrect) {
- $attributes['checked'] = 1;
- $attributes['selected'] = 1;
- }
- }
- $s .= Display::tag('td', Display::input('radio', 'choice['.$questionId.']['.$numAnswer.']', $id, $attributes), array('style'=>''));
- }
- }
-
- if ($show_comment) {
- $s .= '| ';
- $s .= $comment;
- $s .= ' | ';
- }
- $s.=' ';
- }
- } elseif ($answerType == MULTIPLE_ANSWER_COMBINATION) {
- // multiple answers
- $input_id = 'choice-'.$questionId.'-'.$answerId;
-
- if (in_array($numAnswer, $user_choice_array)) {
- $attributes = array('id'=>$input_id, 'checked'=>1, 'selected'=>1);
- } else {
- $attributes = array('id'=>$input_id);
- }
-
- if ($debug_mark_answer) {
- if ($answerCorrect) {
- $attributes['checked'] = 1;
- $attributes['selected'] = 1;
- }
- }
-
- $answer = Security::remove_XSS($answer, STUDENT);
- $answer_input = '';
- $answer_input .= '';
-
- if ($show_comment) {
- $s .= '';
- $s .= '| ';
- $s .= $answer_input;
- $s .= ' | ';
- $s .= '';
- $s .= $comment;
- $s .= ' | ';
- $s .= ' ';
- } else {
- $s .= $answer_input;
- }
-
- } elseif ($answerType == MULTIPLE_ANSWER_COMBINATION_TRUE_FALSE) {
- $s .= '';
-
- $my_choice = array();
- if (!empty($user_choice_array)) {
- foreach ($user_choice_array as $item) {
- $item = explode(':', $item);
- $my_choice[$item[0]] = $item[1];
- }
- }
- $answer = Security::remove_XSS($answer, STUDENT);
- $s .='';
- $s .= Display::tag('td', $answer);
-
- foreach ($objQuestionTmp->options as $key => $item) {
- if (isset($my_choice[$numAnswer]) && $key == $my_choice[$numAnswer]) {
- $attributes = array('checked' => 1, 'selected' => 1);
- } else {
- $attributes = array();
- }
-
- if ($debug_mark_answer) {
- if ($key == $answerCorrect) {
- $attributes['checked'] = 1;
- $attributes['selected'] = 1;
- }
- }
- $s .= Display::tag(
- 'td',
- Display::input('radio', 'choice['.$questionId.']['.$numAnswer.']', $key, $attributes)
- );
- }
-
- if ($show_comment) {
- $s .= '| ';
- $s .= $comment;
- $s .= ' | ';
- }
- $s .=' ';
-
- } elseif ($answerType == FILL_IN_BLANKS) {
- /*
- * In the FILL_IN_BLANKS test
- * you mustn't have [ and ] in the textarea
- * you mustn't have :: in the textarea
- * the text to find mustn't be empty or contains only spaces
- * the text to find mustn't contains HTML tags
- * the text to find mustn't contains char "
- */
-
- list($answer) = explode('::', $answer);
-
- // $correct_answer_list array of array with correct anwsers 0=> [0=>[\p] 1=>[plop]]
- api_preg_match_all('/\[[^]]+\]/', $answer, $correct_answer_list);
-
- // get student answer to display it if student go back to previous fillBlank answer question in a test
- if (isset($user_choice[0]['answer'])) {
- api_preg_match_all('/\[[^]]+\]/', $user_choice[0]['answer'], $student_answer_list);
- $student_answer_list_tobecleaned = $student_answer_list[0];
- $student_answer_list = array();
- // here we got the student answer in a test
- // let's clean up the results
- /*
- Array
- (
- [0] => Array
- (
- [0] => [yer / ici]
- [1] => [plop / /p]
- )
- )
- */
- for ($i=0; $i < count($student_answer_list_tobecleaned); $i++) {
- $answer_corrected = $student_answer_list_tobecleaned[$i];
- /*
- * we got if student answer is wrong
- * [rrr / /p]
- * or if student answer is good
- * [plop / plop]
- * or if student didn't answer []
- */
- $answer_corrected = api_preg_replace('| / .*$|', '', $answer_corrected);
- /*
- * we got [rrr or [plop or [
- */
- $answer_corrected = api_preg_replace('/^\[/', '', $answer_corrected);
- /*
- * we got rrr or plop
- * non breakable spaces from /main/exercice/exercise.class.php have been removed l 2391 and l 2370
- */
- $answer_corrected = api_preg_replace('|^|', '', $answer_corrected);
- $answer_corrected = api_preg_replace('|$|', '', $answer_corrected);
- $answer_corrected = '['.$answer_corrected.']';
- /*
- * we got [rrr] or [plop] or []
- */
- $student_answer_list[] = $answer_corrected;
- }
- }
-
- // If display preview of answer in test view for exemple, set the student answer to the correct answers
- if ($debug_mark_answer) {
- // contain the rights answers surronded with brackets
- $student_answer_list = $correct_answer_list[0];
- }
-
- /*
- Split the response by bracket
- tab_comments is an array with text surrounding the text to find
- we add a space before and after the answer_question to be sure to
- have a block of text before and after [xxx] patterns
- so we have n text to find ([xxx]) and n+1 block of texts before,
- between and after the text to find
- */
- $tab_comments = api_preg_split('/\[[^]]+\]/', ' '.$answer.' ');
-
- if (!empty($correct_answer_list) && !empty($student_answer_list)) {
- $answer = "";
- $i = 0;
- foreach ($student_answer_list as $student_item) {
- // remove surronding brackets
- $student_response = api_substr($student_item, 1, api_strlen($student_item) - 2);
-
- $size = strlen($student_item);
- $attributes['class'] = detectInputAppropriateClass($size);
-
- $answer .= $tab_comments[$i].
- Display::input(
- 'text',
- "choice[$questionId][]",
- $student_response,
- $attributes
- );
- $i++;
- }
- $answer .= $tab_comments[$i];
- } else {
- // display exercise with empty input fields
- // every [xxx] are replaced with an empty input field
- foreach ($correct_answer_list[0] as $item) {
- $size = strlen($item);
- $attributes['class'] = detectInputAppropriateClass($size);
- $answer = str_replace(
- $item,
- Display::input('text', "choice[$questionId][]", '', $attributes),
- $answer
- );
- }
- /*$answer = api_preg_replace(
- '/\[[^]]+\]/',
- Display::input(
- 'text',
- "choice[$questionId][]",
- '',
- $attributes
- ), $answer);*/
- }
- $s .= $answer;
-
- } elseif ($answerType == CALCULATED_ANSWER) {
- /*
- * In the CALCULATED_ANSWER test
- * you mustn't have [ and ] in the textarea
- * you mustn't have @@ in the textarea
- * the text to find mustn't be empty or contains only spaces
- * the text to find mustn't contains HTML tags
- * the text to find mustn't contains char "
- */
- if ($origin !== null) {
- global $exe_id;
- $trackAttempts = Database::get_statistic_table(TABLE_STATISTIC_TRACK_E_ATTEMPT);
- $sqlTrackAttempt = 'SELECT answer FROM '.$trackAttempts.' WHERE exe_id='.$exe_id.' AND question_id='.$questionId;
- $rsLastAttempt = Database::query($sqlTrackAttempt);
- $rowLastAttempt = Database::fetch_array($rsLastAttempt);
- $answer = $rowLastAttempt['answer'];
- if (empty($answer)) {
- $_SESSION['calculatedAnswerId'][$questionId] = mt_rand(1, $nbrAnswers);
- $answer = $objAnswerTmp->selectAnswer($_SESSION['calculatedAnswerId'][$questionId]);
- }
- }
- list($answer) = explode('@@', $answer);
- // $correctAnswerList array of array with correct anwsers 0=> [0=>[\p] 1=>[plop]]
- api_preg_match_all('/\[[^]]+\]/', $answer, $correctAnswerList);
- // get student answer to display it if student go back to previous calculated answer question in a test
- if (isset($user_choice[0]['answer'])) {
- api_preg_match_all('/\[[^]]+\]/', $answer, $studentAnswerList);
- $studentAnswerListTobecleaned = $studentAnswerList[0];
- $studentAnswerList = array();
-
- for ($i=0; $i < count($studentAnswerListTobecleaned); $i++) {
- $answerCorrected = $studentAnswerListTobecleaned[$i];
- $answerCorrected = api_preg_replace('| / .*$|', '', $answerCorrected);
- $answerCorrected = api_preg_replace('/^\[/', '', $answerCorrected);
- $answerCorrected = api_preg_replace('|^|', '', $answerCorrected);
- $answerCorrected = api_preg_replace('|$|', '', $answerCorrected);
- $answerCorrected = '['.$answerCorrected.']';
- $studentAnswerList[] = $answerCorrected;
- }
- }
- // If display preview of answer in test view for exemple, set the student answer to the correct answers
- if ($debug_mark_answer) {
- // contain the rights answers surronded with brackets
- $studentAnswerList = $correctAnswerList[0];
- }
- /*
- Split the response by bracket
- tabComments is an array with text surrounding the text to find
- we add a space before and after the answerQuestion to be sure to
- have a block of text before and after [xxx] patterns
- so we have n text to find ([xxx]) and n+1 block of texts before,
- between and after the text to find
- */
- $tabComments = api_preg_split('/\[[^]]+\]/', ' '.$answer.' ');
- if (!empty($correctAnswerList) && !empty($studentAnswerList)) {
- $answer = "";
- $i = 0;
- foreach ($studentAnswerList as $studentItem) {
- // remove surronding brackets
- $studentResponse = api_substr($studentItem, 1, api_strlen($studentItem) - 2);
- $size = strlen($studentItem);
- $attributes['class'] = detectInputAppropriateClass($size);
-
- $answer .= $tabComments[$i].
- Display::input(
- 'text',
- "choice[$questionId][]",
- $studentResponse,
- $attributes
- );
- $i++;
- }
- $answer .= $tabComments[$i];
- } else {
- // display exercise with empty input fields
- // every [xxx] are replaced with an empty input field
- foreach ($correctAnswerList[0] as $item) {
- $size = strlen($item);
- $attributes['class'] = detectInputAppropriateClass($size);
- $answer = str_replace(
- $item,
- Display::input('text', "choice[$questionId][]", '', $attributes),
- $answer
- );
- }
- }
- if ($origin !== null) {
- $s = $answer;
- break;
- } else {
- $s .= $answer;
- }
- } elseif ($answerType == MATCHING) {
- // matching type, showing suggestions and answers
- // TODO: replace $answerId by $numAnswer
-
- if ($answerCorrect != 0) {
- // only show elements to be answered (not the contents of
- // the select boxes, who are corrrect = 0)
- $s .= '| ';
- $parsed_answer = $answer;
- //left part questions
- $s .= ' '.$lines_count.'.
- '.$parsed_answer.' | ';
- //middle part (matches selects)
-
- $s .= '
- | ';
- $s .='';
- if (isset($select_items[$lines_count])) {
- $s.=''.$select_items[$lines_count]['letter'].'.'.
- ''.$select_items[$lines_count]['answer'].'';
- } else {
- $s.=' ';
- }
- $s .= ' | ';
- $s .= ' ';
- $lines_count++;
- //if the left side of the "matching" has been completely
- // shown but the right side still has values to show...
- if (($lines_count -1) == $num_suggestions) {
- // if it remains answers to shown at the right side
- while (isset($select_items[$lines_count])) {
- $s .= '
- |
- ';
- $s .=''.$select_items[$lines_count]['letter'].'. '.$select_items[$lines_count]['answer'];
- $s .=" |
- ";
- $lines_count++;
- } // end while()
- } // end if()
- $matching_correct_answer++;
- }
- }
- } // end for()
-
- if ($show_comment) {
- $s .= ' ';
- } else {
- if ($answerType == MATCHING || $answerType == UNIQUE_ANSWER_NO_OPTION || $answerType == MULTIPLE_ANSWER_TRUE_FALSE ||
- $answerType == MULTIPLE_ANSWER_COMBINATION_TRUE_FALSE) {
- $s .= ' ';
- }
- }
-
- $s .= '';
-
- // destruction of the Answer object
- unset($objAnswerTmp);
-
- // destruction of the Question object
- unset($objQuestionTmp);
-
- if ($origin != 'export') {
- echo $s;
- } else {
- return $s;
- }
- } elseif ($answerType == HOT_SPOT || $answerType == HOT_SPOT_DELINEATION) {
- // Question is a HOT_SPOT
- //checking document/images visibility
- if (api_is_platform_admin() || api_is_course_admin()) {
- require_once api_get_path(LIBRARY_PATH).'document.lib.php';
- $course = api_get_course_info();
- $doc_id = DocumentManager::get_document_id($course, '/images/'.$pictureName);
- if (is_numeric($doc_id)) {
- $images_folder_visibility = api_get_item_visibility($course,'document', $doc_id, api_get_session_id());
- if (!$images_folder_visibility) {
- //This message is shown only to the course/platform admin if the image is set to visibility = false
- Display::display_warning_message(get_lang('ChangeTheVisibilityOfTheCurrentImage'));
- }
- }
- }
- $questionName = $objQuestionTmp->selectTitle();
- $questionDescription = $objQuestionTmp->selectDescription();
-
- if ($freeze) {
- echo Display::img($objQuestionTmp->selectPicturePath());
- return;
- }
-
- // Get the answers, make a list
- $objAnswerTmp = new Answer($questionId);
- $nbrAnswers = $objAnswerTmp->selectNbrAnswers();
-
- // get answers of hotpost
- $answers_hotspot = array();
- for ($answerId=1;$answerId <= $nbrAnswers;$answerId++) {
- $answers = $objAnswerTmp->selectAnswerByAutoId($objAnswerTmp->selectAutoId($answerId));
- $answers_hotspot[$answers['id']] = $objAnswerTmp->selectAnswer($answerId);
- }
-
- // display answers of hotpost order by id
- $answer_list = ''.get_lang('HotspotZones').'';
- if (!empty($answers_hotspot)) {
- ksort($answers_hotspot);
- foreach ($answers_hotspot as $key => $value) {
- $answer_list .= '- '.$key.'.- '.$value.'
';
- }
- }
- $answer_list .= ' ';
-
- if ($answerType == HOT_SPOT_DELINEATION) {
- $answer_list='';
- $swf_file = 'hotspot_delineation_user';
- $swf_height = 405;
- } else {
- $swf_file = 'hotspot_user';
- $swf_height = 436;
- }
-
- if (!$only_questions) {
- if ($show_title) {
- Testcategory::displayCategoryAndTitle($objQuestionTmp->id);
- echo ''.$current_item.'. '.$questionName.' ';
- }
- //@todo I need to the get the feedback type
- echo '';
- echo '
-
- | ';
- echo $questionDescription;
- echo ' | ';
- }
-
- $canClick = isset($_GET['editQuestion']) ? '0' : (isset($_GET['modifyAnswers']) ? '0' : '1');
-
- $s .= '
-
-
-
-
- ';
- $s .= '|
- | ';
- echo $s;
- echo ' ';
- }
-
- return $nbrAnswers;
-}
-
-/**
- * @param int $exe_id
- * @return array
- */
-function get_exercise_track_exercise_info($exe_id)
-{
- $TBL_EXERCICES = Database::get_course_table(TABLE_QUIZ_TEST);
- $TBL_TRACK_EXERCICES = Database::get_statistic_table(TABLE_STATISTIC_TRACK_E_EXERCICES);
- $TBL_COURSE = Database::get_main_table(TABLE_MAIN_COURSE);
- $exe_id = intval($exe_id);
- $result = array();
- if (!empty($exe_id)) {
- $sql = " SELECT q.*, tee.*
- FROM $TBL_EXERCICES as q
- INNER JOIN $TBL_TRACK_EXERCICES as tee
- ON q.id=tee.exe_exo_id
- INNER JOIN $TBL_COURSE c
- ON c.code = tee.exe_cours_id
- WHERE tee.exe_id=$exe_id
- AND q.c_id=c.id";
-
- $res_fb_type = Database::query($sql);
- $result = Database::fetch_array($res_fb_type, 'ASSOC');
- }
-
- return $result;
-}
-
-/**
- * Validates the time control key
- */
-function exercise_time_control_is_valid($exercise_id, $lp_id = 0 , $lp_item_id = 0)
-{
- $course_id = api_get_course_int_id();
- $exercise_id = intval($exercise_id);
- $TBL_EXERCICES = Database::get_course_table(TABLE_QUIZ_TEST);
- $sql = "SELECT expired_time FROM $TBL_EXERCICES
- WHERE c_id = $course_id AND id = $exercise_id";
- $result = Database::query($sql);
- $row = Database::fetch_array($result, 'ASSOC');
- if (!empty($row['expired_time'])) {
- $current_expired_time_key = get_time_control_key($exercise_id, $lp_id, $lp_item_id);
- if (isset($_SESSION['expired_time'][$current_expired_time_key])) {
- $current_time = time();
- $expired_time = api_strtotime($_SESSION['expired_time'][$current_expired_time_key], 'UTC');
- $total_time_allowed = $expired_time + 30;
- if ($total_time_allowed < $current_time) {
- return false;
- }
- return true;
- } else {
- return false;
- }
- } else {
- return true;
- }
-}
-
-/**
-Deletes the time control token
- */
-function exercise_time_control_delete($exercise_id, $lp_id = 0 , $lp_item_id = 0)
-{
- $current_expired_time_key = get_time_control_key($exercise_id, $lp_id, $lp_item_id);
- unset($_SESSION['expired_time'][$current_expired_time_key]);
-}
-
-/**
-Generates the time control key
- */
-function get_time_control_key($exercise_id, $lp_id = 0, $lp_item_id = 0)
-{
- $exercise_id = intval($exercise_id);
- $lp_id = intval($lp_id);
- $lp_item_id = intval($lp_item_id);
- return api_get_course_int_id().'_'.api_get_session_id().'_'.$exercise_id.'_'.api_get_user_id().'_'.$lp_id.'_'.$lp_item_id;
-}
-
-/**
- * Get session time control
- */
-function get_session_time_control_key($exercise_id, $lp_id = 0, $lp_item_id = 0)
-{
- $return_value = 0;
- $time_control_key = get_time_control_key($exercise_id, $lp_id, $lp_item_id);
- if (isset($_SESSION['expired_time']) && isset($_SESSION['expired_time'][$time_control_key])) {
- $return_value = $_SESSION['expired_time'][$time_control_key];
- }
- return $return_value;
-}
-
-/**
- * Gets count of exam results
- * @todo this function should be moved in a library + no global calls
- */
-function get_count_exam_results($exercise_id, $extra_where_conditions)
-{
- $count = get_exam_results_data(null, null, null, null, $exercise_id, $extra_where_conditions, true);
- return $count;
-}
-
-/**
- * @param string $in_hotpot_path
- * @return int
- */
-function get_count_exam_hotpotatoes_results($in_hotpot_path)
-{
- return get_exam_results_hotpotatoes_data(0, 0, '', '', $in_hotpot_path, true, '');
-}
-
-/**
- * @param int $in_from
- * @param int $in_number_of_items
- * @param int $in_column
- * @param int $in_direction
- * @param string $in_hotpot_path
- * @param bool $in_get_count
- * @param null $where_condition
- * @return array|int
- */
-function get_exam_results_hotpotatoes_data(
- $in_from,
- $in_number_of_items,
- $in_column,
- $in_direction,
- $in_hotpot_path,
- $in_get_count = false,
- $where_condition = null
-) {
- $course_code = api_get_course_id();
- /* by default in_column = 1 If parameters given,
- it is the name of the column witch is the bdd field name*/
- if ($in_column == 1) {
- $in_column = 'firstname';
- }
- $in_hotpot_path = Database::escape_string($in_hotpot_path);
- $in_direction = Database::escape_string($in_direction);
- $in_column = Database::escape_string($in_column);
- $in_number_of_items = intval($in_number_of_items);
- $in_from = intval($in_from);
-
- $TBL_TRACK_HOTPOTATOES = Database :: get_statistic_table(TABLE_STATISTIC_TRACK_E_HOTPOTATOES);
- $TBL_USER = Database :: get_main_table(TABLE_MAIN_USER);
-
- $sql = "SELECT * FROM $TBL_TRACK_HOTPOTATOES thp
- JOIN $TBL_USER u ON thp.exe_user_id = u.user_id
- WHERE thp.exe_cours_id = '$course_code' AND exe_name LIKE '$in_hotpot_path%'";
-
- // just count how many answers
- if ($in_get_count) {
- $res = Database::query($sql);
- return Database::num_rows($res);
- }
- // get a number of sorted results
- $sql .= " $where_condition
- ORDER BY $in_column $in_direction
- LIMIT $in_from, $in_number_of_items";
-
- $res = Database::query($sql);
- $result = array();
- $apiIsAllowedToEdit = api_is_allowed_to_edit();
- $urlBase = api_get_path(WEB_CODE_PATH).'exercice/hotpotatoes_exercise_report.php?action=delete&'.api_get_cidreq().'&id=';
- while ($data = Database::fetch_array($res)) {
- $actions = null;
-
- if ($apiIsAllowedToEdit) {
- $url = $urlBase.$data['id'].'&path='.$data['exe_name'];
- $actions = Display::url(
- Display::return_icon('delete.png', get_lang('Delete')),
- $url
- );
- }
-
- $result[] = array(
- 'firstname' => $data['firstname'],
- 'lastname' => $data['lastname'],
- 'username' => $data['username'],
- 'group_name' => implode("
", GroupManager::get_user_group_name($data['user_id'])),
- 'exe_date' => $data['exe_date'],
- 'score' => $data['exe_result'].' / '.$data['exe_weighting'],
- 'actions' => $actions,
- );
- }
-
- return $result;
-}
-
-/**
- * @param string $exercisePath
- * @param int $userId
- * @param int $courseId
- * @param int $sessionId
- *
- * @return array
- */
-function getLatestHotPotatoResult(
- $exercisePath,
- $userId,
- $courseId,
- $sessionId
-) {
- $table = Database :: get_statistic_table(TABLE_STATISTIC_TRACK_E_HOTPOTATOES);
-
- $courseInfo = api_get_course_info_by_id($courseId);
- $courseCode = $courseInfo['code'];
- $exercisePath = Database::escape_string($exercisePath);
- $userId = intval($userId);
-
- $sql = "SELECT * FROM $table
- WHERE
- exe_cours_id = '$courseCode' AND
- exe_name LIKE '$exercisePath%' AND
- exe_user_id = $userId
- ORDER BY id
- LIMIT 1";
- $result = Database::query($sql);
- $attempt = array();
- if (Database::num_rows($result)) {
- $attempt = Database::fetch_array($result, 'ASSOC');
- }
- return $attempt;
-}
-
-/**
- * Gets the exam'data results
- * @todo this function should be moved in a library + no global calls
- * @param int $from
- * @param int $number_of_items
- * @param int $column
- * @param string $direction
- * @param int $exercise_id
- * @param null $extra_where_conditions
- * @param bool $get_count
- * @return array
- */
-function get_exam_results_data(
- $from,
- $number_of_items,
- $column,
- $direction,
- $exercise_id,
- $extra_where_conditions = null,
- $get_count = false
-) {
- //@todo replace all this globals
- global $documentPath, $filter;
-
- $course_id = api_get_course_int_id();
- $course_code = api_get_course_id();
- $sessionId = api_get_session_id();
-
- $is_allowedToEdit = api_is_allowed_to_edit(null,true) || api_is_allowed_to_edit(true) || api_is_drh() || api_is_student_boss();
-
- $TBL_USER = Database :: get_main_table(TABLE_MAIN_USER);
- $TBL_EXERCICES = Database :: get_course_table(TABLE_QUIZ_TEST);
- $TBL_GROUP_REL_USER = Database :: get_course_table(TABLE_GROUP_USER);
- $TBL_GROUP = Database :: get_course_table(TABLE_GROUP);
- $TBL_TRACK_EXERCICES = Database :: get_statistic_table(TABLE_STATISTIC_TRACK_E_EXERCICES);
- $TBL_TRACK_HOTPOTATOES = Database :: get_statistic_table(TABLE_STATISTIC_TRACK_E_HOTPOTATOES);
- $TBL_TRACK_ATTEMPT_RECORDING = Database :: get_statistic_table(TABLE_STATISTIC_TRACK_E_ATTEMPT_RECORDING);
-
- $session_id_and = ' AND te.session_id = '.$sessionId.' ';
- $exercise_id = intval($exercise_id);
-
- $exercise_where = '';
- if (!empty($exercise_id)) {
- $exercise_where .= ' AND te.exe_exo_id = '.$exercise_id.' ';
- }
-
- $hotpotatoe_where = '';
- if (!empty($_GET['path'])) {
- $hotpotatoe_path = Database::escape_string($_GET['path']);
- $hotpotatoe_where .= ' AND exe_name = "'.$hotpotatoe_path.'" ';
- }
-
- // sql for chamilo-type tests for teacher / tutor view
- $sql_inner_join_tbl_track_exercices = " (
- SELECT DISTINCT ttte.*, if(tr.exe_id,1, 0) as revised
- FROM $TBL_TRACK_EXERCICES ttte LEFT JOIN $TBL_TRACK_ATTEMPT_RECORDING tr
- ON (ttte.exe_id = tr.exe_id)
- WHERE
- exe_cours_id = '$course_code' AND
- exe_exo_id = $exercise_id AND
- ttte.session_id = ".$sessionId."
- )";
- if ($is_allowedToEdit) {
- //Teacher view
- if (isset($_GET['gradebook']) && $_GET['gradebook'] == 'view') {
- //$exercise_where_query = ' te.exe_exo_id = ce.id AND ';
- }
-
- $sqlFromOption = "";
- $sqlWhereOption = ""; // for hpsql
-
- //@todo fix to work with COURSE_RELATION_TYPE_RRHH in both queries
-
- //Hack in order to filter groups
- $sql_inner_join_tbl_user = '';
-
- if (strpos($extra_where_conditions, 'group_id')) {
- $sql_inner_join_tbl_user = "
- (
- SELECT u.user_id, firstname, lastname, email, username, g.name as group_name, g.id as group_id
- FROM $TBL_USER u
- INNER JOIN $TBL_GROUP_REL_USER gru ON ( gru.user_id = u.user_id AND gru.c_id=".$course_id.")
- INNER JOIN $TBL_GROUP g ON (gru.group_id = g.id AND g.c_id=".$course_id.")
- )";
- }
-
- if (strpos($extra_where_conditions, 'group_all')) {
-
- $extra_where_conditions = str_replace("AND ( group_id = 'group_all' )", '', $extra_where_conditions);
- $extra_where_conditions = str_replace("AND group_id = 'group_all'", '', $extra_where_conditions);
- $extra_where_conditions = str_replace("group_id = 'group_all' AND", '', $extra_where_conditions);
-
- $sql_inner_join_tbl_user = "
- (
- SELECT u.user_id, firstname, lastname, email, username, '' as group_name, '' as group_id
- FROM $TBL_USER u
- )";
- $sql_inner_join_tbl_user = null;
- }
-
- if (strpos($extra_where_conditions, 'group_none')) {
- $extra_where_conditions = str_replace("AND ( group_id = 'group_none' )", "AND ( group_id is null )", $extra_where_conditions);
- $extra_where_conditions = str_replace("AND group_id = 'group_none'", "AND ( group_id is null )", $extra_where_conditions);
- $sql_inner_join_tbl_user = "
- (
- SELECT u.user_id, firstname, lastname, email, username, g.name as group_name, g.id as group_id
- FROM $TBL_USER u
- LEFT OUTER JOIN $TBL_GROUP_REL_USER gru ON ( gru.user_id = u.user_id AND gru.c_id=".$course_id." )
- LEFT OUTER JOIN $TBL_GROUP g ON (gru.group_id = g.id AND g.c_id = ".$course_id.")
- )";
- }
-
- // All
- $is_empty_sql_inner_join_tbl_user = false;
-
- if (empty($sql_inner_join_tbl_user)) {
- $is_empty_sql_inner_join_tbl_user = true;
- $sql_inner_join_tbl_user = "
- (
- SELECT u.user_id, firstname, lastname, email, username, ' ' as group_name, '' as group_id, official_code
- FROM $TBL_USER u
- WHERE u.status NOT IN(" . api_get_users_status_ignored_in_reports('string') . ")
- )";
- }
-
- $sqlFromOption = " , $TBL_GROUP_REL_USER AS gru ";
- $sqlWhereOption = " AND gru.c_id = ".api_get_course_int_id()." AND gru.user_id = user.user_id ";
-
- $first_and_last_name = api_is_western_name_order() ? "firstname, lastname" : "lastname, firstname";
-
- if ($get_count) {
- $sql_select = "SELECT count(te.exe_id) ";
- } else {
- $sql_select = "SELECT DISTINCT
- user_id,
- $first_and_last_name,
- official_code,
- ce.title,
- username,
- te.exe_result,
- te.exe_weighting,
- te.exe_date,
- te.exe_id,
- email as exemail,
- te.start_date,
- steps_counter,
- exe_user_id,
- te.exe_duration,
- propagate_neg,
- revised,
- group_name,
- group_id,
- orig_lp_id";
- }
-
- $sql = " $sql_select
- FROM $TBL_EXERCICES AS ce
- INNER JOIN $sql_inner_join_tbl_track_exercices AS te ON (te.exe_exo_id = ce.id)
- INNER JOIN $sql_inner_join_tbl_user AS user ON (user.user_id = exe_user_id)
- WHERE
- te.status != 'incomplete' AND
- te.exe_cours_id='" . api_get_course_id() . "' $session_id_and AND
- ce.active <>-1 AND ce.c_id=".api_get_course_int_id()."
- $exercise_where
- $extra_where_conditions
- ";
-
- // sql for hotpotatoes tests for teacher / tutor view
-
- if ($get_count) {
- $hpsql_select = "SELECT count(username)";
- } else {
- $hpsql_select = "SELECT
- $first_and_last_name ,
- username,
- official_code,
- tth.exe_name,
- tth.exe_result ,
- tth.exe_weighting,
- tth.exe_date";
- }
-
- $hpsql = " $hpsql_select
- FROM
- $TBL_TRACK_HOTPOTATOES tth,
- $TBL_USER user
- $sqlFromOption
- WHERE
- user.user_id=tth.exe_user_id
- AND tth.exe_cours_id = '" . api_get_course_id()."'
- $hotpotatoe_where
- $sqlWhereOption
- AND user.status NOT IN(" . api_get_users_status_ignored_in_reports('string') . ")
- ORDER BY
- tth.exe_cours_id ASC,
- tth.exe_date DESC";
- }
-
- if ($get_count) {
- $resx = Database::query($sql);
- $rowx = Database::fetch_row($resx,'ASSOC');
-
- return $rowx[0];
- }
-
- $teacher_list = CourseManager::get_teacher_list_from_course_code(api_get_course_id());
- $teacher_id_list = array();
- foreach ($teacher_list as $teacher) {
- $teacher_id_list[] = $teacher['user_id'];
- }
-
- $list_info = array();
-
- // Simple exercises
- if (empty($hotpotatoe_where)) {
- $column = !empty($column) ? Database::escape_string($column) : null;
- $from = intval($from);
- $number_of_items = intval($number_of_items);
-
- if (!empty($column)) {
- $sql .= " ORDER BY $column $direction ";
- }
- $sql .= " LIMIT $from, $number_of_items";
-
- $results = array();
- $resx = Database::query($sql);
- while ($rowx = Database::fetch_array($resx, 'ASSOC')) {
- $results[] = $rowx;
- }
-
- $group_list = GroupManager::get_group_list();
- $clean_group_list = array();
-
- if (!empty($group_list)) {
- foreach ($group_list as $group) {
- $clean_group_list[$group['id']] = $group['name'];
- }
- }
-
- $lp_list_obj = new LearnpathList(api_get_user_id());
- $lp_list = $lp_list_obj->get_flat_list();
-
- if (is_array($results)) {
-
- $users_array_id = array();
- $from_gradebook = false;
- if (isset($_GET['gradebook']) && $_GET['gradebook'] == 'view') {
- $from_gradebook = true;
- }
- $sizeof = count($results);
-
- $user_list_id = array();
- $locked = api_resource_is_locked_by_gradebook($exercise_id, LINK_EXERCISE);
-
- // Looping results
- for ($i = 0; $i < $sizeof; $i++) {
- $revised = $results[$i]['revised'];
-
- if ($from_gradebook && ($is_allowedToEdit)) {
- if (in_array($results[$i]['username'] . $results[$i]['firstname'] . $results[$i]['lastname'], $users_array_id)) {
- continue;
- }
- $users_array_id[] = $results[$i]['username'] . $results[$i]['firstname'] . $results[$i]['lastname'];
- }
-
- $lp_obj = isset($results[$i]['orig_lp_id']) && isset($lp_list[$results[$i]['orig_lp_id']]) ? $lp_list[$results[$i]['orig_lp_id']] : null;
- $lp_name = null;
-
- if ($lp_obj) {
- $url = api_get_path(WEB_CODE_PATH).'newscorm/lp_controller.php?'.api_get_cidreq().'&action=view&lp_id='.$results[$i]['orig_lp_id'];
- $lp_name = Display::url($lp_obj['lp_name'], $url, array('target' => '_blank'));
- }
-
- //Add all groups by user
- $group_name_list = null;
-
- if ($is_empty_sql_inner_join_tbl_user) {
- $group_list = GroupManager::get_group_ids(
- api_get_course_int_id(),
- $results[$i]['user_id']
- );
-
- foreach ($group_list as $id) {
- $group_name_list .= $clean_group_list[$id].'
';
- }
- $results[$i]['group_name'] = $group_name_list;
- }
-
- $results[$i]['exe_duration'] = !empty($results[$i]['exe_duration']) ? round($results[$i]['exe_duration'] / 60) : 0;
-
- $user_list_id[] = $results[$i]['exe_user_id'];
- $id = $results[$i]['exe_id'];
-
- $dt = api_convert_and_format_date($results[$i]['exe_weighting']);
-
- // we filter the results if we have the permission to
- if (isset($results[$i]['results_disabled'])) {
- $result_disabled = intval($results[$i]['results_disabled']);
- } else {
- $result_disabled = 0;
- }
-
- if ($result_disabled == 0) {
- $my_res = $results[$i]['exe_result'];
- $my_total = $results[$i]['exe_weighting'];
-
- $results[$i]['start_date'] = api_get_local_time($results[$i]['start_date']);
- $results[$i]['exe_date'] = api_get_local_time($results[$i]['exe_date']);
-
- if (!$results[$i]['propagate_neg'] && $my_res < 0) {
- $my_res = 0;
- }
-
- $score = show_score($my_res, $my_total);
-
- $actions = '';
- if ($is_allowedToEdit) {
- if (isset($teacher_id_list)) {
- if (in_array($results[$i]['exe_user_id'], $teacher_id_list)) {
- $actions .= Display::return_icon('teachers.gif', get_lang('Teacher'));
- }
- }
- if ($revised) {
- $actions .= "".
- Display :: return_icon('edit.png', get_lang('Edit'), array(), ICON_SIZE_SMALL);
- $actions .= ' ';
- } else {
- $actions .="".
- Display :: return_icon('quiz.gif', get_lang('Qualify'));
- $actions .=' ';
- }
- $actions .="";
-
- if ($filter == 2) {
- $actions .=' ' .
- Display :: return_icon('history.gif', get_lang('ViewHistoryChange')).'';
- }
-
- //Admin can always delete the attempt
- if (($locked == false || api_is_platform_admin()) && !api_is_student_boss()) {
- $ip = TrackingUserLog::get_ip_from_user_event($results[$i]['exe_user_id'], date('Y-m-d h:i:s'), false);
- $actions .= '.'img/icons/22/info.png "'.$ip.'") ';
-
- $delete_link = ''.Display :: return_icon('delete.png', get_lang('Delete')).'';
- $delete_link = utf8_encode($delete_link);
-
- if (api_is_drh() && !api_is_platform_admin()) {
- $delete_link = null;
- }
- $actions .= $delete_link.' ';
- }
-
- } else {
- $attempt_url = api_get_path(WEB_CODE_PATH).'exercice/result.php?'.api_get_cidreq().'&id='.$results[$i]['exe_id'].'&id_session='.$sessionId.'&height=500&width=750';
- $attempt_link = Display::url(get_lang('Show'), $attempt_url, array('class'=>'ajax btn'));
- $actions .= $attempt_link;
- }
-
- if ($revised) {
- $revised = Display::label(get_lang('Validated'), 'success');
- } else {
- $revised = Display::label(get_lang('NotValidated'), 'info');
- }
-
- if ($is_allowedToEdit) {
- $results[$i]['status'] = $revised;
- $results[$i]['score'] = $score;
- $results[$i]['lp'] = $lp_name;
- $results[$i]['actions'] = $actions;
- $list_info[] = $results[$i];
- } else {
- $results[$i]['status'] = $revised;
- $results[$i]['score'] = $score;
- $results[$i]['actions'] = $actions;
- $list_info[] = $results[$i];
- }
- }
- }
- }
- } else {
- $hpresults = getManyResultsXCol($hpsql, 6);
- // Print HotPotatoes test results.
- if (is_array($hpresults)) {
- for ($i = 0; $i < sizeof($hpresults); $i++) {
- $hp_title = GetQuizName($hpresults[$i][3], $documentPath);
- if ($hp_title == '') {
- $hp_title = basename($hpresults[$i][3]);
- }
-
- $hp_date = api_get_local_time($hpresults[$i][6], null, date_default_timezone_get());
- $hp_result = round(($hpresults[$i][4] / ($hpresults[$i][5] != 0 ? $hpresults[$i][5] : 1)) * 100, 2).'% ('.$hpresults[$i][4].' / '.$hpresults[$i][5].')';
- if ($is_allowedToEdit) {
- $list_info[] = array($hpresults[$i][0], $hpresults[$i][1], $hpresults[$i][2], '', $hp_title, '-', $hp_date , $hp_result , '-');
- } else {
- $list_info[] = array($hp_title, '-', $hp_date , $hp_result , '-');
- }
- }
- }
- }
-
- return $list_info;
-}
-
-/**
- * Converts the score with the exercise_max_note and exercise_min_score
- * the platform settings + formats the results using the float_format function
- *
- * @param float $score
- * @param float $weight
- * @param bool $show_percentage show percentage or not
- * @param bool $use_platform_settings use or not the platform settings
- * @param bool $show_only_percentage
- * @return string an html with the score modified
- */
-function show_score($score, $weight, $show_percentage = true, $use_platform_settings = true, $show_only_percentage = false)
-{
- if (is_null($score) && is_null($weight)) {
- return '-';
- }
-
- $max_note = api_get_setting('exercise_max_score');
- $min_note = api_get_setting('exercise_min_score');
-
- if ($use_platform_settings) {
- if ($max_note != '' && $min_note != '') {
- if (!empty($weight) && intval($weight) != 0) {
- $score = $min_note + ($max_note - $min_note) * $score / $weight;
- } else {
- $score = $min_note;
- }
- $weight = $max_note;
- }
- }
- $percentage = (100 * $score) / ($weight != 0 ? $weight : 1);
-
- // Formats values
- $percentage = float_format($percentage, 1);
- $score = float_format($score, 1);
- $weight = float_format($weight, 1);
-
- $html = null;
- if ($show_percentage) {
- $parent = '(' . $score . ' / ' . $weight . ')';
- $html = $percentage."% $parent";
- if ($show_only_percentage) {
- $html = $percentage."% ";
- }
- } else {
- $html = $score . ' / ' . $weight;
- }
- $html = Display::span($html, array('class' => 'score_exercise'));
-
- return $html;
-}
-
-/**
- * @param float $score
- * @param float $weight
- * @param string $pass_percentage
- * @return bool
- */
-function is_success_exercise_result($score, $weight, $pass_percentage)
-{
- $percentage = float_format(($score / ($weight != 0 ? $weight : 1)) * 100, 1);
- if (isset($pass_percentage) && !empty($pass_percentage)) {
- if ($percentage >= $pass_percentage) {
- return true;
- }
- }
- return false;
-}
-
-/**
- * @param float $score
- * @param float $weight
- * @param string $pass_percentage
- * @return string
- */
-function show_success_message($score, $weight, $pass_percentage)
-{
- $res = "";
- if (is_pass_pourcentage_enabled($pass_percentage)) {
- $is_success = is_success_exercise_result($score, $weight, $pass_percentage);
-
- if ($is_success) {
- $html = get_lang('CongratulationsYouPassedTheTest');
- $icon = Display::return_icon('completed.png', get_lang('Correct'), array(), ICON_SIZE_MEDIUM);
- } else {
- //$html .= Display::return_message(get_lang('YouDidNotReachTheMinimumScore'), 'warning');
- $html = get_lang('YouDidNotReachTheMinimumScore');
- $icon = Display::return_icon('warning.png', get_lang('Wrong'), array(), ICON_SIZE_MEDIUM);
- }
- $html = Display::tag('h4', $html);
- $html .= Display::tag('h5', $icon, array('style' => 'width:40px; padding:2px 10px 0px 0px'));
- $res = $html;
- }
- return $res;
-}
-
-/**
- * Return true if pass_pourcentage activated (we use the pass pourcentage feature
- * return false if pass_percentage = 0 (we don't use the pass pourcentage feature
- * @param $in_pass_pourcentage
- * @return boolean
- * In this version, pass_percentage and show_success_message are disabled if
- * pass_percentage is set to 0
- */
-function is_pass_pourcentage_enabled($in_pass_pourcentage)
-{
- return $in_pass_pourcentage > 0;
-}
-
-/**
- * Converts a numeric value in a percentage example 0.66666 to 66.67 %
- * @param $value
- * @return float Converted number
- */
-function convert_to_percentage($value)
-{
- $return = '-';
- if ($value != '') {
- $return = float_format($value * 100, 1).' %';
- }
- return $return;
-}
-
-/**
- * Converts a score/weight values to the platform scale
- * @param float $score
- * @param float $weight
- *
- * @return float the score rounded converted to the new range
- */
-function convert_score($score, $weight)
-{
- $max_note = api_get_setting('exercise_max_score');
- $min_note = api_get_setting('exercise_min_score');
-
- if ($score != '' && $weight != '') {
- if ($max_note != '' && $min_note != '') {
- if (!empty($weight)) {
- $score = $min_note + ($max_note - $min_note) * $score / $weight;
- } else {
- $score = $min_note;
- }
- }
- }
- $score_rounded = float_format($score, 1);
- return $score_rounded;
-}
-
-/**
- * Getting all active exercises from a course from a session
- * (if a session_id is provided we will show all the exercises in the course +
- * all exercises in the session)
- * @param array $course_info
- * @param int $session_id
- * @param boolean $check_publication_dates
- * @param string $search Search exercise name
- * @param boolean $search_all_sessions Search exercises in all sessions
- * @param int 0 = only inactive exercises
- * 1 = only active exercises,
- * 2 = all exercises
- * 3 = active <> -1
- * @return array array with exercise data
- */
-function get_all_exercises(
- $course_info = null,
- $session_id = 0,
- $check_publication_dates = false,
- $search = '',
- $search_all_sessions = false,
- $active = 2
-) {
- $course_id = api_get_course_int_id();
-
- if (!empty($course_info) && !empty($course_info['real_id'])) {
- $course_id = $course_info['real_id'];
- }
-
- if ($session_id == -1) {
- $session_id = 0;
- }
-
- $now = api_get_utc_datetime();
- $time_conditions = '';
-
- if ($check_publication_dates) {
- //start and end are set
- $time_conditions = " AND ((start_time <> '0000-00-00 00:00:00' AND start_time < '$now' AND end_time <> '0000-00-00 00:00:00' AND end_time > '$now' ) OR ";
- // only start is set
- $time_conditions .= " (start_time <> '0000-00-00 00:00:00' AND start_time < '$now' AND end_time = '0000-00-00 00:00:00') OR ";
- // only end is set
- $time_conditions .= " (start_time = '0000-00-00 00:00:00' AND end_time <> '0000-00-00 00:00:00' AND end_time > '$now') OR ";
- // nothing is set
- $time_conditions .= " (start_time = '0000-00-00 00:00:00' AND end_time = '0000-00-00 00:00:00')) ";
- }
-
- $needle_where = !empty($search) ? " AND title LIKE '?' " : '';
- $needle = !empty($search) ? "%" . $search . "%" : '';
-
- // Show courses by active status
- $active_sql = '';
- if ($active == 3) {
- $active_sql = ' active <> -1 AND';
- } else if ($active != 2) {
- $active_sql = sprintf(' active = %d AND', $active);
- }
-
- if ($search_all_sessions == true) {
- $conditions = array(
- 'where' => array($active_sql . ' c_id = ? '. $needle_where . $time_conditions => array($course_id, $needle)),
- 'order' => 'title'
- );
- } else {
- if ($session_id == 0) {
- $conditions = array(
- 'where' => array($active_sql . ' session_id = ? AND c_id = ? '. $needle_where . $time_conditions => array($session_id, $course_id, $needle)),
- 'order' =>'title'
- );
- } else {
- $conditions = array(
- 'where' => array($active_sql . ' (session_id = 0 OR session_id = ? ) AND c_id = ? ' . $needle_where . $time_conditions => array($session_id, $course_id, $needle)),
- 'order' => 'title'
- );
- }
- }
-
- $table = Database :: get_course_table(TABLE_QUIZ_TEST);
-
- return Database::select('*', $table, $conditions);
-}
-
-/**
- * Get exercise information by id
- * @param int $exerciseId Exercise Id
- * @param int $courseId The course ID (necessary as c_quiz.id is not unique)
- * @return array Exercise info
- */
-function get_exercise_by_id($exerciseId = 0, $courseId = null)
-{
- $TBL_EXERCICES = Database :: get_course_table(TABLE_QUIZ_TEST);
- if (empty($courseId)) {
- $courseId = api_get_course_int_id();
- } else {
- $courseId = intval($courseId);
- }
- $conditions = array('where' => array('id = ?' => array($exerciseId), ' AND c_id = ? ' => $courseId));
- return Database::select('*', $TBL_EXERCICES, $conditions);
-}
-/**
- * Getting all exercises (active only or all)
- * from a course from a session
- * (if a session_id is provided we will show all the exercises in the
- * course + all exercises in the session)
- * @param array course data
- * @param int session id
- * @param int course c_id
- * @param boolean $only_active_exercises
- * @return array array with exercise data
- * modified by Hubert Borderiou
- */
-function get_all_exercises_for_course_id($course_info = null, $session_id = 0, $course_id = 0, $only_active_exercises = true)
-{
- $TBL_EXERCISES = Database :: get_course_table(TABLE_QUIZ_TEST);
-
- if ($only_active_exercises) {
- // Only active exercises.
- $sql_active_exercises = "active = 1 AND ";
- } else {
- // Not only active means visible and invisible NOT deleted (-2)
- $sql_active_exercises = "active IN (1, 0) AND ";
- }
-
- if ($session_id == -1) {
- $session_id = 0;
- }
-
- $params = array(
- $session_id,
- $course_id
- );
-
- if ($session_id == 0) {
- $conditions = array(
- 'where' => array("$sql_active_exercises session_id = ? AND c_id = ?" => $params),
- 'order'=>'title'
- );
- } else {
- // All exercises
- $conditions = array(
- 'where' => array("$sql_active_exercises (session_id = 0 OR session_id = ? ) AND c_id=?" => $params),
- 'order'=>'title'
- );
- }
-
- return Database::select('*', $TBL_EXERCISES, $conditions);
-}
-
-/**
- * Gets the position of the score based in a given score (result/weight)
- * and the exe_id based in the user list
- * (NO Exercises in LPs )
- * @param float $my_score user score to be compared *attention*
- * $my_score = score/weight and not just the score
- * @param int $my_exe_id exe id of the exercise
- * (this is necessary because if 2 students have the same score the one
- * with the minor exe_id will have a best position, just to be fair and FIFO)
- * @param int $exercise_id
- * @param string $course_code
- * @param int $session_id
- * @param array $user_list
- * @param bool $return_string
- *
- * @return int the position of the user between his friends in a course
- * (or course within a session)
- */
-function get_exercise_result_ranking(
- $my_score,
- $my_exe_id,
- $exercise_id,
- $course_code,
- $session_id = 0,
- $user_list = array(),
- $return_string = true
-) {
- //No score given we return
- if (is_null($my_score)) {
- return '-';
- }
- if (empty($user_list)) {
- return '-';
- }
-
- $best_attempts = array();
- foreach ($user_list as $user_data) {
- $user_id = $user_data['user_id'];
- $best_attempts[$user_id]= get_best_attempt_by_user($user_id, $exercise_id, $course_code, $session_id);
- }
-
- if (empty($best_attempts)) {
- return 1;
- } else {
- $position = 1;
- $my_ranking = array();
- foreach($best_attempts as $user_id => $result) {
- if (!empty($result['exe_weighting']) && intval($result['exe_weighting']) != 0) {
- $my_ranking[$user_id] = $result['exe_result']/$result['exe_weighting'];
- } else {
- $my_ranking[$user_id] = 0;
- }
- }
- //if (!empty($my_ranking)) {
- asort($my_ranking);
- $position = count($my_ranking);
- if (!empty($my_ranking)) {
- foreach ($my_ranking as $user_id => $ranking) {
- if ($my_score >= $ranking) {
- if ($my_score == $ranking) {
- $exe_id = $best_attempts[$user_id]['exe_id'];
- if ($my_exe_id < $exe_id) {
- $position--;
- }
- } else {
- $position--;
- }
- }
- }
- }
- //}
- $return_value = array(
- 'position' => $position,
- 'count' => count($my_ranking)
- );
-
- if ($return_string) {
- if (!empty($position) && !empty($my_ranking)) {
- $return_value = $position.'/'.count($my_ranking);
- } else {
- $return_value = '-';
- }
- }
- return $return_value;
- }
-}
-
-/**
- * Gets the position of the score based in a given score (result/weight) and the exe_id based in all attempts
- * (NO Exercises in LPs ) old functionality by attempt
- * @param float user score to be compared attention => score/weight
- * @param int exe id of the exercise (this is necesary because if 2 students have the same score the one with the minor exe_id will have a best position, just to be fair and FIFO)
- * @param int exercise id
- * @param string course code
- * @param int session id
- * @return int the position of the user between his friends in a course (or course within a session)
- */
-function get_exercise_result_ranking_by_attempt($my_score, $my_exe_id, $exercise_id, $course_code, $session_id = 0, $return_string = true) {
- if (empty($session_id)) {
- $session_id = 0;
- }
- if (is_null($my_score)) {
- return '-';
- }
- $user_results = get_all_exercise_results($exercise_id, $course_code, $session_id, false);
- $position_data = array();
- if (empty($user_results)) {
- return 1;
- } else {
- $position = 1;
- $my_ranking = array();
- foreach($user_results as $result) {
- //print_r($result);
- if (!empty($result['exe_weighting']) && intval($result['exe_weighting']) != 0) {
- $my_ranking[$result['exe_id']] = $result['exe_result']/$result['exe_weighting'];
- } else {
- $my_ranking[$result['exe_id']] = 0;
- }
- }
- asort($my_ranking);
- $position = count($my_ranking);
- if (!empty($my_ranking)) {
- foreach($my_ranking as $exe_id=>$ranking) {
- if ($my_score >= $ranking) {
- if ($my_score == $ranking) {
- if ($my_exe_id < $exe_id) {
- $position--;
- }
- } else {
- $position--;
- }
- }
- }
- }
- $return_value = array(
- 'position' => $position,
- 'count' => count($my_ranking)
- );
-
- if ($return_string) {
- if (!empty($position) && !empty($my_ranking)) {
- return $position.'/'.count($my_ranking);
- }
- }
- return $return_value;
- }
-}
-
-/**
- * Get the best attempt in a exercise (NO Exercises in LPs )
- * @param int $exercise_id
- * @param string $course_code
- * @param int $session_id
- *
- * @return array
- */
-function get_best_attempt_in_course($exercise_id, $course_code, $session_id)
-{
- $user_results = get_all_exercise_results($exercise_id, $course_code, $session_id, false);
- $best_score_data = array();
- $best_score = 0;
- if (!empty($user_results)) {
- foreach($user_results as $result) {
- if (!empty($result['exe_weighting']) && intval($result['exe_weighting']) != 0) {
- $score = $result['exe_result']/$result['exe_weighting'];
- if ($score >= $best_score) {
- $best_score = $score;
- $best_score_data = $result;
- }
- }
- }
- }
- return $best_score_data;
-}
-
-/**
- * Get the best score in a exercise (NO Exercises in LPs )
- * @param int $user_id
- * @param int $exercise_id
- * @param string $course_code
- * @param int $session_id
- *
- * @return array
- */
-function get_best_attempt_by_user($user_id, $exercise_id, $course_code, $session_id)
-{
- $user_results = get_all_exercise_results($exercise_id, $course_code, $session_id, false, $user_id);
- $best_score_data = array();
- $best_score = 0;
- if (!empty($user_results)) {
- foreach($user_results as $result) {
- if (!empty($result['exe_weighting']) && intval($result['exe_weighting']) != 0) {
- $score = $result['exe_result']/$result['exe_weighting'];
- if ($score >= $best_score) {
- $best_score = $score;
- $best_score_data = $result;
- }
- }
- }
- }
- return $best_score_data;
-}
-
-/**
- * Get average score (NO Exercises in LPs )
- * @param int exercise id
- * @param string course code
- * @param int session id
- * @return float Average score
- */
-function get_average_score($exercise_id, $course_code, $session_id)
-{
- $user_results = get_all_exercise_results($exercise_id, $course_code, $session_id);
- $avg_score = 0;
- if (!empty($user_results)) {
- foreach($user_results as $result) {
- if (!empty($result['exe_weighting']) && intval($result['exe_weighting']) != 0) {
- $score = $result['exe_result']/$result['exe_weighting'];
- $avg_score +=$score;
- }
- }
- $avg_score = float_format($avg_score / count($user_results), 1);
- }
-
- return $avg_score;
-}
-
-/**
- * Get average score by score (NO Exercises in LPs )
- * @param int exercise id
- * @param string course code
- * @param int session id
- * @return float Average score
- */
-function get_average_score_by_course($course_code, $session_id)
-{
- $user_results = get_all_exercise_results_by_course($course_code, $session_id, false);
- //echo $course_code.' - '.$session_id.'
';
- $avg_score = 0;
- if (!empty($user_results)) {
- foreach($user_results as $result) {
- if (!empty($result['exe_weighting']) && intval($result['exe_weighting']) != 0) {
- $score = $result['exe_result']/$result['exe_weighting'];
- $avg_score +=$score;
- }
- }
- //We asume that all exe_weighting
- //$avg_score = show_score( $avg_score / count($user_results) , $result['exe_weighting']);
- $avg_score = ($avg_score / count($user_results));
- }
-
- return $avg_score;
-}
-
-/**
- * @param int $user_id
- * @param string $course_code
- * @param int $session_id
- *
- * @return float|int
- */
-function get_average_score_by_course_by_user($user_id, $course_code, $session_id)
-{
- $user_results = get_all_exercise_results_by_user($user_id, $course_code, $session_id);
- $avg_score = 0;
- if (!empty($user_results)) {
- foreach($user_results as $result) {
- if (!empty($result['exe_weighting']) && intval($result['exe_weighting']) != 0) {
- $score = $result['exe_result']/$result['exe_weighting'];
- $avg_score +=$score;
- }
- }
- //We asume that all exe_weighting
- //$avg_score = show_score( $avg_score / count($user_results) , $result['exe_weighting']);
- $avg_score = ($avg_score / count($user_results));
- }
- return $avg_score;
-}
-
-/**
- * Get average score by score (NO Exercises in LPs )
- * @param int exercise id
- * @param string course code
- * @param int session id
- * @return float Best average score
- */
-function get_best_average_score_by_exercise($exercise_id, $course_code, $session_id, $user_count)
-{
- $user_results = get_best_exercise_results_by_user($exercise_id, $course_code, $session_id);
- $avg_score = 0;
- if (!empty($user_results)) {
- foreach($user_results as $result) {
- if (!empty($result['exe_weighting']) && intval($result['exe_weighting']) != 0) {
- $score = $result['exe_result']/$result['exe_weighting'];
- $avg_score +=$score;
- }
- }
- //We asume that all exe_weighting
- //$avg_score = show_score( $avg_score / count($user_results) , $result['exe_weighting']);
- //$avg_score = ($avg_score / count($user_results));
- if(!empty($user_count)) {
- $avg_score = float_format($avg_score / $user_count, 1) * 100;
- } else {
- $avg_score = 0;
- }
- }
- return $avg_score;
-}
-
-/**
- * @param string $course_code
- * @param int $session_id
- *
- * @return array
- */
-function get_exercises_to_be_taken($course_code, $session_id)
-{
- $course_info = api_get_course_info($course_code);
- $exercises = get_all_exercises($course_info, $session_id);
- $result = array();
- $now = time() + 15*24*60*60;
- foreach($exercises as $exercise_item) {
- if (isset($exercise_item['end_time']) &&
- !empty($exercise_item['end_time']) &&
- $exercise_item['end_time'] != '0000-00-00 00:00:00' &&
- api_strtotime($exercise_item['end_time'], 'UTC') < $now
- ) {
- $result[] = $exercise_item;
- }
- }
- return $result;
-}
-
-/**
- * Get student results (only in completed exercises) stats by question
- * @param int $question_id
- * @param int $exercise_id
- * @param string $course_code
- * @param int $session_id
- *
- **/
-function get_student_stats_by_question($question_id, $exercise_id, $course_code, $session_id)
-{
- $track_exercises = Database::get_statistic_table(TABLE_STATISTIC_TRACK_E_EXERCICES);
- $track_attempt = Database::get_statistic_table(TABLE_STATISTIC_TRACK_E_ATTEMPT);
-
- $question_id = intval($question_id);
- $exercise_id = intval($exercise_id);
- $course_code = Database::escape_string($course_code);
- $session_id = intval($session_id);
-
- $sql = "SELECT MAX(marks) as max , MIN(marks) as min, AVG(marks) as average
- FROM $track_exercises e INNER JOIN $track_attempt a ON (a.exe_id = e.exe_id)
- WHERE exe_exo_id = $exercise_id AND
- course_code = '$course_code' AND
- e.session_id = $session_id AND
- question_id = $question_id AND status = '' LIMIT 1";
- $result = Database::query($sql);
- $return = array();
- if ($result) {
- $return = Database::fetch_array($result, 'ASSOC');
-
- }
-
- return $return;
-}
-
-/**
- * @param int $question_id
- * @param int $exercise_id
- * @param string $course_code
- * @param int $session_id
- * @return int
- */
-function get_number_students_question_with_answer_count($question_id, $exercise_id, $course_code, $session_id)
-{
- $track_exercises = Database::get_statistic_table(TABLE_STATISTIC_TRACK_E_EXERCICES);
- $track_attempt = Database::get_statistic_table(TABLE_STATISTIC_TRACK_E_ATTEMPT);
- $course_user = Database::get_main_table(TABLE_MAIN_COURSE_USER);
-
- $question_id = intval($question_id);
- $exercise_id = intval($exercise_id);
- $course_code = Database::escape_string($course_code);
- $session_id = intval($session_id);
-
- $sql = "SELECT DISTINCT exe_user_id
- FROM $track_exercises e
- INNER JOIN $track_attempt a
- ON (a.exe_id = e.exe_id)
- INNER JOIN $course_user cu
- ON cu.course_code = a.course_code AND cu.user_id = exe_user_id
- WHERE
- exe_exo_id = $exercise_id AND
- a.course_code = '$course_code' AND
- e.session_id = $session_id AND
- question_id = $question_id AND
- answer <> '0' AND
- cu.status = ".STUDENT." AND
- relation_type <> 2 AND
- e.status = ''";
- $result = Database::query($sql);
- $return = 0;
- if ($result) {
- $return = Database::num_rows($result);
- }
- return $return;
-}
-
-/**
- * @param int $answer_id
- * @param int $question_id
- * @param int $exercise_id
- * @param string $course_code
- * @param int $session_id
- *
- * @return int
- */
-function get_number_students_answer_hotspot_count($answer_id, $question_id, $exercise_id, $course_code, $session_id)
-{
- $track_exercises = Database::get_statistic_table(TABLE_STATISTIC_TRACK_E_EXERCICES);
- $track_hotspot = Database::get_statistic_table(TABLE_STATISTIC_TRACK_E_HOTSPOT);
- $course_user = Database::get_main_table(TABLE_MAIN_COURSE_USER);
-
- $question_id = intval($question_id);
- $answer_id = intval($answer_id);
- $exercise_id = intval($exercise_id);
- $course_code = Database::escape_string($course_code);
- $session_id = intval($session_id);
-
- $sql = "SELECT DISTINCT exe_user_id
- FROM $track_exercises e
- INNER JOIN $track_hotspot a
- ON (a.hotspot_exe_id = e.exe_id)
- INNER JOIN $course_user cu
- ON cu.course_code = a.hotspot_course_code AND cu.user_id = exe_user_id
- WHERE
- exe_exo_id = $exercise_id AND
- a.hotspot_course_code = '$course_code' AND
- e.session_id = $session_id AND
- hotspot_answer_id = $answer_id AND
- hotspot_question_id = $question_id AND
- cu.status = ".STUDENT." AND
- hotspot_correct = 1 AND
- relation_type <> 2 AND
- e.status = ''";
-
- $result = Database::query($sql);
- $return = 0;
- if ($result) {
- $return = Database::num_rows($result);
- }
- return $return;
-}
-
-/**
- * @param int $answer_id
- * @param int $question_id
- * @param int $exercise_id
- * @param string $course_code
- * @param int $session_id
- * @param string $question_type
- * @param string $correct_answer
- * @param string $current_answer
- * @return int
- */
-function get_number_students_answer_count(
- $answer_id,
- $question_id,
- $exercise_id,
- $course_code,
- $session_id,
- $question_type = null,
- $correct_answer = null,
- $current_answer = null
-) {
- $track_exercises = Database::get_main_table(TABLE_STATISTIC_TRACK_E_EXERCICES);
- $track_attempt = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ATTEMPT);
- $course_user = Database::get_main_table(TABLE_MAIN_COURSE_USER);
-
- $question_id = intval($question_id);
- $answer_id = intval($answer_id);
- $exercise_id = intval($exercise_id);
- $course_code = Database::escape_string($course_code);
- $session_id = intval($session_id);
-
- switch ($question_type) {
- case FILL_IN_BLANKS:
- $answer_condition = "";
- $select_condition = " e.exe_id, answer ";
- break;
- case MATCHING:
- default:
- $answer_condition = " answer = $answer_id AND ";
- $select_condition = " DISTINCT exe_user_id ";
- }
-
- $sql = "SELECT $select_condition
- FROM $track_exercises e
- INNER JOIN $track_attempt a
- ON (a.exe_id = e.exe_id)
- INNER JOIN $course_user cu
- ON cu.course_code = a.course_code AND cu.user_id = exe_user_id
- WHERE
- exe_exo_id = $exercise_id AND
- a.course_code = '$course_code' AND
- e.session_id = $session_id AND
- $answer_condition
- question_id = $question_id AND
- cu.status = ".STUDENT." AND
- relation_type <> 2 AND
- e.status = ''";
- $result = Database::query($sql);
- $return = 0;
- if ($result) {
- $good_answers = 0;
- switch ($question_type) {
- case FILL_IN_BLANKS:
- while ($row = Database::fetch_array($result, 'ASSOC')) {
- $fill_blank = check_fill_in_blanks($correct_answer, $row['answer']);
- if (isset($fill_blank[$current_answer]) && $fill_blank[$current_answer] == 1 ) {
- $good_answers++;
- }
- }
- return $good_answers;
- break;
- case MATCHING:
- default:
- $return = Database::num_rows($result);
- }
- }
-
- return $return;
-}
-
-/**
- * @param array $answer
- * @param string $user_answer
- * @return array
- */
-function check_fill_in_blanks($answer, $user_answer)
-{
- // the question is encoded like this
- // [A] B [C] D [E] F::10,10,10@1
- // number 1 before the "@" means that is a switchable fill in blank question
- // [A] B [C] D [E] F::10,10,10@ or [A] B [C] D [E] F::10,10,10
- // means that is a normal fill blank question
- // first we explode the "::"
- $pre_array = explode('::', $answer);
- // is switchable fill blank or not
- $last = count($pre_array) - 1;
- $is_set_switchable = explode('@', $pre_array[$last]);
- $switchable_answer_set = false;
- if (isset ($is_set_switchable[1]) && $is_set_switchable[1] == 1) {
- $switchable_answer_set = true;
- }
- $answer = '';
- for ($k = 0; $k < $last; $k++) {
- $answer .= $pre_array[$k];
- }
- // splits weightings that are joined with a comma
- $answerWeighting = explode(',', $is_set_switchable[0]);
-
- // we save the answer because it will be modified
- //$temp = $answer;
- $temp = $answer;
-
- $answer = '';
- $j = 0;
- //initialise answer tags
- $user_tags = $correct_tags = $real_text = array ();
- // the loop will stop at the end of the text
- while (1) {
- // quits the loop if there are no more blanks (detect '[')
- if (($pos = api_strpos($temp, '[')) === false) {
- // adds the end of the text
- $answer = $temp;
- /* // Deprecated code
- // TeX parsing - replacement of texcode tags
- $texstring = api_parse_tex($texstring);
- $answer = str_replace("{texcode}", $texstring, $answer);
- */
- $real_text[] = $answer;
- break; //no more "blanks", quit the loop
- }
- // adds the piece of text that is before the blank
- //and ends with '[' into a general storage array
- $real_text[] = api_substr($temp, 0, $pos +1);
- $answer .= api_substr($temp, 0, $pos +1);
- //take the string remaining (after the last "[" we found)
- $temp = api_substr($temp, $pos +1);
- // quit the loop if there are no more blanks, and update $pos to the position of next ']'
- if (($pos = api_strpos($temp, ']')) === false) {
- // adds the end of the text
- $answer .= $temp;
- break;
- }
-
- $str = $user_answer;
-
- preg_match_all('#\[([^[]*)\]#', $str, $arr);
- $str = str_replace('\r\n', '', $str);
- $choice = $arr[1];
-
- $tmp = api_strrpos($choice[$j],' / ');
- $choice[$j] = api_substr($choice[$j],0,$tmp);
- $choice[$j] = trim($choice[$j]);
-
- //Needed to let characters ' and " to work as part of an answer
- $choice[$j] = stripslashes($choice[$j]);
-
- $user_tags[] = api_strtolower($choice[$j]);
- //put the contents of the [] answer tag into correct_tags[]
- $correct_tags[] = api_strtolower(api_substr($temp, 0, $pos));
- $j++;
- $temp = api_substr($temp, $pos +1);
- }
-
- $answer = '';
- $real_correct_tags = $correct_tags;
- $chosen_list = array();
- $good_answer = array();
-
- for ($i = 0; $i < count($real_correct_tags); $i++) {
- if (!$switchable_answer_set) {
- //needed to parse ' and " characters
- $user_tags[$i] = stripslashes($user_tags[$i]);
- if ($correct_tags[$i] == $user_tags[$i]) {
- $good_answer[$correct_tags[$i]] = 1;
- } elseif (!empty ($user_tags[$i])) {
- $good_answer[$correct_tags[$i]] = 0;
- } else {
- $good_answer[$correct_tags[$i]] = 0;
- }
- } else {
- // switchable fill in the blanks
- if (in_array($user_tags[$i], $correct_tags)) {
- $correct_tags = array_diff($correct_tags, $chosen_list);
- $good_answer[$correct_tags[$i]] = 1;
- } elseif (!empty ($user_tags[$i])) {
- $good_answer[$correct_tags[$i]] = 0;
- } else {
- $good_answer[$correct_tags[$i]] = 0;
- }
- }
- // adds the correct word, followed by ] to close the blank
- $answer .= ' / ' . $real_correct_tags[$i] . ']';
- if (isset ($real_text[$i +1])) {
- $answer .= $real_text[$i +1];
- }
- }
-
- return $good_answer;
-}
-
-/**
- * @param int $exercise_id
- * @param string $course_code
- * @param int $session_id
- * @return int
- */
-function get_number_students_finish_exercise($exercise_id, $course_code, $session_id)
-{
- $track_exercises = Database::get_statistic_table(TABLE_STATISTIC_TRACK_E_EXERCICES);
- $track_attempt = Database::get_statistic_table(TABLE_STATISTIC_TRACK_E_ATTEMPT);
-
- $exercise_id = intval($exercise_id);
- $course_code = Database::escape_string($course_code);
- $session_id = intval($session_id);
-
- $sql = "SELECT DISTINCT exe_user_id
- FROM $track_exercises e
- INNER JOIN $track_attempt a ON (a.exe_id = e.exe_id)
- WHERE
- exe_exo_id = $exercise_id AND
- course_code = '$course_code' AND
- e.session_id = $session_id AND
- status = ''";
- $result = Database::query($sql);
- $return = 0;
- if ($result) {
- $return = Database::num_rows($result);
-
- }
- return $return;
-}
-
-/**
- * @param string $in_name is the name and the id of the |