@@ -99,7 +99,7 @@ discard block |
||
99 | 99 | \Patchwork\Utf8\Bootup::initAll(); |
100 | 100 | |
101 | 101 | // Page encoding initialization. |
102 | -header('Content-Type: text/html; charset='. $charset); |
|
102 | +header('Content-Type: text/html; charset='.$charset); |
|
103 | 103 | |
104 | 104 | // Setting the error reporting levels. |
105 | 105 | error_reporting(E_ALL); |
@@ -203,7 +203,7 @@ discard block |
||
203 | 203 | // This is the main configuration file of the system before the upgrade. |
204 | 204 | // Old configuration file. |
205 | 205 | // Don't change to include_once |
206 | - $oldConfigPath = api_get_path(SYS_CODE_PATH) . 'inc/conf/configuration.php'; |
|
206 | + $oldConfigPath = api_get_path(SYS_CODE_PATH).'inc/conf/configuration.php'; |
|
207 | 207 | if (file_exists($oldConfigPath)) { |
208 | 208 | include $oldConfigPath; |
209 | 209 | } |
@@ -331,7 +331,7 @@ discard block |
||
331 | 331 | //Blocking step6 button |
332 | 332 | $("#button_step6").click(function() { |
333 | 333 | $("#button_step6").hide(); |
334 | - $("#button_please_wait").html('<?php echo addslashes(get_lang('PleaseWait'));?>'); |
|
334 | + $("#button_please_wait").html('<?php echo addslashes(get_lang('PleaseWait')); ?>'); |
|
335 | 335 | $("#button_please_wait").show(); |
336 | 336 | $("#button_please_wait").attr('disabled', true); |
337 | 337 | $("#is_executable").attr("value",'step6'); |
@@ -429,7 +429,7 @@ discard block |
||
429 | 429 | |
430 | 430 | $instalation_type_label = ''; |
431 | 431 | if ($installType == 'new') { |
432 | - $instalation_type_label = get_lang('NewInstallation'); |
|
432 | + $instalation_type_label = get_lang('NewInstallation'); |
|
433 | 433 | } elseif ($installType == 'update') { |
434 | 434 | $update_from_version = isset($update_from_version) ? $update_from_version : null; |
435 | 435 | $instalation_type_label = get_lang('UpdateFromLMSVersion').(is_array($update_from_version) ? implode('|', $update_from_version) : ''); |
@@ -599,8 +599,8 @@ discard block |
||
599 | 599 | |
600 | 600 | <?php |
601 | 601 | if ($installType == 'new') { |
602 | - echo get_lang('AdminLogin') . ' : <strong>' . $loginForm . '</strong><br />'; |
|
603 | - echo get_lang('AdminPass') . ' : <strong>' . $passForm . '</strong><br /><br />'; /* TODO: Maybe this password should be hidden too? */ |
|
602 | + echo get_lang('AdminLogin').' : <strong>'.$loginForm.'</strong><br />'; |
|
603 | + echo get_lang('AdminPass').' : <strong>'.$passForm.'</strong><br /><br />'; /* TODO: Maybe this password should be hidden too? */ |
|
604 | 604 | } |
605 | 605 | |
606 | 606 | echo get_lang('AdminFirstName').' : '.$adminFirstName, '<br />', get_lang('AdminLastName').' : '.$adminLastName, '<br />'; |
@@ -755,7 +755,7 @@ discard block |
||
755 | 755 | error_log('Copy conf files'); |
756 | 756 | |
757 | 757 | foreach ($configurationFiles as $file) { |
758 | - if (file_exists(api_get_path(SYS_CODE_PATH) . 'inc/conf/'.$file)) { |
|
758 | + if (file_exists(api_get_path(SYS_CODE_PATH).'inc/conf/'.$file)) { |
|
759 | 759 | copy( |
760 | 760 | api_get_path(SYS_CODE_PATH).'inc/conf/'.$file, |
761 | 761 | api_get_path(CONFIGURATION_PATH).$file |
@@ -17,7 +17,7 @@ discard block |
||
17 | 17 | if (defined('SYSTEM_INSTALLATION')) { |
18 | 18 | |
19 | 19 | // Write the system config file |
20 | - write_system_config_file(api_get_path(CONFIGURATION_PATH) . 'configuration.php'); |
|
20 | + write_system_config_file(api_get_path(CONFIGURATION_PATH).'configuration.php'); |
|
21 | 21 | |
22 | 22 | // Write a distribution file with the config as a backup for the admin |
23 | 23 | //write_system_config_file(api_get_path(CONFIGURATION_PATH) . 'configuration.dist.php'); |
@@ -27,33 +27,33 @@ discard block |
||
27 | 27 | |
28 | 28 | // Copy distribution files with renaming for being the actual system configuration files. |
29 | 29 | copy( |
30 | - api_get_path(CONFIGURATION_PATH) . 'add_course.conf.dist.php', |
|
31 | - api_get_path(CONFIGURATION_PATH) . 'add_course.conf.php' |
|
30 | + api_get_path(CONFIGURATION_PATH).'add_course.conf.dist.php', |
|
31 | + api_get_path(CONFIGURATION_PATH).'add_course.conf.php' |
|
32 | 32 | ); |
33 | 33 | copy( |
34 | - api_get_path(CONFIGURATION_PATH) . 'course_info.conf.dist.php', |
|
35 | - api_get_path(CONFIGURATION_PATH) . 'course_info.conf.php' |
|
34 | + api_get_path(CONFIGURATION_PATH).'course_info.conf.dist.php', |
|
35 | + api_get_path(CONFIGURATION_PATH).'course_info.conf.php' |
|
36 | 36 | ); |
37 | 37 | copy( |
38 | - api_get_path(CONFIGURATION_PATH) . 'mail.conf.dist.php', |
|
39 | - api_get_path(CONFIGURATION_PATH) . 'mail.conf.php' |
|
38 | + api_get_path(CONFIGURATION_PATH).'mail.conf.dist.php', |
|
39 | + api_get_path(CONFIGURATION_PATH).'mail.conf.php' |
|
40 | 40 | ); |
41 | 41 | copy( |
42 | - api_get_path(CONFIGURATION_PATH) . 'profile.conf.dist.php', |
|
43 | - api_get_path(CONFIGURATION_PATH) . 'profile.conf.php' |
|
42 | + api_get_path(CONFIGURATION_PATH).'profile.conf.dist.php', |
|
43 | + api_get_path(CONFIGURATION_PATH).'profile.conf.php' |
|
44 | 44 | ); |
45 | 45 | copy( |
46 | - api_get_path(CONFIGURATION_PATH) . 'events.conf.dist.php', |
|
47 | - api_get_path(CONFIGURATION_PATH) . 'events.conf.php' |
|
46 | + api_get_path(CONFIGURATION_PATH).'events.conf.dist.php', |
|
47 | + api_get_path(CONFIGURATION_PATH).'events.conf.php' |
|
48 | 48 | ); |
49 | 49 | copy( |
50 | - api_get_path(CONFIGURATION_PATH) . 'auth.conf.dist.php', |
|
51 | - api_get_path(CONFIGURATION_PATH) . 'auth.conf.php' |
|
50 | + api_get_path(CONFIGURATION_PATH).'auth.conf.dist.php', |
|
51 | + api_get_path(CONFIGURATION_PATH).'auth.conf.php' |
|
52 | 52 | ); |
53 | 53 | copy( |
54 | - api_get_path(CONFIGURATION_PATH) . 'portfolio.conf.dist.php', |
|
55 | - api_get_path(CONFIGURATION_PATH) . 'portfolio.conf.php' |
|
54 | + api_get_path(CONFIGURATION_PATH).'portfolio.conf.dist.php', |
|
55 | + api_get_path(CONFIGURATION_PATH).'portfolio.conf.php' |
|
56 | 56 | ); |
57 | 57 | } else { |
58 | - echo 'You are not allowed here !' . __FILE__; |
|
58 | + echo 'You are not allowed here !'.__FILE__; |
|
59 | 59 | } |
@@ -10,11 +10,11 @@ discard block |
||
10 | 10 | */ |
11 | 11 | if (defined('SYSTEM_INSTALLATION')) { |
12 | 12 | |
13 | - error_log("Starting " . basename(__FILE__)); |
|
13 | + error_log("Starting ".basename(__FILE__)); |
|
14 | 14 | $perm = api_get_permissions_for_new_files(); |
15 | 15 | |
16 | - $oldConfFile = api_get_path(SYS_CODE_PATH) . 'inc/conf/configuration.php'; |
|
17 | - $newConfFile = api_get_path(CONFIGURATION_PATH) . 'configuration.php'; |
|
16 | + $oldConfFile = api_get_path(SYS_CODE_PATH).'inc/conf/configuration.php'; |
|
17 | + $newConfFile = api_get_path(CONFIGURATION_PATH).'configuration.php'; |
|
18 | 18 | |
19 | 19 | if (file_exists($oldConfFile)) { |
20 | 20 | copy($oldConfFile, $newConfFile); |
@@ -37,18 +37,18 @@ discard block |
||
37 | 37 | $ignore = false; |
38 | 38 | if (stripos($line, '$_configuration[\'system_version\']') !== false) { |
39 | 39 | $found_version = true; |
40 | - $line = '$_configuration[\'system_version\'] = \'' . $new_version . '\';' . "\r\n"; |
|
40 | + $line = '$_configuration[\'system_version\'] = \''.$new_version.'\';'."\r\n"; |
|
41 | 41 | } elseif (stripos($line, '$_configuration[\'system_stable\']') !== false) { |
42 | 42 | $found_stable = true; |
43 | - $line = '$_configuration[\'system_stable\'] = ' . ($new_version_stable ? 'true' : 'false') . ';' . "\r\n"; |
|
43 | + $line = '$_configuration[\'system_stable\'] = '.($new_version_stable ? 'true' : 'false').';'."\r\n"; |
|
44 | 44 | } elseif (stripos($line, '$_configuration[\'software_name\']') !== false) { |
45 | 45 | $found_software_name = true; |
46 | - $line = '$_configuration[\'software_name\'] = \'' . $software_name . '\';' . "\r\n"; |
|
46 | + $line = '$_configuration[\'software_name\'] = \''.$software_name.'\';'."\r\n"; |
|
47 | 47 | } elseif (stripos($line, '$_configuration[\'software_url\']') !== false) { |
48 | 48 | $found_software_url = true; |
49 | - $line = '$_configuration[\'software_url\'] = \'' . $software_url . '\';' . "\r\n"; |
|
49 | + $line = '$_configuration[\'software_url\'] = \''.$software_url.'\';'."\r\n"; |
|
50 | 50 | } elseif (stripos($line, '$userPasswordCrypted') !== false) { |
51 | - $line = '$_configuration[\'password_encryption\'] = \'' .$userPasswordCrypted.'\';' . "\r\n"; |
|
51 | + $line = '$_configuration[\'password_encryption\'] = \''.$userPasswordCrypted.'\';'."\r\n"; |
|
52 | 52 | } elseif (stripos($line, '?>') !== false) { |
53 | 53 | $ignore = true; |
54 | 54 | } |
@@ -58,21 +58,21 @@ discard block |
||
58 | 58 | } |
59 | 59 | |
60 | 60 | if (!$found_version) { |
61 | - fwrite($fh, '$_configuration[\'system_version\'] = \'' . $new_version . '\';' . "\r\n"); |
|
61 | + fwrite($fh, '$_configuration[\'system_version\'] = \''.$new_version.'\';'."\r\n"); |
|
62 | 62 | } |
63 | 63 | if (!$found_stable) { |
64 | - fwrite($fh, '$_configuration[\'system_stable\'] = ' . ($new_version_stable ? 'true' : 'false') . ';' . "\r\n"); |
|
64 | + fwrite($fh, '$_configuration[\'system_stable\'] = '.($new_version_stable ? 'true' : 'false').';'."\r\n"); |
|
65 | 65 | } |
66 | 66 | if (!$found_software_name) { |
67 | - fwrite($fh, '$_configuration[\'software_name\'] = \'' . $software_name . '\';' . "\r\n"); |
|
67 | + fwrite($fh, '$_configuration[\'software_name\'] = \''.$software_name.'\';'."\r\n"); |
|
68 | 68 | } |
69 | 69 | if (!$found_software_url) { |
70 | - fwrite($fh, '$_configuration[\'software_url\'] = \'' . $software_url . '\';' . "\r\n"); |
|
70 | + fwrite($fh, '$_configuration[\'software_url\'] = \''.$software_url.'\';'."\r\n"); |
|
71 | 71 | } |
72 | 72 | fwrite($fh, '?>'); |
73 | 73 | fclose($fh); |
74 | 74 | |
75 | 75 | error_log("configuration.php file updated."); |
76 | 76 | } else { |
77 | - echo 'You are not allowed here !'. __FILE__; |
|
77 | + echo 'You are not allowed here !'.__FILE__; |
|
78 | 78 | } |
@@ -13,7 +13,7 @@ discard block |
||
13 | 13 | * current configuration file. |
14 | 14 | * @package chamilo.install |
15 | 15 | */ |
16 | -error_log("Starting " . basename(__FILE__)); |
|
16 | +error_log("Starting ".basename(__FILE__)); |
|
17 | 17 | |
18 | 18 | global $debug; |
19 | 19 | |
@@ -142,12 +142,12 @@ discard block |
||
142 | 142 | |
143 | 143 | $list = scandir($langPath); |
144 | 144 | foreach ($list as $entry) { |
145 | - if (is_dir($langPath . $entry) && |
|
145 | + if (is_dir($langPath.$entry) && |
|
146 | 146 | in_array($entry, $officialLanguages) |
147 | 147 | ) { |
148 | 148 | foreach ($filesToDelete as $file) { |
149 | - if (is_file($langPath . $entry . '/' . $file . '.inc.php')) { |
|
150 | - unlink($langPath . $entry . '/' . $file . '.inc.php'); |
|
149 | + if (is_file($langPath.$entry.'/'.$file.'.inc.php')) { |
|
150 | + unlink($langPath.$entry.'/'.$file.'.inc.php'); |
|
151 | 151 | } |
152 | 152 | } |
153 | 153 | } |
@@ -234,7 +234,7 @@ discard block |
||
234 | 234 | @rrmdir(api_get_path(SYS_PATH).'archive'); |
235 | 235 | |
236 | 236 | } else { |
237 | - echo 'You are not allowed here !'. __FILE__; |
|
237 | + echo 'You are not allowed here !'.__FILE__; |
|
238 | 238 | } |
239 | 239 | |
240 | 240 | /** |
@@ -21,7 +21,7 @@ |
||
21 | 21 | |
22 | 22 | // Including libraries |
23 | 23 | require_once '../inc/global.inc.php'; |
24 | -$current_course_tool = TOOL_LINK; |
|
24 | +$current_course_tool = TOOL_LINK; |
|
25 | 25 | |
26 | 26 | $this_section = SECTION_COURSES; |
27 | 27 | api_protect_course_script(); |
@@ -25,8 +25,8 @@ |
||
25 | 25 | // Launch event |
26 | 26 | Event::event_link($linkId); |
27 | 27 | |
28 | -header("Cache-Control: no-store, no-cache, must-revalidate"); // HTTP/1.1 |
|
28 | +header("Cache-Control: no-store, no-cache, must-revalidate"); // HTTP/1.1 |
|
29 | 29 | header("Cache-Control: post-check=0, pre-check=0", false); |
30 | -header("Pragma: no-cache"); // HTTP/1.0 |
|
30 | +header("Pragma: no-cache"); // HTTP/1.0 |
|
31 | 31 | header("Location: $linkUrl"); |
32 | 32 | exit; |
@@ -11,7 +11,7 @@ discard block |
||
11 | 11 | |
12 | 12 | // setting the section (for the tabs) |
13 | 13 | $this_section = SECTION_PLATFORM_ADMIN; |
14 | -$id_session = (int)$_GET['id_session']; |
|
14 | +$id_session = (int) $_GET['id_session']; |
|
15 | 15 | SessionManager::protect_teacher_session_edit($id_session); |
16 | 16 | |
17 | 17 | $tool_name = get_lang('SessionOverview'); |
@@ -59,7 +59,7 @@ discard block |
||
59 | 59 | $rs = Database::query($sql); |
60 | 60 | $session_category = ''; |
61 | 61 | |
62 | - if (Database::num_rows($rs)>0) { |
|
62 | + if (Database::num_rows($rs) > 0) { |
|
63 | 63 | $rows_session_category = Database::store_result($rs); |
64 | 64 | $rows_session_category = $rows_session_category[0]; |
65 | 65 | $session_category = $rows_session_category['name']; |
@@ -83,25 +83,25 @@ discard block |
||
83 | 83 | break; |
84 | 84 | case 'delete': |
85 | 85 | $idChecked = $_GET['idChecked']; |
86 | - if(is_array($idChecked)) { |
|
86 | + if (is_array($idChecked)) { |
|
87 | 87 | $my_temp = array(); |
88 | - foreach ($idChecked as $id){ |
|
88 | + foreach ($idChecked as $id) { |
|
89 | 89 | $courseInfo = api_get_course_info($id); |
90 | - $my_temp[]= $courseInfo['real_id'];// forcing the escape_string |
|
90 | + $my_temp[] = $courseInfo['real_id']; // forcing the escape_string |
|
91 | 91 | } |
92 | 92 | $idChecked = $my_temp; |
93 | 93 | $idChecked = "'".implode("','", $idChecked)."'"; |
94 | 94 | |
95 | 95 | $result = Database::query("DELETE FROM $tbl_session_rel_course WHERE session_id='$id_session' AND c_id IN($idChecked)"); |
96 | - $nbr_affected_rows=Database::affected_rows($result); |
|
96 | + $nbr_affected_rows = Database::affected_rows($result); |
|
97 | 97 | |
98 | 98 | Database::query("DELETE FROM $tbl_session_rel_course_rel_user WHERE session_id='$id_session' AND c_id IN($idChecked)"); |
99 | 99 | Database::query("UPDATE $tbl_session SET nbr_courses=nbr_courses-$nbr_affected_rows WHERE id='$id_session'"); |
100 | 100 | } |
101 | 101 | |
102 | - if (!empty($_GET['class'])){ |
|
102 | + if (!empty($_GET['class'])) { |
|
103 | 103 | $result = Database::query("DELETE FROM $tbl_session_rel_class WHERE session_id='$id_session' AND class_id=".intval($_GET['class'])); |
104 | - $nbr_affected_rows=Database::affected_rows($result); |
|
104 | + $nbr_affected_rows = Database::affected_rows($result); |
|
105 | 105 | Database::query("UPDATE $tbl_session SET nbr_classes=nbr_classes-$nbr_affected_rows WHERE id='$id_session'"); |
106 | 106 | } |
107 | 107 | |
@@ -111,7 +111,7 @@ discard block |
||
111 | 111 | Database::query("UPDATE $tbl_session SET nbr_users=nbr_users-$nbr_affected_rows WHERE id='$id_session'"); |
112 | 112 | |
113 | 113 | $result = Database::query("DELETE FROM $tbl_session_rel_course_rel_user WHERE session_id ='$id_session' AND user_id=".intval($_GET['user'])); |
114 | - $nbr_affected_rows=Database::affected_rows($result); |
|
114 | + $nbr_affected_rows = Database::affected_rows($result); |
|
115 | 115 | |
116 | 116 | Database::query("UPDATE $tbl_session_rel_course SET nbr_users=nbr_users-$nbr_affected_rows WHERE session_id ='$id_session'"); |
117 | 117 | } |
@@ -137,28 +137,28 @@ discard block |
||
137 | 137 | <td><?php echo get_lang('GeneralCoach'); ?> :</td> |
138 | 138 | <td><?php echo api_get_person_name($session['firstname'], $session['lastname']).' ('.$session['username'].')' ?></td> |
139 | 139 | </tr> |
140 | - <?php if(!empty($session_category)) { ?> |
|
140 | + <?php if (!empty($session_category)) { ?> |
|
141 | 141 | <tr> |
142 | 142 | <td><?php echo get_lang('SessionCategory') ?></td> |
143 | - <td><?php echo $session_category; ?></td> |
|
143 | + <td><?php echo $session_category; ?></td> |
|
144 | 144 | </tr> |
145 | 145 | <?php } ?> |
146 | 146 | <tr> |
147 | 147 | <td><?php echo get_lang('Date'); ?> :</td> |
148 | 148 | <td> |
149 | 149 | <?php |
150 | - if ($session['access_start_date'] == '00-00-0000' && $session['access_end_date']== '00-00-0000' ) { |
|
150 | + if ($session['access_start_date'] == '00-00-0000' && $session['access_end_date'] == '00-00-0000') { |
|
151 | 151 | echo get_lang('NoTimeLimits'); |
152 | 152 | } |
153 | 153 | else { |
154 | 154 | if ($session['access_start_date'] != '00-00-0000') { |
155 | 155 | //$session['date_start'] = Display::tag('i', get_lang('NoTimeLimits')); |
156 | - $session['access_start_date'] = get_lang('From').' '.$session['access_start_date']; |
|
156 | + $session['access_start_date'] = get_lang('From').' '.$session['access_start_date']; |
|
157 | 157 | } else { |
158 | 158 | $session['access_start_date'] = ''; |
159 | 159 | } |
160 | 160 | if ($session['access_end_date'] == '00-00-0000') { |
161 | - $session['access_end_date'] =''; |
|
161 | + $session['access_end_date'] = ''; |
|
162 | 162 | } else { |
163 | 163 | $session['access_end_date'] = get_lang('Until').' '.$session['access_end_date']; |
164 | 164 | } |
@@ -189,7 +189,7 @@ discard block |
||
189 | 189 | <?php echo api_ucfirst(get_lang('SessionVisibility')) ?> : |
190 | 190 | </td> |
191 | 191 | <td> |
192 | - <?php if ($session['visibility']==1) echo get_lang('ReadOnly'); elseif($session['visibility']==2) echo get_lang('Visible');elseif($session['visibility']==3) echo api_ucfirst(get_lang('Invisible')) ?> |
|
192 | + <?php if ($session['visibility'] == 1) echo get_lang('ReadOnly'); elseif ($session['visibility'] == 2) echo get_lang('Visible'); elseif ($session['visibility'] == 3) echo api_ucfirst(get_lang('Invisible')) ?> |
|
193 | 193 | </td> |
194 | 194 | </tr> |
195 | 195 | <?php |
@@ -201,7 +201,7 @@ discard block |
||
201 | 201 | echo '</td>'; |
202 | 202 | echo '<td>'; |
203 | 203 | $url_list = UrlManager::get_access_url_from_session($id_session); |
204 | - foreach($url_list as $url_data) { |
|
204 | + foreach ($url_list as $url_data) { |
|
205 | 205 | echo $url_data['url'].'<br />'; |
206 | 206 | } |
207 | 207 | echo '</td></tr>'; |
@@ -231,8 +231,8 @@ discard block |
||
231 | 231 | WHERE c.id = sc.c_id |
232 | 232 | AND session_id='$id_session' |
233 | 233 | ORDER BY title"; |
234 | - $result=Database::query($sql); |
|
235 | - $courses=Database::store_result($result); |
|
234 | + $result = Database::query($sql); |
|
235 | + $courses = Database::store_result($result); |
|
236 | 236 | foreach ($courses as $course) { |
237 | 237 | //select the number of users |
238 | 238 | |
@@ -245,7 +245,7 @@ discard block |
||
245 | 245 | srcru.session_id = '".intval($id_session)."'"; |
246 | 246 | |
247 | 247 | $rs = Database::query($sql); |
248 | - $course['nbr_users'] = Database::result($rs,0,0); |
|
248 | + $course['nbr_users'] = Database::result($rs, 0, 0); |
|
249 | 249 | |
250 | 250 | // Get coachs of the courses in session |
251 | 251 | |
@@ -271,7 +271,7 @@ discard block |
||
271 | 271 | } |
272 | 272 | |
273 | 273 | if (count($coachs) > 0) { |
274 | - $coach = implode('<br />',$coachs); |
|
274 | + $coach = implode('<br />', $coachs); |
|
275 | 275 | } else { |
276 | 276 | $coach = get_lang('None'); |
277 | 277 | } |
@@ -281,7 +281,7 @@ discard block |
||
281 | 281 | // name of the course, that appeared in the default $interbreadcrumb |
282 | 282 | echo ' |
283 | 283 | <tr> |
284 | - <td>'.Display::url($course['title'].' ('.$course['visual_code'].')', api_get_path(WEB_COURSE_PATH).$course['code'].'/?id_session='.$id_session),'</td> |
|
284 | + <td>'.Display::url($course['title'].' ('.$course['visual_code'].')', api_get_path(WEB_COURSE_PATH).$course['code'].'/?id_session='.$id_session), '</td> |
|
285 | 285 | <td>'.$coach.'</td> |
286 | 286 | <td>'.$course['nbr_users'].'</td> |
287 | 287 | |
@@ -306,7 +306,7 @@ discard block |
||
306 | 306 | </tr> |
307 | 307 | <?php |
308 | 308 | |
309 | - if ($session['nbr_users']==0) { |
|
309 | + if ($session['nbr_users'] == 0) { |
|
310 | 310 | echo '<tr> |
311 | 311 | <td colspan="2">'.get_lang('NoUsersForThisSession').'</td> |
312 | 312 | </tr>'; |
@@ -337,7 +337,7 @@ discard block |
||
337 | 337 | $user_link = ''; |
338 | 338 | if (!empty($user['user_id'])) { |
339 | 339 | $user_link = '<a href="'.api_get_path(WEB_CODE_PATH).'admin/user_information.php?user_id='.intval($user['user_id']).'">'. |
340 | - api_htmlentities(api_get_person_name($user['firstname'], $user['lastname']),ENT_QUOTES,$charset).' ('.$user['username'].')</a>'; |
|
340 | + api_htmlentities(api_get_person_name($user['firstname'], $user['lastname']), ENT_QUOTES, $charset).' ('.$user['username'].')</a>'; |
|
341 | 341 | } |
342 | 342 | |
343 | 343 | $link_to_add_user_in_url = ''; |
@@ -13,7 +13,7 @@ discard block |
||
13 | 13 | */ |
14 | 14 | $use_anonymous = true; |
15 | 15 | require_once '../inc/global.inc.php'; |
16 | -$current_course_tool = TOOL_USER; |
|
16 | +$current_course_tool = TOOL_USER; |
|
17 | 17 | $this_section = SECTION_COURSES; |
18 | 18 | |
19 | 19 | // notice for unauthorized people. |
@@ -41,7 +41,7 @@ discard block |
||
41 | 41 | |
42 | 42 | //Can't auto unregister from a session |
43 | 43 | if (!empty($sessionId)) { |
44 | - $course_info['unsubscribe'] = 0; |
|
44 | + $course_info['unsubscribe'] = 0; |
|
45 | 45 | } |
46 | 46 | |
47 | 47 | /* Unregistering a user section */ |
@@ -184,7 +184,7 @@ discard block |
||
184 | 184 | '#', |
185 | 185 | get_lang('UserPicture'), |
186 | 186 | get_lang('OfficialCode'), |
187 | - get_lang('FirstName') . ', ' . get_lang('LastName'), |
|
187 | + get_lang('FirstName').', '.get_lang('LastName'), |
|
188 | 188 | get_lang('Email'), |
189 | 189 | get_lang('Phone') |
190 | 190 | ); |
@@ -193,7 +193,7 @@ discard block |
||
193 | 193 | '#', |
194 | 194 | get_lang('UserPicture'), |
195 | 195 | get_lang('OfficialCode'), |
196 | - get_lang('LastName') . ', ' . get_lang('FirstName'), |
|
196 | + get_lang('LastName').', '.get_lang('FirstName'), |
|
197 | 197 | get_lang('Email'), |
198 | 198 | get_lang('Phone') |
199 | 199 | ); |
@@ -218,7 +218,7 @@ discard block |
||
218 | 218 | if (api_is_multiple_url_enabled()) { |
219 | 219 | $sql .= ' , '.Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER).' au '; |
220 | 220 | } |
221 | - $sql .=" WHERE c_id = '$courseId' AND session_course_user.user_id = user.user_id "; |
|
221 | + $sql .= " WHERE c_id = '$courseId' AND session_course_user.user_id = user.user_id "; |
|
222 | 222 | $sql .= ' AND session_id = '.$sessionId; |
223 | 223 | |
224 | 224 | if (api_is_multiple_url_enabled()) { |
@@ -252,7 +252,7 @@ discard block |
||
252 | 252 | true |
253 | 253 | ); |
254 | 254 | if (!empty($extra_fields)) { |
255 | - foreach($extra_fields as $key => $extra_value) { |
|
255 | + foreach ($extra_fields as $key => $extra_value) { |
|
256 | 256 | $user[$key] = $extra_value; |
257 | 257 | } |
258 | 258 | } |
@@ -266,7 +266,7 @@ discard block |
||
266 | 266 | $counter, |
267 | 267 | $user_image, |
268 | 268 | $user['official_code'], |
269 | - $user['firstname'] . ', ' . $user['lastname'], |
|
269 | + $user['firstname'].', '.$user['lastname'], |
|
270 | 270 | $user['email'], |
271 | 271 | $user['phone'] |
272 | 272 | ); |
@@ -275,7 +275,7 @@ discard block |
||
275 | 275 | $counter, |
276 | 276 | $user_image, |
277 | 277 | $user['official_code'], |
278 | - $user['lastname'] . ', ' . $user['firstname'], |
|
278 | + $user['lastname'].', '.$user['firstname'], |
|
279 | 279 | $user['email'], |
280 | 280 | $user['phone'] |
281 | 281 | ); |
@@ -354,7 +354,7 @@ discard block |
||
354 | 354 | $counter, |
355 | 355 | $user_image, |
356 | 356 | $user['official_code'], |
357 | - $user['firstname'] . ', ' . $user['lastname'], |
|
357 | + $user['firstname'].', '.$user['lastname'], |
|
358 | 358 | $user['email'], |
359 | 359 | $user['phone'] |
360 | 360 | ); |
@@ -363,7 +363,7 @@ discard block |
||
363 | 363 | $counter, |
364 | 364 | $user_image, |
365 | 365 | $user['official_code'], |
366 | - $user['lastname'] . ', ' . $user['firstname'], |
|
366 | + $user['lastname'].', '.$user['firstname'], |
|
367 | 367 | $user['email'], |
368 | 368 | $user['phone'] |
369 | 369 | ); |
@@ -700,7 +700,7 @@ discard block |
||
700 | 700 | $userInfo = api_get_user_info($user_id); |
701 | 701 | $userPicture = $userInfo['avatar']; |
702 | 702 | |
703 | - $photo= '<img src="'.$userPicture.'" alt="'.$userInfo['complete_name'].'" width="22" height="22" title="'.$userInfo['complete_name'].'" />'; |
|
703 | + $photo = '<img src="'.$userPicture.'" alt="'.$userInfo['complete_name'].'" width="22" height="22" title="'.$userInfo['complete_name'].'" />'; |
|
704 | 704 | |
705 | 705 | $temp[] = $user_id; |
706 | 706 | $temp[] = $photo; |
@@ -821,7 +821,7 @@ discard block |
||
821 | 821 | if (api_get_setting('allow_user_course_subscription_by_course_admin') == 'true' or api_is_platform_admin()) { |
822 | 822 | // unregister |
823 | 823 | if ($user_id != $current_user_id || api_is_platform_admin()) { |
824 | - $result .= '<a class="btn btn-small btn-danger" href="'.api_get_self().'?'.api_get_cidreq().'&type='.$type.'&unregister=yes&user_id='.$user_id.'" title="'.get_lang('Unreg').' " onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang('ConfirmYourChoice'),ENT_QUOTES,$charset)).'\')) return false;">'. |
|
824 | + $result .= '<a class="btn btn-small btn-danger" href="'.api_get_self().'?'.api_get_cidreq().'&type='.$type.'&unregister=yes&user_id='.$user_id.'" title="'.get_lang('Unreg').' " onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang('ConfirmYourChoice'), ENT_QUOTES, $charset)).'\')) return false;">'. |
|
825 | 825 | get_lang('Unreg').'</a> '; |
826 | 826 | } else { |
827 | 827 | //$result .= Display::return_icon('unsubscribe_course_na.png', get_lang('Unreg'),'',ICON_SIZE_SMALL).'</a> '; |
@@ -831,7 +831,7 @@ discard block |
||
831 | 831 | // Show buttons for unsubscribe |
832 | 832 | if ($course_info['unsubscribe'] == 1) { |
833 | 833 | if ($user_id == $current_user_id) { |
834 | - $result .= '<a class="btn btn-small btn-danger" href="'.api_get_self().'?'.api_get_cidreq().'&type='.$type.'&unregister=yes&user_id='.$user_id.'" title="'.get_lang('Unreg').' " onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang('ConfirmYourChoice'),ENT_QUOTES,$charset)).'\')) return false;">'. |
|
834 | + $result .= '<a class="btn btn-small btn-danger" href="'.api_get_self().'?'.api_get_cidreq().'&type='.$type.'&unregister=yes&user_id='.$user_id.'" title="'.get_lang('Unreg').' " onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang('ConfirmYourChoice'), ENT_QUOTES, $charset)).'\')) return false;">'. |
|
835 | 835 | get_lang('Unreg').'</a> '; |
836 | 836 | } |
837 | 837 | } |
@@ -907,7 +907,7 @@ discard block |
||
907 | 907 | |
908 | 908 | // Actions column |
909 | 909 | $table->set_header($header_nr++, get_lang('Action'), false); |
910 | - $table->set_column_filter($header_nr-1, 'modify_filter'); |
|
910 | + $table->set_column_filter($header_nr - 1, 'modify_filter'); |
|
911 | 911 | |
912 | 912 | if (api_get_setting('allow_user_course_subscription_by_course_admin') == 'true') { |
913 | 913 | $table->set_form_actions(array('unsubscribe' => get_lang('Unreg')), 'user'); |
@@ -915,7 +915,7 @@ discard block |
||
915 | 915 | } else { |
916 | 916 | if ($course_info['unsubscribe'] == 1) { |
917 | 917 | $table->set_header($header_nr++, get_lang('Action'), false); |
918 | - $table->set_column_filter($header_nr-1, 'modify_filter'); |
|
918 | + $table->set_column_filter($header_nr - 1, 'modify_filter'); |
|
919 | 919 | } |
920 | 920 | } |
921 | 921 | |
@@ -971,19 +971,19 @@ discard block |
||
971 | 971 | echo '<div class="col-md-6">'; |
972 | 972 | echo $icon; |
973 | 973 | $actions .= '<a href="user.php?'.api_get_cidreq().'&action=export&format=csv&type='.$type.'">'. |
974 | - Display::return_icon('export_csv.png', get_lang('ExportAsCSV'),'',ICON_SIZE_MEDIUM).'</a> '; |
|
974 | + Display::return_icon('export_csv.png', get_lang('ExportAsCSV'), '', ICON_SIZE_MEDIUM).'</a> '; |
|
975 | 975 | $actions .= '<a href="user.php?'.api_get_cidreq().'&action=export&format=xls&type='.$type.'">'. |
976 | - Display::return_icon('export_excel.png', get_lang('ExportAsXLS'),'',ICON_SIZE_MEDIUM).'</a> '; |
|
976 | + Display::return_icon('export_excel.png', get_lang('ExportAsXLS'), '', ICON_SIZE_MEDIUM).'</a> '; |
|
977 | 977 | |
978 | 978 | if (api_get_setting('allow_user_course_subscription_by_course_admin') == 'true' || |
979 | 979 | api_is_platform_admin() |
980 | 980 | ) { |
981 | 981 | $actions .= '<a href="user_import.php?'.api_get_cidreq().'&action=import">'. |
982 | - Display::return_icon('import_csv.png', get_lang('ImportUsersToACourse'),'',ICON_SIZE_MEDIUM).'</a> '; |
|
982 | + Display::return_icon('import_csv.png', get_lang('ImportUsersToACourse'), '', ICON_SIZE_MEDIUM).'</a> '; |
|
983 | 983 | } |
984 | 984 | |
985 | 985 | $actions .= '<a href="user.php?'.api_get_cidreq().'&action=export&format=pdf&type='.$type.'">'. |
986 | - Display::return_icon('pdf.png', get_lang('ExportToPDF'),'',ICON_SIZE_MEDIUM).'</a> '; |
|
986 | + Display::return_icon('pdf.png', get_lang('ExportToPDF'), '', ICON_SIZE_MEDIUM).'</a> '; |
|
987 | 987 | echo $actions; |
988 | 988 | |
989 | 989 | echo '</div>'; |
@@ -56,15 +56,15 @@ discard block |
||
56 | 56 | ); |
57 | 57 | |
58 | 58 | //Column config |
59 | - $column_model = array( |
|
60 | - array('name'=>'name', 'index'=>'name', 'width'=>'160', 'align'=>'left', 'search' => 'true', 'wrap_cell' => "true"), |
|
61 | - array('name'=>'nbr_courses', 'index'=>'nbr_courses', 'width'=>'30', 'align'=>'left', 'search' => 'true'), |
|
62 | - array('name'=>'nbr_users', 'index'=>'nbr_users', 'width'=>'30', 'align'=>'left', 'search' => 'true'), |
|
63 | - array('name'=>'category_name', 'index'=>'category_name', 'width'=>'70', 'align'=>'left', 'search' => 'true'), |
|
64 | - array('name'=>'access_start_date', 'index'=>'access_start_date', 'width'=>'40', 'align'=>'left', 'search' => 'true'), |
|
65 | - array('name'=>'access_end_date', 'index'=>'access_end_date', 'width'=>'40', 'align'=>'left', 'search' => 'true'), |
|
66 | - array('name'=>'coach_name', 'index'=>'coach_name', 'width'=>'80', 'align'=>'left', 'search' => 'false'), |
|
67 | - array('name'=>'status', 'index'=>'session_active','width'=>'40', 'align'=>'left', 'search' => 'true', 'stype'=>'select', |
|
59 | + $column_model = array( |
|
60 | + array('name'=>'name', 'index'=>'name', 'width'=>'160', 'align'=>'left', 'search' => 'true', 'wrap_cell' => "true"), |
|
61 | + array('name'=>'nbr_courses', 'index'=>'nbr_courses', 'width'=>'30', 'align'=>'left', 'search' => 'true'), |
|
62 | + array('name'=>'nbr_users', 'index'=>'nbr_users', 'width'=>'30', 'align'=>'left', 'search' => 'true'), |
|
63 | + array('name'=>'category_name', 'index'=>'category_name', 'width'=>'70', 'align'=>'left', 'search' => 'true'), |
|
64 | + array('name'=>'access_start_date', 'index'=>'access_start_date', 'width'=>'40', 'align'=>'left', 'search' => 'true'), |
|
65 | + array('name'=>'access_end_date', 'index'=>'access_end_date', 'width'=>'40', 'align'=>'left', 'search' => 'true'), |
|
66 | + array('name'=>'coach_name', 'index'=>'coach_name', 'width'=>'80', 'align'=>'left', 'search' => 'false'), |
|
67 | + array('name'=>'status', 'index'=>'session_active', 'width'=>'40', 'align'=>'left', 'search' => 'true', 'stype'=>'select', |
|
68 | 68 | //for the bottom bar |
69 | 69 | 'searchoptions' => array( |
70 | 70 | 'defaultValue' => '1', |
@@ -72,8 +72,8 @@ discard block |
||
72 | 72 | ), |
73 | 73 | //for the top bar |
74 | 74 | 'editoptions' => array('value' => ':'.get_lang('All').';1:'.get_lang('Active').';0:'.get_lang('Inactive'))), |
75 | - array('name'=>'visibility', 'index'=>'visibility', 'width'=>'40', 'align'=>'left', 'search' => 'false'), |
|
76 | - array('name'=>'actions', 'index'=>'actions', 'width'=>'100', 'align'=>'left','formatter'=>'action_formatter','sortable'=>'false', 'search' => 'false') |
|
75 | + array('name'=>'visibility', 'index'=>'visibility', 'width'=>'40', 'align'=>'left', 'search' => 'false'), |
|
76 | + array('name'=>'actions', 'index'=>'actions', 'width'=>'100', 'align'=>'left', 'formatter'=>'action_formatter', 'sortable'=>'false', 'search' => 'false') |
|
77 | 77 | ); |
78 | 78 | //Autowidth |
79 | 79 | $extra_params['autowidth'] = 'true'; |
@@ -85,7 +85,7 @@ discard block |
||
85 | 85 | |
86 | 86 | //With this function we can add actions to the jgrid (edit, delete, etc) |
87 | 87 | $action_links = 'function action_formatter(cellvalue, options, rowObject) { |
88 | - return \' <a href="add_users_to_session.php?page=session_list.php&id_session=\'+options.rowId+\'">'.Display::return_icon('user_subscribe_session.png',get_lang('SubscribeUsersToSession'),'',ICON_SIZE_SMALL).'</a>'. |
|
88 | + return \' <a href="add_users_to_session.php?page=session_list.php&id_session=\'+options.rowId+\'">'.Display::return_icon('user_subscribe_session.png', get_lang('SubscribeUsersToSession'), '', ICON_SIZE_SMALL).'</a>'. |
|
89 | 89 | '\'; |
90 | 90 | }'; |
91 | 91 | ?> |
@@ -106,7 +106,7 @@ discard block |
||
106 | 106 | |
107 | 107 | $(function() { |
108 | 108 | <?php |
109 | - echo Display::grid_js('sessions', $url,$columns,$column_model,$extra_params, array(), $action_links,true); |
|
109 | + echo Display::grid_js('sessions', $url, $columns, $column_model, $extra_params, array(), $action_links, true); |
|
110 | 110 | ?> |
111 | 111 | |
112 | 112 | setSearchSelect("status"); |
@@ -148,9 +148,9 @@ discard block |
||
148 | 148 | <?php if (api_is_platform_admin()) {?> |
149 | 149 | <div class="actions"> |
150 | 150 | <?php |
151 | - echo '<a href="'.api_get_path(WEB_CODE_PATH).'session/session_add.php">'.Display::return_icon('new_session.png',get_lang('AddSession'),'',ICON_SIZE_MEDIUM).'</a>'; |
|
152 | - echo '<a href="'.api_get_path(WEB_CODE_PATH).'session/add_many_session_to_category.php">'.Display::return_icon('session_to_category.png',get_lang('AddSessionsInCategories'),'',ICON_SIZE_MEDIUM).'</a>'; |
|
153 | - echo '<a href="'.api_get_path(WEB_CODE_PATH).'session/session_category_list.php">'.Display::return_icon('folder.png',get_lang('ListSessionCategory'),'',ICON_SIZE_MEDIUM).'</a>'; |
|
151 | + echo '<a href="'.api_get_path(WEB_CODE_PATH).'session/session_add.php">'.Display::return_icon('new_session.png', get_lang('AddSession'), '', ICON_SIZE_MEDIUM).'</a>'; |
|
152 | + echo '<a href="'.api_get_path(WEB_CODE_PATH).'session/add_many_session_to_category.php">'.Display::return_icon('session_to_category.png', get_lang('AddSessionsInCategories'), '', ICON_SIZE_MEDIUM).'</a>'; |
|
153 | + echo '<a href="'.api_get_path(WEB_CODE_PATH).'session/session_category_list.php">'.Display::return_icon('folder.png', get_lang('ListSessionCategory'), '', ICON_SIZE_MEDIUM).'</a>'; |
|
154 | 154 | echo '</div>'; |
155 | 155 | } |
156 | 156 | } else { |