Completed
Push — 1.10.x ( 23ca11...187186 )
by Julito
106:28 queued 51:04
created
main/upload/upload_ppt.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@  discard block
 block discarded – undo
21 21
         if (in_array(strtolower(pathinfo($_FILES['user_file']['name'], PATHINFO_EXTENSION)), $allowed_extensions)) {
22 22
             require_once api_get_path(SYS_CODE_PATH).'newscorm/lp_upload.php';
23 23
             if (isset($o_ppt) && $first_item_id != 0) {
24
-                if (api_get_setting('search_enabled')=='true') {
24
+                if (api_get_setting('search_enabled') == 'true') {
25 25
                     require_once api_get_path(LIBRARY_PATH).'specific_fields_manager.lib.php';
26 26
                     $specific_fields = get_specific_field_list();
27 27
                     foreach ($specific_fields as $specific_field) {
@@ -60,7 +60,7 @@  discard block
 block discarded – undo
60 60
     api_not_allowed(true);
61 61
 }
62 62
 
63
-$interbreadcrumb[]= array ("url"=>"../newscorm/lp_controller.php?action=list", "name"=> get_lang("Doc"));
63
+$interbreadcrumb[] = array("url"=>"../newscorm/lp_controller.php?action=list", "name"=> get_lang("Doc"));
64 64
 
65 65
 $nameTools = get_lang("OogieConversionPowerPoint");
66 66
 Display :: display_header($nameTools);
@@ -78,7 +78,7 @@  discard block
 block discarded – undo
78 78
 $form->addElement('file', 'user_file', array('<img src="../img/powerpoint_big.gif" />', $div_upload_limit));
79 79
 $form->addElement('checkbox', 'take_slide_name', '', get_lang('TakeSlideName'));
80 80
 if (api_get_setting('search_enabled') == 'true') {
81
-    require_once(api_get_path(LIBRARY_PATH) . 'specific_fields_manager.lib.php');
81
+    require_once(api_get_path(LIBRARY_PATH).'specific_fields_manager.lib.php');
82 82
     $specific_fields = get_specific_field_list();
83 83
     $form->addElement('checkbox', 'index_document', '', get_lang('SearchFeatureDoIndexDocument'));
84 84
     $form->addElement('select_language', 'language', get_lang('SearchFeatureDocumentLanguage'));
@@ -90,7 +90,7 @@  discard block
 block discarded – undo
90 90
 $form->addButtonUpload(get_lang('ConvertToLP'), 'convert');
91 91
 $form->addElement('hidden', 'ppt2lp', 'true');
92 92
 $form->add_real_progress_bar(md5(rand(0, 10000)), 'user_file', 1, true);
93
-$defaults = array('take_slide_name'=>'checked="checked"','index_document'=>'checked="checked"');
93
+$defaults = array('take_slide_name'=>'checked="checked"', 'index_document'=>'checked="checked"');
94 94
 $form->setDefaults($defaults);
95 95
 
96 96
 // display the form
Please login to merge, or discard this patch.
main/upload/upload.scorm.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -33,7 +33,7 @@  discard block
 block discarded – undo
33 33
         $dialogtype = 'error';
34 34
     } else {
35 35
         if (api_get_setting('search_enabled') == 'true') {
36
-            require_once api_get_path(LIBRARY_PATH) . 'specific_fields_manager.lib.php';
36
+            require_once api_get_path(LIBRARY_PATH).'specific_fields_manager.lib.php';
37 37
             $specific_fields = get_specific_field_list();
38 38
 
39 39
             foreach ($specific_fields as $specific_field) {
@@ -58,5 +58,5 @@  discard block
 block discarded – undo
58 58
         $dialogtype = 'confirmation';
59 59
     }
60 60
 }
61
-header('location: ../newscorm/lp_controller.php?action=list&dialog_box=' . $msg . '&dialogtype=' . $dialogtype);
61
+header('location: ../newscorm/lp_controller.php?action=list&dialog_box='.$msg.'&dialogtype='.$dialogtype);
62 62
 exit;
Please login to merge, or discard this patch.
main/upload/form.document.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -12,8 +12,8 @@  discard block
 block discarded – undo
12 12
  */
13 13
 $noPHP_SELF = false;
14 14
 $nameTools = get_lang('FileUpload');
15
-$interbreadcrumb[]= array ("url"=>"../newscorm/lp_controller.php?action=list", "name"=> get_lang(TOOL_DOCUMENT));
16
-Display::display_header($nameTools,"Doc");
15
+$interbreadcrumb[] = array("url"=>"../newscorm/lp_controller.php?action=list", "name"=> get_lang(TOOL_DOCUMENT));
16
+Display::display_header($nameTools, "Doc");
17 17
 //show the title
18 18
 api_display_tool_title($nameTools.$add_group_to_title);
19 19
 ?>
@@ -21,7 +21,7 @@  discard block
 block discarded – undo
21 21
 <div id="dynamic_div" style="display:block;margin-left:40%;margin-top:10px;height:50px;">
22 22
 </div>
23 23
 <div id="upload_form_div" name="form_div" style="display:block;">
24
-	<form method="POST" action="upload.php" id="upload_form" enctype="multipart/form-data" onsubmit="javascript: myUpload.start('dynamic_div','progressbar_green.gif','<?php echo(get_lang('Uploading', ''));?>','upload_form_div');">
24
+	<form method="POST" action="upload.php" id="upload_form" enctype="multipart/form-data" onsubmit="javascript: myUpload.start('dynamic_div','progressbar_green.gif','<?php echo(get_lang('Uploading', '')); ?>','upload_form_div');">
25 25
 		<input type="hidden" name="curdirpath" value="<?php echo $path; ?>">
26 26
 		<input type="hidden" name="tool" value="<?php echo $my_tool; ?>">
27 27
 		<input type="file" name="user_file">
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 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_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.