@@ -161,9 +161,9 @@ |
||
161 | 161 | // possible : number_groups_left > 0 and is group member |
162 | 162 | $possible_users = array(); |
163 | 163 | foreach ($complete_user_list as $index => $user) { |
164 | - if ($user['number_groups_left'] > 0 || in_array($user['user_id'], $selected_users)) { |
|
164 | + if ($user['number_groups_left'] > 0 || in_array($user['user_id'], $selected_users)) { |
|
165 | 165 | $possible_users[$user['user_id']] = api_get_person_name($user['firstname'], $user['lastname']).' ('.$user['username'].')'; |
166 | - } |
|
166 | + } |
|
167 | 167 | } |
168 | 168 | |
169 | 169 | $group_members_element = $form->addElement('advmultiselect', 'group_members', get_lang('GroupMembers'), $possible_users, 'style="width: 280px;"'); |
@@ -18,7 +18,7 @@ discard block |
||
18 | 18 | isset ($_GET['action']) || |
19 | 19 | isset ($_POST['action'])) |
20 | 20 | ) { |
21 | - api_not_allowed(); |
|
21 | + api_not_allowed(); |
|
22 | 22 | } |
23 | 23 | |
24 | 24 | /** |
@@ -86,30 +86,30 @@ discard block |
||
86 | 86 | |
87 | 87 | // Build the form |
88 | 88 | if (isset($_GET['id'])) { |
89 | - // Update settings of existing category |
|
90 | - $action = 'update_settings'; |
|
89 | + // Update settings of existing category |
|
90 | + $action = 'update_settings'; |
|
91 | 91 | $form = new FormValidator( |
92 | 92 | 'group_category', |
93 | 93 | 'post', |
94 | 94 | api_get_self().'?id='.$category['id'].'&'.api_get_cidReq() |
95 | 95 | ); |
96 | - $form->addElement('hidden', 'id'); |
|
96 | + $form->addElement('hidden', 'id'); |
|
97 | 97 | } else { |
98 | 98 | // Checks if the field was created in the table Category. It creates it if is neccesary |
99 | 99 | $table_category = Database :: get_course_table(TABLE_GROUP_CATEGORY); |
100 | 100 | if (!Database::query("SELECT wiki_state FROM $table_category WHERE c_id = $course_id")) { |
101 | 101 | Database::query("ALTER TABLE $table_category ADD wiki_state tinyint(3) UNSIGNED NOT NULL default '1' WHERE c_id = $course_id"); |
102 | 102 | } |
103 | - // Create a new category |
|
104 | - $action = 'add_category'; |
|
105 | - $form = new FormValidator('group_category'); |
|
103 | + // Create a new category |
|
104 | + $action = 'add_category'; |
|
105 | + $form = new FormValidator('group_category'); |
|
106 | 106 | } |
107 | 107 | |
108 | 108 | // If categories allowed, show title & description field |
109 | 109 | if (api_get_setting('allow_group_categories') == 'true') { |
110 | 110 | $form->addElement('header', $nameTools); |
111 | 111 | $form->addElement('html', '<div class="row"><div class="col-md-6">'); |
112 | - $form->addText('title', get_lang('Title')); |
|
112 | + $form->addText('title', get_lang('Title')); |
|
113 | 113 | |
114 | 114 | // Groups per user |
115 | 115 | $possible_values = array(); |
@@ -142,8 +142,8 @@ discard block |
||
142 | 142 | $form->addElement('html', '</div>'); |
143 | 143 | $form->addElement('html', '</div>'); |
144 | 144 | } else { |
145 | - $form->addElement('hidden', 'title'); |
|
146 | - $form->addElement('hidden', 'description'); |
|
145 | + $form->addElement('hidden', 'title'); |
|
146 | + $form->addElement('hidden', 'description'); |
|
147 | 147 | } |
148 | 148 | |
149 | 149 | $form->addElement('header', get_lang('DefaultSettingsForNewGroups')); |
@@ -228,17 +228,17 @@ discard block |
||
228 | 228 | if ($form->validate()) { |
229 | 229 | $values = $form->exportValues(); |
230 | 230 | if ($values['max_member_no_limit'] == GroupManager::MEMBER_PER_GROUP_NO_LIMIT) { |
231 | - $max_member = GroupManager::MEMBER_PER_GROUP_NO_LIMIT; |
|
232 | - } else { |
|
233 | - $max_member = $values['max_member']; |
|
234 | - } |
|
231 | + $max_member = GroupManager::MEMBER_PER_GROUP_NO_LIMIT; |
|
232 | + } else { |
|
233 | + $max_member = $values['max_member']; |
|
234 | + } |
|
235 | 235 | |
236 | - $self_reg_allowed = isset($values['self_reg_allowed']) ? $values['self_reg_allowed'] : 0; |
|
237 | - $self_unreg_allowed = isset($values['self_unreg_allowed']) ? $values['self_unreg_allowed'] : 0; |
|
236 | + $self_reg_allowed = isset($values['self_reg_allowed']) ? $values['self_reg_allowed'] : 0; |
|
237 | + $self_unreg_allowed = isset($values['self_unreg_allowed']) ? $values['self_unreg_allowed'] : 0; |
|
238 | 238 | |
239 | - switch ($values['action']) { |
|
240 | - case 'update_settings': |
|
241 | - GroupManager::update_category( |
|
239 | + switch ($values['action']) { |
|
240 | + case 'update_settings': |
|
241 | + GroupManager::update_category( |
|
242 | 242 | $values['id'], |
243 | 243 | $values['title'], |
244 | 244 | $values['description'], |
@@ -257,8 +257,8 @@ discard block |
||
257 | 257 | Display::addFlash(Display::return_message(get_lang('GroupPropertiesModified'))); |
258 | 258 | header("Location: ".$currentUrl."&category=".$values['id']); |
259 | 259 | exit; |
260 | - case 'add_category': |
|
261 | - GroupManager :: create_category( |
|
260 | + case 'add_category': |
|
261 | + GroupManager :: create_category( |
|
262 | 262 | $values['title'], |
263 | 263 | $values['description'], |
264 | 264 | $values['doc_state'], |
@@ -276,8 +276,8 @@ discard block |
||
276 | 276 | Display::addFlash(Display::return_message(get_lang('CategoryCreated'))); |
277 | 277 | header("Location: ".$currentUrl); |
278 | 278 | exit; |
279 | - break; |
|
280 | - } |
|
279 | + break; |
|
280 | + } |
|
281 | 281 | } |
282 | 282 | |
283 | 283 | // Else display the form |
@@ -292,10 +292,10 @@ discard block |
||
292 | 292 | $defaults = $category; |
293 | 293 | $defaults['action'] = $action; |
294 | 294 | if ($defaults['max_student'] == GroupManager::MEMBER_PER_GROUP_NO_LIMIT) { |
295 | - $defaults['max_member_no_limit'] = GroupManager::MEMBER_PER_GROUP_NO_LIMIT; |
|
295 | + $defaults['max_member_no_limit'] = GroupManager::MEMBER_PER_GROUP_NO_LIMIT; |
|
296 | 296 | } else { |
297 | - $defaults['max_member_no_limit'] = 1; |
|
298 | - $defaults['max_member'] = $defaults['max_student']; |
|
297 | + $defaults['max_member_no_limit'] = 1; |
|
298 | + $defaults['max_member'] = $defaults['max_student']; |
|
299 | 299 | } |
300 | 300 | $form->setDefaults($defaults); |
301 | 301 | $form->display(); |
@@ -89,7 +89,7 @@ |
||
89 | 89 | 'error' |
90 | 90 | ) |
91 | 91 | ); |
92 | - exit; |
|
92 | + exit; |
|
93 | 93 | } else { |
94 | 94 | /* DOWNLOAD THE FILE */ |
95 | 95 | // the user is allowed to download the file |
@@ -33,21 +33,21 @@ discard block |
||
33 | 33 | $thisIsAMailing = false; |
34 | 34 | $thisIsJustUpload = false; |
35 | 35 | |
36 | - foreach ($_POST['recipients'] as $rec) { |
|
36 | + foreach ($_POST['recipients'] as $rec) { |
|
37 | 37 | if ($rec == 'mailing') { |
38 | - $thisIsAMailing = true; |
|
38 | + $thisIsAMailing = true; |
|
39 | 39 | } elseif ($rec == 'upload') { |
40 | - $thisIsJustUpload = true; |
|
40 | + $thisIsJustUpload = true; |
|
41 | 41 | } elseif (strpos($rec, 'user_') === 0 && !isCourseMember(substr($rec, strlen('user_')))) { |
42 | - echo '401'; |
|
43 | - die(get_lang('BadFormData').' (code 401)'); |
|
44 | - } elseif (strpos($rec, 'group_') !== 0 && strpos($rec, 'user_') !== 0) { |
|
45 | - echo '402'; |
|
46 | - die(get_lang('BadFormData').' (code 402)'); |
|
47 | - } |
|
42 | + echo '401'; |
|
43 | + die(get_lang('BadFormData').' (code 401)'); |
|
44 | + } elseif (strpos($rec, 'group_') !== 0 && strpos($rec, 'user_') !== 0) { |
|
45 | + echo '402'; |
|
46 | + die(get_lang('BadFormData').' (code 402)'); |
|
47 | + } |
|
48 | 48 | } |
49 | 49 | |
50 | - // we are doing a mailing but an additional recipient is selected |
|
50 | + // we are doing a mailing but an additional recipient is selected |
|
51 | 51 | if ($thisIsAMailing && ( count($_POST['recipients']) != 1)) { |
52 | 52 | $error = true; |
53 | 53 | $errormsg = get_lang('MailingSelectNoOther'); |
@@ -62,11 +62,11 @@ discard block |
||
62 | 62 | } |
63 | 63 | } |
64 | 64 | |
65 | - //check if $_POST['cb_overwrite'] is true or false |
|
66 | - $dropbox_overwrite = false; |
|
67 | - if (isset($_POST['cb_overwrite']) && $_POST['cb_overwrite']) { |
|
68 | - $dropbox_overwrite = true; |
|
69 | - } |
|
65 | + //check if $_POST['cb_overwrite'] is true or false |
|
66 | + $dropbox_overwrite = false; |
|
67 | + if (isset($_POST['cb_overwrite']) && $_POST['cb_overwrite']) { |
|
68 | + $dropbox_overwrite = true; |
|
69 | + } |
|
70 | 70 | |
71 | 71 | /** |
72 | 72 | * FORM SUBMIT : UPLOAD NEW FILE |
@@ -168,13 +168,13 @@ discard block |
||
168 | 168 | } |
169 | 169 | } |
170 | 170 | |
171 | - // After uploading the file, create the db entries |
|
171 | + // After uploading the file, create the db entries |
|
172 | 172 | |
173 | - if (!$error) { |
|
174 | - @move_uploaded_file($dropbox_filetmpname, dropbox_cnf('sysPath') . '/' . $dropbox_filename) |
|
175 | - or die(get_lang('UploadError').' (code 407)'); |
|
176 | - new Dropbox_SentWork($_user['user_id'], $dropbox_title, $_POST['description'], strip_tags($_POST['authors']), $dropbox_filename, $dropbox_filesize, $newWorkRecipients); |
|
177 | - } |
|
173 | + if (!$error) { |
|
174 | + @move_uploaded_file($dropbox_filetmpname, dropbox_cnf('sysPath') . '/' . $dropbox_filename) |
|
175 | + or die(get_lang('UploadError').' (code 407)'); |
|
176 | + new Dropbox_SentWork($_user['user_id'], $dropbox_title, $_POST['description'], strip_tags($_POST['authors']), $dropbox_filename, $dropbox_filesize, $newWorkRecipients); |
|
177 | + } |
|
178 | 178 | } |
179 | 179 | } |
180 | 180 | } //end if(!$error) |
@@ -183,9 +183,9 @@ discard block |
||
183 | 183 | * SUBMIT FORM RESULTMESSAGE |
184 | 184 | */ |
185 | 185 | if (!$error) { |
186 | - $return_message = get_lang('FileUploadSucces'); |
|
186 | + $return_message = get_lang('FileUploadSucces'); |
|
187 | 187 | } else { |
188 | - $return_message = $errormsg; |
|
188 | + $return_message = $errormsg; |
|
189 | 189 | } |
190 | 190 | } |
191 | 191 | |
@@ -199,25 +199,25 @@ discard block |
||
199 | 199 | */ |
200 | 200 | if (isset($_GET['deleteReceived']) || isset($_GET['deleteSent']) |
201 | 201 | || isset( $_GET['showFeedback']) || isset( $_GET['editFeedback'])) { |
202 | - if ($_GET['mailing']) { |
|
203 | - getUserOwningThisMailing($_GET['mailing'], $_user['user_id'], '408'); |
|
204 | - $dropbox_person = new Dropbox_Person($_GET['mailing'], $is_courseAdmin, $is_courseTutor); |
|
205 | - } else { |
|
206 | - $dropbox_person = new Dropbox_Person($_user['user_id'], $is_courseAdmin, $is_courseTutor); |
|
202 | + if ($_GET['mailing']) { |
|
203 | + getUserOwningThisMailing($_GET['mailing'], $_user['user_id'], '408'); |
|
204 | + $dropbox_person = new Dropbox_Person($_GET['mailing'], $is_courseAdmin, $is_courseTutor); |
|
205 | + } else { |
|
206 | + $dropbox_person = new Dropbox_Person($_user['user_id'], $is_courseAdmin, $is_courseTutor); |
|
207 | 207 | } |
208 | 208 | |
209 | - if (isset($_SESSION['sentOrder'])) { |
|
210 | - $dropbox_person->orderSentWork($_SESSION['sentOrder']); |
|
211 | - } |
|
212 | - if (isset($_SESSION['receivedOrder'])) { |
|
213 | - $dropbox_person->orderReceivedWork($_SESSION['receivedOrder']); |
|
214 | - } |
|
209 | + if (isset($_SESSION['sentOrder'])) { |
|
210 | + $dropbox_person->orderSentWork($_SESSION['sentOrder']); |
|
211 | + } |
|
212 | + if (isset($_SESSION['receivedOrder'])) { |
|
213 | + $dropbox_person->orderReceivedWork($_SESSION['receivedOrder']); |
|
214 | + } |
|
215 | 215 | |
216 | - /*if (!$dropbox_person->isCourseAdmin || ! $dropbox_person->isCourseTutor) { |
|
216 | + /*if (!$dropbox_person->isCourseAdmin || ! $dropbox_person->isCourseTutor) { |
|
217 | 217 | die(get_lang('GeneralError').' (code 408)'); |
218 | 218 | }*/ |
219 | 219 | |
220 | - $tellUser = get_lang('FileDeleted'); |
|
220 | + $tellUser = get_lang('FileDeleted'); |
|
221 | 221 | |
222 | 222 | if (isset($_GET['deleteReceived'])) { |
223 | 223 | if ($_GET['deleteReceived'] == 'all') { |
@@ -236,20 +236,20 @@ discard block |
||
236 | 236 | die(get_lang('GeneralError').' (code 410)'); |
237 | 237 | } |
238 | 238 | } elseif (isset($_GET['showFeedback'])) { |
239 | - $w = new Dropbox_SentWork($id = $_GET['showFeedback']); |
|
239 | + $w = new Dropbox_SentWork($id = $_GET['showFeedback']); |
|
240 | 240 | |
241 | - if ($w->uploader_id != $_user['user_id']) { |
|
242 | - getUserOwningThisMailing($w->uploader_id, $_user['user_id'], '411'); |
|
243 | - } |
|
241 | + if ($w->uploader_id != $_user['user_id']) { |
|
242 | + getUserOwningThisMailing($w->uploader_id, $_user['user_id'], '411'); |
|
243 | + } |
|
244 | 244 | |
245 | - foreach ($w -> recipients as $r) { |
|
246 | - if (($fb = $r['feedback'])) { |
|
247 | - $fbarray[$r['feedback_date'].$r['name']] = $r['name'].' '.get_lang('SentOn', '').' '.$r['feedback_date'].":\n".$fb; |
|
248 | - } |
|
249 | - } |
|
245 | + foreach ($w -> recipients as $r) { |
|
246 | + if (($fb = $r['feedback'])) { |
|
247 | + $fbarray[$r['feedback_date'].$r['name']] = $r['name'].' '.get_lang('SentOn', '').' '.$r['feedback_date'].":\n".$fb; |
|
248 | + } |
|
249 | + } |
|
250 | 250 | |
251 | - if ($fbarray) { |
|
252 | - krsort($fbarray); |
|
251 | + if ($fbarray) { |
|
252 | + krsort($fbarray); |
|
253 | 253 | echo '<textarea class="dropbox_feedbacks">', |
254 | 254 | htmlspecialchars(implode("\n\n", $fbarray), ENT_QUOTES, api_get_system_encoding()), '</textarea>', "\n"; |
255 | 255 | } else { |
@@ -261,13 +261,13 @@ discard block |
||
261 | 261 | } else { // if ( isset( $_GET['editFeedback'])) { |
262 | 262 | $id = $_GET['editFeedback']; |
263 | 263 | $found = false; |
264 | - foreach ($dropbox_person->receivedWork as $w) { |
|
265 | - if ($w->id == $id) { |
|
266 | - $found = true; |
|
267 | - break; |
|
268 | - } |
|
269 | - } |
|
270 | - if (!$found) die(get_lang('GeneralError').' (code 415)'); |
|
264 | + foreach ($dropbox_person->receivedWork as $w) { |
|
265 | + if ($w->id == $id) { |
|
266 | + $found = true; |
|
267 | + break; |
|
268 | + } |
|
269 | + } |
|
270 | + if (!$found) die(get_lang('GeneralError').' (code 415)'); |
|
271 | 271 | |
272 | 272 | echo '<form method="post" action="index.php">', "\n", |
273 | 273 | '<input type="hidden" name="feedbackid" value="', |
@@ -83,11 +83,11 @@ |
||
83 | 83 | if (strstr($_POST['action'], 'move_')) { |
84 | 84 | // check move_received_n or move_sent_n command |
85 | 85 | if (strstr($_POST['action'], 'received')) { |
86 | - $part = 'received'; |
|
87 | - $to_cat_id = str_replace('move_received_', '', $_POST['action']); |
|
86 | + $part = 'received'; |
|
87 | + $to_cat_id = str_replace('move_received_', '', $_POST['action']); |
|
88 | 88 | } else { |
89 | - $part = 'sent'; |
|
90 | - $to_cat_id = str_replace('move_sent_', '', $_POST['action']); |
|
89 | + $part = 'sent'; |
|
90 | + $to_cat_id = str_replace('move_sent_', '', $_POST['action']); |
|
91 | 91 | } |
92 | 92 | |
93 | 93 | foreach ($checked_file_ids as $value) { |
@@ -390,7 +390,7 @@ |
||
390 | 390 | * |
391 | 391 | */ |
392 | 392 | public function thematic_advance($action) |
393 | - { |
|
393 | + { |
|
394 | 394 | $thematic = new Thematic(); |
395 | 395 | $attendance = new Attendance(); |
396 | 396 | $data = array(); |
@@ -47,15 +47,15 @@ |
||
47 | 47 | $form->addElement('hidden', 'description_type['.$id.']', $id); |
48 | 48 | $form->addText('title['.$id.']', get_lang('Title'), false, array('size'=>'50')); |
49 | 49 | $form->addHtmlEditor( |
50 | - 'description['.$id.']', |
|
51 | - get_lang('Description'), |
|
52 | - false, |
|
53 | - false, |
|
54 | - array( |
|
55 | - 'ToolbarStartExpanded' => 'false', |
|
56 | - 'ToolbarSet' => 'TrainingDescription', |
|
57 | - 'Height' => '150' |
|
58 | - ) |
|
50 | + 'description['.$id.']', |
|
51 | + get_lang('Description'), |
|
52 | + false, |
|
53 | + false, |
|
54 | + array( |
|
55 | + 'ToolbarStartExpanded' => 'false', |
|
56 | + 'ToolbarSet' => 'TrainingDescription', |
|
57 | + 'Height' => '150' |
|
58 | + ) |
|
59 | 59 | ); |
60 | 60 | |
61 | 61 | if (!empty($thematic_simple_list) && in_array($id, $thematic_simple_list)) { |
@@ -40,7 +40,7 @@ |
||
40 | 40 | |
41 | 41 | // Using the resource linker as a tool for adding resources to the learning path. |
42 | 42 | if ($action == 'add' and $type == 'learnpathitem') { |
43 | - $htmlHeadXtra[] = "<script> window.location=\"../resourcelinker/resourcelinker.php?source_id=5&action=$action&learnpath_id=$learnpath_id&chapter_id=$chapter_id&originalresource=no\"; </script>"; |
|
43 | + $htmlHeadXtra[] = "<script> window.location=\"../resourcelinker/resourcelinker.php?source_id=5&action=$action&learnpath_id=$learnpath_id&chapter_id=$chapter_id&originalresource=no\"; </script>"; |
|
44 | 44 | } |
45 | 45 | if ((!$is_allowed_to_edit) || ($isStudentView)) { |
46 | 46 | error_log('New LP - User not authorized in lp_admin_view.php'); |
@@ -160,8 +160,8 @@ discard block |
||
160 | 160 | $form->addElement('checkbox', 'activate_start_date_check', null,get_lang('EnableStartTime'), array('onclick' => 'activate_start_date()')); |
161 | 161 | $display_date = 'none'; |
162 | 162 | if ($publicated_on!='0000-00-00 00:00:00' && !empty($publicated_on)) { |
163 | - $display_date = 'block'; |
|
164 | - $defaults['activate_start_date_check'] = 1; |
|
163 | + $display_date = 'block'; |
|
164 | + $defaults['activate_start_date_check'] = 1; |
|
165 | 165 | } |
166 | 166 | |
167 | 167 | $form->addElement('html','<div id="start_date_div" style="display:'.$display_date.';">'); |
@@ -172,8 +172,8 @@ discard block |
||
172 | 172 | $form->addElement('checkbox', 'activate_end_date_check', null, get_lang('EnableEndTime'), array('onclick' => 'activate_end_date()')); |
173 | 173 | $display_date = 'none'; |
174 | 174 | if ($expired_on!='0000-00-00 00:00:00' && !empty($expired_on)) { |
175 | - $display_date = 'block'; |
|
176 | - $defaults['activate_end_date_check'] = 1; |
|
175 | + $display_date = 'block'; |
|
176 | + $defaults['activate_end_date_check'] = 1; |
|
177 | 177 | } |
178 | 178 | |
179 | 179 | $form->addElement('html','<div id="end_date_div" style="display:'.$display_date.';">'); |