@@ -44,7 +44,7 @@ |
||
44 | 44 | $message .= '<p><a class="btn btn-primary" href="'.api_get_path(WEB_CODE_PATH).'course_info/maintenance.php?'.api_get_cidreq().'">'. |
45 | 45 | get_lang('No').'</a> <a class="btn btn-danger" href="'.api_get_self().'?delete=yes&'.api_get_cidreq().'">'. |
46 | 46 | get_lang('Yes').'</a></p>'; |
47 | - $interbreadcrumb[] = array('url' => 'maintenance.php', 'name' => get_lang('Maintenance')); |
|
47 | + $interbreadcrumb[] = array('url' => 'maintenance.php', 'name' => get_lang('Maintenance')); |
|
48 | 48 | } |
49 | 49 | Display :: display_header($tool_name, 'Settings'); |
50 | 50 | echo Display::page_header($tool_name); |
@@ -10,11 +10,11 @@ discard block |
||
10 | 10 | $this_section = SECTION_COURSES; |
11 | 11 | |
12 | 12 | if (isset($_GET['session']) && $_GET['session']) { |
13 | - $archive_path = api_get_path(SYS_ARCHIVE_PATH).'temp/'; |
|
14 | - $_cid = true; |
|
15 | - $is_courseAdmin = true; |
|
13 | + $archive_path = api_get_path(SYS_ARCHIVE_PATH).'temp/'; |
|
14 | + $_cid = true; |
|
15 | + $is_courseAdmin = true; |
|
16 | 16 | } else { |
17 | - $archive_path = api_get_path(SYS_ARCHIVE_PATH); |
|
17 | + $archive_path = api_get_path(SYS_ARCHIVE_PATH); |
|
18 | 18 | } |
19 | 19 | |
20 | 20 | $archive_file = isset($_GET['archive']) ? $_GET['archive'] : null; |
@@ -23,16 +23,16 @@ discard block |
||
23 | 23 | list($extension) = getextension($archive_file); |
24 | 24 | |
25 | 25 | if (empty($extension) || !file_exists($archive_path.$archive_file)) { |
26 | - exit; |
|
26 | + exit; |
|
27 | 27 | } |
28 | 28 | |
29 | 29 | $extension = strtolower($extension); |
30 | 30 | $content_type = ''; |
31 | 31 | |
32 | 32 | if (in_array($extension, array('xml', 'csv')) && (api_is_platform_admin(true) || api_is_drh())) { |
33 | - $content_type = 'application/force-download'; |
|
33 | + $content_type = 'application/force-download'; |
|
34 | 34 | } elseif ($extension === 'zip' && $_cid && (api_is_platform_admin(true) || $is_courseAdmin)) { |
35 | - $content_type = 'application/force-download'; |
|
35 | + $content_type = 'application/force-download'; |
|
36 | 36 | } |
37 | 37 | |
38 | 38 | if (empty($content_type)) { |
@@ -115,13 +115,13 @@ discard block |
||
115 | 115 | } |
116 | 116 | |
117 | 117 | /** |
118 | - * Export tabular data to XML-file |
|
119 | - * @param array Simple array of data to put in XML |
|
120 | - * @param string Name of file to be given to the user |
|
121 | - * @param string Name of common tag to place each line in |
|
122 | - * @param string Name of the root element. A root element should always be given. |
|
123 | - * @param string Encoding in which the data is provided |
|
124 | - */ |
|
118 | + * Export tabular data to XML-file |
|
119 | + * @param array Simple array of data to put in XML |
|
120 | + * @param string Name of file to be given to the user |
|
121 | + * @param string Name of common tag to place each line in |
|
122 | + * @param string Name of the root element. A root element should always be given. |
|
123 | + * @param string Encoding in which the data is provided |
|
124 | + */ |
|
125 | 125 | public static function arrayToXml( |
126 | 126 | $data, |
127 | 127 | $filename = 'export', |
@@ -200,7 +200,7 @@ discard block |
||
200 | 200 | foreach ($data as $row) { |
201 | 201 | $string .= "\n".str_repeat("\t",$level).'<'.$row['name'].'>'; |
202 | 202 | if (is_array($row['value'])) { |
203 | - $string .= self::_export_complex_table_xml_helper($row['value'],$level+1)."\n"; |
|
203 | + $string .= self::_export_complex_table_xml_helper($row['value'],$level+1)."\n"; |
|
204 | 204 | $string .= str_repeat("\t",$level).'</'.$row['name'].'>'; |
205 | 205 | } else { |
206 | 206 | $string .= $row['value']; |
@@ -25,29 +25,29 @@ |
||
25 | 25 | function search_courses($needle,$type) |
26 | 26 | { |
27 | 27 | $tbl_session = Database :: get_main_table(TABLE_MAIN_SESSION); |
28 | - $xajax_response = new xajaxResponse(); |
|
29 | - $return = ''; |
|
30 | - if(!empty($needle) && !empty($type)) { |
|
31 | - // xajax send utf8 datas... datas in db can be non-utf8 datas |
|
32 | - $charset = api_get_system_encoding(); |
|
33 | - $needle = api_convert_encoding($needle, $charset, 'utf-8'); |
|
34 | - $needle = Database::escape_string($needle); |
|
28 | + $xajax_response = new xajaxResponse(); |
|
29 | + $return = ''; |
|
30 | + if(!empty($needle) && !empty($type)) { |
|
31 | + // xajax send utf8 datas... datas in db can be non-utf8 datas |
|
32 | + $charset = api_get_system_encoding(); |
|
33 | + $needle = api_convert_encoding($needle, $charset, 'utf-8'); |
|
34 | + $needle = Database::escape_string($needle); |
|
35 | 35 | |
36 | - $sql = 'SELECT * FROM '.$tbl_session.' WHERE name LIKE "'.$needle.'%" ORDER BY id'; |
|
36 | + $sql = 'SELECT * FROM '.$tbl_session.' WHERE name LIKE "'.$needle.'%" ORDER BY id'; |
|
37 | 37 | |
38 | - $rs = Database::query($sql); |
|
39 | - $course_list = array(); |
|
38 | + $rs = Database::query($sql); |
|
39 | + $course_list = array(); |
|
40 | 40 | |
41 | - $return .= '<select id="origin" name="NoSessionCategoryList[]" multiple="multiple" size="20" style="width:340px;">'; |
|
42 | - while($course = Database :: fetch_array($rs)) { |
|
43 | - $course_list[] = $course['id']; |
|
44 | - $return .= '<option value="'.$course['id'].'" title="'.htmlspecialchars($course['name'],ENT_QUOTES).'">'.$course['name'].'</option>'; |
|
45 | - } |
|
46 | - $return .= '</select>'; |
|
47 | - $xajax_response -> addAssign('ajax_list_courses_multiple','innerHTML',api_utf8_encode($return)); |
|
48 | - } |
|
49 | - $_SESSION['course_list'] = $course_list; |
|
41 | + $return .= '<select id="origin" name="NoSessionCategoryList[]" multiple="multiple" size="20" style="width:340px;">'; |
|
42 | + while($course = Database :: fetch_array($rs)) { |
|
43 | + $course_list[] = $course['id']; |
|
44 | + $return .= '<option value="'.$course['id'].'" title="'.htmlspecialchars($course['name'],ENT_QUOTES).'">'.$course['name'].'</option>'; |
|
45 | + } |
|
46 | + $return .= '</select>'; |
|
47 | + $xajax_response -> addAssign('ajax_list_courses_multiple','innerHTML',api_utf8_encode($return)); |
|
48 | + } |
|
49 | + $_SESSION['course_list'] = $course_list; |
|
50 | 50 | |
51 | - return $xajax_response; |
|
52 | - } |
|
51 | + return $xajax_response; |
|
52 | + } |
|
53 | 53 | } |
@@ -137,7 +137,7 @@ |
||
137 | 137 | array('\r', '\n', '\x3c', '\x3e', '\x26'), |
138 | 138 | addslashes($var) |
139 | 139 | ).'"'; |
140 | - case 'array': |
|
140 | + case 'array': |
|
141 | 141 | // Arrays in JSON can't be associative. If the array is empty or if it |
142 | 142 | // has sequential whole number keys starting with 0, it's not associative |
143 | 143 | // so we can go ahead and convert it as an array. |
@@ -47,20 +47,20 @@ discard block |
||
47 | 47 | $navigation['myprofile']['url'] = api_get_path(WEB_CODE_PATH).'auth/profile.php'.(!empty($_course['path']) ? '?coursePath='.$_course['path'].'&courseCode='.$_course['official_code'] : '' ); |
48 | 48 | $navigation['myprofile']['title'] = get_lang('ModifyProfile'); |
49 | 49 | $navigation['myprofile']['key'] = 'profile'; |
50 | - // Link to my agenda |
|
50 | + // Link to my agenda |
|
51 | 51 | $navigation['myagenda']['url'] = api_get_path(WEB_CODE_PATH).'calendar/agenda_js.php?type=personal'; |
52 | 52 | $navigation['myagenda']['title'] = get_lang('MyAgenda'); |
53 | 53 | $navigation['myagenda']['key'] = 'agenda'; |
54 | 54 | |
55 | - // Gradebook |
|
56 | - if (api_get_setting('gradebook_enable') == 'true') { |
|
55 | + // Gradebook |
|
56 | + if (api_get_setting('gradebook_enable') == 'true') { |
|
57 | 57 | $navigation['mygradebook']['url'] = api_get_path(WEB_CODE_PATH).'gradebook/gradebook.php'.(!empty($_course['path']) ? '?coursePath='.$_course['path'].'&courseCode='.$_course['official_code'] : '' ); |
58 | 58 | $navigation['mygradebook']['title'] = get_lang('MyGradebook'); |
59 | 59 | $navigation['mygradebook']['key'] = 'gradebook'; |
60 | - } |
|
60 | + } |
|
61 | 61 | |
62 | - // Reporting |
|
63 | - if (api_is_allowed_to_create_course() || api_is_drh() || api_is_session_admin()) { |
|
62 | + // Reporting |
|
63 | + if (api_is_allowed_to_create_course() || api_is_drh() || api_is_session_admin()) { |
|
64 | 64 | // Link to my space |
65 | 65 | $navigation['session_my_space']['url'] = api_get_path(WEB_CODE_PATH).'mySpace/'.(api_is_drh()?'session.php':''); |
66 | 66 | $navigation['session_my_space']['title'] = get_lang('MySpace'); |
@@ -84,21 +84,21 @@ discard block |
||
84 | 84 | $navigation['session_my_progress']['key'] = 'my-progress'; |
85 | 85 | } |
86 | 86 | |
87 | - // Social |
|
88 | - if (api_get_setting('allow_social_tool')=='true') { |
|
87 | + // Social |
|
88 | + if (api_get_setting('allow_social_tool')=='true') { |
|
89 | 89 | $navigation['social']['url'] = api_get_path(WEB_CODE_PATH).'social/home.php'; |
90 | 90 | $navigation['social']['title'] = get_lang('SocialNetwork'); |
91 | 91 | $navigation['social']['key'] = 'social-network'; |
92 | - } |
|
92 | + } |
|
93 | 93 | |
94 | - // Dashboard |
|
95 | - if (api_is_platform_admin() || api_is_drh() || api_is_session_admin()) { |
|
94 | + // Dashboard |
|
95 | + if (api_is_platform_admin() || api_is_drh() || api_is_session_admin()) { |
|
96 | 96 | $navigation['dashboard']['url'] = api_get_path(WEB_CODE_PATH).'dashboard/index.php'; |
97 | 97 | $navigation['dashboard']['title'] = get_lang('Dashboard'); |
98 | 98 | $navigation['dashboard']['key'] = 'dashboard'; |
99 | - } |
|
99 | + } |
|
100 | 100 | |
101 | - // Reports |
|
101 | + // Reports |
|
102 | 102 | /* |
103 | 103 | if (api_is_platform_admin() || api_is_drh() || api_is_session_admin()) { |
104 | 104 | $navigation['reports']['url'] = api_get_path(WEB_CODE_PATH).'reports/index.php'; |
@@ -121,14 +121,14 @@ discard block |
||
121 | 121 | } |
122 | 122 | // End Custom Tabs |
123 | 123 | |
124 | - // Platform administration |
|
125 | - if (api_is_platform_admin(true)) { |
|
124 | + // Platform administration |
|
125 | + if (api_is_platform_admin(true)) { |
|
126 | 126 | $navigation['platform_admin']['url'] = api_get_path(WEB_CODE_PATH).'admin/'; |
127 | 127 | $navigation['platform_admin']['title'] = get_lang('PlatformAdmin'); |
128 | 128 | $navigation['platform_admin']['key'] = 'admin'; |
129 | - } |
|
129 | + } |
|
130 | 130 | |
131 | - return $navigation; |
|
131 | + return $navigation; |
|
132 | 132 | } |
133 | 133 | |
134 | 134 | /** |
@@ -254,7 +254,7 @@ discard block |
||
254 | 254 | if ($number && |
255 | 255 | (api_get_setting('showonline', 'world') == 'true' && !$user_id) || |
256 | 256 | (api_get_setting('showonline', 'users') == 'true' && $user_id) |
257 | - ) |
|
257 | + ) |
|
258 | 258 | { |
259 | 259 | $html .= '<li><a href="'.api_get_path(WEB_PATH).'whoisonline.php" target="_self" title="'.get_lang('UsersOnline').'" >'. |
260 | 260 | Display::return_icon('user.png', get_lang('UsersOnline'), array(), ICON_SIZE_TINY).' '.$number.'</a></li>'; |
@@ -265,7 +265,7 @@ discard block |
||
265 | 265 | (is_array($_course) && |
266 | 266 | api_get_setting('showonline', 'course') == 'true' && isset($_course['sysCode']) |
267 | 267 | ) |
268 | - ) |
|
268 | + ) |
|
269 | 269 | { |
270 | 270 | $html .= '<li><a href="'.api_get_path(WEB_PATH).'whoisonline.php?cidReq='.$_course['sysCode'].'" target="_self">'. |
271 | 271 | Display::return_icon('course.png', get_lang('UsersOnline').' '.get_lang('InThisCourse'), array(), ICON_SIZE_TINY).' '.$number_online_in_course.' </a></li>'; |
@@ -376,7 +376,7 @@ discard block |
||
376 | 376 | } |
377 | 377 | } |
378 | 378 | |
379 | - // Reports |
|
379 | + // Reports |
|
380 | 380 | if (!empty($possible_tabs['reports'])) { |
381 | 381 | if (api_get_setting('show_tabs', 'reports') == 'true') { |
382 | 382 | if ((api_is_platform_admin() || api_is_drh() || api_is_session_admin()) && Rights::hasRight('show_tabs:reports')) { |
@@ -623,7 +623,7 @@ discard block |
||
623 | 623 | $navigation_item_my_courses['title'] = get_lang('MyCourses'); |
624 | 624 | $navigation_item_my_courses['url'] = api_get_path(WEB_PATH).'user_portal.php'; |
625 | 625 | $navigation[] = $navigation_item_my_courses; |
626 | - */ |
|
626 | + */ |
|
627 | 627 | $navigation[] = $navigation_item; |
628 | 628 | } |
629 | 629 |
@@ -1320,10 +1320,10 @@ discard block |
||
1320 | 1320 | } |
1321 | 1321 | |
1322 | 1322 | $sql .= ' FROM ' . Database::get_main_table(TABLE_MAIN_USER) . ' as user ' |
1323 | - . ' LEFT JOIN ' . Database::get_main_table(TABLE_MAIN_COURSE_USER) . ' as course_rel_user |
|
1323 | + . ' LEFT JOIN ' . Database::get_main_table(TABLE_MAIN_COURSE_USER) . ' as course_rel_user |
|
1324 | 1324 | ON user.user_id = course_rel_user.user_id AND |
1325 | 1325 | course_rel_user.relation_type <> ' . COURSE_RELATION_TYPE_RRHH . ' ' |
1326 | - . " INNER JOIN $course_table course ON course_rel_user.c_id = course.id "; |
|
1326 | + . " INNER JOIN $course_table course ON course_rel_user.c_id = course.id "; |
|
1327 | 1327 | |
1328 | 1328 | if (!empty($course_code)) { |
1329 | 1329 | $sql .= ' AND course_rel_user.c_id="' . $courseId . '"'; |
@@ -1665,7 +1665,7 @@ discard block |
||
1665 | 1665 | |
1666 | 1666 | // We get the coach for the given course in a given session. |
1667 | 1667 | $sql = 'SELECT user_id FROM ' . Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER) . |
1668 | - ' WHERE session_id ="' . $session_id . '" AND c_id="' . $courseId . '" AND status = 2'; |
|
1668 | + ' WHERE session_id ="' . $session_id . '" AND c_id="' . $courseId . '" AND status = 2'; |
|
1669 | 1669 | $rs = Database::query($sql); |
1670 | 1670 | while ($user = Database::fetch_array($rs)) { |
1671 | 1671 | $user_info = api_get_user_info($user['user_id']); |
@@ -3374,13 +3374,13 @@ discard block |
||
3374 | 3374 | $params['edit_actions'] .= api_get_path(WEB_CODE_PATH) . 'course_info/infocours.php?cidReq=' . $course['code']; |
3375 | 3375 | if ($load_dirs) { |
3376 | 3376 | $params['document'] = '<a id="document_preview_' . $course_info['real_id'] . '_0" class="document_preview btn btn-default btn-sm" href="javascript:void(0);">' |
3377 | - . Display::returnFontAwesomeIcon('folder-open') . '</a>'; |
|
3377 | + . Display::returnFontAwesomeIcon('folder-open') . '</a>'; |
|
3378 | 3378 | $params['document'] .= Display::div('', ['id' => 'document_result_' . $course_info['real_id'] . '_0', 'class' => 'document_preview_container']); |
3379 | 3379 | } |
3380 | 3380 | }else{ |
3381 | 3381 | if ($course_info['visibility'] != COURSE_VISIBILITY_CLOSED && $load_dirs) { |
3382 | 3382 | $params['document'] = '<a id="document_preview_' . $course_info['real_id'] . '_0" class="document_preview btn btn-default btn-sm" href="javascript:void(0);">' |
3383 | - . Display::returnFontAwesomeIcon('folder-open') . '</a>'; |
|
3383 | + . Display::returnFontAwesomeIcon('folder-open') . '</a>'; |
|
3384 | 3384 | $params['document'] .= Display::div('', ['id' => 'document_result_' . $course_info['real_id'] . '_0', 'class' => 'document_preview_container']); |
3385 | 3385 | } |
3386 | 3386 | } |
@@ -3563,7 +3563,7 @@ discard block |
||
3563 | 3563 | $params['edit_actions'] .= api_get_path(WEB_CODE_PATH) . 'course_info/infocours.php?cidReq=' . $course['code']; |
3564 | 3564 | if($load_dirs){ |
3565 | 3565 | $params['document'] = '<a id="document_preview_' . $course_info['real_id'] . '_0" class="document_preview btn btn-default btn-sm" href="javascript:void(0);">' |
3566 | - . Display::returnFontAwesomeIcon('folder-open') . '</a>'; |
|
3566 | + . Display::returnFontAwesomeIcon('folder-open') . '</a>'; |
|
3567 | 3567 | $params['document'] .= Display::div('', array('id' => 'document_result_' . $course_info['real_id'] . '_0', 'class' => 'document_preview_container')); |
3568 | 3568 | } |
3569 | 3569 | } |
@@ -3701,7 +3701,7 @@ discard block |
||
3701 | 3701 | $params['edit_actions'] .= api_get_path(WEB_CODE_PATH) . 'course_info/infocours.php?cidReq=' . $course['code']; |
3702 | 3702 | if($load_dirs){ |
3703 | 3703 | $params['document'] = '<a id="document_preview_' . $course_info['real_id'] . '_0" class="document_preview btn btn-default btn-sm" href="javascript:void(0);">' |
3704 | - . Display::returnFontAwesomeIcon('folder-open') . '</a>'; |
|
3704 | + . Display::returnFontAwesomeIcon('folder-open') . '</a>'; |
|
3705 | 3705 | $params['document'] .= Display::div('', array('id' => 'document_result_' . $course_info['real_id'] . '_0', 'class' => 'document_preview_container')); |
3706 | 3706 | } |
3707 | 3707 | } |
@@ -4010,7 +4010,7 @@ discard block |
||
4010 | 4010 | } |
4011 | 4011 | |
4012 | 4012 | $session_title .= isset($course['special_course']) ? ' ' . |
4013 | - Display::return_icon('klipper.png', get_lang('CourseAutoRegister')) : ''; |
|
4013 | + Display::return_icon('klipper.png', get_lang('CourseAutoRegister')) : ''; |
|
4014 | 4014 | |
4015 | 4015 | $params['title'] = $session_title; |
4016 | 4016 | $params['extra'] = ''; |
@@ -304,9 +304,9 @@ discard block |
||
304 | 304 | */ |
305 | 305 | public static function remove_XSS($var, $user_status = null, $filter_terms = false) |
306 | 306 | { |
307 | - if ($filter_terms) { |
|
308 | - $var = self::filter_terms($var); |
|
309 | - } |
|
307 | + if ($filter_terms) { |
|
308 | + $var = self::filter_terms($var); |
|
309 | + } |
|
310 | 310 | |
311 | 311 | if (empty($user_status)) { |
312 | 312 | if (api_is_anonymous()) { |
@@ -401,7 +401,7 @@ discard block |
||
401 | 401 | */ |
402 | 402 | public static function filter_terms($text) |
403 | 403 | { |
404 | - static $bad_terms = array(); |
|
404 | + static $bad_terms = array(); |
|
405 | 405 | |
406 | 406 | if (empty($bad_terms)) { |
407 | 407 | $list = api_get_setting('filter_terms'); |
@@ -422,14 +422,14 @@ discard block |
||
422 | 422 | } |
423 | 423 | } |
424 | 424 | |
425 | - $replace = '***'; |
|
426 | - if (!empty($bad_terms)) { |
|
427 | - // Fast way |
|
428 | - $new_text = str_ireplace($bad_terms, $replace, $text, $count); |
|
429 | - $text = $new_text; |
|
430 | - } |
|
425 | + $replace = '***'; |
|
426 | + if (!empty($bad_terms)) { |
|
427 | + // Fast way |
|
428 | + $new_text = str_ireplace($bad_terms, $replace, $text, $count); |
|
429 | + $text = $new_text; |
|
430 | + } |
|
431 | 431 | |
432 | - return $text; |
|
432 | + return $text; |
|
433 | 433 | } |
434 | 434 | |
435 | 435 |
@@ -139,7 +139,7 @@ |
||
139 | 139 | api_get_local_time($glossary_data['update_date']) |
140 | 140 | ); |
141 | 141 | } else { |
142 | - $glossary_data['update_date'] = ''; |
|
142 | + $glossary_data['update_date'] = ''; |
|
143 | 143 | } |
144 | 144 | |
145 | 145 | $form->addLabel(get_lang('CreationDate'), $glossary_data['insert_date']); |