Passed
Push — 1.10.x ( 767d99...288426 )
by Yannick
44:51
created
main/group/group_overview.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -15,7 +15,7 @@  discard block
 block discarded – undo
15 15
  */
16 16
 require_once '../inc/global.inc.php';
17 17
 $this_section = SECTION_COURSES;
18
-$current_course_tool  = TOOL_GROUP;
18
+$current_course_tool = TOOL_GROUP;
19 19
 
20 20
 // Notice for unauthorized people.
21 21
 api_protect_course_script(true);
@@ -85,29 +85,29 @@  discard block
 block discarded – undo
85 85
         Display::return_icon('add.png', get_lang('NewGroupCreate'), '', ICON_SIZE_MEDIUM).'</a>';
86 86
 
87 87
     if (api_get_setting('allow_group_categories') == 'true') {
88
-        $actions.= '<a href="group_category.php?'.api_get_cidreq().'&action=add_category">'.
88
+        $actions .= '<a href="group_category.php?'.api_get_cidreq().'&action=add_category">'.
89 89
             Display::return_icon('new_folder.png', get_lang('AddCategory'), '', ICON_SIZE_MEDIUM).'</a>';
90 90
     } else {
91
-        $actions.= '<a href="group_category.php?'.api_get_cidreq().'&id=2">'.
91
+        $actions .= '<a href="group_category.php?'.api_get_cidreq().'&id=2">'.
92 92
             Display::return_icon('settings.png', get_lang('PropModify'), '', ICON_SIZE_MEDIUM).'</a>';
93 93
     }
94
-    $actions.= '<a href="import.php?'.api_get_cidreq().'&action=import">'.
94
+    $actions .= '<a href="import.php?'.api_get_cidreq().'&action=import">'.
95 95
         Display::return_icon('import_csv.png', get_lang('Import'), '', ICON_SIZE_MEDIUM).'</a>';
96 96
 
97
-    $actions.= '<a href="group_overview.php?'.api_get_cidreq().'&action=export_all&type=csv">'.
97
+    $actions .= '<a href="group_overview.php?'.api_get_cidreq().'&action=export_all&type=csv">'.
98 98
         Display::return_icon('export_csv.png', get_lang('Export'), '', ICON_SIZE_MEDIUM).'</a>';
99 99
 
100
-    $actions.= '<a href="group_overview.php?'.api_get_cidreq().'&action=export&type=xls">'.
100
+    $actions .= '<a href="group_overview.php?'.api_get_cidreq().'&action=export&type=xls">'.
101 101
     Display::return_icon('export_excel.png', get_lang('ExportAsXLS'), '', ICON_SIZE_MEDIUM).'</a>';
102 102
 
103
-    $actions.= '<a href="group_overview.php?'.api_get_cidreq().'&action=export_pdf">'.
103
+    $actions .= '<a href="group_overview.php?'.api_get_cidreq().'&action=export_pdf">'.
104 104
         Display::return_icon('pdf.png', get_lang('ExportToPDF'), '', ICON_SIZE_MEDIUM).'</a>';
105 105
 
106
-    $actions.= '<a href="group.php?'.api_get_cidreq().'">'.
107
-        Display::return_icon('group.png', get_lang('Groups'),'',ICON_SIZE_MEDIUM).'</a>';
106
+    $actions .= '<a href="group.php?'.api_get_cidreq().'">'.
107
+        Display::return_icon('group.png', get_lang('Groups'), '', ICON_SIZE_MEDIUM).'</a>';
108 108
 
109 109
 
110
-    $actions.= '<a href="../user/user.php?'.api_get_cidreq().'">'.
110
+    $actions .= '<a href="../user/user.php?'.api_get_cidreq().'">'.
111 111
     Display::return_icon('user.png', get_lang('GoTo').' '.get_lang('Users'), '', ICON_SIZE_MEDIUM).'</a>';
112 112
 
113 113
 // Action links
Please login to merge, or discard this patch.
main/group/group.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -20,7 +20,7 @@  discard block
 block discarded – undo
20 20
 $userId = api_get_user_id();
21 21
 
22 22
 $this_section = SECTION_COURSES;
23
-$current_course_tool  = TOOL_GROUP;
23
+$current_course_tool = TOOL_GROUP;
24 24
 
25 25
 // Notice for unauthorized people.
26 26
 api_protect_course_script(true);
@@ -42,7 +42,7 @@  discard block
 block discarded – undo
42 42
  * Self-registration and un-registration
43 43
  */
44 44
 $my_group_id = isset($_GET['group_id']) ? intval($_GET['group_id']) : null;
45
-$my_msg	= isset($_GET['msg']) ? Security::remove_XSS($_GET['msg']) : null;
45
+$my_msg = isset($_GET['msg']) ? Security::remove_XSS($_GET['msg']) : null;
46 46
 $my_group = isset($_REQUEST['group']) ? Security::remove_XSS($_REQUEST['group']) : null;
47 47
 $my_get_id1 = isset($_GET['id1']) ? Security::remove_XSS($_GET['id1']) : null;
48 48
 $my_get_id2 = isset($_GET['id2']) ? Security::remove_XSS($_GET['id2']) : null;
@@ -169,7 +169,7 @@  discard block
 block discarded – undo
169 169
         Display::return_icon('add-groups.png', get_lang('NewGroupCreate'), '', ICON_SIZE_MEDIUM).'</a>';
170 170
 
171 171
     if (api_get_setting('allow_group_categories') == 'true') {
172
-        $actionsLeft .=  '<a href="group_category.php?'.api_get_cidreq().'&action=add_category">'.
172
+        $actionsLeft .= '<a href="group_category.php?'.api_get_cidreq().'&action=add_category">'.
173 173
             Display::return_icon('new_folder.png', get_lang('AddCategory'), '', ICON_SIZE_MEDIUM).'</a>';
174 174
     } else {
175 175
         $actionsLeft .= '<a href="group_category.php?'.api_get_cidreq().'&id=2">'.
@@ -194,7 +194,7 @@  discard block
 block discarded – undo
194 194
 
195 195
 
196 196
 $actionsRight = GroupManager::getSearchForm();
197
-$toolbar = Display::toolbarAction('toolbar-groups', $content = array( 0 => $actionsLeft, 1 => $actionsRight ));
197
+$toolbar = Display::toolbarAction('toolbar-groups', $content = array(0 => $actionsLeft, 1 => $actionsRight));
198 198
 $group_cats = GroupManager::get_categories(api_get_course_id());
199 199
 
200 200
 echo $toolbar;
@@ -225,7 +225,7 @@  discard block
 block discarded – undo
225 225
         $actions = null;
226 226
         if (api_is_allowed_to_edit(false, true) && !empty($categoryId)) {
227 227
             $actions .= '<a href="group_category.php?'.api_get_cidreq().'&id='.$categoryId.'" title="'.get_lang('Edit').'">'.
228
-                Display::return_icon('edit.png', get_lang('EditGroup'),'',ICON_SIZE_SMALL).'</a>';
228
+                Display::return_icon('edit.png', get_lang('EditGroup'), '', ICON_SIZE_SMALL).'</a>';
229 229
             $actions .=
230 230
                 Display::url(
231 231
                     Display::return_icon('delete.png', get_lang('Delete'), '', ICON_SIZE_SMALL),
@@ -235,17 +235,17 @@  discard block
 block discarded – undo
235 235
                     )
236 236
                 );
237 237
             if ($index != 0) {
238
-                $actions .=  ' <a href="group.php?'.api_get_cidreq().'&action=swap_cat_order&id1='.$categoryId.'&id2='.$group_cats[$index -1]['id'].'">'.
239
-                    Display::return_icon('up.png','&nbsp;','',ICON_SIZE_SMALL).'</a>';
238
+                $actions .= ' <a href="group.php?'.api_get_cidreq().'&action=swap_cat_order&id1='.$categoryId.'&id2='.$group_cats[$index - 1]['id'].'">'.
239
+                    Display::return_icon('up.png', '&nbsp;', '', ICON_SIZE_SMALL).'</a>';
240 240
             }
241 241
             if ($index != count($group_cats) - 1) {
242
-                $actions .= ' <a href="group.php?'.api_get_cidreq().'&action=swap_cat_order&id1='.$categoryId.'&id2='.$group_cats[$index +1]['id'].'">'.
243
-                    Display::return_icon('down.png','&nbsp;','',ICON_SIZE_SMALL).'</a>';
242
+                $actions .= ' <a href="group.php?'.api_get_cidreq().'&action=swap_cat_order&id1='.$categoryId.'&id2='.$group_cats[$index + 1]['id'].'">'.
243
+                    Display::return_icon('down.png', '&nbsp;', '', ICON_SIZE_SMALL).'</a>';
244 244
             }
245 245
         }
246 246
 
247 247
         echo Display::page_header(
248
-            Security::remove_XSS($category['title'].' '. $label.' ').$actions,
248
+            Security::remove_XSS($category['title'].' '.$label.' ').$actions,
249 249
             null,
250 250
             'h4',
251 251
             false
Please login to merge, or discard this patch.
main/group/settings.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -12,7 +12,7 @@
 block discarded – undo
12 12
 
13 13
 require_once '../inc/global.inc.php';
14 14
 $this_section = SECTION_COURSES;
15
-$current_course_tool  = TOOL_GROUP;
15
+$current_course_tool = TOOL_GROUP;
16 16
 
17 17
 // Notice for unauthorized people.
18 18
 api_protect_course_script(true);
Please login to merge, or discard this patch.
main/group/group_edit.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -13,7 +13,7 @@  discard block
 block discarded – undo
13 13
 
14 14
 require '../inc/global.inc.php';
15 15
 $this_section = SECTION_COURSES;
16
-$current_course_tool  = TOOL_GROUP;
16
+$current_course_tool = TOOL_GROUP;
17 17
 
18 18
 // Notice for unauthorized people.
19 19
 api_protect_course_script(true);
@@ -22,8 +22,8 @@  discard block
 block discarded – undo
22 22
 $current_group = GroupManager :: get_group_properties($group_id);
23 23
 
24 24
 $nameTools = get_lang('EditGroup');
25
-$interbreadcrumb[] = array ('url' => 'group.php?'.api_get_cidReq(), 'name' => get_lang('Groups'));
26
-$interbreadcrumb[] = array ('url' => 'group_space.php?'.api_get_cidReq(), 'name' => $current_group['name']);
25
+$interbreadcrumb[] = array('url' => 'group.php?'.api_get_cidReq(), 'name' => get_lang('Groups'));
26
+$interbreadcrumb[] = array('url' => 'group_space.php?'.api_get_cidReq(), 'name' => $current_group['name']);
27 27
 
28 28
 $is_group_member = GroupManager :: is_tutor_of_group(api_get_user_id(), $group_id);
29 29
 
@@ -104,7 +104,7 @@  discard block
 block discarded – undo
104 104
         return true;
105 105
     }
106 106
     if (isset($value['max_member']) && isset($value['group_members']) && $value['max_member'] < count($value['group_members'])) {
107
-        return array ('group_members' => get_lang('GroupTooMuchMembers'));
107
+        return array('group_members' => get_lang('GroupTooMuchMembers'));
108 108
     }
109 109
     return true;
110 110
 }
@@ -130,7 +130,7 @@  discard block
 block discarded – undo
130 130
 $form->addText('name', get_lang('GroupName'));
131 131
 
132 132
 // Description
133
-$form->addElement('textarea', 'description', get_lang('Description'), array ('rows' => 6));
133
+$form->addElement('textarea', 'description', get_lang('Description'), array('rows' => 6));
134 134
 
135 135
 $complete_user_list = GroupManager :: fill_groups_list($current_group['id']);
136 136
 usort($complete_user_list, 'sort_users');
@@ -153,7 +153,7 @@  discard block
 block discarded – undo
153 153
 // Group members
154 154
 $group_member_list = GroupManager :: get_subscribed_users($current_group['id']);
155 155
 
156
-$selected_users = array ();
156
+$selected_users = array();
157 157
 foreach ($group_member_list as $index => $user) {
158 158
     $selected_users[] = $user['user_id'];
159 159
 }
@@ -183,42 +183,42 @@  discard block
 block discarded – undo
183 183
     $form->createElement('checkbox', 'self_registration_allowed', get_lang('GroupSelfRegistration'), get_lang('GroupAllowStudentRegistration'), 1),
184 184
     $form->createElement('checkbox', 'self_unregistration_allowed', null, get_lang('GroupAllowStudentUnregistration'), 1)
185 185
 );
186
-$form->addGroup($group, '', Display::return_icon('user.png', get_lang('GroupSelfRegistration') , array(), ICON_SIZE_SMALL).' '.get_lang('GroupSelfRegistration'), '', false);
186
+$form->addGroup($group, '', Display::return_icon('user.png', get_lang('GroupSelfRegistration'), array(), ICON_SIZE_SMALL).' '.get_lang('GroupSelfRegistration'), '', false);
187 187
 
188 188
 // Documents settings
189 189
 $group = array();
190 190
 $group[] = $form->createElement('radio', 'doc_state', get_lang('GroupDocument'), get_lang('NotAvailable'), GroupManager::TOOL_NOT_AVAILABLE);
191 191
 $group[] = $form->createElement('radio', 'doc_state', null, get_lang('Public'), GroupManager::TOOL_PUBLIC);
192 192
 $group[] = $form->createElement('radio', 'doc_state', null, get_lang('Private'), GroupManager::TOOL_PRIVATE);
193
-$form->addGroup($group, '', Display::return_icon('folder.png', get_lang('GroupDocument') , array(), ICON_SIZE_SMALL).' '.get_lang('GroupDocument'), '', false);
193
+$form->addGroup($group, '', Display::return_icon('folder.png', get_lang('GroupDocument'), array(), ICON_SIZE_SMALL).' '.get_lang('GroupDocument'), '', false);
194 194
 
195 195
 // Work settings
196 196
 $group = array();
197 197
 $group[] = $form->createElement('radio', 'work_state', get_lang('GroupWork'), get_lang('NotAvailable'), GroupManager::TOOL_NOT_AVAILABLE);
198 198
 $group[] = $form->createElement('radio', 'work_state', null, get_lang('Public'), GroupManager::TOOL_PUBLIC);
199 199
 $group[] = $form->createElement('radio', 'work_state', null, get_lang('Private'), GroupManager::TOOL_PRIVATE);
200
-$form->addGroup($group, '', Display::return_icon('work.png', get_lang('GroupWork') , array(), ICON_SIZE_SMALL).' '.get_lang('GroupWork'), '', false);
200
+$form->addGroup($group, '', Display::return_icon('work.png', get_lang('GroupWork'), array(), ICON_SIZE_SMALL).' '.get_lang('GroupWork'), '', false);
201 201
 
202 202
 // Calendar settings
203 203
 $group = array();
204 204
 $group[] = $form->createElement('radio', 'calendar_state', get_lang('GroupCalendar'), get_lang('NotAvailable'), GroupManager::TOOL_NOT_AVAILABLE);
205 205
 $group[] = $form->createElement('radio', 'calendar_state', null, get_lang('Public'), GroupManager::TOOL_PUBLIC);
206 206
 $group[] = $form->createElement('radio', 'calendar_state', null, get_lang('Private'), GroupManager::TOOL_PRIVATE);
207
-$form->addGroup($group, '', Display::return_icon('agenda.png', get_lang('GroupCalendar') , array(), ICON_SIZE_SMALL).' '.get_lang('GroupCalendar'), '', false);
207
+$form->addGroup($group, '', Display::return_icon('agenda.png', get_lang('GroupCalendar'), array(), ICON_SIZE_SMALL).' '.get_lang('GroupCalendar'), '', false);
208 208
 
209 209
 // Announcements settings
210 210
 $group = array();
211 211
 $group[] = $form->createElement('radio', 'announcements_state', get_lang('GroupAnnouncements'), get_lang('NotAvailable'), GroupManager::TOOL_NOT_AVAILABLE);
212 212
 $group[] = $form->createElement('radio', 'announcements_state', null, get_lang('Public'), GroupManager::TOOL_PUBLIC);
213 213
 $group[] = $form->createElement('radio', 'announcements_state', null, get_lang('Private'), GroupManager::TOOL_PRIVATE);
214
-$form->addGroup($group, '', Display::return_icon('announce.png', get_lang('GroupAnnouncements') , array(), ICON_SIZE_SMALL).' '.get_lang('GroupAnnouncements'), '', false);
214
+$form->addGroup($group, '', Display::return_icon('announce.png', get_lang('GroupAnnouncements'), array(), ICON_SIZE_SMALL).' '.get_lang('GroupAnnouncements'), '', false);
215 215
 
216 216
 //Forum settings
217 217
 $group = array();
218 218
 $group[] = $form->createElement('radio', 'forum_state', get_lang('GroupForum'), get_lang('NotAvailable'), GroupManager::TOOL_NOT_AVAILABLE);
219 219
 $group[] = $form->createElement('radio', 'forum_state', null, get_lang('Public'), GroupManager::TOOL_PUBLIC);
220 220
 $group[] = $form->createElement('radio', 'forum_state', null, get_lang('Private'), GroupManager::TOOL_PRIVATE);
221
-$form->addGroup($group, '', Display::return_icon('forum.png', get_lang('GroupForum') , array(), ICON_SIZE_SMALL).' '.get_lang('GroupForum'), '', false);
221
+$form->addGroup($group, '', Display::return_icon('forum.png', get_lang('GroupForum'), array(), ICON_SIZE_SMALL).' '.get_lang('GroupForum'), '', false);
222 222
 
223 223
 // Wiki settings
224 224
 $group = array(
@@ -226,7 +226,7 @@  discard block
 block discarded – undo
226 226
     $form->createElement('radio', 'wiki_state', null, get_lang('Public'), GroupManager::TOOL_PUBLIC),
227 227
     $form->createElement('radio', 'wiki_state', null, get_lang('Private'), GroupManager::TOOL_PRIVATE)
228 228
 );
229
-$form->addGroup($group, '', Display::return_icon('wiki.png', get_lang('GroupWiki') , array(), ICON_SIZE_SMALL).' '.get_lang('GroupWiki'), '', false);
229
+$form->addGroup($group, '', Display::return_icon('wiki.png', get_lang('GroupWiki'), array(), ICON_SIZE_SMALL).' '.get_lang('GroupWiki'), '', false);
230 230
 
231 231
 // Chat settings
232 232
 $group = array(
Please login to merge, or discard this patch.
main/group/tutor_settings.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -13,7 +13,7 @@  discard block
 block discarded – undo
13 13
 
14 14
 require_once '../inc/global.inc.php';
15 15
 $this_section = SECTION_COURSES;
16
-$current_course_tool  = TOOL_GROUP;
16
+$current_course_tool = TOOL_GROUP;
17 17
 
18 18
 // Notice for unauthorized people.
19 19
 api_protect_course_script(true);
@@ -22,8 +22,8 @@  discard block
 block discarded – undo
22 22
 $current_group = GroupManager :: get_group_properties($group_id);
23 23
 
24 24
 $nameTools = get_lang('EditGroup');
25
-$interbreadcrumb[] = array ('url' => 'group.php?'.api_get_cidReq(), 'name' => get_lang('Groups'));
26
-$interbreadcrumb[] = array ('url' => 'group_space.php?'.api_get_cidReq(), 'name' => $current_group['name']);
25
+$interbreadcrumb[] = array('url' => 'group.php?'.api_get_cidReq(), 'name' => get_lang('Groups'));
26
+$interbreadcrumb[] = array('url' => 'group_space.php?'.api_get_cidReq(), 'name' => $current_group['name']);
27 27
 
28 28
 $is_group_member = GroupManager :: is_tutor_of_group(api_get_user_id(), $group_id);
29 29
 
Please login to merge, or discard this patch.
main/group/group_category.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -7,12 +7,12 @@  discard block
 block discarded – undo
7 7
 
8 8
 require_once '../inc/global.inc.php';
9 9
 $this_section = SECTION_COURSES;
10
-$current_course_tool  = TOOL_GROUP;
10
+$current_course_tool = TOOL_GROUP;
11 11
 
12 12
 // Notice for unauthorized people.
13 13
 api_protect_course_script(true);
14 14
 
15
-if (!api_is_allowed_to_edit(false,true) ||
15
+if (!api_is_allowed_to_edit(false, true) ||
16 16
     !(isset ($_GET['id']) ||
17 17
     isset ($_POST['id']) ||
18 18
     isset ($_GET['action']) ||
@@ -59,7 +59,7 @@  discard block
 block discarded – undo
59 59
             'groups_per_user' => 1,
60 60
             'doc_state' => GroupManager::TOOL_PRIVATE,
61 61
             'work_state' => GroupManager::TOOL_PRIVATE,
62
-            'wiki_state' => GroupManager::TOOL_PRIVATE ,
62
+            'wiki_state' => GroupManager::TOOL_PRIVATE,
63 63
             'chat_state' => GroupManager::TOOL_PRIVATE,
64 64
             'calendar_state' => GroupManager::TOOL_PRIVATE,
65 65
             'announcements_state'=> GroupManager::TOOL_PRIVATE,
@@ -113,7 +113,7 @@  discard block
 block discarded – undo
113 113
 
114 114
     // Groups per user
115 115
     $possible_values = array();
116
-    for ($i = 1; $i <= 10; $i ++) {
116
+    for ($i = 1; $i <= 10; $i++) {
117 117
         $possible_values[$i] = $i;
118 118
     }
119 119
     $possible_values[GroupManager::GROUP_PER_MEMBER_NO_LIMIT] = get_lang('All');
@@ -138,7 +138,7 @@  discard block
 block discarded – undo
138 138
 
139 139
     $form->addElement('html', '<div class="col-md-6">');
140 140
     // Description
141
-    $form->addElement('textarea', 'description', get_lang('Description'), array ('rows' => 6));
141
+    $form->addElement('textarea', 'description', get_lang('Description'), array('rows' => 6));
142 142
     $form->addElement('html', '</div>');
143 143
     $form->addElement('html', '</div>');
144 144
 } else {
@@ -286,7 +286,7 @@  discard block
 block discarded – undo
286 286
 // actions bar
287 287
 echo '<div class="actions">';
288 288
 echo '<a href="group.php">'.
289
-    Display::return_icon('back.png', get_lang('BackToGroupList'),'',ICON_SIZE_MEDIUM).'</a>';
289
+    Display::return_icon('back.png', get_lang('BackToGroupList'), '', ICON_SIZE_MEDIUM).'</a>';
290 290
 echo '</div>';
291 291
 
292 292
 $defaults = $category;
Please login to merge, or discard this patch.
main/group/member_settings.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -13,7 +13,7 @@  discard block
 block discarded – undo
13 13
 
14 14
 require_once '../inc/global.inc.php';
15 15
 $this_section = SECTION_COURSES;
16
-$current_course_tool  = TOOL_GROUP;
16
+$current_course_tool = TOOL_GROUP;
17 17
 
18 18
 // Notice for unauthorized people.
19 19
 api_protect_course_script(true);
@@ -162,7 +162,7 @@  discard block
 block discarded – undo
162 162
 // Group members
163 163
 $group_member_list = GroupManager::get_subscribed_users($current_group['id']);
164 164
 
165
-$selected_users = array ();
165
+$selected_users = array();
166 166
 if (!empty($group_member_list)) {
167 167
     foreach ($group_member_list as $index => $user) {
168 168
         $selected_users[] = $user['user_id'];
Please login to merge, or discard this patch.
main/dropbox/dropbox_download.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -50,7 +50,7 @@  discard block
 block discarded – undo
50 50
                 ON (post.file_id = file.id AND post.c_id = $course_id AND file.c_id = $course_id)
51 51
                 WHERE
52 52
                     post.cat_id = ".intval($_GET['cat_id'])." AND
53
-                    post.dest_user_id = $user_id" ;
53
+                    post.dest_user_id = $user_id";
54 54
     }
55 55
     $files_to_download = array();
56 56
     $result = Database::query($sql);
@@ -96,7 +96,7 @@  discard block
 block discarded – undo
96 96
     $_SESSION['_seen'][$_course['id']][TOOL_DROPBOX][] = intval($_GET['id']);
97 97
 
98 98
     $work = new Dropbox_Work($_GET['id']);
99
-    $path = dropbox_cnf('sysPath') . '/' . $work -> filename; //path to file as stored on server
99
+    $path = dropbox_cnf('sysPath').'/'.$work -> filename; //path to file as stored on server
100 100
 
101 101
     if (!Security::check_abs_path($path, dropbox_cnf('sysPath').'/')) {
102 102
         exit;
Please login to merge, or discard this patch.
main/dropbox/dropbox_class.inc.php 1 patch
Spacing   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -184,7 +184,7 @@  discard block
 block discarded – undo
184 184
         $action = isset($_GET['action']) ? $_GET['action'] : null;
185 185
 
186 186
         // Do some sanity checks
187
-        $id	= intval($id);
187
+        $id = intval($id);
188 188
 
189 189
         // Get the data from DB
190 190
         $sql = "SELECT uploader_id, filename, filesize, title, description, author, upload_date, last_upload_date, cat_id
@@ -226,14 +226,14 @@  discard block
 block discarded – undo
226 226
                 $row_feedback['feedback'] = Security::remove_XSS($row_feedback['feedback']);
227 227
                 $feedback2[] = $row_feedback;
228 228
             }
229
-            $this->feedback2= $feedback2;
229
+            $this->feedback2 = $feedback2;
230 230
         }
231 231
 	}
232 232
 }
233 233
 
234 234
 class Dropbox_SentWork extends Dropbox_Work
235 235
 {
236
-	public $recipients;	//array of ['id']['name'] arrays
236
+	public $recipients; //array of ['id']['name'] arrays
237 237
 
238 238
 	/**
239 239
 	 * Constructor calls private functions to create a new work or retreive an existing work from DB
@@ -290,15 +290,15 @@  discard block
 block discarded – undo
290 290
 		settype($uploader_id, 'integer') or die(get_lang('GeneralError').' (code 208)'); // Set $uploader_id to correct type
291 291
 
292 292
 		$justSubmit = false;
293
-		if ( is_int($recipient_ids)) {
293
+		if (is_int($recipient_ids)) {
294 294
 			$justSubmit = true;
295 295
 			$recipient_ids = array($recipient_ids + $this->id);
296
-		} elseif ( count($recipient_ids) == 0) {
296
+		} elseif (count($recipient_ids) == 0) {
297 297
 			$justSubmit = true;
298 298
 			$recipient_ids = array($uploader_id);
299 299
 		}
300 300
 
301
-		if (! is_array($recipient_ids) || count($recipient_ids) == 0) {
301
+		if (!is_array($recipient_ids) || count($recipient_ids) == 0) {
302 302
 			die(get_lang('GeneralError').' (code 209)');
303 303
 		}
304 304
 
@@ -313,11 +313,11 @@  discard block
 block discarded – undo
313 313
         $table_person = $dropbox_cnf['tbl_person'];
314 314
         $session_id = api_get_session_id();
315 315
         $uploader_id = $this->uploader_id;
316
-        $user  = api_get_user_id();
316
+        $user = api_get_user_id();
317 317
 		// Insert data in dropbox_post and dropbox_person table for each recipient
318 318
 		foreach ($this->recipients as $rec) {
319
-            $file_id = (int)$this->id;
320
-            $user_id = (int)$rec['id'];
319
+            $file_id = (int) $this->id;
320
+            $user_id = (int) $rec['id'];
321 321
 			$sql = "INSERT INTO $table_post (c_id, file_id, dest_user_id, session_id)
322 322
                     VALUES ($course_id, $file_id, $user_id, $session_id)";
323 323
 	        Database::query($sql);
@@ -333,7 +333,7 @@  discard block
 block discarded – undo
333 333
 
334 334
                 // Do not add recipient in person table if mailing zip or just upload.
335 335
                 if (!$justSubmit) {
336
-                    Database::query($sql);	// If work already exists no error is generated
336
+                    Database::query($sql); // If work already exists no error is generated
337 337
                 }
338 338
             }
339 339
 
@@ -342,7 +342,7 @@  discard block
 block discarded – undo
342 342
 			    $ownerid = getUserOwningThisMailing($ownerid);
343 343
 			}
344 344
 			if (($recipid = $rec["id"]) > $dropbox_cnf['mailingIdBase']) {
345
-			    $recipid = $ownerid;  // mailing file recipient = mailing id, not a person
345
+			    $recipid = $ownerid; // mailing file recipient = mailing id, not a person
346 346
 			}
347 347
             api_item_property_update(
348 348
                 $_course,
@@ -401,13 +401,13 @@  discard block
 block discarded – undo
401 401
 class Dropbox_Person
402 402
 {
403 403
 	// The receivedWork and the sentWork arrays are sorted.
404
-	public $receivedWork;	// an array of Dropbox_Work objects
405
-	public $sentWork;		// an array of Dropbox_SentWork objects
404
+	public $receivedWork; // an array of Dropbox_Work objects
405
+	public $sentWork; // an array of Dropbox_SentWork objects
406 406
 
407 407
 	public $userId = 0;
408 408
 	public $isCourseAdmin = false;
409 409
 	public $isCourseTutor = false;
410
-	public $_orderBy = '';	// private property that determines by which field
410
+	public $_orderBy = ''; // private property that determines by which field
411 411
 
412 412
 	/**
413 413
 	 * Constructor for recreating the Dropbox_Person object
@@ -506,7 +506,7 @@  discard block
 block discarded – undo
506 506
 	 */
507 507
 	function orderSentWork($sort)
508 508
     {
509
-		switch($sort) {
509
+		switch ($sort) {
510 510
 			case 'lastDate':
511 511
 				$this->_orderBy = 'last_upload_date';
512 512
 				break;
@@ -539,7 +539,7 @@  discard block
 block discarded – undo
539 539
 	 */
540 540
 	function orderReceivedWork($sort)
541 541
     {
542
-		switch($sort) {
542
+		switch ($sort) {
543 543
 			case 'lastDate':
544 544
 				$this->_orderBy = 'last_upload_date';
545 545
 				break;
@@ -632,7 +632,7 @@  discard block
 block discarded – undo
632 632
         $sql = "DELETE FROM ".$dropbox_cnf['tbl_person']."
633 633
                 WHERE c_id = $course_id AND user_id = '".$this->userId."' AND file_id ='".$id."'";
634 634
 		Database::query($sql);
635
-		removeUnusedFiles();	// Check for unused files
635
+		removeUnusedFiles(); // Check for unused files
636 636
 	}
637 637
 
638 638
 	/**
@@ -649,7 +649,7 @@  discard block
 block discarded – undo
649 649
 			Database::query($sql);
650 650
 			removeMoreIfMailing($w->id);
651 651
 		}
652
-		removeUnusedFiles();	// Check for unused files
652
+		removeUnusedFiles(); // Check for unused files
653 653
 	}
654 654
 
655 655
 	/**
@@ -683,7 +683,7 @@  discard block
 block discarded – undo
683 683
                 WHERE c_id = $course_id AND user_id='".$this->userId."' AND file_id='".$id."'";
684 684
 		Database::query($sql);
685 685
 		removeMoreIfMailing($id);
686
-		removeUnusedFiles();	// Check for unused files
686
+		removeUnusedFiles(); // Check for unused files
687 687
 	}
688 688
 
689 689
 	/**
@@ -705,7 +705,7 @@  discard block
 block discarded – undo
705 705
 		$wi = -1;
706 706
 		foreach ($this->receivedWork as $w) {
707 707
 			$wi++;
708
-			if ($w->id == $id){
708
+			if ($w->id == $id) {
709 709
 			   $found = true;
710 710
 			   break;
711 711
 			}  // foreach (... as $wi -> $w) gives error 221! (no idea why...)
Please login to merge, or discard this patch.