@@ -1377,11 +1377,11 @@ discard block |
||
1377 | 1377 | } |
1378 | 1378 | |
1379 | 1379 | $sql .= ' FROM ' . Database::get_main_table(TABLE_MAIN_USER) . ' as user ' |
1380 | - . ' LEFT JOIN ' . Database::get_main_table(TABLE_MAIN_COURSE_USER) . ' as course_rel_user |
|
1380 | + . ' LEFT JOIN ' . Database::get_main_table(TABLE_MAIN_COURSE_USER) . ' as course_rel_user |
|
1381 | 1381 | ON |
1382 | 1382 | user.id = course_rel_user.user_id AND |
1383 | 1383 | course_rel_user.relation_type <> ' . COURSE_RELATION_TYPE_RRHH . ' ' |
1384 | - . " INNER JOIN $course_table course ON course_rel_user.c_id = course.id "; |
|
1384 | + . " INNER JOIN $course_table course ON course_rel_user.c_id = course.id "; |
|
1385 | 1385 | |
1386 | 1386 | if (!empty($course_code)) { |
1387 | 1387 | $sql .= ' AND course_rel_user.c_id = "' . $courseId . '"'; |
@@ -1725,7 +1725,7 @@ discard block |
||
1725 | 1725 | |
1726 | 1726 | // We get the coach for the given course in a given session. |
1727 | 1727 | $sql = 'SELECT user_id FROM ' . Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER) . |
1728 | - ' WHERE session_id ="' . $session_id . '" AND c_id="' . $courseId . '" AND status = 2'; |
|
1728 | + ' WHERE session_id ="' . $session_id . '" AND c_id="' . $courseId . '" AND status = 2'; |
|
1729 | 1729 | $rs = Database::query($sql); |
1730 | 1730 | while ($user = Database::fetch_array($rs)) { |
1731 | 1731 | $userInfo = api_get_user_info($user['user_id']); |
@@ -3503,13 +3503,13 @@ discard block |
||
3503 | 3503 | $params['edit_actions'] .= api_get_path(WEB_CODE_PATH) . 'course_info/infocours.php?cidReq=' . $course['code']; |
3504 | 3504 | if ($load_dirs) { |
3505 | 3505 | $params['document'] = '<a id="document_preview_' . $courseId . '_0" class="document_preview btn btn-default btn-sm" href="javascript:void(0);">' |
3506 | - . Display::returnFontAwesomeIcon('folder-open') . '</a>'; |
|
3506 | + . Display::returnFontAwesomeIcon('folder-open') . '</a>'; |
|
3507 | 3507 | $params['document'] .= Display::div('', ['id' => 'document_result_' . $courseId . '_0', 'class' => 'document_preview_container']); |
3508 | 3508 | } |
3509 | 3509 | } else { |
3510 | 3510 | if ($course_info['visibility'] != COURSE_VISIBILITY_CLOSED && $load_dirs) { |
3511 | 3511 | $params['document'] = '<a id="document_preview_' . $courseId . '_0" class="document_preview btn btn-default btn-sm" href="javascript:void(0);">' |
3512 | - . Display::returnFontAwesomeIcon('folder-open') . '</a>'; |
|
3512 | + . Display::returnFontAwesomeIcon('folder-open') . '</a>'; |
|
3513 | 3513 | $params['document'] .= Display::div('', ['id' => 'document_result_' . $courseId . '_0', 'class' => 'document_preview_container']); |
3514 | 3514 | } |
3515 | 3515 | } |
@@ -3685,7 +3685,7 @@ discard block |
||
3685 | 3685 | $params['edit_actions'] .= api_get_path(WEB_CODE_PATH) . 'course_info/infocours.php?cidReq=' . $course_info['code']; |
3686 | 3686 | if ($load_dirs) { |
3687 | 3687 | $params['document'] = '<a id="document_preview_' . $course_info['real_id'] . '_0" class="document_preview btn btn-default btn-sm" href="javascript:void(0);">' |
3688 | - . Display::returnFontAwesomeIcon('folder-open') . '</a>'; |
|
3688 | + . Display::returnFontAwesomeIcon('folder-open') . '</a>'; |
|
3689 | 3689 | $params['document'] .= Display::div('', array('id' => 'document_result_' . $course_info['real_id'] . '_0', 'class' => 'document_preview_container')); |
3690 | 3690 | } |
3691 | 3691 | } |
@@ -3812,7 +3812,7 @@ discard block |
||
3812 | 3812 | $params['edit_actions'] .= api_get_path(WEB_CODE_PATH) . 'course_info/infocours.php?cidReq=' . $course_info['code']; |
3813 | 3813 | if($load_dirs){ |
3814 | 3814 | $params['document'] = '<a id="document_preview_' . $course_info['real_id'] . '_0" class="document_preview btn btn-default btn-sm" href="javascript:void(0);">' |
3815 | - . Display::returnFontAwesomeIcon('folder-open') . '</a>'; |
|
3815 | + . Display::returnFontAwesomeIcon('folder-open') . '</a>'; |
|
3816 | 3816 | $params['document'] .= Display::div('', array('id' => 'document_result_' . $course_info['real_id'] . '_0', 'class' => 'document_preview_container')); |
3817 | 3817 | } |
3818 | 3818 | } |
@@ -4093,7 +4093,7 @@ discard block |
||
4093 | 4093 | } |
4094 | 4094 | |
4095 | 4095 | $session_title .= isset($course['special_course']) ? ' ' . |
4096 | - Display::return_icon('klipper.png', get_lang('CourseAutoRegister')) : ''; |
|
4096 | + Display::return_icon('klipper.png', get_lang('CourseAutoRegister')) : ''; |
|
4097 | 4097 | |
4098 | 4098 | $params['title'] = $session_title; |
4099 | 4099 | $params['extra'] = ''; |
@@ -46,7 +46,7 @@ discard block |
||
46 | 46 | $exercise_id = 0, |
47 | 47 | $hotpotato_name = null |
48 | 48 | ) { |
49 | - $return = array(); |
|
49 | + $return = array(); |
|
50 | 50 | |
51 | 51 | $TBL_EXERCISES = Database::get_course_table(TABLE_QUIZ_TEST); |
52 | 52 | $TBL_TABLE_LP_MAIN = Database::get_course_table(TABLE_LP_MAIN); |
@@ -275,8 +275,8 @@ discard block |
||
275 | 275 | return true; |
276 | 276 | } |
277 | 277 | |
278 | - /** |
|
279 | - * Exports the complete report as a CSV file |
|
278 | + /** |
|
279 | + * Exports the complete report as a CSV file |
|
280 | 280 | * |
281 | 281 | * @param string $document_path Document path inside the document tool |
282 | 282 | * @param integer $user_id Optional user ID |
@@ -285,8 +285,8 @@ discard block |
||
285 | 285 | * @param int $exercise_id |
286 | 286 | * @param string $hotpotato_name |
287 | 287 | * |
288 | - * @return boolean False on error |
|
289 | - */ |
|
288 | + * @return boolean False on error |
|
289 | + */ |
|
290 | 290 | public function exportCompleteReportCSV( |
291 | 291 | $document_path = '', |
292 | 292 | $user_id = null, |
@@ -186,11 +186,11 @@ discard block |
||
186 | 186 | } |
187 | 187 | |
188 | 188 | /** |
189 | - * provides a side connection to a vchamilo database |
|
190 | - * @param array $_configuration |
|
189 | + * provides a side connection to a vchamilo database |
|
190 | + * @param array $_configuration |
|
191 | 191 | * |
192 | - * @return \Doctrine\DBAL\Driver\Connection |
|
193 | - */ |
|
192 | + * @return \Doctrine\DBAL\Driver\Connection |
|
193 | + */ |
|
194 | 194 | public static function bootConnection(&$_configuration) |
195 | 195 | { |
196 | 196 | $dbParams = array( |
@@ -298,10 +298,10 @@ discard block |
||
298 | 298 | } |
299 | 299 | |
300 | 300 | /** |
301 | - * drop a vchamilo instance databases using the physical connection |
|
302 | - * @param stdClass $params |
|
303 | - * return an array of errors or false if ok |
|
304 | - */ |
|
301 | + * drop a vchamilo instance databases using the physical connection |
|
302 | + * @param stdClass $params |
|
303 | + * return an array of errors or false if ok |
|
304 | + */ |
|
305 | 305 | public static function dropDatabase($params) |
306 | 306 | { |
307 | 307 | $params = clone $params; |
@@ -376,10 +376,10 @@ discard block |
||
376 | 376 | } |
377 | 377 | |
378 | 378 | /** |
379 | - * get a proper SQLdump command |
|
380 | - * @param object $vchamilodata the complete new host information |
|
381 | - * @return string the shell command |
|
382 | - */ |
|
379 | + * get a proper SQLdump command |
|
380 | + * @param object $vchamilodata the complete new host information |
|
381 | + * @return string the shell command |
|
382 | + */ |
|
383 | 383 | public static function getDatabaseDumpCmd($vchamilodata) |
384 | 384 | { |
385 | 385 | $pgm = self::getConfig('vchamilo', 'mysql_cmd'); |
@@ -536,8 +536,8 @@ discard block |
||
536 | 536 | } |
537 | 537 | |
538 | 538 | /** |
539 | - * read manifest values in vchamilo template. |
|
540 | - */ |
|
539 | + * read manifest values in vchamilo template. |
|
540 | + */ |
|
541 | 541 | public static function getVmanifest($version) |
542 | 542 | { |
543 | 543 | $templatewwwroot = ''; |
@@ -558,8 +558,8 @@ discard block |
||
558 | 558 | } |
559 | 559 | |
560 | 560 | /** |
561 | - * make a fake vchamilo that represents the current host |
|
562 | - */ |
|
561 | + * make a fake vchamilo that represents the current host |
|
562 | + */ |
|
563 | 563 | public static function makeThis() |
564 | 564 | { |
565 | 565 | global $_configuration; |
@@ -623,10 +623,10 @@ discard block |
||
623 | 623 | } |
624 | 624 | |
625 | 625 | /** |
626 | - * this function set will map standard moodle API calls to chamilo |
|
627 | - * internal primitives. This avoids too many changes to do in imported |
|
628 | - * code |
|
629 | - */ |
|
626 | + * this function set will map standard moodle API calls to chamilo |
|
627 | + * internal primitives. This avoids too many changes to do in imported |
|
628 | + * code |
|
629 | + */ |
|
630 | 630 | public static function getConfig($module, $key, $isplugin = true) |
631 | 631 | { |
632 | 632 | if ($isplugin) { |
@@ -205,7 +205,7 @@ |
||
205 | 205 | |
206 | 206 | // Show the chamilo mascot |
207 | 207 | if (empty($courseAndSessions['html']) && !isset($_GET['history'])) { |
208 | - $controller->tpl->assign('welcome_to_course_block', $controller->return_welcome_to_course_block()); |
|
208 | + $controller->tpl->assign('welcome_to_course_block', $controller->return_welcome_to_course_block()); |
|
209 | 209 | } |
210 | 210 | |
211 | 211 | $controller->tpl->assign('content', $courseAndSessions['html']); |
@@ -7,7 +7,6 @@ |
||
7 | 7 | * @author Sebastien Piraux |
8 | 8 | * |
9 | 9 | * @package chamilo.tracking |
10 | - |
|
11 | 10 | */ |
12 | 11 | /** |
13 | 12 | * Code |
@@ -53,7 +53,7 @@ |
||
53 | 53 | // Create the directory |
54 | 54 | $result = $this->generate_lp_folder($_course, $this->file_name); |
55 | 55 | |
56 | - // Create the directory |
|
56 | + // Create the directory |
|
57 | 57 | $this->base_work_dir = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document'; |
58 | 58 | ///learning_path/ppt_dirname directory |
59 | 59 | $this->created_dir = $result['dir']; |
@@ -5,8 +5,8 @@ |
||
5 | 5 | */ |
6 | 6 | require_once __DIR__.'/../inc/global.inc.php'; |
7 | 7 | if (api_get_setting('allow_social_tool')=='true' && api_get_setting('allow_message_tool')=='true') { |
8 | - header('Location:inbox.php?f=social'); |
|
8 | + header('Location:inbox.php?f=social'); |
|
9 | 9 | } elseif ( api_get_setting('allow_message_tool')=='true') { |
10 | - header('Location:inbox.php'); |
|
10 | + header('Location:inbox.php'); |
|
11 | 11 | } |
12 | 12 | exit; |
@@ -7,40 +7,40 @@ |
||
7 | 7 | require_once __DIR__.'/../inc/global.inc.php'; |
8 | 8 | api_block_anonymous_users(); |
9 | 9 | if (api_get_setting('allow_message_tool')!='true') { |
10 | - api_not_allowed(); |
|
10 | + api_not_allowed(); |
|
11 | 11 | } |
12 | 12 | |
13 | 13 | if (isset($_REQUEST['f']) && $_REQUEST['f'] == 'social') { |
14 | - $this_section = SECTION_SOCIAL; |
|
15 | - $interbreadcrumb[]= array ('url' => api_get_path(WEB_PATH).'main/social/home.php','name' => get_lang('Social')); |
|
16 | - $interbreadcrumb[]= array ('url' => 'inbox.php?f=social','name' => get_lang('Inbox')); |
|
14 | + $this_section = SECTION_SOCIAL; |
|
15 | + $interbreadcrumb[]= array ('url' => api_get_path(WEB_PATH).'main/social/home.php','name' => get_lang('Social')); |
|
16 | + $interbreadcrumb[]= array ('url' => 'inbox.php?f=social','name' => get_lang('Inbox')); |
|
17 | 17 | } else { |
18 | - $this_section = SECTION_MYPROFILE; |
|
19 | - $interbreadcrumb[]= array ('url' => api_get_path(WEB_PATH).'main/auth/profile.php','name' => get_lang('Profile')); |
|
18 | + $this_section = SECTION_MYPROFILE; |
|
19 | + $interbreadcrumb[]= array ('url' => api_get_path(WEB_PATH).'main/auth/profile.php','name' => get_lang('Profile')); |
|
20 | 20 | } |
21 | 21 | |
22 | 22 | $social_right_content = ''; |
23 | 23 | |
24 | 24 | if (isset($_GET['f']) && $_GET['f']=='social') { |
25 | - $social_parameter = '?f=social'; |
|
25 | + $social_parameter = '?f=social'; |
|
26 | 26 | } else { |
27 | - if (api_get_setting('extended_profile') == 'true') { |
|
28 | - $social_right_content .= '<div class="actions">'; |
|
27 | + if (api_get_setting('extended_profile') == 'true') { |
|
28 | + $social_right_content .= '<div class="actions">'; |
|
29 | 29 | |
30 | - if (api_get_setting('allow_social_tool') === 'true' && api_get_setting('allow_message_tool') === 'true') { |
|
31 | - $social_right_content .= '<a href="'.api_get_path(WEB_PATH).'main/social/profile.php">'. |
|
30 | + if (api_get_setting('allow_social_tool') === 'true' && api_get_setting('allow_message_tool') === 'true') { |
|
31 | + $social_right_content .= '<a href="'.api_get_path(WEB_PATH).'main/social/profile.php">'. |
|
32 | 32 | Display::return_icon('shared_profile.png', get_lang('ViewSharedProfile')).'</a>'; |
33 | - } |
|
34 | - if (api_get_setting('allow_message_tool') === 'true') { |
|
35 | - $social_right_content .= '<a href="'.api_get_path(WEB_PATH).'main/messages/new_message.php">'. |
|
33 | + } |
|
34 | + if (api_get_setting('allow_message_tool') === 'true') { |
|
35 | + $social_right_content .= '<a href="'.api_get_path(WEB_PATH).'main/messages/new_message.php">'. |
|
36 | 36 | Display::return_icon('message_new.png',get_lang('ComposeMessage')).'</a>'; |
37 | 37 | $social_right_content .= '<a href="'.api_get_path(WEB_PATH).'main/messages/inbox.php">'. |
38 | 38 | Display::return_icon('inbox.png',get_lang('Inbox')).'</a>'; |
39 | 39 | $social_right_content .= '<a href="'.api_get_path(WEB_PATH).'main/messages/outbox.php">'. |
40 | 40 | Display::return_icon('outbox.png',get_lang('Outbox')).'</a>'; |
41 | - } |
|
42 | - $social_right_content .= '</div>'; |
|
43 | - } |
|
41 | + } |
|
42 | + $social_right_content .= '</div>'; |
|
43 | + } |
|
44 | 44 | } |
45 | 45 | |
46 | 46 | if (empty($_GET['id'])) { |
@@ -9,20 +9,20 @@ discard block |
||
9 | 9 | api_block_anonymous_users(); |
10 | 10 | |
11 | 11 | if (isset($_GET['messages_page_nr'])) { |
12 | - if (api_get_setting('allow_social_tool')=='true' && |
|
12 | + if (api_get_setting('allow_social_tool')=='true' && |
|
13 | 13 | api_get_setting('allow_message_tool')=='true' |
14 | 14 | ) { |
15 | - $social_link = ''; |
|
16 | - if ($_REQUEST['f']=='social') { |
|
17 | - $social_link = '&f=social'; |
|
18 | - } |
|
19 | - header('Location:outbox.php?pager='.Security::remove_XSS($_GET['messages_page_nr']).$social_link.''); |
|
20 | - exit; |
|
21 | - } |
|
15 | + $social_link = ''; |
|
16 | + if ($_REQUEST['f']=='social') { |
|
17 | + $social_link = '&f=social'; |
|
18 | + } |
|
19 | + header('Location:outbox.php?pager='.Security::remove_XSS($_GET['messages_page_nr']).$social_link.''); |
|
20 | + exit; |
|
21 | + } |
|
22 | 22 | } |
23 | 23 | |
24 | 24 | if (api_get_setting('allow_message_tool') != 'true') { |
25 | - api_not_allowed(); |
|
25 | + api_not_allowed(); |
|
26 | 26 | } |
27 | 27 | //jquery thickbox already called from main/inc/header.inc.php |
28 | 28 | |
@@ -50,13 +50,13 @@ discard block |
||
50 | 50 | MAIN CODE |
51 | 51 | */ |
52 | 52 | if (isset($_GET['f']) && $_GET['f'] === 'social') { |
53 | - $this_section = SECTION_SOCIAL; |
|
54 | - $interbreadcrumb[]= array ('url' => api_get_path(WEB_PATH).'main/social/home.php','name' => get_lang('Social')); |
|
55 | - $interbreadcrumb[]= array ('url' => '#','name' => get_lang('Outbox')); |
|
53 | + $this_section = SECTION_SOCIAL; |
|
54 | + $interbreadcrumb[]= array ('url' => api_get_path(WEB_PATH).'main/social/home.php','name' => get_lang('Social')); |
|
55 | + $interbreadcrumb[]= array ('url' => '#','name' => get_lang('Outbox')); |
|
56 | 56 | } else { |
57 | - $this_section = SECTION_MYPROFILE; |
|
58 | - $interbreadcrumb[]= array ('url' => api_get_path(WEB_PATH).'main/auth/profile.php','name' => get_lang('Profile')); |
|
59 | - $interbreadcrumb[]= array ('url' => '#','name' => get_lang('Outbox')); |
|
57 | + $this_section = SECTION_MYPROFILE; |
|
58 | + $interbreadcrumb[]= array ('url' => api_get_path(WEB_PATH).'main/auth/profile.php','name' => get_lang('Profile')); |
|
59 | + $interbreadcrumb[]= array ('url' => '#','name' => get_lang('Outbox')); |
|
60 | 60 | } |
61 | 61 | |
62 | 62 | $actions = ''; |
@@ -83,8 +83,8 @@ discard block |
||
83 | 83 | |
84 | 84 | if (isset($info_delete_outbox[0]) && trim($info_delete_outbox[0]) == 'delete') { |
85 | 85 | for ($i = 1; $i <= $count_delete_outbox; $i++) { |
86 | - MessageManager::delete_message_by_user_sender(api_get_user_id(),$info_delete_outbox[$i]); |
|
87 | - } |
|
86 | + MessageManager::delete_message_by_user_sender(api_get_user_id(),$info_delete_outbox[$i]); |
|
87 | + } |
|
88 | 88 | $message_box=get_lang('SelectedMessagesDeleted'). |
89 | 89 | '  |
90 | 90 | <br><a href="../social/index.php?#remote-tab-3">'. |