@@ -36,7 +36,7 @@ discard block |
||
36 | 36 | $obj->setupBreadcrumb($interbreadcrumb, $action); |
37 | 37 | |
38 | 38 | //jqgrid will use this URL to do the selects |
39 | -$url = api_get_path(WEB_AJAX_PATH) . 'model.ajax.php?a=get_extra_fields&type=' . $extraFieldType; |
|
39 | +$url = api_get_path(WEB_AJAX_PATH).'model.ajax.php?a=get_extra_fields&type='.$extraFieldType; |
|
40 | 40 | |
41 | 41 | //The order is important you need to check the the $column variable in the model.ajax.php file |
42 | 42 | $columns = $obj->getJqgridColumnNames(); |
@@ -64,43 +64,43 @@ discard block |
||
64 | 64 | array(), |
65 | 65 | $action_links, |
66 | 66 | true |
67 | - ). ' |
|
67 | + ).' |
|
68 | 68 | |
69 | 69 | $("#field_type").on("change", function() { |
70 | 70 | id = $(this).val(); |
71 | 71 | switch(id) { |
72 | 72 | case "1": |
73 | - $("#example").html("' . addslashes(Display::return_icon('userfield_text.png')) . '"); |
|
73 | + $("#example").html("' . addslashes(Display::return_icon('userfield_text.png')).'"); |
|
74 | 74 | break; |
75 | 75 | case "2": |
76 | - $("#example").html("' . addslashes(Display::return_icon('userfield_text_area.png')) . '"); |
|
76 | + $("#example").html("' . addslashes(Display::return_icon('userfield_text_area.png')).'"); |
|
77 | 77 | break; |
78 | 78 | case "3": |
79 | - $("#example").html("' . addslashes(Display::return_icon('add_user_field_howto.png')) . '"); |
|
79 | + $("#example").html("' . addslashes(Display::return_icon('add_user_field_howto.png')).'"); |
|
80 | 80 | break; |
81 | 81 | case "4": |
82 | - $("#example").html("' . addslashes(Display::return_icon('userfield_drop_down.png')) . '"); |
|
82 | + $("#example").html("' . addslashes(Display::return_icon('userfield_drop_down.png')).'"); |
|
83 | 83 | break; |
84 | 84 | case "5": |
85 | - $("#example").html("' . addslashes(Display::return_icon('userfield_multidropdown.png')) . '"); |
|
85 | + $("#example").html("' . addslashes(Display::return_icon('userfield_multidropdown.png')).'"); |
|
86 | 86 | break; |
87 | 87 | case "6": |
88 | - $("#example").html("' . addslashes(Display::return_icon('userfield_data.png')) . '"); |
|
88 | + $("#example").html("' . addslashes(Display::return_icon('userfield_data.png')).'"); |
|
89 | 89 | break; |
90 | 90 | case "7": |
91 | - $("#example").html("' . addslashes(Display::return_icon('userfield_date_time.png')) . '"); |
|
91 | + $("#example").html("' . addslashes(Display::return_icon('userfield_date_time.png')).'"); |
|
92 | 92 | break; |
93 | 93 | case "8": |
94 | - $("#example").html("' . addslashes(Display::return_icon('userfield_doubleselect.png')) . '"); |
|
94 | + $("#example").html("' . addslashes(Display::return_icon('userfield_doubleselect.png')).'"); |
|
95 | 95 | break; |
96 | 96 | case "9": |
97 | - $("#example").html("' . addslashes(Display::return_icon('userfield_divider.png')) . '"); |
|
97 | + $("#example").html("' . addslashes(Display::return_icon('userfield_divider.png')).'"); |
|
98 | 98 | break; |
99 | 99 | case "10": |
100 | - $("#example").html("' . addslashes(Display::return_icon('userfield_user_tag.png')) . '"); |
|
100 | + $("#example").html("' . addslashes(Display::return_icon('userfield_user_tag.png')).'"); |
|
101 | 101 | break; |
102 | 102 | case "11": |
103 | - $("#example").html("' . addslashes(Display::return_icon('userfield_data.png')) . '"); |
|
103 | + $("#example").html("' . addslashes(Display::return_icon('userfield_data.png')).'"); |
|
104 | 104 | break; |
105 | 105 | } |
106 | 106 | }); |
@@ -119,7 +119,7 @@ discard block |
||
119 | 119 | ) { |
120 | 120 | api_not_allowed(); |
121 | 121 | } |
122 | - $url = api_get_self() . '?type=' . $obj->type . '&action=' . Security::remove_XSS($_GET['action']); |
|
122 | + $url = api_get_self().'?type='.$obj->type.'&action='.Security::remove_XSS($_GET['action']); |
|
123 | 123 | $form = $obj->return_form($url, 'add'); |
124 | 124 | |
125 | 125 | // The validation or display |
@@ -135,8 +135,8 @@ discard block |
||
135 | 135 | $obj->display(); |
136 | 136 | } else { |
137 | 137 | echo '<div class="actions">'; |
138 | - echo '<a href="' . api_get_self() . '?type=' . $obj->type . '">' . |
|
139 | - Display::return_icon('back.png', get_lang('Back'), '', ICON_SIZE_MEDIUM) . '</a>'; |
|
138 | + echo '<a href="'.api_get_self().'?type='.$obj->type.'">'. |
|
139 | + Display::return_icon('back.png', get_lang('Back'), '', ICON_SIZE_MEDIUM).'</a>'; |
|
140 | 140 | echo '</div>'; |
141 | 141 | $form->addElement('hidden', 'sec_token'); |
142 | 142 | $form->setConstants(array('sec_token' => $token)); |
@@ -145,7 +145,7 @@ discard block |
||
145 | 145 | break; |
146 | 146 | case 'edit': |
147 | 147 | // Action handling: Editing |
148 | - $url = api_get_self() . '?type=' . $obj->type . '&action=' . Security::remove_XSS($_GET['action']) . '&id=' . intval($_GET['id']); |
|
148 | + $url = api_get_self().'?type='.$obj->type.'&action='.Security::remove_XSS($_GET['action']).'&id='.intval($_GET['id']); |
|
149 | 149 | $form = $obj->return_form($url, 'edit'); |
150 | 150 | |
151 | 151 | // The validation or display |
@@ -159,8 +159,8 @@ discard block |
||
159 | 159 | $obj->display(); |
160 | 160 | } else { |
161 | 161 | echo '<div class="actions">'; |
162 | - echo '<a href="' . api_get_self() . '?type=' . $obj->type . '">' . |
|
163 | - Display::return_icon('back.png', get_lang('Back'), '', ICON_SIZE_MEDIUM) . '</a>'; |
|
162 | + echo '<a href="'.api_get_self().'?type='.$obj->type.'">'. |
|
163 | + Display::return_icon('back.png', get_lang('Back'), '', ICON_SIZE_MEDIUM).'</a>'; |
|
164 | 164 | echo '</div>'; |
165 | 165 | $form->addElement('hidden', 'sec_token'); |
166 | 166 | $form->setConstants(array('sec_token' => $token)); |
@@ -7,16 +7,16 @@ |
||
7 | 7 | * @package chamilo.admin |
8 | 8 | */ |
9 | 9 | include ('../inc/global.inc.php'); |
10 | -$this_section=SECTION_PLATFORM_ADMIN; |
|
10 | +$this_section = SECTION_PLATFORM_ADMIN; |
|
11 | 11 | |
12 | 12 | api_protect_admin_script(); |
13 | 13 | $tool_name = get_lang('DummyCourseCreator'); |
14 | -$interbreadcrumb[] = array ("url" => 'index.php', "name" => get_lang('PlatformAdmin')); |
|
14 | +$interbreadcrumb[] = array("url" => 'index.php', "name" => get_lang('PlatformAdmin')); |
|
15 | 15 | Display::display_header($tool_name); |
16 | 16 | //api_display_tool_title($tool_name); |
17 | 17 | if (api_get_setting('server_type') != 'test') { |
18 | 18 | echo get_lang('DummyCourseOnlyOnTestServer'); |
19 | -} elseif( isset($_POST['action'])) { |
|
19 | +} elseif (isset($_POST['action'])) { |
|
20 | 20 | require_once('../coursecopy/classes/DummyCourseCreator.class.php'); |
21 | 21 | $dcc = new DummyCourseCreator(); |
22 | 22 | $dcc->create_dummy_course($_POST['course_code']); |
@@ -15,15 +15,15 @@ |
||
15 | 15 | Display::display_header($tool_name); |
16 | 16 | //api_display_tool_title($tool_name); |
17 | 17 | if (api_get_setting('server_type') != 'test') { |
18 | - echo get_lang('DummyCourseOnlyOnTestServer'); |
|
18 | + echo get_lang('DummyCourseOnlyOnTestServer'); |
|
19 | 19 | } elseif( isset($_POST['action'])) { |
20 | - require_once('../coursecopy/classes/DummyCourseCreator.class.php'); |
|
21 | - $dcc = new DummyCourseCreator(); |
|
22 | - $dcc->create_dummy_course($_POST['course_code']); |
|
23 | - echo get_lang('Done'); |
|
20 | + require_once('../coursecopy/classes/DummyCourseCreator.class.php'); |
|
21 | + $dcc = new DummyCourseCreator(); |
|
22 | + $dcc->create_dummy_course($_POST['course_code']); |
|
23 | + echo get_lang('Done'); |
|
24 | 24 | } else { |
25 | - echo get_lang('DummyCourseDescription'); |
|
26 | - echo '<form method="post"><input type="hidden" name="course_code" value="'.Security::remove_XSS($_GET['course_code']).'"/><input type="submit" name="action" value="'.get_lang('Ok').'"/></form>'; |
|
25 | + echo get_lang('DummyCourseDescription'); |
|
26 | + echo '<form method="post"><input type="hidden" name="course_code" value="'.Security::remove_XSS($_GET['course_code']).'"/><input type="submit" name="action" value="'.get_lang('Ok').'"/></form>'; |
|
27 | 27 | } |
28 | 28 | |
29 | 29 | Display::display_footer(); |
@@ -5,13 +5,13 @@ |
||
5 | 5 | * @package chamilo.admin |
6 | 6 | */ |
7 | 7 | |
8 | -$cidReset=true; |
|
8 | +$cidReset = true; |
|
9 | 9 | require_once '../inc/global.inc.php'; |
10 | 10 | $this_section = SECTION_PLATFORM_ADMIN; |
11 | 11 | |
12 | 12 | api_protect_admin_script(); |
13 | 13 | |
14 | -$interbreadcrumb[]=array('url' => 'index.php',"name" => get_lang('PlatformAdmin')); |
|
14 | +$interbreadcrumb[] = array('url' => 'index.php', "name" => get_lang('PlatformAdmin')); |
|
15 | 15 | $tool_name = get_lang('Statistics'); |
16 | 16 | Display::display_header($tool_name); |
17 | 17 | Display::display_footer(); |
@@ -18,12 +18,12 @@ discard block |
||
18 | 18 | $htmlHeadXtra[] = api_get_jqgrid_js(); |
19 | 19 | |
20 | 20 | // setting breadcrumbs |
21 | -$interbreadcrumb[]=array('url' => 'index.php','name' => get_lang('PlatformAdmin')); |
|
22 | -$interbreadcrumb[]=array('url' => 'career_dashboard.php','name' => get_lang('CareersAndPromotions')); |
|
21 | +$interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin')); |
|
22 | +$interbreadcrumb[] = array('url' => 'career_dashboard.php', 'name' => get_lang('CareersAndPromotions')); |
|
23 | 23 | |
24 | 24 | Display :: display_header(null); |
25 | 25 | |
26 | -$form = new FormValidator('filter_form','GET', api_get_self()); |
|
26 | +$form = new FormValidator('filter_form', 'GET', api_get_self()); |
|
27 | 27 | |
28 | 28 | $career = new Career(); |
29 | 29 | |
@@ -54,11 +54,11 @@ discard block |
||
54 | 54 | // action links |
55 | 55 | echo '<div class="actions" style="margin-bottom:20px">'; |
56 | 56 | echo '<a href="../admin/index.php">'. |
57 | - Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('PlatformAdmin'),'',ICON_SIZE_MEDIUM).'</a>'; |
|
57 | + Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('PlatformAdmin'), '', ICON_SIZE_MEDIUM).'</a>'; |
|
58 | 58 | echo '<a href="careers.php">'. |
59 | - Display::return_icon('career.png',get_lang('Careers'),'',ICON_SIZE_MEDIUM).'</a>'; |
|
59 | + Display::return_icon('career.png', get_lang('Careers'), '', ICON_SIZE_MEDIUM).'</a>'; |
|
60 | 60 | echo '<a href="promotions.php">'. |
61 | - Display::return_icon('promotion.png',get_lang('Promotions'),'',ICON_SIZE_MEDIUM).'</a>'; |
|
61 | + Display::return_icon('promotion.png', get_lang('Promotions'), '', ICON_SIZE_MEDIUM).'</a>'; |
|
62 | 62 | echo '</div>'; |
63 | 63 | |
64 | 64 | $form->display(); |
@@ -119,22 +119,22 @@ discard block |
||
119 | 119 | foreach ($career_array as $career_id => $data) { |
120 | 120 | $career = $data['name']; |
121 | 121 | $promotions = $data['promotions']; |
122 | - $career = Display::url($career, 'careers.php?action=edit&id=' . $career_id); |
|
122 | + $career = Display::url($career, 'careers.php?action=edit&id='.$career_id); |
|
123 | 123 | $career = Display::tag('h4', $career); |
124 | - echo '<tr><td style="background-color:#ECF0F1" colspan="3">' . $career . '</td></tr>'; |
|
124 | + echo '<tr><td style="background-color:#ECF0F1" colspan="3">'.$career.'</td></tr>'; |
|
125 | 125 | if (!empty($promotions)) { |
126 | 126 | foreach ($promotions as $promotion_id => $promotion) { |
127 | 127 | $promotion_name = $promotion['name']; |
128 | - $promotion_url = Display::url($promotion_name, 'promotions.php?action=edit&id=' . $promotion_id); |
|
128 | + $promotion_url = Display::url($promotion_name, 'promotions.php?action=edit&id='.$promotion_id); |
|
129 | 129 | $sessions = $promotion['sessions']; |
130 | 130 | echo '<tr>'; |
131 | 131 | $count = count($sessions); |
132 | 132 | $rowspan = ''; |
133 | 133 | if (!empty($count)) { |
134 | 134 | $count++; |
135 | - $rowspan = 'rowspan="' . $count . '"'; |
|
135 | + $rowspan = 'rowspan="'.$count.'"'; |
|
136 | 136 | } |
137 | - echo '<td ' . $rowspan . '>'; |
|
137 | + echo '<td '.$rowspan.'>'; |
|
138 | 138 | echo Display::tag('h5', $promotion_url); |
139 | 139 | echo '</td>'; |
140 | 140 | echo '</tr>'; |
@@ -144,7 +144,7 @@ discard block |
||
144 | 144 | $course_list = $session['courses']; |
145 | 145 | |
146 | 146 | $url = Display::url($session['data']['name'], |
147 | - '../session/resume_session.php?id_session=' . $session['data']['id']); |
|
147 | + '../session/resume_session.php?id_session='.$session['data']['id']); |
|
148 | 148 | echo '<tr>'; |
149 | 149 | //Session name |
150 | 150 | echo Display::tag('td', $url); |
@@ -157,7 +157,7 @@ discard block |
||
157 | 157 | |
158 | 158 | $url = Display::url( |
159 | 159 | $course['title'], |
160 | - api_get_path(WEB_COURSE_PATH) . $course['directory'] . '/index.php?id_session=' . $session['data']['id'] |
|
160 | + api_get_path(WEB_COURSE_PATH).$course['directory'].'/index.php?id_session='.$session['data']['id'] |
|
161 | 161 | ); |
162 | 162 | echo Display::tag('td', $url); |
163 | 163 | echo '</tr>'; |
@@ -15,18 +15,18 @@ discard block |
||
15 | 15 | |
16 | 16 | $tool_name = get_lang('SessionOverview'); |
17 | 17 | |
18 | -$interbreadcrumb[]=array('url' => 'index.php','name' => get_lang('PlatformAdmin')); |
|
19 | -$interbreadcrumb[]=array('url' => 'session_list.php','name' => get_lang('SessionList')); |
|
18 | +$interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin')); |
|
19 | +$interbreadcrumb[] = array('url' => 'session_list.php', 'name' => get_lang('SessionList')); |
|
20 | 20 | |
21 | 21 | // Database Table Definitions |
22 | -$tbl_user = Database::get_main_table(TABLE_MAIN_USER); |
|
23 | -$tbl_session_rel_user = Database::get_main_table(TABLE_MAIN_SESSION_USER); |
|
22 | +$tbl_user = Database::get_main_table(TABLE_MAIN_USER); |
|
23 | +$tbl_session_rel_user = Database::get_main_table(TABLE_MAIN_SESSION_USER); |
|
24 | 24 | $table_access_url_user = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER); |
25 | 25 | $url_id = api_get_current_access_url_id(); |
26 | 26 | |
27 | 27 | $action = $_GET['action']; |
28 | 28 | |
29 | -switch($action) { |
|
29 | +switch ($action) { |
|
30 | 30 | case 'add_user_to_url': |
31 | 31 | $user_id = $_REQUEST['user_id']; |
32 | 32 | $result = UrlManager::add_user_to_url($user_id, $url_id); |
@@ -58,7 +58,7 @@ discard block |
||
58 | 58 | } |
59 | 59 | |
60 | 60 | |
61 | -foreach($session_list as $session_item) { |
|
61 | +foreach ($session_list as $session_item) { |
|
62 | 62 | $session_id = $session_item['id']; |
63 | 63 | $html .= '<h3>'.$session_item['name'].'</h3>'; |
64 | 64 |
@@ -12,13 +12,13 @@ |
||
12 | 12 | */ |
13 | 13 | function validate_data($courses) |
14 | 14 | { |
15 | - $errors = array (); |
|
16 | - $coursecodes = array (); |
|
15 | + $errors = array(); |
|
16 | + $coursecodes = array(); |
|
17 | 17 | foreach ($courses as $index => $course) { |
18 | - $course['line'] = $index +1; |
|
18 | + $course['line'] = $index + 1; |
|
19 | 19 | |
20 | 20 | // 1. Check whether mandatory fields are set. |
21 | - $mandatory_fields = array ('Code', 'Title', 'CourseCategory'); |
|
21 | + $mandatory_fields = array('Code', 'Title', 'CourseCategory'); |
|
22 | 22 | foreach ($mandatory_fields as $field) { |
23 | 23 | if (!isset($course[$field]) || strlen($course[$field]) == 0) { |
24 | 24 | $course['error'] = get_lang($field.'Mandatory'); |
@@ -151,7 +151,7 @@ |
||
151 | 151 | /** |
152 | 152 | * Read the CSV-file |
153 | 153 | * @param string $file Path to the CSV-file |
154 | - * @return array All course-information read from the file |
|
154 | + * @return Ddeboer\DataImport\Reader\CsvReader All course-information read from the file |
|
155 | 155 | */ |
156 | 156 | function parse_csv_data($file) |
157 | 157 | { |
@@ -263,7 +263,7 @@ discard block |
||
263 | 263 | <option value="">--</option> |
264 | 264 | <?php |
265 | 265 | echo Display :: get_alphabet_options($first_letter_user); |
266 | - ?> |
|
266 | + ?> |
|
267 | 267 | </select> |
268 | 268 | </td> |
269 | 269 | <td width="20%"> </td> |
@@ -274,8 +274,8 @@ discard block |
||
274 | 274 | <select name="firstLetterCourse" onchange="javascript:document.formulaire.form_sent.value='2'; document.formulaire.submit();"> |
275 | 275 | <option value="">--</option> |
276 | 276 | <?php |
277 | - echo Display :: get_alphabet_options($first_letter_course); |
|
278 | - ?> |
|
277 | + echo Display :: get_alphabet_options($first_letter_course); |
|
278 | + ?> |
|
279 | 279 | </select> |
280 | 280 | </td> |
281 | 281 | </tr> |
@@ -295,7 +295,7 @@ discard block |
||
295 | 295 | } |
296 | 296 | |
297 | 297 | echo $userName; |
298 | - ?> |
|
298 | + ?> |
|
299 | 299 | </option> |
300 | 300 | <?php |
301 | 301 | } |
@@ -287,7 +287,10 @@ discard block |
||
287 | 287 | <td width="40%" align="center"> |
288 | 288 | <select name="UserList[]" multiple="multiple" size="20" style="width:300px;"> |
289 | 289 | <?php foreach ($db_users as $user) { ?> |
290 | - <option value="<?php echo $user['user_id']; ?>" <?php if(in_array($user['user_id'],$users)) echo 'selected="selected"'; ?>> |
|
290 | + <option value="<?php echo $user['user_id']; ?>" <?php if(in_array($user['user_id'],$users)) { |
|
291 | + echo 'selected="selected"'; |
|
292 | +} |
|
293 | +?>> |
|
291 | 294 | <?php |
292 | 295 | $userName = api_get_person_name($user['firstname'], $user['lastname']).' ('.$user['username'].')'; |
293 | 296 | if ($showOfficialCode) { |
@@ -308,7 +311,10 @@ discard block |
||
308 | 311 | <td width="40%" align="center"> |
309 | 312 | <select name="CourseList[]" multiple="multiple" size="20" style="width:300px;"> |
310 | 313 | <?php foreach ($db_courses as $course) { ?> |
311 | - <option value="<?php echo $course['code']; ?>" <?php if(in_array($course['code'],$courses)) echo 'selected="selected"'; ?>> |
|
314 | + <option value="<?php echo $course['code']; ?>" <?php if(in_array($course['code'],$courses)) { |
|
315 | + echo 'selected="selected"'; |
|
316 | +} |
|
317 | +?>> |
|
312 | 318 | <?php echo '('.$course['visual_code'].') '.$course['title']; ?> |
313 | 319 | </option> |
314 | 320 | <?php } ?> |
@@ -30,7 +30,7 @@ discard block |
||
30 | 30 | |
31 | 31 | /* Header */ |
32 | 32 | $tool_name = get_lang('AddUsersToACourse'); |
33 | -$interbreadcrumb[] = array ("url" => 'index.php', "name" => get_lang('PlatformAdmin')); |
|
33 | +$interbreadcrumb[] = array("url" => 'index.php', "name" => get_lang('PlatformAdmin')); |
|
34 | 34 | |
35 | 35 | $htmlHeadXtra[] = '<script> |
36 | 36 | function validate_filter() { |
@@ -142,12 +142,12 @@ discard block |
||
142 | 142 | if (isset($_POST[$varname]) && $_POST[$varname] != '0') { |
143 | 143 | $use_extra_fields = true; |
144 | 144 | if ($fieldtype == ExtraField::FIELD_TYPE_TAG) { |
145 | - $extra_field_result[]= UserManager::get_extra_user_data_by_tags( |
|
145 | + $extra_field_result[] = UserManager::get_extra_user_data_by_tags( |
|
146 | 146 | intval($_POST['field_id']), |
147 | 147 | $_POST[$varname] |
148 | 148 | ); |
149 | 149 | } else { |
150 | - $extra_field_result[]= UserManager::get_extra_user_data_by_value( |
|
150 | + $extra_field_result[] = UserManager::get_extra_user_data_by_value( |
|
151 | 151 | $new_field['variable'], |
152 | 152 | $_POST[$varname] |
153 | 153 | ); |
@@ -163,8 +163,8 @@ discard block |
||
163 | 163 | $final_result = array(); |
164 | 164 | if (count($extra_field_result) > 1) { |
165 | 165 | for ($i = 0; $i < count($extra_field_result) - 1; $i++) { |
166 | - if (is_array($extra_field_result[$i+1])) { |
|
167 | - $final_result = array_intersect($extra_field_result[$i], $extra_field_result[$i+1]); |
|
166 | + if (is_array($extra_field_result[$i + 1])) { |
|
167 | + $final_result = array_intersect($extra_field_result[$i], $extra_field_result[$i + 1]); |
|
168 | 168 | } |
169 | 169 | } |
170 | 170 | } else { |
@@ -172,14 +172,14 @@ discard block |
||
172 | 172 | } |
173 | 173 | |
174 | 174 | if (api_is_multiple_url_enabled()) { |
175 | - if (is_array($final_result) && count($final_result)>0) { |
|
176 | - $where_filter = " AND u.user_id IN ('".implode("','",$final_result)."') "; |
|
175 | + if (is_array($final_result) && count($final_result) > 0) { |
|
176 | + $where_filter = " AND u.user_id IN ('".implode("','", $final_result)."') "; |
|
177 | 177 | } else { |
178 | 178 | //no results |
179 | 179 | $where_filter = " AND u.user_id = -1"; |
180 | 180 | } |
181 | 181 | } else { |
182 | - if (is_array($final_result) && count($final_result)>0) { |
|
182 | + if (is_array($final_result) && count($final_result) > 0) { |
|
183 | 183 | $where_filter = " AND user_id IN ('".implode("','", $final_result)."') "; |
184 | 184 | } else { |
185 | 185 | //no results |
@@ -200,10 +200,10 @@ discard block |
||
200 | 200 | $sql = "SELECT user_id, lastname, firstname, username, official_code |
201 | 201 | FROM $tbl_user |
202 | 202 | WHERE user_id<>2 AND ".$target_name." LIKE '".$first_letter_user."%' $where_filter |
203 | - ORDER BY ". (count($users) > 0 ? "(user_id IN(".implode(',', $users).")) DESC," : "")." ".$orderBy; |
|
203 | + ORDER BY ".(count($users) > 0 ? "(user_id IN(".implode(',', $users).")) DESC," : "")." ".$orderBy; |
|
204 | 204 | |
205 | 205 | if (api_is_multiple_url_enabled()) { |
206 | - $tbl_user_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER); |
|
206 | + $tbl_user_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER); |
|
207 | 207 | $access_url_id = api_get_current_access_url_id(); |
208 | 208 | if ($access_url_id != -1) { |
209 | 209 | $sql = "SELECT u.user_id,lastname,firstname,username, official_code |
@@ -215,7 +215,7 @@ discard block |
||
215 | 215 | access_url_id = $access_url_id AND |
216 | 216 | (".$target_name." LIKE '".$first_letter_user."%' ) |
217 | 217 | $where_filter |
218 | - ORDER BY ". (count($users) > 0 ? "(u.user_id IN(".implode(',', $users).")) DESC," : "")." ".$orderBy; |
|
218 | + ORDER BY ".(count($users) > 0 ? "(u.user_id IN(".implode(',', $users).")) DESC," : "")." ".$orderBy; |
|
219 | 219 | } |
220 | 220 | } |
221 | 221 | |
@@ -258,8 +258,8 @@ discard block |
||
258 | 258 | $fieldtype = $new_field['type']; |
259 | 259 | echo ' <select name="'.$varname.'">'; |
260 | 260 | echo '<option value="0">--'.get_lang('Select').'--</option>'; |
261 | - foreach ($new_field['data'] as $option) { |
|
262 | - $checked=''; |
|
261 | + foreach ($new_field['data'] as $option) { |
|
262 | + $checked = ''; |
|
263 | 263 | if ($fieldtype == ExtraField::FIELD_TYPE_TAG) { |
264 | 264 | if (isset($_POST[$varname])) { |
265 | 265 | if ($_POST[$varname] == $option['tag']) { |
@@ -317,7 +317,7 @@ discard block |
||
317 | 317 | <td width="40%" align="center"> |
318 | 318 | <select name="UserList[]" multiple="multiple" size="20" style="width:300px;"> |
319 | 319 | <?php foreach ($db_users as $user) { ?> |
320 | - <option value="<?php echo $user['user_id']; ?>" <?php if(in_array($user['user_id'],$users)) echo 'selected="selected"'; ?>> |
|
320 | + <option value="<?php echo $user['user_id']; ?>" <?php if (in_array($user['user_id'], $users)) echo 'selected="selected"'; ?>> |
|
321 | 321 | <?php |
322 | 322 | $userName = api_get_person_name($user['firstname'], $user['lastname']).' ('.$user['username'].')'; |
323 | 323 | if ($showOfficialCode) { |
@@ -338,7 +338,7 @@ discard block |
||
338 | 338 | <td width="40%" align="center"> |
339 | 339 | <select name="CourseList[]" multiple="multiple" size="20" style="width:300px;"> |
340 | 340 | <?php foreach ($db_courses as $course) { ?> |
341 | - <option value="<?php echo $course['code']; ?>" <?php if(in_array($course['code'],$courses)) echo 'selected="selected"'; ?>> |
|
341 | + <option value="<?php echo $course['code']; ?>" <?php if (in_array($course['code'], $courses)) echo 'selected="selected"'; ?>> |
|
342 | 342 | <?php echo '('.$course['visual_code'].') '.$course['title']; ?> |
343 | 343 | </option> |
344 | 344 | <?php } ?> |
@@ -295,7 +295,7 @@ |
||
295 | 295 | if (isset($_GET['export'])) { |
296 | 296 | $dataToExport = $timeReport->prepareDataToExport($withFilter); |
297 | 297 | |
298 | - $fileName = get_lang('TeacherTimeReport') . ' ' . api_get_local_time(); |
|
298 | + $fileName = get_lang('TeacherTimeReport').' '.api_get_local_time(); |
|
299 | 299 | |
300 | 300 | switch ($_GET['export']) { |
301 | 301 | case 'pdf': |
@@ -197,7 +197,7 @@ discard block |
||
197 | 197 | <option value = "%">--</option> |
198 | 198 | <?php |
199 | 199 | echo Display :: get_alphabet_options(); |
200 | - ?> |
|
200 | + ?> |
|
201 | 201 | </select> |
202 | 202 | </td> |
203 | 203 | <td align="center"> </td> |
@@ -207,31 +207,31 @@ discard block |
||
207 | 207 | <td align="center"> |
208 | 208 | <div id="content_source"> |
209 | 209 | <?php |
210 | - if (!($add_type=='multiple')) { |
|
210 | + if (!($add_type=='multiple')) { |
|
211 | 211 | ?> |
212 | 212 | <input type="text" id="user_to_add" onkeyup="xajax_search_users(this.value,'single')" /> |
213 | 213 | <div id="ajax_list_users_single"></div> |
214 | 214 | <?php |
215 | - } else { |
|
216 | - ?> |
|
215 | + } else { |
|
216 | + ?> |
|
217 | 217 | <div id="ajax_list_multiple"> |
218 | 218 | <?php echo Display::select('session_not_in_promotion_name',$session_not_in_promotion, '',array('style'=>'width:360px', 'multiple'=>'multiple','id'=>'session_not_in_promotion','size'=>'15px'),false); ?> |
219 | 219 | </div> |
220 | 220 | <?php |
221 | - } |
|
222 | - ?> |
|
221 | + } |
|
222 | + ?> |
|
223 | 223 | </div> |
224 | 224 | </td> |
225 | 225 | <td width="10%" valign="middle" align="center"> |
226 | 226 | <?php |
227 | - if ($ajax_search) { |
|
228 | - ?> |
|
227 | + if ($ajax_search) { |
|
228 | + ?> |
|
229 | 229 | <button class="btn btn-default" type="button" onclick="remove_item(document.getElementById('session_in_promotion'))" > |
230 | 230 | <em class="fa fa-arrow-left"></em> |
231 | 231 | </button> |
232 | 232 | <?php |
233 | - } else { |
|
234 | - ?> |
|
233 | + } else { |
|
234 | + ?> |
|
235 | 235 | <button class="btn btn-default" type="button" onclick="moveItem(document.getElementById('session_not_in_promotion'), document.getElementById('session_in_promotion'))" onclick="moveItem(document.getElementById('session_not_in_promotion'), document.getElementById('session_in_promotion'))"> |
236 | 236 | <em class="fa fa-arrow-right"></em> |
237 | 237 | </button> |
@@ -240,8 +240,8 @@ discard block |
||
240 | 240 | <em class="fa fa-arrow-left"></em> |
241 | 241 | </button> |
242 | 242 | <?php |
243 | - } |
|
244 | - ?> |
|
243 | + } |
|
244 | + ?> |
|
245 | 245 | <br /><br /><br /><br /><br /><br /> |
246 | 246 | </td> |
247 | 247 | <td align="center"> |
@@ -10,7 +10,7 @@ discard block |
||
10 | 10 | require_once '../inc/global.inc.php'; |
11 | 11 | |
12 | 12 | $xajax = new xajax(); |
13 | -$xajax->registerFunction ('search_sessions'); |
|
13 | +$xajax->registerFunction('search_sessions'); |
|
14 | 14 | |
15 | 15 | // setting the section (for the tabs) |
16 | 16 | $this_section = SECTION_PLATFORM_ADMIN; |
@@ -19,13 +19,13 @@ discard block |
||
19 | 19 | api_protect_admin_script(true); |
20 | 20 | |
21 | 21 | // setting breadcrumbs |
22 | -$interbreadcrumb[]=array('url' => 'index.php','name' => get_lang('PlatformAdmin')); |
|
23 | -$interbreadcrumb[]=array('url' => 'career_dashboard.php','name' => get_lang('CareersAndPromotions')); |
|
22 | +$interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin')); |
|
23 | +$interbreadcrumb[] = array('url' => 'career_dashboard.php', 'name' => get_lang('CareersAndPromotions')); |
|
24 | 24 | |
25 | 25 | // Setting the name of the tool |
26 | 26 | $tool_name = get_lang('SubscribeSessionsToPromotions'); |
27 | 27 | $add_type = 'multiple'; |
28 | -if (isset($_REQUEST['add_type']) && $_REQUEST['add_type']!=''){ |
|
28 | +if (isset($_REQUEST['add_type']) && $_REQUEST['add_type'] != '') { |
|
29 | 29 | $add_type = Security::remove_XSS($_REQUEST['add_type']); |
30 | 30 | } |
31 | 31 | |
@@ -67,14 +67,14 @@ discard block |
||
67 | 67 | |
68 | 68 | $form_sent = 0; |
69 | 69 | $errorMsg = ''; |
70 | -$users =$sessions=array(); |
|
70 | +$users = $sessions = array(); |
|
71 | 71 | $promotion = new Promotion(); |
72 | 72 | $id = intval($_GET['id']); |
73 | 73 | if (isset($_POST['form_sent']) && $_POST['form_sent']) { |
74 | 74 | $form_sent = $_POST['form_sent']; |
75 | 75 | $session_in_promotion_posted = $_POST['session_in_promotion_name']; |
76 | 76 | if (!is_array($session_in_promotion_posted)) { |
77 | - $session_in_promotion_posted=array(); |
|
77 | + $session_in_promotion_posted = array(); |
|
78 | 78 | } |
79 | 79 | if ($form_sent == 1) { |
80 | 80 | // Added a parameter to send emails when registering a user |
@@ -86,7 +86,7 @@ discard block |
||
86 | 86 | |
87 | 87 | $promotion_data = $promotion->get($id); |
88 | 88 | $session_list = SessionManager::get_sessions_list(array(), array('name')); |
89 | -$session_not_in_promotion = $session_in_promotion= array(); |
|
89 | +$session_not_in_promotion = $session_in_promotion = array(); |
|
90 | 90 | |
91 | 91 | if (!empty($session_list)) { |
92 | 92 | foreach ($session_list as $session) { |
@@ -122,7 +122,7 @@ discard block |
||
122 | 122 | } |
123 | 123 | } |
124 | 124 | $return .= '</select>'; |
125 | - $xajax_response -> addAssign('ajax_list_multiple','innerHTML',api_utf8_encode($return)); |
|
125 | + $xajax_response -> addAssign('ajax_list_multiple', 'innerHTML', api_utf8_encode($return)); |
|
126 | 126 | } |
127 | 127 | |
128 | 128 | return $xajax_response; |
@@ -140,14 +140,14 @@ discard block |
||
140 | 140 | } |
141 | 141 | |
142 | 142 | echo '<div class="actions">'; |
143 | -echo '<a href="promotions.php">'.Display::return_icon('back.png',get_lang('Back'),'',ICON_SIZE_MEDIUM).'</a>'; |
|
143 | +echo '<a href="promotions.php">'.Display::return_icon('back.png', get_lang('Back'), '', ICON_SIZE_MEDIUM).'</a>'; |
|
144 | 144 | echo '</div>'; |
145 | 145 | ?> |
146 | 146 | |
147 | -<form name="formulaire" method="post" action="<?php echo api_get_self(); ?>?id=<?php echo $id; if(!empty($_GET['add'])) echo '&add=true' ; ?>" style="margin:0px;" <?php if($ajax_search){echo ' onsubmit="valide();"';}?>> |
|
147 | +<form name="formulaire" method="post" action="<?php echo api_get_self(); ?>?id=<?php echo $id; if (!empty($_GET['add'])) echo '&add=true'; ?>" style="margin:0px;" <?php if ($ajax_search) {echo ' onsubmit="valide();"'; }?>> |
|
148 | 148 | <?php echo '<legend>'.$tool_name.' '.$promotion_data['name'].'</legend>'; |
149 | 149 | |
150 | -if ($add_type=='multiple') { |
|
150 | +if ($add_type == 'multiple') { |
|
151 | 151 | if (is_array($extra_field_list)) { |
152 | 152 | if (is_array($new_field_list) && count($new_field_list) > 0) { |
153 | 153 | echo '<h3>'.get_lang('FilterUsers').'</h3>'; |
@@ -157,9 +157,9 @@ discard block |
||
157 | 157 | echo ' <select name="'.$varname.'">'; |
158 | 158 | echo '<option value="0">--'.get_lang('Select').'--</option>'; |
159 | 159 | foreach ($new_field['data'] as $option) { |
160 | - $checked=''; |
|
160 | + $checked = ''; |
|
161 | 161 | if (isset($_POST[$varname])) { |
162 | - if ($_POST[$varname]==$option[1]) { |
|
162 | + if ($_POST[$varname] == $option[1]) { |
|
163 | 163 | $checked = 'selected="true"'; |
164 | 164 | } |
165 | 165 | } |
@@ -189,7 +189,7 @@ discard block |
||
189 | 189 | <td align="center"><b><?php echo get_lang('SessionsInPromotion') ?> :</b></td> |
190 | 190 | </tr> |
191 | 191 | |
192 | -<?php if ($add_type=='multiple') { ?> |
|
192 | +<?php if ($add_type == 'multiple') { ?> |
|
193 | 193 | <tr> |
194 | 194 | <td align="center"> |
195 | 195 | <?php echo get_lang('FirstLetterSessions'); ?> : |
@@ -207,7 +207,7 @@ discard block |
||
207 | 207 | <td align="center"> |
208 | 208 | <div id="content_source"> |
209 | 209 | <?php |
210 | - if (!($add_type=='multiple')) { |
|
210 | + if (!($add_type == 'multiple')) { |
|
211 | 211 | ?> |
212 | 212 | <input type="text" id="user_to_add" onkeyup="xajax_search_users(this.value,'single')" /> |
213 | 213 | <div id="ajax_list_users_single"></div> |
@@ -215,7 +215,7 @@ discard block |
||
215 | 215 | } else { |
216 | 216 | ?> |
217 | 217 | <div id="ajax_list_multiple"> |
218 | - <?php echo Display::select('session_not_in_promotion_name',$session_not_in_promotion, '',array('style'=>'width:360px', 'multiple'=>'multiple','id'=>'session_not_in_promotion','size'=>'15px'),false); ?> |
|
218 | + <?php echo Display::select('session_not_in_promotion_name', $session_not_in_promotion, '', array('style'=>'width:360px', 'multiple'=>'multiple', 'id'=>'session_not_in_promotion', 'size'=>'15px'), false); ?> |
|
219 | 219 | </div> |
220 | 220 | <?php |
221 | 221 | } |
@@ -250,7 +250,7 @@ discard block |
||
250 | 250 | 'session_in_promotion_name[]', |
251 | 251 | $session_in_promotion, |
252 | 252 | '', |
253 | - array('style'=>'width:360px', 'multiple'=>'multiple','id'=>'session_in_promotion','size'=>'15px'), |
|
253 | + array('style'=>'width:360px', 'multiple'=>'multiple', 'id'=>'session_in_promotion', 'size'=>'15px'), |
|
254 | 254 | false |
255 | 255 | ); |
256 | 256 | unset($sessionUsersList); |
@@ -144,7 +144,10 @@ |
||
144 | 144 | echo '</div>'; |
145 | 145 | ?> |
146 | 146 | |
147 | -<form name="formulaire" method="post" action="<?php echo api_get_self(); ?>?id=<?php echo $id; if(!empty($_GET['add'])) echo '&add=true' ; ?>" style="margin:0px;" <?php if($ajax_search){echo ' onsubmit="valide();"';}?>> |
|
147 | +<form name="formulaire" method="post" action="<?php echo api_get_self(); ?>?id=<?php echo $id; if(!empty($_GET['add'])) { |
|
148 | + echo '&add=true' ; |
|
149 | +} |
|
150 | +?>" style="margin:0px;" <?php if($ajax_search){echo ' onsubmit="valide();"';}?>> |
|
148 | 151 | <?php echo '<legend>'.$tool_name.' '.$promotion_data['name'].'</legend>'; |
149 | 152 | |
150 | 153 | if ($add_type=='multiple') { |