Completed
Push — 1.11.x ( 253320...1d91e0 )
by José
124:55 queued 86:48
created
main/template/default/auth/categories_list.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -16,7 +16,7 @@
 block discarded – undo
16 16
 <!-- Actions: The menu with the different options in cathe course management -->
17 17
 <div id="actions" class="actions">
18 18
     <a href="<?php echo api_get_self() ?>?action=sortmycourses">
19
-        <?php echo Display::return_icon('back.png', get_lang('Back'),'','32'); ?>
19
+        <?php echo Display::return_icon('back.png', get_lang('Back'), '', '32'); ?>
20 20
     </a>
21 21
 </div>
22 22
 
Please login to merge, or discard this patch.
main/upload/upload.document.php 3 patches
Braces   +9 added lines, -4 removed lines patch added patch discarded remove patch
@@ -65,12 +65,17 @@
 block discarded – undo
65 65
     	$new_comment = isset($_POST['comment']) ? trim($_POST['comment']) : '';
66 66
     	$new_title = isset($_POST['title']) ? trim($_POST['title']) : '';
67 67
 
68
-    	if ($new_path && ($new_comment || $new_title))
69
-    	if (($docid = DocumentManager::get_document_id($_course, $new_path))) {
68
+    	if ($new_path && ($new_comment || $new_title)) {
69
+    	    	if (($docid = DocumentManager::get_document_id($_course, $new_path))) {
70 70
         	$table_document = Database::get_course_table(TABLE_DOCUMENT);
71
+    	}
71 72
         	$ct = '';
72
-        	if ($new_comment) $ct .= ", comment='$new_comment'";
73
-        	if ($new_title)   $ct .= ", title='$new_title'";
73
+        	if ($new_comment) {
74
+        	    $ct .= ", comment='$new_comment'";
75
+        	}
76
+        	if ($new_title) {
77
+        	    $ct .= ", title='$new_title'";
78
+        	}
74 79
         	Database::query("UPDATE $table_document SET" . substr($ct, 1) ." WHERE id = '$docid'");
75 80
     	}
76 81
         //check for missing images in html files
Please login to merge, or discard this patch.
Indentation   +24 added lines, -24 removed lines patch added patch discarded remove patch
@@ -48,9 +48,9 @@  discard block
 block discarded – undo
48 48
  */
49 49
 //user has submitted a file
50 50
 if (isset($_FILES['user_upload'])) {
51
-	$upload_ok = process_uploaded_file($_FILES['user_upload']);
52
-	if ($upload_ok) {
53
-		//file got on the server without problems, now process it
51
+    $upload_ok = process_uploaded_file($_FILES['user_upload']);
52
+    if ($upload_ok) {
53
+        //file got on the server without problems, now process it
54 54
         $new_path = handle_uploaded_document(
55 55
             $_course,
56 56
             $_FILES['user_upload'],
@@ -62,17 +62,17 @@  discard block
 block discarded – undo
62 62
             $_POST['unzip'],
63 63
             $_POST['if_exists']
64 64
         );
65
-    	$new_comment = isset($_POST['comment']) ? trim($_POST['comment']) : '';
66
-    	$new_title = isset($_POST['title']) ? trim($_POST['title']) : '';
65
+        $new_comment = isset($_POST['comment']) ? trim($_POST['comment']) : '';
66
+        $new_title = isset($_POST['title']) ? trim($_POST['title']) : '';
67 67
 
68
-    	if ($new_path && ($new_comment || $new_title))
69
-    	if (($docid = DocumentManager::get_document_id($_course, $new_path))) {
70
-        	$table_document = Database::get_course_table(TABLE_DOCUMENT);
71
-        	$ct = '';
72
-        	if ($new_comment) $ct .= ", comment='$new_comment'";
73
-        	if ($new_title)   $ct .= ", title='$new_title'";
74
-        	Database::query("UPDATE $table_document SET" . substr($ct, 1) ." WHERE id = '$docid'");
75
-    	}
68
+        if ($new_path && ($new_comment || $new_title))
69
+        if (($docid = DocumentManager::get_document_id($_course, $new_path))) {
70
+            $table_document = Database::get_course_table(TABLE_DOCUMENT);
71
+            $ct = '';
72
+            if ($new_comment) $ct .= ", comment='$new_comment'";
73
+            if ($new_title)   $ct .= ", title='$new_title'";
74
+            Database::query("UPDATE $table_document SET" . substr($ct, 1) ." WHERE id = '$docid'");
75
+        }
76 76
         //check for missing images in html files
77 77
         $missing_files = check_for_missing_files($base_work_dir.$_POST['curdirpath'].$new_path);
78 78
         if ($missing_files)  {
@@ -128,8 +128,8 @@  discard block
 block discarded – undo
128 128
 }
129 129
 //they want to create a directory
130 130
 if (isset($_POST['create_dir']) && $_POST['dirname']!='') {
131
-	$added_slash = ($path=='/')?'':'/';
132
-	$dir_name = $path.$added_slash.api_replace_dangerous_char($_POST['dirname']);
131
+    $added_slash = ($path=='/')?'':'/';
132
+    $dir_name = $path.$added_slash.api_replace_dangerous_char($_POST['dirname']);
133 133
     $created_dir = create_unexisting_directory(
134 134
         $_course,
135 135
         $_user['user_id'],
@@ -149,15 +149,15 @@  discard block
 block discarded – undo
149 149
 }
150 150
 
151 151
 if (isset($_GET['createdir'])) {
152
-	//create the form that asks for the directory name
153
-	$new_folder_text = '<form action="'.api_get_self().'" method="POST">';
154
-	$new_folder_text .= '<input type="hidden" name="curdirpath" value="'.$path.'"/>';
155
-	$new_folder_text .= get_lang('NewDir') .' ';
156
-	$new_folder_text .= '<input type="text" name="dirname"/>';
157
-	$new_folder_text .= '<input type="submit" name="create_dir" value="'.get_lang('Ok').'"/>';
158
-	$new_folder_text .= '</form>';
159
-	//show the form
160
-	Display::display_normal_message($new_folder_text);
152
+    //create the form that asks for the directory name
153
+    $new_folder_text = '<form action="'.api_get_self().'" method="POST">';
154
+    $new_folder_text .= '<input type="hidden" name="curdirpath" value="'.$path.'"/>';
155
+    $new_folder_text .= get_lang('NewDir') .' ';
156
+    $new_folder_text .= '<input type="text" name="dirname"/>';
157
+    $new_folder_text .= '<input type="submit" name="create_dir" value="'.get_lang('Ok').'"/>';
158
+    $new_folder_text .= '</form>';
159
+    //show the form
160
+    Display::display_normal_message($new_folder_text);
161 161
 } else {	//give them a link to create a directory
162 162
 ?>
163 163
 	<p>
Please login to merge, or discard this patch.
Spacing   +23 added lines, -23 removed lines patch added patch discarded remove patch
@@ -9,9 +9,9 @@  discard block
 block discarded – undo
9 9
  * @author Yannick Warnier <[email protected]>
10 10
  */
11 11
 
12
-$courseDir = $_course['path'] . "/document";
12
+$courseDir = $_course['path']."/document";
13 13
 $sys_course_path = api_get_path(SYS_COURSE_PATH);
14
-$base_work_dir = $sys_course_path . $courseDir;
14
+$base_work_dir = $sys_course_path.$courseDir;
15 15
 $noPHP_SELF = true;
16 16
 $max_filled_space = DocumentManager::get_course_quota();
17 17
 
@@ -34,14 +34,14 @@  discard block
 block discarded – undo
34 34
 
35 35
 $nameTools = get_lang('UplUploadDocument');
36 36
 $interbreadcrumb[] = array(
37
-    "url" => "./document.php?curdirpath=" . urlencode(
37
+    "url" => "./document.php?curdirpath=".urlencode(
38 38
             $path
39
-        ) . $req_gid,
39
+        ).$req_gid,
40 40
     "name" => $langDocuments
41 41
 );
42 42
 Display::display_header($nameTools, "Doc");
43 43
 //show the title
44
-api_display_tool_title($nameTools . $add_group_to_title);
44
+api_display_tool_title($nameTools.$add_group_to_title);
45 45
 
46 46
 /**
47 47
  * Process
@@ -71,11 +71,11 @@  discard block
 block discarded – undo
71 71
         	$ct = '';
72 72
         	if ($new_comment) $ct .= ", comment='$new_comment'";
73 73
         	if ($new_title)   $ct .= ", title='$new_title'";
74
-        	Database::query("UPDATE $table_document SET" . substr($ct, 1) ." WHERE id = '$docid'");
74
+        	Database::query("UPDATE $table_document SET".substr($ct, 1)." WHERE id = '$docid'");
75 75
     	}
76 76
         //check for missing images in html files
77 77
         $missing_files = check_for_missing_files($base_work_dir.$_POST['curdirpath'].$new_path);
78
-        if ($missing_files)  {
78
+        if ($missing_files) {
79 79
             //show a form to upload the missing files
80 80
             Display::display_normal_message(
81 81
                 build_missing_files_form(
@@ -94,7 +94,7 @@  discard block
 block discarded – undo
94 94
     if ($number_of_uploaded_images > 0) {
95 95
         //we could also create a function for this, I'm not sure...
96 96
         //create a directory for the missing files
97
-        $img_directory = str_replace('.','_',$_POST['related_file']."_files");
97
+        $img_directory = str_replace('.', '_', $_POST['related_file']."_files");
98 98
         $folderData = create_unexisting_directory(
99 99
             $_course,
100 100
             $_user['user_id'],
@@ -120,15 +120,15 @@  discard block
 block discarded – undo
120 120
         replace_img_path_in_html_file(
121 121
             $_POST['img_file_path'],
122 122
             $paths_to_replace_in_file,
123
-            $base_work_dir . $_POST['related_file']
123
+            $base_work_dir.$_POST['related_file']
124 124
         );
125 125
         //update parent folders
126
-        item_property_update_on_folder($_course,$_POST['curdirpath'],$_user['user_id']);
126
+        item_property_update_on_folder($_course, $_POST['curdirpath'], $_user['user_id']);
127 127
     }
128 128
 }
129 129
 //they want to create a directory
130
-if (isset($_POST['create_dir']) && $_POST['dirname']!='') {
131
-	$added_slash = ($path=='/')?'':'/';
130
+if (isset($_POST['create_dir']) && $_POST['dirname'] != '') {
131
+	$added_slash = ($path == '/') ? '' : '/';
132 132
 	$dir_name = $path.$added_slash.api_replace_dangerous_char($_POST['dirname']);
133 133
     $created_dir = create_unexisting_directory(
134 134
         $_course,
@@ -152,7 +152,7 @@  discard block
 block discarded – undo
152 152
 	//create the form that asks for the directory name
153 153
 	$new_folder_text = '<form action="'.api_get_self().'" method="POST">';
154 154
 	$new_folder_text .= '<input type="hidden" name="curdirpath" value="'.$path.'"/>';
155
-	$new_folder_text .= get_lang('NewDir') .' ';
155
+	$new_folder_text .= get_lang('NewDir').' ';
156 156
 	$new_folder_text .= '<input type="text" name="dirname"/>';
157 157
 	$new_folder_text .= '<input type="submit" name="create_dir" value="'.get_lang('Ok').'"/>';
158 158
 	$new_folder_text .= '</form>';
@@ -163,7 +163,7 @@  discard block
 block discarded – undo
163 163
 	<p>
164 164
         <a href="<?php echo api_get_self(); ?>?path=<?php echo $path; ?>&amp;createdir=1">
165 165
             <?php echo Display::return_icon('new_folder.gif'); ?>
166
-            <?php echo(get_lang('CreateDir'));?>
166
+            <?php echo(get_lang('CreateDir')); ?>
167 167
         </a>
168 168
     </p>
169 169
 <?php
@@ -186,11 +186,11 @@  discard block
 block discarded – undo
186 186
 </td>
187 187
 </tr>
188 188
 <tr>
189
-<td><?php echo get_lang('Title');?></td>
189
+<td><?php echo get_lang('Title'); ?></td>
190 190
 <td><input type="text" size="20" name="title" style="width:300px;"></td>
191 191
 </tr>
192 192
 <tr>
193
-<td valign="top"><?php echo get_lang('Comment');?></td>
193
+<td valign="top"><?php echo get_lang('Comment'); ?></td>
194 194
 <td><textarea rows="3" cols="20" name="comment" wrap="virtual" style="width:300px;"></textarea></td>
195 195
 </tr>
196 196
 <tr>
@@ -198,22 +198,22 @@  discard block
 block discarded – undo
198 198
 <?php echo get_lang('Options'); ?>
199 199
 </td>
200 200
 <td>
201
-- <input type="checkbox" name="unzip" value="1" onclick="check_unzip()"/> <?php echo(get_lang('Uncompress'));?><br/>
202
-- <?php echo (get_lang('UplWhatIfFileExists'));?><br/>
203
-&nbsp;&nbsp;&nbsp;<input type="radio" name="if_exists" value="nothing" title="<?php echo (get_lang('UplDoNothingLong'));?>" checked="checked"/>  <?php echo (get_lang('UplDoNothing'));?><br/>
204
-&nbsp;&nbsp;&nbsp;<input type="radio" name="if_exists" value="overwrite" title="<?php echo (get_lang('UplOverwriteLong'));?>"/> <?php echo (get_lang('UplOverwrite'));?><br/>
205
-&nbsp;&nbsp;&nbsp;<input type="radio" name="if_exists" value="rename" title="<?php echo (get_lang('UplRenameLong'));?>"/> <?php echo (get_lang('UplRename'));?>
201
+- <input type="checkbox" name="unzip" value="1" onclick="check_unzip()"/> <?php echo(get_lang('Uncompress')); ?><br/>
202
+- <?php echo (get_lang('UplWhatIfFileExists')); ?><br/>
203
+&nbsp;&nbsp;&nbsp;<input type="radio" name="if_exists" value="nothing" title="<?php echo (get_lang('UplDoNothingLong')); ?>" checked="checked"/>  <?php echo (get_lang('UplDoNothing')); ?><br/>
204
+&nbsp;&nbsp;&nbsp;<input type="radio" name="if_exists" value="overwrite" title="<?php echo (get_lang('UplOverwriteLong')); ?>"/> <?php echo (get_lang('UplOverwrite')); ?><br/>
205
+&nbsp;&nbsp;&nbsp;<input type="radio" name="if_exists" value="rename" title="<?php echo (get_lang('UplRenameLong')); ?>"/> <?php echo (get_lang('UplRename')); ?>
206 206
 
207 207
 </td>
208 208
 </tr>
209 209
 </table>
210 210
 
211
-<input type="submit" value="<?php echo(get_lang('Ok'));?>">
211
+<input type="submit" value="<?php echo(get_lang('Ok')); ?>">
212 212
 </form>
213 213
 <!-- end upload form -->
214 214
 
215 215
  <!-- so they can get back to the documents   -->
216
- <p><?php echo (get_lang('Back'));?> <?php echo (get_lang('To'));?> <a href="document.php?curdirpath=<?php echo $path; ?>"><?php echo (get_lang('DocumentsOverview'));?></a></p>
216
+ <p><?php echo (get_lang('Back')); ?> <?php echo (get_lang('To')); ?> <a href="document.php?curdirpath=<?php echo $path; ?>"><?php echo (get_lang('DocumentsOverview')); ?></a></p>
217 217
 <?php
218 218
 
219 219
 Display::display_footer();
Please login to merge, or discard this patch.
main/upload/upload.php 1 patch
Switch Indentation   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -26,14 +26,14 @@
 block discarded – undo
26 26
  * Redirect to the correct script to handle this type of upload
27 27
  */
28 28
 switch ($_SESSION['my_tool']) {
29
-    case TOOL_LEARNPATH:
30
-        require 'upload.scorm.php';
31
-        break;
32
-    //the following cases need to be distinguished later on
33
-    case TOOL_DROPBOX:
34
-    case TOOL_STUDENTPUBLICATION:
35
-    case TOOL_DOCUMENT:
36
-    default:
37
-        require 'upload.document.php';
38
-        break;
29
+        case TOOL_LEARNPATH:
30
+            require 'upload.scorm.php';
31
+            break;
32
+        //the following cases need to be distinguished later on
33
+        case TOOL_DROPBOX:
34
+        case TOOL_STUDENTPUBLICATION:
35
+        case TOOL_DOCUMENT:
36
+        default:
37
+            require 'upload.document.php';
38
+            break;
39 39
 }
Please login to merge, or discard this patch.
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 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -3,7 +3,7 @@
 block discarded – undo
3 3
 
4 4
 /**
5 5
  *	This script displays an area where teachers can edit the group properties and member list.
6
-  *
6
+ *
7 7
  *	@author various contributors
8 8
  *	@author Roan Embrechts (VUB), partial code cleanup, initial virtual course support
9 9
  *	@package chamilo.group
Please login to merge, or discard this 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 2 patches
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -161,9 +161,9 @@
 block discarded – undo
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;"');
Please login to merge, or discard this 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/group_category.php 2 patches
Indentation   +26 added lines, -26 removed lines patch added patch discarded remove patch
@@ -18,7 +18,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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();
Please login to merge, or discard this 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.