@@ -19,7 +19,7 @@ discard block |
||
19 | 19 | $interbreadcrumb[] = array("url" => "index.php", "name" => get_lang('MySpace')); |
20 | 20 | |
21 | 21 | if (isset($_GET["id_student"])) { |
22 | - $interbreadcrumb[] = array("url" => "student.php", "name" => get_lang('Students')); |
|
22 | + $interbreadcrumb[] = array("url" => "student.php", "name" => get_lang('Students')); |
|
23 | 23 | } |
24 | 24 | |
25 | 25 | Display :: display_header($nameTools); |
@@ -197,25 +197,25 @@ discard block |
||
197 | 197 | '.Display::return_icon('2rightarrow.png', get_lang('Details')).'</a> |
198 | 198 | </td> |
199 | 199 | </tr>'; |
200 | - } |
|
201 | - |
|
202 | - if (api_is_western_name_order(PERSON_NAME_DATA_EXPORT)) { |
|
203 | - $data[$id_coach]["firstname"] = $firstname; |
|
204 | - $data[$id_coach]["lastname"] = $lastname; |
|
205 | - } else { |
|
206 | - $data[$id_coach]["lastname"] = $lastname; |
|
207 | - $data[$id_coach]["firstname"] = $firstname; |
|
208 | - } |
|
209 | - $data[$id_coach]["connection_time"] = $s_connection_time; |
|
210 | - } |
|
200 | + } |
|
201 | + |
|
202 | + if (api_is_western_name_order(PERSON_NAME_DATA_EXPORT)) { |
|
203 | + $data[$id_coach]["firstname"] = $firstname; |
|
204 | + $data[$id_coach]["lastname"] = $lastname; |
|
205 | + } else { |
|
206 | + $data[$id_coach]["lastname"] = $lastname; |
|
207 | + $data[$id_coach]["firstname"] = $firstname; |
|
208 | + } |
|
209 | + $data[$id_coach]["connection_time"] = $s_connection_time; |
|
210 | + } |
|
211 | 211 | } else { |
212 | - // No results |
|
213 | - echo '<tr><td colspan="5">'.get_lang("NoResult").'</td></tr>'; |
|
212 | + // No results |
|
213 | + echo '<tr><td colspan="5">'.get_lang("NoResult").'</td></tr>'; |
|
214 | 214 | } |
215 | 215 | echo '</table>'; |
216 | 216 | |
217 | 217 | if (isset($_POST['export'])) { |
218 | - export_csv($header, $data, 'coaches.csv'); |
|
218 | + export_csv($header, $data, 'coaches.csv'); |
|
219 | 219 | } |
220 | 220 | |
221 | 221 | echo "<br /><br />"; |
@@ -538,8 +538,8 @@ discard block |
||
538 | 538 | ); |
539 | 539 | |
540 | 540 | if (($counter % $batchSize) === 0) { |
541 | - $em->flush(); |
|
542 | - $em->clear(); |
|
541 | + $em->flush(); |
|
542 | + $em->clear(); |
|
543 | 543 | } |
544 | 544 | $counter++; |
545 | 545 | } |
@@ -560,8 +560,8 @@ discard block |
||
560 | 560 | ); |
561 | 561 | |
562 | 562 | if (($counter % $batchSize) === 0) { |
563 | - $em->flush(); |
|
564 | - $em->clear(); |
|
563 | + $em->flush(); |
|
564 | + $em->clear(); |
|
565 | 565 | } |
566 | 566 | $counter++; |
567 | 567 | } |
@@ -1490,7 +1490,7 @@ discard block |
||
1490 | 1490 | (ip.to_user_id='$user_id' OR ip.to_user_id IS NULL) AND (ip.to_group_id IS NULL OR ip.to_group_id IN (0, ".implode(", ", $group_memberships).")) |
1491 | 1491 | ) "; |
1492 | 1492 | } else { |
1493 | - $cond_user_id = " AND ( |
|
1493 | + $cond_user_id = " AND ( |
|
1494 | 1494 | (ip.to_user_id='$user_id' OR ip.to_user_id IS NULL) AND (ip.to_group_id IS NULL OR ip.to_group_id IN (0, ".$group_id.")) |
1495 | 1495 | )"; |
1496 | 1496 | } |
@@ -241,31 +241,31 @@ discard block |
||
241 | 241 | <td align="center"> |
242 | 242 | <div id="content_source"> |
243 | 243 | <?php |
244 | - if (!($add_type == 'multiple')) { |
|
244 | + if (!($add_type == 'multiple')) { |
|
245 | 245 | ?> |
246 | 246 | <input type="text" id="user_to_add" onkeyup="xajax_search_users(this.value,'single')" /> |
247 | 247 | <div id="ajax_list_users_single"></div> |
248 | 248 | <?php |
249 | - } else { |
|
250 | - ?> |
|
249 | + } else { |
|
250 | + ?> |
|
251 | 251 | <div id="ajax_list_multiple"> |
252 | 252 | <?php echo Display::select('elements_not_in_name', $elements_not_in, '', array('style'=>'width:360px', 'multiple'=>'multiple', 'id'=>'elements_not_in', 'size'=>'15px'), false); ?> |
253 | 253 | </div> |
254 | 254 | <?php |
255 | - } |
|
256 | - ?> |
|
255 | + } |
|
256 | + ?> |
|
257 | 257 | </div> |
258 | 258 | </td> |
259 | 259 | <td width="10%" valign="middle" align="center"> |
260 | 260 | <?php |
261 | - if ($ajax_search) { |
|
262 | - ?> |
|
261 | + if ($ajax_search) { |
|
262 | + ?> |
|
263 | 263 | <button class="btn bt-default" type="button" onclick="remove_item(document.getElementById('elements_in'))" > |
264 | 264 | <em class="fa fa-arrow-left"></em> |
265 | 265 | </button> |
266 | 266 | <?php |
267 | - } else { |
|
268 | - ?> |
|
267 | + } else { |
|
268 | + ?> |
|
269 | 269 | <button class="btn btn-default" type="button" onclick="moveItem(document.getElementById('elements_not_in'), document.getElementById('elements_in'))" onclick="moveItem(document.getElementById('elements_not_in'), document.getElementById('elements_in'))"> |
270 | 270 | <em class="fa fa-arrow-right"></em> |
271 | 271 | </button> |
@@ -274,8 +274,8 @@ discard block |
||
274 | 274 | <em class="fa fa-arrow-left"></em> |
275 | 275 | </button> |
276 | 276 | <?php |
277 | - } |
|
278 | - ?> |
|
277 | + } |
|
278 | + ?> |
|
279 | 279 | <br /><br /><br /><br /><br /><br /> |
280 | 280 | </td> |
281 | 281 | <td align="center"> |
@@ -24,16 +24,16 @@ |
||
24 | 24 | $lang_match = $chamilo_langs[get_preferred_language($available_langs)]; |
25 | 25 | // recover previous value ... |
26 | 26 | if (isset($_SESSION['user_language_choice'])) { |
27 | - $lang_match = $_SESSION['user_language_choice']; |
|
27 | + $lang_match = $_SESSION['user_language_choice']; |
|
28 | 28 | } |
29 | 29 | |
30 | 30 | // Chamilo parameter, on logout |
31 | 31 | if (isset($_REQUEST['language']) && !empty($_REQUEST['language']) && in_array($_REQUEST['language'], $chamilo_langs)) { |
32 | - $lang_match = $_REQUEST['language']; |
|
32 | + $lang_match = $_REQUEST['language']; |
|
33 | 33 | } |
34 | 34 | // Incoming link parameter |
35 | 35 | if (isset($_REQUEST['lang']) && !empty($_REQUEST['lang']) && in_array($_REQUEST['lang'], $available_langs)) { |
36 | - $lang_match = $chamilo_langs[$_REQUEST['lang']]; |
|
36 | + $lang_match = $chamilo_langs[$_REQUEST['lang']]; |
|
37 | 37 | } |
38 | 38 | |
39 | 39 | $detect = api_get_setting('auto_detect_language_custom_pages'); |
@@ -4,55 +4,55 @@ |
||
4 | 4 | require_once 'reports.lib.php'; |
5 | 5 | |
6 | 6 | $longopts = array( |
7 | - 'course:', |
|
8 | - 'tool:', |
|
9 | - 'ci:', |
|
10 | - 'cn:', |
|
11 | - 'sci:', |
|
12 | - 'scn:', |
|
13 | - 'ssci:', |
|
14 | - 'sscn:', |
|
15 | - 'link:', |
|
16 | - 'addValue', |
|
17 | - 'addKey', |
|
18 | - 'help', |
|
19 | - 'clearAll', |
|
20 | - 'score:', |
|
21 | - 'progress:', |
|
22 | - 'time:', |
|
23 | - 'attempt:', |
|
24 | - 'session:', |
|
25 | - 'attempt:', |
|
26 | - 'uid:', |
|
27 | - 'key:', |
|
28 | - 'addDBKeys', |
|
29 | - 'build'); |
|
7 | + 'course:', |
|
8 | + 'tool:', |
|
9 | + 'ci:', |
|
10 | + 'cn:', |
|
11 | + 'sci:', |
|
12 | + 'scn:', |
|
13 | + 'ssci:', |
|
14 | + 'sscn:', |
|
15 | + 'link:', |
|
16 | + 'addValue', |
|
17 | + 'addKey', |
|
18 | + 'help', |
|
19 | + 'clearAll', |
|
20 | + 'score:', |
|
21 | + 'progress:', |
|
22 | + 'time:', |
|
23 | + 'attempt:', |
|
24 | + 'session:', |
|
25 | + 'attempt:', |
|
26 | + 'uid:', |
|
27 | + 'key:', |
|
28 | + 'addDBKeys', |
|
29 | + 'build'); |
|
30 | 30 | |
31 | 31 | $options = getopt("", $longopts); |
32 | 32 | |
33 | 33 | echo "\n\n"; |
34 | 34 | |
35 | 35 | if (array_key_exists('help', $options)) { |
36 | - echo "help message\n"; |
|
36 | + echo "help message\n"; |
|
37 | 37 | } else if (array_key_exists('clearAll', $options)) { |
38 | - reports_clearAll(); |
|
38 | + reports_clearAll(); |
|
39 | 39 | } else if (array_key_exists('build', $options)) { |
40 | - reports_build(); |
|
40 | + reports_build(); |
|
41 | 41 | } else if (array_key_exists('addDBKeys', $options)) { |
42 | - reports_addDBKeys(); |
|
42 | + reports_addDBKeys(); |
|
43 | 43 | } else if (array_key_exists('addValue', $options)) { |
44 | - reports_addValue($options['key'], $options['session'], $options['uid'], |
|
45 | - $options['attempt'], $options['score'], |
|
46 | - $options['progress'], $options['time']); |
|
44 | + reports_addValue($options['key'], $options['session'], $options['uid'], |
|
45 | + $options['attempt'], $options['score'], |
|
46 | + $options['progress'], $options['time']); |
|
47 | 47 | } else if (array_key_exists('addKey', $options)) { |
48 | - echo reports_addKey($options['course'], $options['tool'], |
|
49 | - $options['ci'], $options['cn'], |
|
50 | - $options['sci'], $options['scn'], |
|
51 | - $options['ssci'], $options['sscn'], |
|
52 | - $options['link']); |
|
53 | - echo "\n"; |
|
48 | + echo reports_addKey($options['course'], $options['tool'], |
|
49 | + $options['ci'], $options['cn'], |
|
50 | + $options['sci'], $options['scn'], |
|
51 | + $options['ssci'], $options['sscn'], |
|
52 | + $options['link']); |
|
53 | + echo "\n"; |
|
54 | 54 | } else { |
55 | - echo "action not found\n"; |
|
55 | + echo "action not found\n"; |
|
56 | 56 | } |
57 | 57 | |
58 | 58 | echo "\n"; |
@@ -267,7 +267,7 @@ |
||
267 | 267 | break; |
268 | 268 | case RESULT_DISABLE_SHOW_SCORE_ONLY: |
269 | 269 | if ($objExercise->feedback_type != EXERCISE_FEEDBACK_TYPE_END) { |
270 | - $header_names = array(get_lang('Attempt'), get_lang('StartDate'), get_lang('IP'), get_lang('Score')); |
|
270 | + $header_names = array(get_lang('Attempt'), get_lang('StartDate'), get_lang('IP'), get_lang('Score')); |
|
271 | 271 | } else { |
272 | 272 | $header_names = array(get_lang('Attempt'), get_lang('StartDate'), get_lang('IP'), get_lang('Score'), get_lang('Details')); |
273 | 273 | } |
@@ -42,7 +42,7 @@ |
||
42 | 42 | $event = $agenda->get_event($id); |
43 | 43 | |
44 | 44 | if (!empty($event)) { |
45 | - define('ICAL_LANG', api_get_language_isocode()); |
|
45 | + define('ICAL_LANG', api_get_language_isocode()); |
|
46 | 46 | |
47 | 47 | $ical = new vcalendar(); |
48 | 48 | $ical->setConfig('unique_id', api_get_path(WEB_PATH)); |
@@ -602,13 +602,13 @@ |
||
602 | 602 | |
603 | 603 | } |
604 | 604 | |
605 | - /** |
|
606 | - * Add a tab to platform |
|
607 | - * @param string $tabName |
|
608 | - * @param string $url |
|
609 | - * |
|
610 | - * @return false|string |
|
611 | - */ |
|
605 | + /** |
|
606 | + * Add a tab to platform |
|
607 | + * @param string $tabName |
|
608 | + * @param string $url |
|
609 | + * |
|
610 | + * @return false|string |
|
611 | + */ |
|
612 | 612 | public function addTab($tabName, $url) |
613 | 613 | { |
614 | 614 | $sql = "SELECT * FROM settings_current |
@@ -728,7 +728,7 @@ discard block |
||
728 | 728 | $connection = Database::getManager()->getConnection(); |
729 | 729 | $tableExists = $connection->getSchemaManager()->tablesExist(['plugin_bbb_room']); |
730 | 730 | if ($tableExists) { |
731 | - // Delete user from database |
|
731 | + // Delete user from database |
|
732 | 732 | $sql = "DELETE FROM plugin_bbb_room WHERE participant_id = $user_id"; |
733 | 733 | Database::query($sql); |
734 | 734 | } |
@@ -1367,13 +1367,13 @@ discard block |
||
1367 | 1367 | } |
1368 | 1368 | |
1369 | 1369 | /** |
1370 | - * Get the users by ID |
|
1371 | - * @param array $ids student ids |
|
1372 | - * @param string $active |
|
1373 | - * @param string $order |
|
1374 | - * @param string $limit |
|
1375 | - * @return array $result student information |
|
1376 | - */ |
|
1370 | + * Get the users by ID |
|
1371 | + * @param array $ids student ids |
|
1372 | + * @param string $active |
|
1373 | + * @param string $order |
|
1374 | + * @param string $limit |
|
1375 | + * @return array $result student information |
|
1376 | + */ |
|
1377 | 1377 | public static function get_user_list_by_ids($ids = array(), $active = null, $order = null, $limit = null) |
1378 | 1378 | { |
1379 | 1379 | if (empty($ids)) { |
@@ -2531,7 +2531,7 @@ discard block |
||
2531 | 2531 | * |
2532 | 2532 | * @return array with extra data info of a user i.e array('field_variable'=>'value'); |
2533 | 2533 | */ |
2534 | - public static function get_extra_user_data_by_value($variable, $value, $all_visibility = true) |
|
2534 | + public static function get_extra_user_data_by_value($variable, $value, $all_visibility = true) |
|
2535 | 2535 | { |
2536 | 2536 | $extraFieldValue = new ExtraFieldValue('user'); |
2537 | 2537 | $extraField = new ExtraField('user'); |
@@ -3674,12 +3674,12 @@ discard block |
||
3674 | 3674 | if ($tag_id == 0) { |
3675 | 3675 | //the tag doesn't exist |
3676 | 3676 | $sql = "INSERT INTO $table_user_tag (tag, field_id,count) VALUES ('$tag','$field_id', count + 1)"; |
3677 | - Database::query($sql); |
|
3677 | + Database::query($sql); |
|
3678 | 3678 | $last_insert_id = Database::insert_id(); |
3679 | 3679 | } else { |
3680 | 3680 | //the tag exists we update it |
3681 | 3681 | $sql = "UPDATE $table_user_tag SET count = count + 1 WHERE id = $tag_id"; |
3682 | - Database::query($sql); |
|
3682 | + Database::query($sql); |
|
3683 | 3683 | $last_insert_id = $tag_id; |
3684 | 3684 | } |
3685 | 3685 | |
@@ -3874,9 +3874,9 @@ discard block |
||
3874 | 3874 | } |
3875 | 3875 | |
3876 | 3876 | /** |
3877 | - * Get extra filtrable user fields (only type select) |
|
3878 | - * @return array |
|
3879 | - */ |
|
3877 | + * Get extra filtrable user fields (only type select) |
|
3878 | + * @return array |
|
3879 | + */ |
|
3880 | 3880 | public static function get_extra_filtrable_fields() |
3881 | 3881 | { |
3882 | 3882 | $extraFieldList = self::get_extra_fields(); |
@@ -3901,9 +3901,9 @@ discard block |
||
3901 | 3901 | } |
3902 | 3902 | |
3903 | 3903 | /** |
3904 | - * Get extra where clauses for finding users based on extra filtrable user fields (type select) |
|
3905 | - * @return string With AND clauses based on user's ID which have the values to search in extra user fields |
|
3906 | - */ |
|
3904 | + * Get extra where clauses for finding users based on extra filtrable user fields (type select) |
|
3905 | + * @return string With AND clauses based on user's ID which have the values to search in extra user fields |
|
3906 | + */ |
|
3907 | 3907 | public static function get_search_form_where_extra_fields() |
3908 | 3908 | { |
3909 | 3909 | $useExtraFields = false; |
@@ -4222,23 +4222,23 @@ discard block |
||
4222 | 4222 | } |
4223 | 4223 | |
4224 | 4224 | /** |
4225 | - * Get users followed by human resource manager |
|
4226 | - * @param int $userId |
|
4227 | - * @param int $userStatus Filter users by status (STUDENT, COURSEMANAGER, etc) |
|
4228 | - * @param bool $getOnlyUserId |
|
4229 | - * @param bool $getSql |
|
4230 | - * @param bool $getCount |
|
4231 | - * @param int $from |
|
4232 | - * @param int $numberItems |
|
4233 | - * @param int $column |
|
4234 | - * @param string $direction |
|
4235 | - * @param int $active |
|
4236 | - * @param string $lastConnectionDate |
|
4237 | - * @param int $status the function is called by who? COURSEMANAGER, DRH? |
|
4238 | - * @param string $keyword |
|
4225 | + * Get users followed by human resource manager |
|
4226 | + * @param int $userId |
|
4227 | + * @param int $userStatus Filter users by status (STUDENT, COURSEMANAGER, etc) |
|
4228 | + * @param bool $getOnlyUserId |
|
4229 | + * @param bool $getSql |
|
4230 | + * @param bool $getCount |
|
4231 | + * @param int $from |
|
4232 | + * @param int $numberItems |
|
4233 | + * @param int $column |
|
4234 | + * @param string $direction |
|
4235 | + * @param int $active |
|
4236 | + * @param string $lastConnectionDate |
|
4237 | + * @param int $status the function is called by who? COURSEMANAGER, DRH? |
|
4238 | + * @param string $keyword |
|
4239 | 4239 | * |
4240 | - * @return array user list |
|
4241 | - */ |
|
4240 | + * @return array user list |
|
4241 | + */ |
|
4242 | 4242 | public static function getUsersFollowedByUser( |
4243 | 4243 | $userId, |
4244 | 4244 | $userStatus = null, |