Completed
Push — 1.10.x ( f2aaaf...ef00db )
by Yannick
241:15 queued 197:35
created
main/document/create_document.php 3 patches
Spacing   +31 added lines, -31 removed lines patch added patch discarded remove patch
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
55 55
     $.ajax({
56 56
         contentType: "application/x-www-form-urlencoded",
57 57
         data: "dirValue="+dirValue,
58
-        url: "' . api_get_path(WEB_AJAX_PATH) . 'document.ajax.php?a=document_destination",
58
+        url: "' . api_get_path(WEB_AJAX_PATH).'document.ajax.php?a=document_destination",
59 59
         type: "POST",
60 60
         success: function(response) {
61 61
             $("[name=\'dirValue\']").val(response)
@@ -152,14 +152,14 @@  discard block
 block discarded – undo
152 152
 }
153 153
 
154 154
 if ($is_certificate_mode) {
155
-	$document_id 	= DocumentManager::get_document_id(api_get_course_info(), '/certificates');
156
-	$document_data 	= DocumentManager::get_document_data_by_id($document_id, api_get_course_id(), true);
155
+	$document_id = DocumentManager::get_document_id(api_get_course_info(), '/certificates');
156
+	$document_data = DocumentManager::get_document_data_by_id($document_id, api_get_course_id(), true);
157 157
 	$folder_id = $document_data['id'];
158 158
 	$dir = '/certificates/';
159 159
 }
160 160
 
161 161
 $doc_tree  = explode('/', $dir);
162
-$count_dir = count($doc_tree) -2; // "2" because at the begin and end there are 2 "/"
162
+$count_dir = count($doc_tree) - 2; // "2" because at the begin and end there are 2 "/"
163 163
 
164 164
 if (api_is_in_group()) {
165 165
     $group_properties = GroupManager::get_group_properties(api_get_group_id());
@@ -174,7 +174,7 @@  discard block
 block discarded – undo
174 174
 	$relative_url .= '../';
175 175
 }
176 176
 
177
-if ($relative_url== '') {
177
+if ($relative_url == '') {
178 178
 	$relative_url = '/';
179 179
 }
180 180
 
@@ -211,7 +211,7 @@  discard block
 block discarded – undo
211 211
 
212 212
 if (!$is_certificate_mode) {
213 213
 	if (api_is_in_group()) {
214
-		$interbreadcrumb[] = array ("url" => "../group/group_space.php?".api_get_cidreq(), "name" => get_lang('GroupSpace'));
214
+		$interbreadcrumb[] = array("url" => "../group/group_space.php?".api_get_cidreq(), "name" => get_lang('GroupSpace'));
215 215
 		$noPHP_SELF = true;
216 216
 		$to_group_id = api_get_group_id();
217 217
 		$path = explode('/', $dir);
@@ -221,7 +221,7 @@  discard block
 block discarded – undo
221 221
 	}
222 222
 	$interbreadcrumb[] = array("url" => "./document.php?curdirpath=".urlencode($dir)."&".api_get_cidreq(), "name" => get_lang('Documents'));
223 223
 } else {
224
-	$interbreadcrumb[]= array('url' => '../gradebook/'.$_SESSION['gradebook_dest'], 'name' => get_lang('Gradebook'));
224
+	$interbreadcrumb[] = array('url' => '../gradebook/'.$_SESSION['gradebook_dest'], 'name' => get_lang('Gradebook'));
225 225
 }
226 226
 
227 227
 if (!$is_allowed_in_course) {
@@ -260,9 +260,9 @@  discard block
 block discarded – undo
260 260
 $form->addElement('header', $nameTools);
261 261
 
262 262
 if ($is_certificate_mode) {//added condition for certicate in gradebook
263
-	$form->addElement('hidden','certificate','true',array('id'=>'certificate'));
263
+	$form->addElement('hidden', 'certificate', 'true', array('id'=>'certificate'));
264 264
 	if (isset($_GET['selectcat'])) {
265
-		$form->addElement('hidden','selectcat', $select_cat);
265
+		$form->addElement('hidden', 'selectcat', $select_cat);
266 266
     }
267 267
 }
268 268
 
@@ -302,13 +302,13 @@  discard block
 block discarded – undo
302 302
 
303 303
 // Show read-only box only in groups
304 304
 if (!empty($groupId)) {
305
-	$group[]= $form->createElement('checkbox', 'readonly', '', get_lang('ReadOnly'));
305
+	$group[] = $form->createElement('checkbox', 'readonly', '', get_lang('ReadOnly'));
306 306
 }
307 307
 $form->addRule('title', get_lang('ThisFieldIsRequired'), 'required');
308 308
 $form->addRule('title', get_lang('FileExists'), 'callback', 'document_exists');
309 309
 
310 310
 $current_session_id = api_get_session_id();
311
-$form->addHtmlEditor('content','', true, true, $editorConfig, true);
311
+$form->addHtmlEditor('content', '', true, true, $editorConfig, true);
312 312
 
313 313
 // Comment-field
314 314
 $folders = DocumentManager::get_all_document_folders($_course, $to_group_id, $is_allowed_to_edit);
@@ -322,7 +322,7 @@  discard block
 block discarded – undo
322 322
 	$folders = DocumentManager::get_all_document_folders($_course, $to_group_id, $is_allowed_to_edit);
323 323
 
324 324
 	//$parent_select = $form->addElement('select', 'curdirpath', array(null, get_lang('DestinationDirectory')));
325
-        $parent_select = $form->addSelect('curdirpath', get_lang('DestinationDirectory'),null, array('cols-size' => [2, 10, 0]) );
325
+        $parent_select = $form->addSelect('curdirpath', get_lang('DestinationDirectory'), null, array('cols-size' => [2, 10, 0]));
326 326
 	// Following two conditions copied from document.inc.php::build_directory_selector()
327 327
 	$folder_titles = array();
328 328
 
@@ -330,19 +330,19 @@  discard block
 block discarded – undo
330 330
         $escaped_folders = array();
331 331
         foreach ($folders as $key => & $val) {
332 332
             // Hide some folders
333
-            if ($val=='/HotPotatoes_files' || $val=='/certificates' || basename($val)=='css'){
333
+            if ($val == '/HotPotatoes_files' || $val == '/certificates' || basename($val) == 'css') {
334 334
                 continue;
335 335
             }
336 336
             // Admin setting for Hide/Show the folders of all users
337
-            if (api_get_setting('show_users_folders') == 'false' && (strstr($val, '/shared_folder') || strstr($val, 'shared_folder_session_'))){
337
+            if (api_get_setting('show_users_folders') == 'false' && (strstr($val, '/shared_folder') || strstr($val, 'shared_folder_session_'))) {
338 338
                 continue;
339 339
             }
340 340
             // Admin setting for Hide/Show Default folders to all users
341
-            if (api_get_setting('show_default_folders') == 'false' && ($val=='/images' || $val=='/flash' || $val=='/audio' || $val=='/video' || strstr($val, '/images/gallery') || $val=='/video/flv')){
341
+            if (api_get_setting('show_default_folders') == 'false' && ($val == '/images' || $val == '/flash' || $val == '/audio' || $val == '/video' || strstr($val, '/images/gallery') || $val == '/video/flv')) {
342 342
                 continue;
343 343
             }
344 344
             // Admin setting for Hide/Show chat history folder
345
-            if (api_get_setting('show_chat_folder') == 'false' && $val=='/chat_files'){
345
+            if (api_get_setting('show_chat_folder') == 'false' && $val == '/chat_files') {
346 346
                 continue;
347 347
             }
348 348
 
@@ -367,13 +367,13 @@  discard block
 block discarded – undo
367 367
 		if (is_array($folders)) {
368 368
 			foreach ($folders as & $folder) {
369 369
 				//Hide some folders
370
-				if ($folder=='/HotPotatoes_files' || $folder=='/certificates' || basename($folder)=='css') {
370
+				if ($folder == '/HotPotatoes_files' || $folder == '/certificates' || basename($folder) == 'css') {
371 371
                     continue;
372 372
 				}
373 373
 				//Admin setting for Hide/Show the folders of all users
374 374
 				if (api_get_setting('show_users_folders') == 'false' &&
375 375
                     (strstr($folder, '/shared_folder') || strstr($folder, 'shared_folder_session_'))
376
-                ){
376
+                ) {
377 377
 					continue;
378 378
 				}
379 379
 				//Admin setting for Hide/Show Default folders to all users
@@ -386,20 +386,20 @@  discard block
 block discarded – undo
386 386
                         strstr($folder, '/images/gallery') ||
387 387
                         $folder == '/video/flv'
388 388
                     )
389
-                ){
389
+                ) {
390 390
 					continue;
391 391
 				}
392 392
 				//Admin setting for Hide/Show chat history folder
393 393
 				if (api_get_setting('show_chat_folder') == 'false' &&
394
-                    $folder=='/chat_files'
395
-                ){
394
+                    $folder == '/chat_files'
395
+                ) {
396 396
 					continue;
397 397
 				}
398 398
 
399
-				$selected = (substr($dir,0,-1) == $folder) ? ' selected="selected"' : '';
399
+				$selected = (substr($dir, 0, -1) == $folder) ? ' selected="selected"' : '';
400 400
 				$path_parts = explode('/', $folder);
401 401
 				$folder_titles[$folder] = cut($folder_titles[$folder], 80);
402
-                $space_counter =count($path_parts) - 2;
402
+                $space_counter = count($path_parts) - 2;
403 403
                 if ($space_counter > 0) {
404 404
                     $label = str_repeat('   ', $space_counter).' — '.$folder_titles[$folder];
405 405
                 } else {
@@ -413,7 +413,7 @@  discard block
 block discarded – undo
413 413
 		}
414 414
 	} else {
415 415
 		foreach ($folders as & $folder) {
416
-			$selected = (substr($dir,0,-1)==$folder) ? ' selected="selected"' : '';
416
+			$selected = (substr($dir, 0, -1) == $folder) ? ' selected="selected"' : '';
417 417
 			$label = $folder_titles[$folder];
418 418
 			if ($folder == $group_dir) {
419 419
 				$label = '/ ('.get_lang('HomeDirectory').')';
@@ -559,7 +559,7 @@  discard block
 block discarded – undo
559 559
                     );
560 560
                 }
561 561
 			}
562
-			$dir= substr($dir,0,-1);
562
+			$dir = substr($dir, 0, -1);
563 563
 			$selectcat = '';
564 564
 			if (isset($_REQUEST['selectcat']))
565 565
 				$selectcat = "&selectcat=".Security::remove_XSS($_REQUEST['selectcat']);
@@ -567,7 +567,7 @@  discard block
 block discarded – undo
567 567
 			if ($is_certificate_mode) {
568 568
 				$df = DocumentManager::get_default_certificate_id($_course['code']);
569 569
                 if (!isset($df)) {
570
-                    DocumentManager::attach_gradebook_certificate ($_course['code'],$document_id);
570
+                    DocumentManager::attach_gradebook_certificate($_course['code'], $document_id);
571 571
 				}
572 572
 				$certificate_condition = '&certificate=true&curdirpath=/certificates';
573 573
 			}
@@ -611,11 +611,11 @@  discard block
 block discarded – undo
611 611
 
612 612
 	// link back to the documents overview
613 613
 	if ($is_certificate_mode) {
614
-		$actionsLeft =  '<a href="document.php?certificate=true&id='.$folder_id.'&selectcat=' . Security::remove_XSS($_GET['selectcat']).'">'.
615
-            Display::return_icon('back.png',get_lang('Back').' '.get_lang('To').' '.get_lang('CertificateOverview'),'',ICON_SIZE_MEDIUM).'</a>';
614
+		$actionsLeft = '<a href="document.php?certificate=true&id='.$folder_id.'&selectcat='.Security::remove_XSS($_GET['selectcat']).'">'.
615
+            Display::return_icon('back.png', get_lang('Back').' '.get_lang('To').' '.get_lang('CertificateOverview'), '', ICON_SIZE_MEDIUM).'</a>';
616 616
         } else {
617 617
 		$actionsLeft = '<a href="document.php?curdirpath='.Security::remove_XSS($dir).'">'.
618
-            Display::return_icon('back.png',get_lang('Back').' '.get_lang('To').' '.get_lang('DocumentsOverview'),'',ICON_SIZE_MEDIUM).'</a>';
618
+            Display::return_icon('back.png', get_lang('Back').' '.get_lang('To').' '.get_lang('DocumentsOverview'), '', ICON_SIZE_MEDIUM).'</a>';
619 619
         }
620 620
         
621 621
         echo $toolbar = Display::toolbarAction('actions-documents', array(0 => $actionsLeft, 1 => ''));
@@ -626,10 +626,10 @@  discard block
 block discarded – undo
626 626
 
627 627
 		$str_info = '';
628 628
 		foreach ($all_information_by_create_certificate[0] as $info_value) {
629
-			$str_info.=$info_value.'<br/>';
629
+			$str_info .= $info_value.'<br/>';
630 630
 		}
631 631
 		$create_certificate = get_lang('CreateCertificateWithTags');
632
-		Display::display_normal_message($create_certificate.': <br /><br/>'.$str_info,false);
632
+		Display::display_normal_message($create_certificate.': <br /><br/>'.$str_info, false);
633 633
 	}
634 634
     // HTML-editor
635 635
     echo '<div class="row" style="overflow:hidden">
Please login to merge, or discard this patch.
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -561,8 +561,9 @@
 block discarded – undo
561 561
 			}
562 562
 			$dir= substr($dir,0,-1);
563 563
 			$selectcat = '';
564
-			if (isset($_REQUEST['selectcat']))
565
-				$selectcat = "&selectcat=".Security::remove_XSS($_REQUEST['selectcat']);
564
+			if (isset($_REQUEST['selectcat'])) {
565
+							$selectcat = "&selectcat=".Security::remove_XSS($_REQUEST['selectcat']);
566
+			}
566 567
 			$certificate_condition = '';
567 568
 			if ($is_certificate_mode) {
568 569
 				$df = DocumentManager::get_default_certificate_id($_course['code']);
Please login to merge, or discard this patch.
Indentation   +168 added lines, -168 removed lines patch added patch discarded remove patch
@@ -77,13 +77,13 @@  discard block
 block discarded – undo
77 77
 $is_certificate_mode = false;
78 78
 
79 79
 if (isset($_REQUEST['certificate']) && $_REQUEST['certificate'] == 'true') {
80
-	$is_certificate_mode = true;
80
+    $is_certificate_mode = true;
81 81
 }
82 82
 
83 83
 if ($is_certificate_mode) {
84
-	$nameTools = get_lang('CreateCertificate');
84
+    $nameTools = get_lang('CreateCertificate');
85 85
 } else {
86
-	$nameTools = get_lang('CreateDocument');
86
+    $nameTools = get_lang('CreateDocument');
87 87
 }
88 88
 
89 89
 /*	Constants and variables */
@@ -136,26 +136,26 @@  discard block
 block discarded – undo
136 136
 
137 137
 // Please, do not modify this dirname formatting
138 138
 if (strstr($dir, '..')) {
139
-	$dir = '/';
139
+    $dir = '/';
140 140
 }
141 141
 
142 142
 if ($dir[0] == '.') {
143
-	$dir = substr($dir, 1);
143
+    $dir = substr($dir, 1);
144 144
 }
145 145
 
146 146
 if ($dir[0] != '/') {
147
-	$dir = '/'.$dir;
147
+    $dir = '/'.$dir;
148 148
 }
149 149
 
150 150
 if ($dir[strlen($dir) - 1] != '/') {
151
-	$dir .= '/';
151
+    $dir .= '/';
152 152
 }
153 153
 
154 154
 if ($is_certificate_mode) {
155
-	$document_id 	= DocumentManager::get_document_id(api_get_course_info(), '/certificates');
156
-	$document_data 	= DocumentManager::get_document_data_by_id($document_id, api_get_course_id(), true);
157
-	$folder_id = $document_data['id'];
158
-	$dir = '/certificates/';
155
+    $document_id 	= DocumentManager::get_document_id(api_get_course_info(), '/certificates');
156
+    $document_data 	= DocumentManager::get_document_data_by_id($document_id, api_get_course_id(), true);
157
+    $folder_id = $document_data['id'];
158
+    $dir = '/certificates/';
159 159
 }
160 160
 
161 161
 $doc_tree  = explode('/', $dir);
@@ -166,16 +166,16 @@  discard block
 block discarded – undo
166 166
 
167 167
     // Level correction for group documents.
168 168
     if (!empty($group_properties['directory'])) {
169
-    	$count_dir = $count_dir > 0 ? $count_dir - 1 : 0;
169
+        $count_dir = $count_dir > 0 ? $count_dir - 1 : 0;
170 170
     }
171 171
 }
172 172
 $relative_url = '';
173 173
 for ($i = 0; $i < ($count_dir); $i++) {
174
-	$relative_url .= '../';
174
+    $relative_url .= '../';
175 175
 }
176 176
 
177 177
 if ($relative_url== '') {
178
-	$relative_url = '/';
178
+    $relative_url = '/';
179 179
 }
180 180
 
181 181
 $is_allowed_to_edit = api_is_allowed_to_edit(null, true);
@@ -187,11 +187,11 @@  discard block
 block discarded – undo
187 187
     'cols-size' => [2, 10, 0],
188 188
     'FullPage' => true,
189 189
     'InDocument' => true,
190
-	'CreateDocumentDir'    => $relative_url,
191
-	'CreateDocumentWebDir' => (empty($group_properties['directory']))
192
-                        		? api_get_path(WEB_COURSE_PATH).$_course['path'].'/document/'
193
-                        		: api_get_path(WEB_COURSE_PATH).api_get_course_path().'/document'.$group_properties['directory'].'/',
194
-	'BaseHref'             => api_get_path(WEB_COURSE_PATH).$_course['path'].'/document'.$dir
190
+    'CreateDocumentDir'    => $relative_url,
191
+    'CreateDocumentWebDir' => (empty($group_properties['directory']))
192
+                                ? api_get_path(WEB_COURSE_PATH).$_course['path'].'/document/'
193
+                                : api_get_path(WEB_COURSE_PATH).api_get_course_path().'/document'.$group_properties['directory'].'/',
194
+    'BaseHref'             => api_get_path(WEB_COURSE_PATH).$_course['path'].'/document'.$dir
195 195
 );
196 196
 
197 197
 if ($is_certificate_mode) {
@@ -203,36 +203,36 @@  discard block
 block discarded – undo
203 203
 $filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document';
204 204
 
205 205
 if (!is_dir($filepath)) {
206
-	$filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document/';
207
-	$dir = '/';
206
+    $filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document/';
207
+    $dir = '/';
208 208
 }
209 209
 
210 210
 $to_group_id = 0;
211 211
 
212 212
 if (!$is_certificate_mode) {
213
-	if (api_is_in_group()) {
214
-		$interbreadcrumb[] = array ("url" => "../group/group_space.php?".api_get_cidreq(), "name" => get_lang('GroupSpace'));
215
-		$noPHP_SELF = true;
216
-		$to_group_id = api_get_group_id();
217
-		$path = explode('/', $dir);
218
-		if ('/'.$path[1] != $group_properties['directory']) {
219
-			api_not_allowed(true);
220
-		}
221
-	}
222
-	$interbreadcrumb[] = array("url" => "./document.php?curdirpath=".urlencode($dir)."&".api_get_cidreq(), "name" => get_lang('Documents'));
213
+    if (api_is_in_group()) {
214
+        $interbreadcrumb[] = array ("url" => "../group/group_space.php?".api_get_cidreq(), "name" => get_lang('GroupSpace'));
215
+        $noPHP_SELF = true;
216
+        $to_group_id = api_get_group_id();
217
+        $path = explode('/', $dir);
218
+        if ('/'.$path[1] != $group_properties['directory']) {
219
+            api_not_allowed(true);
220
+        }
221
+    }
222
+    $interbreadcrumb[] = array("url" => "./document.php?curdirpath=".urlencode($dir)."&".api_get_cidreq(), "name" => get_lang('Documents'));
223 223
 } else {
224
-	$interbreadcrumb[]= array('url' => '../gradebook/'.$_SESSION['gradebook_dest'], 'name' => get_lang('Gradebook'));
224
+    $interbreadcrumb[]= array('url' => '../gradebook/'.$_SESSION['gradebook_dest'], 'name' => get_lang('Gradebook'));
225 225
 }
226 226
 
227 227
 if (!$is_allowed_in_course) {
228
-	api_not_allowed(true);
228
+    api_not_allowed(true);
229 229
 }
230 230
 
231 231
 if (!($is_allowed_to_edit ||
232 232
     $_SESSION['group_member_with_upload_rights'] ||
233 233
     DocumentManager::is_my_shared_folder($userId, $dir, api_get_session_id()))
234 234
 ) {
235
-	api_not_allowed(true);
235
+    api_not_allowed(true);
236 236
 }
237 237
 
238 238
 /*	Header */
@@ -240,10 +240,10 @@  discard block
 block discarded – undo
240 240
 
241 241
 $display_dir = $dir;
242 242
 if (isset($group_properties)) {
243
-	$display_dir = explode('/', $dir);
244
-	unset($display_dir[0]);
245
-	unset($display_dir[1]);
246
-	$display_dir = implode('/', $display_dir);
243
+    $display_dir = explode('/', $dir);
244
+    unset($display_dir[0]);
245
+    unset($display_dir[1]);
246
+    $display_dir = implode('/', $display_dir);
247 247
 }
248 248
 
249 249
 $select_cat = isset($_GET['selectcat']) ? intval($_GET['selectcat']) : null;
@@ -260,9 +260,9 @@  discard block
 block discarded – undo
260 260
 $form->addElement('header', $nameTools);
261 261
 
262 262
 if ($is_certificate_mode) {//added condition for certicate in gradebook
263
-	$form->addElement('hidden','certificate','true',array('id'=>'certificate'));
264
-	if (isset($_GET['selectcat'])) {
265
-		$form->addElement('hidden','selectcat', $select_cat);
263
+    $form->addElement('hidden','certificate','true',array('id'=>'certificate'));
264
+    if (isset($_GET['selectcat'])) {
265
+        $form->addElement('hidden','selectcat', $select_cat);
266 266
     }
267 267
 }
268 268
 
@@ -297,12 +297,12 @@  discard block
 block discarded – undo
297 297
 if ($is_certificate_mode) {
298 298
     $form->addText('title', get_lang('CertificateName'), true, array('cols-size' => [2, 10, 0], 'autofocus'));
299 299
 } else {
300
-	$form->addText('title', get_lang('Title'), true, array('cols-size' => [2, 10, 0], 'autofocus'));
300
+    $form->addText('title', get_lang('Title'), true, array('cols-size' => [2, 10, 0], 'autofocus'));
301 301
 }
302 302
 
303 303
 // Show read-only box only in groups
304 304
 if (!empty($groupId)) {
305
-	$group[]= $form->createElement('checkbox', 'readonly', '', get_lang('ReadOnly'));
305
+    $group[]= $form->createElement('checkbox', 'readonly', '', get_lang('ReadOnly'));
306 306
 }
307 307
 $form->addRule('title', get_lang('ThisFieldIsRequired'), 'required');
308 308
 $form->addRule('title', get_lang('FileExists'), 'callback', 'document_exists');
@@ -317,14 +317,14 @@  discard block
 block discarded – undo
317 317
 // new document created
318 318
 
319 319
 if (!$is_certificate_mode &&
320
-	!DocumentManager::is_my_shared_folder($userId, $dir, $current_session_id)
320
+    !DocumentManager::is_my_shared_folder($userId, $dir, $current_session_id)
321 321
 ) {
322
-	$folders = DocumentManager::get_all_document_folders($_course, $to_group_id, $is_allowed_to_edit);
322
+    $folders = DocumentManager::get_all_document_folders($_course, $to_group_id, $is_allowed_to_edit);
323 323
 
324
-	//$parent_select = $form->addElement('select', 'curdirpath', array(null, get_lang('DestinationDirectory')));
324
+    //$parent_select = $form->addElement('select', 'curdirpath', array(null, get_lang('DestinationDirectory')));
325 325
         $parent_select = $form->addSelect('curdirpath', get_lang('DestinationDirectory'),null, array('cols-size' => [2, 10, 0]) );
326
-	// Following two conditions copied from document.inc.php::build_directory_selector()
327
-	$folder_titles = array();
326
+    // Following two conditions copied from document.inc.php::build_directory_selector()
327
+    $folder_titles = array();
328 328
 
329 329
     if (is_array($folders)) {
330 330
         $escaped_folders = array();
@@ -362,22 +362,22 @@  discard block
 block discarded – undo
362 362
         }
363 363
     }
364 364
 
365
-	if (empty($group_dir)) {
366
-		$parent_select -> addOption(get_lang('HomeDirectory'), '/');
367
-		if (is_array($folders)) {
368
-			foreach ($folders as & $folder) {
369
-				//Hide some folders
370
-				if ($folder=='/HotPotatoes_files' || $folder=='/certificates' || basename($folder)=='css') {
365
+    if (empty($group_dir)) {
366
+        $parent_select -> addOption(get_lang('HomeDirectory'), '/');
367
+        if (is_array($folders)) {
368
+            foreach ($folders as & $folder) {
369
+                //Hide some folders
370
+                if ($folder=='/HotPotatoes_files' || $folder=='/certificates' || basename($folder)=='css') {
371 371
                     continue;
372
-				}
373
-				//Admin setting for Hide/Show the folders of all users
374
-				if (api_get_setting('show_users_folders') == 'false' &&
372
+                }
373
+                //Admin setting for Hide/Show the folders of all users
374
+                if (api_get_setting('show_users_folders') == 'false' &&
375 375
                     (strstr($folder, '/shared_folder') || strstr($folder, 'shared_folder_session_'))
376 376
                 ){
377
-					continue;
378
-				}
379
-				//Admin setting for Hide/Show Default folders to all users
380
-				if (api_get_setting('show_default_folders') == 'false' &&
377
+                    continue;
378
+                }
379
+                //Admin setting for Hide/Show Default folders to all users
380
+                if (api_get_setting('show_default_folders') == 'false' &&
381 381
                     (
382 382
                         $folder == '/images' ||
383 383
                         $folder == '/flash' ||
@@ -387,80 +387,80 @@  discard block
 block discarded – undo
387 387
                         $folder == '/video/flv'
388 388
                     )
389 389
                 ){
390
-					continue;
391
-				}
392
-				//Admin setting for Hide/Show chat history folder
393
-				if (api_get_setting('show_chat_folder') == 'false' &&
390
+                    continue;
391
+                }
392
+                //Admin setting for Hide/Show chat history folder
393
+                if (api_get_setting('show_chat_folder') == 'false' &&
394 394
                     $folder=='/chat_files'
395 395
                 ){
396
-					continue;
397
-				}
396
+                    continue;
397
+                }
398 398
 
399
-				$selected = (substr($dir,0,-1) == $folder) ? ' selected="selected"' : '';
400
-				$path_parts = explode('/', $folder);
401
-				$folder_titles[$folder] = cut($folder_titles[$folder], 80);
399
+                $selected = (substr($dir,0,-1) == $folder) ? ' selected="selected"' : '';
400
+                $path_parts = explode('/', $folder);
401
+                $folder_titles[$folder] = cut($folder_titles[$folder], 80);
402 402
                 $space_counter =count($path_parts) - 2;
403 403
                 if ($space_counter > 0) {
404 404
                     $label = str_repeat('&nbsp;&nbsp;&nbsp;', $space_counter).' &mdash; '.$folder_titles[$folder];
405 405
                 } else {
406 406
                     $label = ' &mdash; '.$folder_titles[$folder];
407 407
                 }
408
-				$parent_select -> addOption($label, $folder);
409
-				if ($selected != '') {
410
-					$parent_select->setSelected($folder);
411
-				}
412
-			}
413
-		}
414
-	} else {
415
-		foreach ($folders as & $folder) {
416
-			$selected = (substr($dir,0,-1)==$folder) ? ' selected="selected"' : '';
417
-			$label = $folder_titles[$folder];
418
-			if ($folder == $group_dir) {
419
-				$label = '/ ('.get_lang('HomeDirectory').')';
420
-			} else {
421
-				$path_parts = explode('/', str_replace($group_dir, '', $folder));
422
-				$label = cut($label, 80);
423
-				$label = str_repeat('&nbsp;&nbsp;&nbsp;', count($path_parts) - 2).' &mdash; '.$label;
424
-			}
425
-			$parent_select -> addOption($label, $folder);
426
-			if ($selected != '') {
427
-				$parent_select->setSelected($folder);
428
-			}
429
-		}
430
-	}
408
+                $parent_select -> addOption($label, $folder);
409
+                if ($selected != '') {
410
+                    $parent_select->setSelected($folder);
411
+                }
412
+            }
413
+        }
414
+    } else {
415
+        foreach ($folders as & $folder) {
416
+            $selected = (substr($dir,0,-1)==$folder) ? ' selected="selected"' : '';
417
+            $label = $folder_titles[$folder];
418
+            if ($folder == $group_dir) {
419
+                $label = '/ ('.get_lang('HomeDirectory').')';
420
+            } else {
421
+                $path_parts = explode('/', str_replace($group_dir, '', $folder));
422
+                $label = cut($label, 80);
423
+                $label = str_repeat('&nbsp;&nbsp;&nbsp;', count($path_parts) - 2).' &mdash; '.$label;
424
+            }
425
+            $parent_select -> addOption($label, $folder);
426
+            if ($selected != '') {
427
+                $parent_select->setSelected($folder);
428
+            }
429
+        }
430
+    }
431 431
 }
432 432
 
433 433
 $form->addHidden('dirValue', '');
434 434
 
435 435
 if ($is_certificate_mode) {
436
-	$form->addButtonCreate(get_lang('CreateCertificate'));
436
+    $form->addButtonCreate(get_lang('CreateCertificate'));
437 437
 } else {
438
-	$form->addButtonCreate(get_lang('CreateDoc'));
438
+    $form->addButtonCreate(get_lang('CreateDoc'));
439 439
 }
440 440
 
441 441
 $form->setDefaults($defaults);
442 442
 
443 443
 // If form validates -> save the new document
444 444
 if ($form->validate()) {
445
-	$values = $form->exportValues();
446
-	$readonly = isset($values['readonly']) ? 1 : 0;
447
-	$values['title'] = trim($values['title']);
445
+    $values = $form->exportValues();
446
+    $readonly = isset($values['readonly']) ? 1 : 0;
447
+    $values['title'] = trim($values['title']);
448 448
     
449 449
     if (!empty($values['dirValue'])) {
450 450
         $dir = $values['dirValue'];
451 451
     }
452 452
 
453 453
     if ($dir[strlen($dir) - 1] != '/') {
454
-		$dir .= '/';
455
-	}
454
+        $dir .= '/';
455
+    }
456 456
     $filepath = $filepath.$dir;
457 457
 
458 458
     // Setting the filename
459
-	$filename = $values['title'];
460
-	$filename = addslashes(trim($filename));
461
-	$filename = Security::remove_XSS($filename);
462
-	$filename = api_replace_dangerous_char($filename);
463
-	$filename = disable_dangerous_file($filename);
459
+    $filename = $values['title'];
460
+    $filename = addslashes(trim($filename));
461
+    $filename = Security::remove_XSS($filename);
462
+    $filename = api_replace_dangerous_char($filename);
463
+    $filename = disable_dangerous_file($filename);
464 464
     $filename .= DocumentManager::getDocumentSuffix(
465 465
         $_course,
466 466
         api_get_session_id(),
@@ -468,14 +468,14 @@  discard block
 block discarded – undo
468 468
     );
469 469
 
470 470
     // Setting the title
471
-	$title = $values['title'];
471
+    $title = $values['title'];
472 472
 
473 473
     // Setting the extension
474
-	$extension = 'html';
474
+    $extension = 'html';
475 475
 
476
-	$content = Security::remove_XSS($values['content'], COURSEMANAGERLOWSECURITY);
476
+    $content = Security::remove_XSS($values['content'], COURSEMANAGERLOWSECURITY);
477 477
 
478
-	/*if (strpos($content, '/css/frames.css') == false) {
478
+    /*if (strpos($content, '/css/frames.css') == false) {
479 479
 		$content = str_replace('</head>', '<link rel="stylesheet" href="./css/frames.css" type="text/css" /><style> body{margin:50px;}</style></head>', $content);
480 480
 	}*/
481 481
 
@@ -488,12 +488,12 @@  discard block
 block discarded – undo
488 488
         exit;
489 489
     }
490 490
 
491
-	if ($fp = @fopen($filepath.$filename.'.'.$extension, 'w')) {
492
-		$content = str_replace(api_get_path(WEB_COURSE_PATH), $_configuration['url_append'].'/courses/', $content);
491
+    if ($fp = @fopen($filepath.$filename.'.'.$extension, 'w')) {
492
+        $content = str_replace(api_get_path(WEB_COURSE_PATH), $_configuration['url_append'].'/courses/', $content);
493 493
 
494
-		fputs($fp, $content);
495
-		fclose($fp);
496
-		chmod($filepath.$filename.'.'.$extension, api_get_permissions_for_new_files());
494
+        fputs($fp, $content);
495
+        fclose($fp);
496
+        chmod($filepath.$filename.'.'.$extension, api_get_permissions_for_new_files());
497 497
 
498 498
         /*
499 499
 		if (!is_dir($filepath.'css')) {
@@ -511,8 +511,8 @@  discard block
 block discarded – undo
511 511
 			api_item_property_update($_course, TOOL_DOCUMENT, $doc_id, 'invisible', $userId, null, null, null, null, $current_session_id);
512 512
 		}*/
513 513
 
514
-		$file_size = filesize($filepath.$filename.'.'.$extension);
515
-		$save_file_path = $dir.$filename.'.'.$extension;
514
+        $file_size = filesize($filepath.$filename.'.'.$extension);
515
+        $save_file_path = $dir.$filename.'.'.$extension;
516 516
 
517 517
         $document_id = add_document(
518 518
             $_course,
@@ -524,8 +524,8 @@  discard block
 block discarded – undo
524 524
             $readonly
525 525
         );
526 526
 
527
-		if ($document_id) {
528
-			api_item_property_update(
527
+        if ($document_id) {
528
+            api_item_property_update(
529 529
                 $_course,
530 530
                 TOOL_DOCUMENT,
531 531
                 $document_id,
@@ -537,13 +537,13 @@  discard block
 block discarded – undo
537 537
                 null,
538 538
                 $current_session_id
539 539
             );
540
-			// Update parent folders
541
-			item_property_update_on_folder($_course, $dir, $userId);
542
-			$new_comment = isset($_POST['comment']) ? trim($_POST['comment']) : '';
543
-			$new_title = isset($_POST['title']) ? trim($_POST['title']) : '';
540
+            // Update parent folders
541
+            item_property_update_on_folder($_course, $dir, $userId);
542
+            $new_comment = isset($_POST['comment']) ? trim($_POST['comment']) : '';
543
+            $new_title = isset($_POST['title']) ? trim($_POST['title']) : '';
544 544
             $new_title = htmlspecialchars($new_title);
545
-			if ($new_comment || $new_title) {
546
-				$ct = '';
545
+            if ($new_comment || $new_title) {
546
+                $ct = '';
547 547
                 $params = [];
548 548
                 if ($new_comment) {
549 549
                     $params['comment'] = $new_comment;
@@ -558,38 +558,38 @@  discard block
 block discarded – undo
558 558
                         ['c_id = ? AND id = ?' => [$course_id, $document_id]]
559 559
                     );
560 560
                 }
561
-			}
562
-			$dir= substr($dir,0,-1);
563
-			$selectcat = '';
564
-			if (isset($_REQUEST['selectcat']))
565
-				$selectcat = "&selectcat=".Security::remove_XSS($_REQUEST['selectcat']);
566
-			$certificate_condition = '';
567
-			if ($is_certificate_mode) {
568
-				$df = DocumentManager::get_default_certificate_id($_course['code']);
561
+            }
562
+            $dir= substr($dir,0,-1);
563
+            $selectcat = '';
564
+            if (isset($_REQUEST['selectcat']))
565
+                $selectcat = "&selectcat=".Security::remove_XSS($_REQUEST['selectcat']);
566
+            $certificate_condition = '';
567
+            if ($is_certificate_mode) {
568
+                $df = DocumentManager::get_default_certificate_id($_course['code']);
569 569
                 if (!isset($df)) {
570 570
                     DocumentManager::attach_gradebook_certificate ($_course['code'],$document_id);
571
-				}
572
-				$certificate_condition = '&certificate=true&curdirpath=/certificates';
573
-			}
574
-
575
-			header('Location: document.php?'.api_get_cidreq().'&id='.$folder_id.$selectcat.$certificate_condition);
576
-			exit();
577
-		} else {
578
-			Display :: display_header($nameTools, 'Doc');
579
-			Display :: display_error_message(get_lang('Impossible'));
580
-			Display :: display_footer();
581
-		}
582
-	} else {
583
-		Display :: display_header($nameTools, 'Doc');
584
-		Display :: display_error_message(get_lang('Impossible'));
585
-		Display :: display_footer();
586
-	}
571
+                }
572
+                $certificate_condition = '&certificate=true&curdirpath=/certificates';
573
+            }
574
+
575
+            header('Location: document.php?'.api_get_cidreq().'&id='.$folder_id.$selectcat.$certificate_condition);
576
+            exit();
577
+        } else {
578
+            Display :: display_header($nameTools, 'Doc');
579
+            Display :: display_error_message(get_lang('Impossible'));
580
+            Display :: display_footer();
581
+        }
582
+    } else {
583
+        Display :: display_header($nameTools, 'Doc');
584
+        Display :: display_error_message(get_lang('Impossible'));
585
+        Display :: display_footer();
586
+    }
587 587
 } else {
588
-	// Copied from document.php
589
-	$dir_array = explode('/', $dir);
590
-	$array_len = count($dir_array);
588
+    // Copied from document.php
589
+    $dir_array = explode('/', $dir);
590
+    $array_len = count($dir_array);
591 591
 
592
-	// Breadcrumb for the current directory root path
592
+    // Breadcrumb for the current directory root path
593 593
     if (!empty($document_data)) {
594 594
         if (empty($document_data['parents'])) {
595 595
             $interbreadcrumb[] = array(
@@ -606,31 +606,31 @@  discard block
 block discarded – undo
606 606
         }
607 607
     }
608 608
 
609
-	Display :: display_header($nameTools, "Doc");
610
-	// actions
609
+    Display :: display_header($nameTools, "Doc");
610
+    // actions
611 611
 
612
-	// link back to the documents overview
613
-	if ($is_certificate_mode) {
614
-		$actionsLeft =  '<a href="document.php?certificate=true&id='.$folder_id.'&selectcat=' . Security::remove_XSS($_GET['selectcat']).'">'.
612
+    // link back to the documents overview
613
+    if ($is_certificate_mode) {
614
+        $actionsLeft =  '<a href="document.php?certificate=true&id='.$folder_id.'&selectcat=' . Security::remove_XSS($_GET['selectcat']).'">'.
615 615
             Display::return_icon('back.png',get_lang('Back').' '.get_lang('To').' '.get_lang('CertificateOverview'),'',ICON_SIZE_MEDIUM).'</a>';
616 616
         } else {
617
-		$actionsLeft = '<a href="document.php?curdirpath='.Security::remove_XSS($dir).'">'.
617
+        $actionsLeft = '<a href="document.php?curdirpath='.Security::remove_XSS($dir).'">'.
618 618
             Display::return_icon('back.png',get_lang('Back').' '.get_lang('To').' '.get_lang('DocumentsOverview'),'',ICON_SIZE_MEDIUM).'</a>';
619 619
         }
620 620
         
621 621
         echo $toolbar = Display::toolbarAction('actions-documents', array(0 => $actionsLeft, 1 => ''));
622 622
                 
623 623
 
624
-	if ($is_certificate_mode) {
625
-		$all_information_by_create_certificate = DocumentManager::get_all_info_to_certificate(api_get_user_id(), api_get_course_id());
624
+    if ($is_certificate_mode) {
625
+        $all_information_by_create_certificate = DocumentManager::get_all_info_to_certificate(api_get_user_id(), api_get_course_id());
626 626
 
627
-		$str_info = '';
628
-		foreach ($all_information_by_create_certificate[0] as $info_value) {
629
-			$str_info.=$info_value.'<br/>';
630
-		}
631
-		$create_certificate = get_lang('CreateCertificateWithTags');
632
-		Display::display_normal_message($create_certificate.': <br /><br/>'.$str_info,false);
633
-	}
627
+        $str_info = '';
628
+        foreach ($all_information_by_create_certificate[0] as $info_value) {
629
+            $str_info.=$info_value.'<br/>';
630
+        }
631
+        $create_certificate = get_lang('CreateCertificateWithTags');
632
+        Display::display_normal_message($create_certificate.': <br /><br/>'.$str_info,false);
633
+    }
634 634
     // HTML-editor
635 635
     echo '<div class="row" style="overflow:hidden">
636 636
             <div id="template_col" class="col-md-2">
@@ -647,5 +647,5 @@  discard block
 block discarded – undo
647 647
                 '.$form->returnForm().'
648 648
             </div>
649 649
           </div>';
650
-	Display :: display_footer();
650
+    Display :: display_footer();
651 651
 }
Please login to merge, or discard this patch.
main/document/show_content.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -90,7 +90,7 @@  discard block
 block discarded – undo
90 90
 $file_url_web = api_get_path(WEB_COURSE_PATH).$_course['path'].'/document'.$header_file.'?'.api_get_cidreq();
91 91
 $pathinfo = pathinfo($header_file);
92 92
 
93
-if ($pathinfo['extension']=='wav' && preg_match('/_chnano_.wav/i', $file_url_web) && api_get_setting('enable_nanogong') == 'true'){
93
+if ($pathinfo['extension'] == 'wav' && preg_match('/_chnano_.wav/i', $file_url_web) && api_get_setting('enable_nanogong') == 'true') {
94 94
 	echo '<div align="center">';
95 95
 		echo '<br/>';
96 96
 		echo '<applet id="applet" archive="../inc/lib/nanogong/nanogong.jar" code="gong.NanoGong" width="160" height="95" >';
@@ -101,6 +101,6 @@  discard block
 block discarded – undo
101 101
 		echo '</applet>';
102 102
 	echo '</div>';
103 103
 } else {
104
-	if ($pathinfo['extension']=='swf') { $width='83%'; $height='83%';} else {$width='100%'; $height='100%';}
104
+	if ($pathinfo['extension'] == 'swf') { $width = '83%'; $height = '83%'; } else {$width = '100%'; $height = '100%'; }
105 105
 	echo '<iframe border="0" frameborder="0" scrolling="no" style="width:'.$width.'; height:'.$height.';background-color:#ffffff;" id="mainFrame" name="mainFrame" src="'.$file_url_web.'?'.api_get_cidreq().'&amp;rand='.mt_rand(1, 1000).'"></iframe>';
106 106
 }
Please login to merge, or discard this patch.
Indentation   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -91,16 +91,16 @@
 block discarded – undo
91 91
 $pathinfo = pathinfo($header_file);
92 92
 
93 93
 if ($pathinfo['extension']=='wav' && preg_match('/_chnano_.wav/i', $file_url_web) && api_get_setting('enable_nanogong') == 'true'){
94
-	echo '<div align="center">';
95
-		echo '<br/>';
96
-		echo '<applet id="applet" archive="../inc/lib/nanogong/nanogong.jar" code="gong.NanoGong" width="160" height="95" >';
97
-			echo '<param name="SoundFileURL" value="'.$file_url_web.'" />';
98
-			echo '<param name="ShowSaveButton" value="false" />';
99
-			echo '<param name="ShowTime" value="true" />';
100
-			echo '<param name="ShowRecordButton" value="false" />';
101
-		echo '</applet>';
102
-	echo '</div>';
94
+    echo '<div align="center">';
95
+        echo '<br/>';
96
+        echo '<applet id="applet" archive="../inc/lib/nanogong/nanogong.jar" code="gong.NanoGong" width="160" height="95" >';
97
+            echo '<param name="SoundFileURL" value="'.$file_url_web.'" />';
98
+            echo '<param name="ShowSaveButton" value="false" />';
99
+            echo '<param name="ShowTime" value="true" />';
100
+            echo '<param name="ShowRecordButton" value="false" />';
101
+        echo '</applet>';
102
+    echo '</div>';
103 103
 } else {
104
-	if ($pathinfo['extension']=='swf') { $width='83%'; $height='83%';} else {$width='100%'; $height='100%';}
105
-	echo '<iframe border="0" frameborder="0" scrolling="no" style="width:'.$width.'; height:'.$height.';background-color:#ffffff;" id="mainFrame" name="mainFrame" src="'.$file_url_web.'?'.api_get_cidreq().'&amp;rand='.mt_rand(1, 1000).'"></iframe>';
104
+    if ($pathinfo['extension']=='swf') { $width='83%'; $height='83%';} else {$width='100%'; $height='100%';}
105
+    echo '<iframe border="0" frameborder="0" scrolling="no" style="width:'.$width.'; height:'.$height.';background-color:#ffffff;" id="mainFrame" name="mainFrame" src="'.$file_url_web.'?'.api_get_cidreq().'&amp;rand='.mt_rand(1, 1000).'"></iframe>';
106 106
 }
Please login to merge, or discard this patch.
main/document/slideshowoptions.php 2 patches
Indentation   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -77,7 +77,7 @@  discard block
 block discarded – undo
77 77
                     if ($image_resizing == 'noresizing' || $image_resizing == '') {
78 78
                             echo ' checked';
79 79
                     }
80
-		?>>
80
+        ?>>
81 81
             </label>
82 82
             <?php echo '<b>'. get_lang('NoResizing') . '</b>, ' . get_lang('NoResizingComment') ;?>
83 83
         </div>
@@ -87,7 +87,7 @@  discard block
 block discarded – undo
87 87
                         if ($image_resizing == 'resizing_auto' || $image_resizing == '') {
88 88
                                 echo ' checked';
89 89
                         }
90
-		?>>
90
+        ?>>
91 91
             </label>
92 92
             <?php echo '<b>'. get_lang('ResizingAuto') . '</b>, ' . get_lang('ResizingAutoComment');?>
93 93
 	</div>
@@ -99,7 +99,7 @@  discard block
 block discarded – undo
99 99
                             $width = $_SESSION['image_resizing_width'];
100 100
                             $height = $_SESSION['image_resizing_height'];
101 101
                     }
102
-		?>>
102
+        ?>>
103 103
             </label>
104 104
             <?php echo '<b>'. get_lang('Resizing') . '</b>, ' . get_lang('ResizingComment'); ?>
105 105
 	</div>
@@ -107,13 +107,13 @@  discard block
 block discarded – undo
107 107
             <label class="col-sm-1 control-label"><?php echo get_lang('Width'); ?></label>
108 108
             <div class="col-sm-3">
109 109
                 <input class="form-control" name="width" type="text" id="width" <?php
110
-		if ($image_resizing == 'resizing') {
111
-			echo ' value="'.$width.'"';
112
-			echo ' class="enabled_input"';
110
+        if ($image_resizing == 'resizing') {
111
+            echo ' value="'.$width.'"';
112
+            echo ' class="enabled_input"';
113 113
                     } else {
114 114
                     echo ' class="disabled_input"';
115 115
                 }
116
-		?> >
116
+        ?> >
117 117
             </div>
118 118
             <div class="col-sm-8"></div>
119 119
         </div>
@@ -121,13 +121,13 @@  discard block
 block discarded – undo
121 121
             <label class="col-sm-1 control-label"><?php echo get_lang('Height'); ?></label>
122 122
             <div class="col-sm-3">
123 123
                 <input class="form-control" name="height" type="text" id="height" <?php
124
-		if ($image_resizing == 'resizing') {
125
-			echo ' value="'.$height.'"';
126
-			echo ' class="enabled_input"';
127
-		} else {
124
+        if ($image_resizing == 'resizing') {
125
+            echo ' value="'.$height.'"';
126
+            echo ' class="enabled_input"';
127
+        } else {
128 128
                         echo ' class="disabled_input"';
129 129
                 }
130
-		?> >
130
+        ?> >
131 131
             </div>
132 132
             <div class="col-sm-8"></div>
133 133
         </div>
Please login to merge, or discard this patch.
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -39,7 +39,7 @@  discard block
 block discarded – undo
39 39
 // bypass the $nametools thing and use <b></b> tags in the $interbreadcrump array
40 40
 $url = 'slideshowoptions.php?curdirpath='.$pathurl;
41 41
 $originaltoolname = '<b>'.get_lang('SlideshowOptions').'</b>';
42
-$interbreadcrumb[] = array('url' => $url, 'name' => $originaltoolname );
42
+$interbreadcrumb[] = array('url' => $url, 'name' => $originaltoolname);
43 43
 
44 44
 Display::display_header($originalToolName, 'Doc');
45 45
 $image_resizing = isset($_SESSION['image_resizing']) ? $_SESSION['image_resizing'] : null;
@@ -63,8 +63,8 @@  discard block
 block discarded – undo
63 63
 </script>
64 64
 
65 65
 <?php
66
-$actions = '<a href="document.php?action=exit_slideshow&curdirpath='.$pathurl.'">'.Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('DocumentsOverview'),'',ICON_SIZE_MEDIUM).'</a>';
67
-$actions .= '<a href="slideshow.php?curdirpath='.$pathurl.'">'.Display::return_icon('slideshow.png',get_lang('BackTo').' '.get_lang('SlideShow'),'',ICON_SIZE_MEDIUM).'</a>';
66
+$actions = '<a href="document.php?action=exit_slideshow&curdirpath='.$pathurl.'">'.Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('DocumentsOverview'), '', ICON_SIZE_MEDIUM).'</a>';
67
+$actions .= '<a href="slideshow.php?curdirpath='.$pathurl.'">'.Display::return_icon('slideshow.png', get_lang('BackTo').' '.get_lang('SlideShow'), '', ICON_SIZE_MEDIUM).'</a>';
68 68
 Display::toolbarAction('toolbar-slideshow', $content)
69 69
 ?>
70 70
 <div class="panel panel-default">
@@ -79,7 +79,7 @@  discard block
 block discarded – undo
79 79
                     }
80 80
 		?>>
81 81
             </label>
82
-            <?php echo '<b>'. get_lang('NoResizing') . '</b>, ' . get_lang('NoResizingComment') ;?>
82
+            <?php echo '<b>'.get_lang('NoResizing').'</b>, '.get_lang('NoResizingComment'); ?>
83 83
         </div>
84 84
         <div class="radio">
85 85
             <label>
@@ -89,7 +89,7 @@  discard block
 block discarded – undo
89 89
                         }
90 90
 		?>>
91 91
             </label>
92
-            <?php echo '<b>'. get_lang('ResizingAuto') . '</b>, ' . get_lang('ResizingAutoComment');?>
92
+            <?php echo '<b>'.get_lang('ResizingAuto').'</b>, '.get_lang('ResizingAutoComment'); ?>
93 93
 	</div>
94 94
 	<div class="radio">
95 95
             <label>
@@ -101,7 +101,7 @@  discard block
 block discarded – undo
101 101
                     }
102 102
 		?>>
103 103
             </label>
104
-            <?php echo '<b>'. get_lang('Resizing') . '</b>, ' . get_lang('ResizingComment'); ?>
104
+            <?php echo '<b>'.get_lang('Resizing').'</b>, '.get_lang('ResizingComment'); ?>
105 105
 	</div>
106 106
         <div class="form-group">
107 107
             <label class="col-sm-1 control-label"><?php echo get_lang('Width'); ?></label>
Please login to merge, or discard this patch.
main/document/record_audio.php 2 patches
Indentation   +40 added lines, -40 removed lines patch added patch discarded remove patch
@@ -23,11 +23,11 @@  discard block
 block discarded – undo
23 23
 $document_data  = array();
24 24
 
25 25
 if (isset($_GET['id'])) {
26
-	$document_data = DocumentManager::get_document_data_by_id(
27
-		$_GET['id'],
28
-		api_get_course_id(),
29
-		true
30
-	);
26
+    $document_data = DocumentManager::get_document_data_by_id(
27
+        $_GET['id'],
28
+        api_get_course_id(),
29
+        true
30
+    );
31 31
 }
32 32
 
33 33
 if (empty($document_data)) {
@@ -46,46 +46,46 @@  discard block
 block discarded – undo
46 46
 // Please, do not modify this dirname formatting
47 47
 
48 48
 if (strstr($dir, '..')) {
49
-	$dir = '/';
49
+    $dir = '/';
50 50
 }
51 51
 
52 52
 if ($dir[0] == '.') {
53
-	$dir = substr($dir, 1);
53
+    $dir = substr($dir, 1);
54 54
 }
55 55
 
56 56
 if ($dir[0] != '/') {
57
-	$dir = '/'.$dir;
57
+    $dir = '/'.$dir;
58 58
 }
59 59
 
60 60
 if ($dir[strlen($dir) - 1] != '/') {
61
-	$dir .= '/';
61
+    $dir .= '/';
62 62
 }
63 63
 
64 64
 $filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document'.$dir;
65 65
 
66 66
 if (!is_dir($filepath)) {
67
-	$filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document/';
68
-	$dir = '/';
67
+    $filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document/';
68
+    $dir = '/';
69 69
 }
70 70
 
71 71
 if (!empty($groupId)) {
72
-	$interbreadcrumb[] = array ("url" => "../group/group_space.php?".api_get_cidreq(), "name" => get_lang('GroupSpace'));
73
-	$group = GroupManager :: get_group_properties($groupId);
74
-	$path = explode('/', $dir);
75
-	if ('/'.$path[1] != $group['directory']) {
76
-		api_not_allowed(true);
77
-	}
72
+    $interbreadcrumb[] = array ("url" => "../group/group_space.php?".api_get_cidreq(), "name" => get_lang('GroupSpace'));
73
+    $group = GroupManager :: get_group_properties($groupId);
74
+    $path = explode('/', $dir);
75
+    if ('/'.$path[1] != $group['directory']) {
76
+        api_not_allowed(true);
77
+    }
78 78
 }
79 79
 
80 80
 $interbreadcrumb[] = array("url" => "./document.php?id=".$document_id.'&'.api_get_cidreq(), "name" => get_lang('Documents'));
81 81
 
82 82
 if (!$is_allowed_in_course) {
83
-	api_not_allowed(true);
83
+    api_not_allowed(true);
84 84
 }
85 85
 
86 86
 if (!($is_allowed_to_edit || $_SESSION['group_member_with_upload_rights'] ||
87
-	DocumentManager::is_my_shared_folder(api_get_user_id(), Security::remove_XSS($dir),api_get_session_id()))) {
88
-	api_not_allowed(true);
87
+    DocumentManager::is_my_shared_folder(api_get_user_id(), Security::remove_XSS($dir),api_get_session_id()))) {
88
+    api_not_allowed(true);
89 89
 }
90 90
 
91 91
 /*	Header */
@@ -93,10 +93,10 @@  discard block
 block discarded – undo
93 93
 
94 94
 $display_dir = $dir;
95 95
 if (isset ($group)) {
96
-	$display_dir = explode('/', $dir);
97
-	unset ($display_dir[0]);
98
-	unset ($display_dir[1]);
99
-	$display_dir = implode('/', $display_dir);
96
+    $display_dir = explode('/', $dir);
97
+    unset ($display_dir[0]);
98
+    unset ($display_dir[1]);
99
+    $display_dir = implode('/', $display_dir);
100 100
 }
101 101
 
102 102
 // Interbreadcrumb for the current directory root path
@@ -117,7 +117,7 @@  discard block
 block discarded – undo
117 117
 Display :: display_header($nameTools, 'Doc');
118 118
 
119 119
 echo '<div class="actions">';
120
-		echo '<a href="document.php?'.api_get_cidreq().'&id='.$document_id.'">'.Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('DocumentsOverview'),'',ICON_SIZE_MEDIUM).'</a>';
120
+        echo '<a href="document.php?'.api_get_cidreq().'&id='.$document_id.'">'.Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('DocumentsOverview'),'',ICON_SIZE_MEDIUM).'</a>';
121 121
 echo '</div>';
122 122
 
123 123
 ?>
@@ -178,24 +178,24 @@  discard block
 block discarded – undo
178 178
 Display::display_icon('microphone.png', get_lang('PressRecordButton'),'','128');
179 179
 echo '<br/>';
180 180
 echo '<applet id="nanogong" archive="'.api_get_path(WEB_LIBRARY_PATH).'nanogong/nanogong.jar" code="gong.NanoGong" width="250" height="95" ALIGN="middle">';
181
-	//echo '<param name="ShowRecordButton" value="false" />'; // default true
182
-	// echo '<param name="ShowSaveButton" value="false" />'; //you can save in local computer | (default true)
183
-	//echo '<param name="ShowSpeedButton" value="false" />'; // default true
184
-	//echo '<param name="ShowAudioLevel" value="false" />'; //  it displays the audiometer | (default true)
185
-	echo '<param name="ShowTime" value="true" />'; // default false
186
-	//echo '<param name="Color" value="#C0E0FF" />'; // default #FFFFFF
187
-	//echo '<param name="StartTime" value="10.5" />';
188
-	//echo '<param name="EndTime" value="65" />';
189
-	echo '<param name="AudioFormat" value="ImaADPCM" />';// ImaADPCM (more speed), Speex (more compression)|(default Speex)
190
-	//echo '<param name="SamplingRate" value="32000" />';//Quality for ImaADPCM (low 8000, medium 11025, normal 22050, hight 44100) OR Quality for Speex (low 8000, medium 16000, normal 32000, hight 44100) | (default 44100)
191
-	//echo '<param name="MaxDuration" value="60" />';
192
-	//echo '<param name="SoundFileURL" value="http://somewhere.com/mysoundfile.wav" />';//load a file |(default "")
181
+    //echo '<param name="ShowRecordButton" value="false" />'; // default true
182
+    // echo '<param name="ShowSaveButton" value="false" />'; //you can save in local computer | (default true)
183
+    //echo '<param name="ShowSpeedButton" value="false" />'; // default true
184
+    //echo '<param name="ShowAudioLevel" value="false" />'; //  it displays the audiometer | (default true)
185
+    echo '<param name="ShowTime" value="true" />'; // default false
186
+    //echo '<param name="Color" value="#C0E0FF" />'; // default #FFFFFF
187
+    //echo '<param name="StartTime" value="10.5" />';
188
+    //echo '<param name="EndTime" value="65" />';
189
+    echo '<param name="AudioFormat" value="ImaADPCM" />';// ImaADPCM (more speed), Speex (more compression)|(default Speex)
190
+    //echo '<param name="SamplingRate" value="32000" />';//Quality for ImaADPCM (low 8000, medium 11025, normal 22050, hight 44100) OR Quality for Speex (low 8000, medium 16000, normal 32000, hight 44100) | (default 44100)
191
+    //echo '<param name="MaxDuration" value="60" />';
192
+    //echo '<param name="SoundFileURL" value="http://somewhere.com/mysoundfile.wav" />';//load a file |(default "")
193 193
 echo '</applet>';
194 194
 
195 195
 echo '<form name="form_nanogong">';
196
-	echo '<input placeholder="'.get_lang('InputNameHere').'" type="text" id="audio_title">';
197
-	echo '<input id="status" type="hidden" name="status" value="0">';
198
-	echo '<button class="upload" type="submit" value="'.get_lang('Send').'" onClick="submitVoice()" />'.get_lang('Send').'</button>';
196
+    echo '<input placeholder="'.get_lang('InputNameHere').'" type="text" id="audio_title">';
197
+    echo '<input id="status" type="hidden" name="status" value="0">';
198
+    echo '<button class="upload" type="submit" value="'.get_lang('Send').'" onClick="submitVoice()" />'.get_lang('Send').'</button>';
199 199
 echo '</form>';
200 200
 
201 201
 echo '</div>';
Please login to merge, or discard this patch.
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -69,7 +69,7 @@  discard block
 block discarded – undo
69 69
 }
70 70
 
71 71
 if (!empty($groupId)) {
72
-	$interbreadcrumb[] = array ("url" => "../group/group_space.php?".api_get_cidreq(), "name" => get_lang('GroupSpace'));
72
+	$interbreadcrumb[] = array("url" => "../group/group_space.php?".api_get_cidreq(), "name" => get_lang('GroupSpace'));
73 73
 	$group = GroupManager :: get_group_properties($groupId);
74 74
 	$path = explode('/', $dir);
75 75
 	if ('/'.$path[1] != $group['directory']) {
@@ -84,7 +84,7 @@  discard block
 block discarded – undo
84 84
 }
85 85
 
86 86
 if (!($is_allowed_to_edit || $_SESSION['group_member_with_upload_rights'] ||
87
-	DocumentManager::is_my_shared_folder(api_get_user_id(), Security::remove_XSS($dir),api_get_session_id()))) {
87
+	DocumentManager::is_my_shared_folder(api_get_user_id(), Security::remove_XSS($dir), api_get_session_id()))) {
88 88
 	api_not_allowed(true);
89 89
 }
90 90
 
@@ -102,7 +102,7 @@  discard block
 block discarded – undo
102 102
 // Interbreadcrumb for the current directory root path
103 103
 $counter = 0;
104 104
 if (isset($document_data['parents'])) {
105
-    foreach($document_data['parents'] as $document_sub_data) {
105
+    foreach ($document_data['parents'] as $document_sub_data) {
106 106
         //fixing double group folder in breadcrumb
107 107
         if (api_get_group_id()) {
108 108
             if ($counter == 0) {
@@ -117,7 +117,7 @@  discard block
 block discarded – undo
117 117
 Display :: display_header($nameTools, 'Doc');
118 118
 
119 119
 echo '<div class="actions">';
120
-		echo '<a href="document.php?'.api_get_cidreq().'&id='.$document_id.'">'.Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('DocumentsOverview'),'',ICON_SIZE_MEDIUM).'</a>';
120
+		echo '<a href="document.php?'.api_get_cidreq().'&id='.$document_id.'">'.Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('DocumentsOverview'), '', ICON_SIZE_MEDIUM).'</a>';
121 121
 echo '</div>';
122 122
 
123 123
 ?>
@@ -175,7 +175,7 @@  discard block
 block discarded – undo
175 175
 <?php
176 176
 
177 177
 echo '<div align="center">';
178
-Display::display_icon('microphone.png', get_lang('PressRecordButton'),'','128');
178
+Display::display_icon('microphone.png', get_lang('PressRecordButton'), '', '128');
179 179
 echo '<br/>';
180 180
 echo '<applet id="nanogong" archive="'.api_get_path(WEB_LIBRARY_PATH).'nanogong/nanogong.jar" code="gong.NanoGong" width="250" height="95" ALIGN="middle">';
181 181
 	//echo '<param name="ShowRecordButton" value="false" />'; // default true
@@ -186,7 +186,7 @@  discard block
 block discarded – undo
186 186
 	//echo '<param name="Color" value="#C0E0FF" />'; // default #FFFFFF
187 187
 	//echo '<param name="StartTime" value="10.5" />';
188 188
 	//echo '<param name="EndTime" value="65" />';
189
-	echo '<param name="AudioFormat" value="ImaADPCM" />';// ImaADPCM (more speed), Speex (more compression)|(default Speex)
189
+	echo '<param name="AudioFormat" value="ImaADPCM" />'; // ImaADPCM (more speed), Speex (more compression)|(default Speex)
190 190
 	//echo '<param name="SamplingRate" value="32000" />';//Quality for ImaADPCM (low 8000, medium 11025, normal 22050, hight 44100) OR Quality for Speex (low 8000, medium 16000, normal 32000, hight 44100) | (default 44100)
191 191
 	//echo '<param name="MaxDuration" value="60" />';
192 192
 	//echo '<param name="SoundFileURL" value="http://somewhere.com/mysoundfile.wav" />';//load a file |(default "")
Please login to merge, or discard this patch.
main/document/exit_pixlr.php 2 patches
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -24,12 +24,12 @@
 block discarded – undo
24 24
 unset($_SESSION['temp_realpath_image']);
25 25
 
26 26
 if (!isset($_SESSION['exit_pixlr'])){
27
-	$location=api_get_path(WEB_CODE_PATH).'document/document.php';
28
-	echo '<script>window.parent.location.href="'.$location.'"</script>';
29
-	api_not_allowed(true);
27
+    $location=api_get_path(WEB_CODE_PATH).'document/document.php';
28
+    echo '<script>window.parent.location.href="'.$location.'"</script>';
29
+    api_not_allowed(true);
30 30
 } else {
31
-	echo '<div align="center" style="padding-top:150; font-family:Arial, Helvetica, Sans-serif;font-size:25px;color:#aaa;font-weight:bold;">'.get_lang('PleaseStandBy').'</div>';
32
-	$location=api_get_path(WEB_CODE_PATH).'document/document.php?id='.Security::remove_XSS($_SESSION['exit_pixlr']);
33
-	echo '<script>window.parent.location.href="'.$location.'"</script>';
34
-	unset($_SESSION['exit_pixlr']);
31
+    echo '<div align="center" style="padding-top:150; font-family:Arial, Helvetica, Sans-serif;font-size:25px;color:#aaa;font-weight:bold;">'.get_lang('PleaseStandBy').'</div>';
32
+    $location=api_get_path(WEB_CODE_PATH).'document/document.php?id='.Security::remove_XSS($_SESSION['exit_pixlr']);
33
+    echo '<script>window.parent.location.href="'.$location.'"</script>';
34
+    unset($_SESSION['exit_pixlr']);
35 35
 }
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -23,13 +23,13 @@
 block discarded – undo
23 23
 unset($_SESSION['whereami']);
24 24
 unset($_SESSION['temp_realpath_image']);
25 25
 
26
-if (!isset($_SESSION['exit_pixlr'])){
27
-	$location=api_get_path(WEB_CODE_PATH).'document/document.php';
26
+if (!isset($_SESSION['exit_pixlr'])) {
27
+	$location = api_get_path(WEB_CODE_PATH).'document/document.php';
28 28
 	echo '<script>window.parent.location.href="'.$location.'"</script>';
29 29
 	api_not_allowed(true);
30 30
 } else {
31 31
 	echo '<div align="center" style="padding-top:150; font-family:Arial, Helvetica, Sans-serif;font-size:25px;color:#aaa;font-weight:bold;">'.get_lang('PleaseStandBy').'</div>';
32
-	$location=api_get_path(WEB_CODE_PATH).'document/document.php?id='.Security::remove_XSS($_SESSION['exit_pixlr']);
32
+	$location = api_get_path(WEB_CODE_PATH).'document/document.php?id='.Security::remove_XSS($_SESSION['exit_pixlr']);
33 33
 	echo '<script>window.parent.location.href="'.$location.'"</script>';
34 34
 	unset($_SESSION['exit_pixlr']);
35 35
 }
Please login to merge, or discard this patch.
main/document/remote.php 2 patches
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -15,11 +15,11 @@  discard block
 block discarded – undo
15 15
 /* FIX for IE cache when using https */
16 16
 session_cache_limiter('none');
17 17
 /*==== DEBUG ====*/
18
-$debug=0;
19
-if ($debug>0) {
18
+$debug = 0;
19
+if ($debug > 0) {
20 20
     // dump the request
21 21
     $v = array_keys(get_defined_vars());
22
-    error_log(var_export($v, true),3, '/tmp/log');
22
+    error_log(var_export($v, true), 3, '/tmp/log');
23 23
     foreach (array_keys(get_defined_vars()) as $k) {
24 24
         if ($k == 'GLOBALS') {
25 25
             continue;
@@ -33,9 +33,9 @@  discard block
 block discarded – undo
33 33
 api_block_anonymous_users();
34 34
 /*==== Variables initialisation ====*/
35 35
 $action = $_REQUEST['action']; //safe as only used in if()'s
36
-$seek = array('/','%2F','..');
37
-$destroy = array('','','');
38
-$cidReq = str_replace($seek,$destroy,$_REQUEST["cidReq"]);
36
+$seek = array('/', '%2F', '..');
37
+$destroy = array('', '', '');
38
+$cidReq = str_replace($seek, $destroy, $_REQUEST["cidReq"]);
39 39
 $cidReq = Security::remove_XSS($cidReq);
40 40
 $user_id = api_get_user_id();
41 41
 $coursePath = api_get_path(SYS_COURSE_PATH).$cidReq.'/document';
@@ -44,27 +44,27 @@  discard block
 block discarded – undo
44 44
 // stupid variable initialisation for old version of DocumentManager functions.
45 45
 $_course['path'] = $_course['directory'];
46 46
 $is_manager = (CourseManager::get_user_in_course_status($user_id, $cidReq) == COURSEMANAGER);
47
-if ($debug>0) { error_log($coursePath, 0); }
47
+if ($debug > 0) { error_log($coursePath, 0); }
48 48
 // FIXME: check security around $_REQUEST["cwd"]
49 49
 $cwd = $_REQUEST['cwd'];
50 50
 // treat /..
51 51
 $nParent = 0; // the number of /.. into the url
52 52
 while (substr($cwd, -3, 3) == '/..') {
53 53
     // go to parent directory
54
-    $cwd= substr($cwd, 0, -3);
55
-    if (strlen($cwd) == 0) { $cwd='/'; }
54
+    $cwd = substr($cwd, 0, -3);
55
+    if (strlen($cwd) == 0) { $cwd = '/'; }
56 56
     $nParent++;
57 57
 }
58
-for (;$nParent >0; $nParent--) {
59
-    $cwd = (strrpos($cwd,'/')>-1 ? substr($cwd, 0, strrpos($cwd,'/')) : $cwd);
58
+for (;$nParent > 0; $nParent--) {
59
+    $cwd = (strrpos($cwd, '/') > -1 ? substr($cwd, 0, strrpos($cwd, '/')) : $cwd);
60 60
 }
61
-if (strlen($cwd) == 0) { $cwd='/'; }
62
-if (Security::check_abs_path($cwd,api_get_path(SYS_PATH))) {
61
+if (strlen($cwd) == 0) { $cwd = '/'; }
62
+if (Security::check_abs_path($cwd, api_get_path(SYS_PATH))) {
63 63
     die();
64 64
 }
65 65
 if ($action == 'list') {
66 66
     /*==== List files ====*/
67
-    if ($debug>0) { error_log("sending file list",0); }
67
+    if ($debug > 0) { error_log("sending file list", 0); }
68 68
 
69 69
     // get files list
70 70
     $files = DocumentManager::get_all_document_data($_course, $cwd, 0, NULL, false);
Please login to merge, or discard this patch.
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -40,7 +40,9 @@
 block discarded – undo
40 40
 $user_id = api_get_user_id();
41 41
 $coursePath = api_get_path(SYS_COURSE_PATH).$cidReq.'/document';
42 42
 $_course = CourseManager::get_course_information($cidReq);
43
-if ($_course == null) die ("problem when fetching course information");
43
+if ($_course == null) {
44
+    die ("problem when fetching course information");
45
+}
44 46
 // stupid variable initialisation for old version of DocumentManager functions.
45 47
 $_course['path'] = $_course['directory'];
46 48
 $is_manager = (CourseManager::get_user_in_course_status($user_id, $cidReq) == COURSEMANAGER);
Please login to merge, or discard this patch.
main/document/slideshow.inc.php 2 patches
Indentation   +11 added lines, -13 removed lines patch added patch discarded remove patch
@@ -15,8 +15,6 @@  discard block
 block discarded – undo
15 15
 	This file has two large sections.
16 16
 	1. code that belongs in document.php, but to avoid clutter I put the code here
17 17
 	2. the function resize_image that handles the image resizing
18
-
19
-
20 18
  *	@author Patrick Cool
21 19
  *	@package chamilo.document
22 20
  *	@todo convert comments to be understandable to phpDocumentor
@@ -34,16 +32,16 @@  discard block
 block discarded – undo
34 32
  *							view is also possible when you choose not to resize the source images
35 33
  */
36 34
 function resize_image($image, $target_width, $target_height, $slideshow = 0) {
37
-	// Modifications by Ivan Tcholakov, 04-MAY-2009.
38
-	$result = array();
39
-	if ( (isset($_SESSION['image_resizing']) && $_SESSION['image_resizing']== 'resizing') or $slideshow == 1) {
40
-		$new_sizes = api_resize_image($image, $target_width, $target_height);
41
-		$result[] = $new_sizes['height'];
42
-		$result[] = $new_sizes['width'];
43
-	} else {		
35
+    // Modifications by Ivan Tcholakov, 04-MAY-2009.
36
+    $result = array();
37
+    if ( (isset($_SESSION['image_resizing']) && $_SESSION['image_resizing']== 'resizing') or $slideshow == 1) {
38
+        $new_sizes = api_resize_image($image, $target_width, $target_height);
39
+        $result[] = $new_sizes['height'];
40
+        $result[] = $new_sizes['width'];
41
+    } else {		
44 42
         $size = api_getimagesize($image);
45
-		$result[] = $size['height'];
46
-		$result[] = $size['width'];
47
-	}
48
-	return $result;
43
+        $result[] = $size['height'];
44
+        $result[] = $size['width'];
45
+    }
46
+    return $result;
49 47
 }
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -36,7 +36,7 @@
 block discarded – undo
36 36
 function resize_image($image, $target_width, $target_height, $slideshow = 0) {
37 37
 	// Modifications by Ivan Tcholakov, 04-MAY-2009.
38 38
 	$result = array();
39
-	if ( (isset($_SESSION['image_resizing']) && $_SESSION['image_resizing']== 'resizing') or $slideshow == 1) {
39
+	if ((isset($_SESSION['image_resizing']) && $_SESSION['image_resizing'] == 'resizing') or $slideshow == 1) {
40 40
 		$new_sizes = api_resize_image($image, $target_width, $target_height);
41 41
 		$result[] = $new_sizes['height'];
42 42
 		$result[] = $new_sizes['width'];
Please login to merge, or discard this patch.
main/document/showinframes.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -148,8 +148,8 @@  discard block
 block discarded – undo
148 148
         );
149 149
     }
150 150
 } else {
151
-    foreach($document_data['parents'] as $document_sub_data) {
152
-        if (!isset($_GET['createdir']) && $document_sub_data['id'] ==  $document_data['id']) {
151
+    foreach ($document_data['parents'] as $document_sub_data) {
152
+        if (!isset($_GET['createdir']) && $document_sub_data['id'] == $document_data['id']) {
153 153
             $document_sub_data['document_url'] = '#';
154 154
         }
155 155
         $interbreadcrumb[] = array(
@@ -179,7 +179,7 @@  discard block
 block discarded – undo
179 179
 }
180 180
 $js_glossary_in_documents = '';
181 181
 
182
-$js_glossary_in_documents =	'
182
+$js_glossary_in_documents = '
183 183
   $.frameReady(function(){
184 184
    //  $("<div>I am a div courses</div>").prependTo("body");
185 185
   }, "top.mainFrame",
@@ -199,7 +199,7 @@  discard block
 block discarded – undo
199 199
 // PDF should be displayed with viewerJS
200 200
 $web_odf_supported_files[] = 'pdf';
201 201
 if (in_array(strtolower($pathinfo['extension']), $web_odf_supported_files)) {
202
-    $show_web_odf  = true;
202
+    $show_web_odf = true;
203 203
     /*
204 204
     $htmlHeadXtra[] = api_get_js('webodf/webodf.js');
205 205
     $htmlHeadXtra[] = api_get_css(api_get_path(WEB_LIBRARY_PATH).'javascript/webodf/webodf.css');
@@ -242,7 +242,7 @@  discard block
 block discarded – undo
242 242
     $htmlHeadXtra[] = api_get_js('highlight/highlight.pack.js');
243 243
     $htmlHeadXtra[] = api_get_css(api_get_path(WEB_CSS_PATH).'chat.css');
244 244
     $htmlHeadXtra[] = api_get_css(
245
-        api_get_path(WEB_LIBRARY_PATH) . 'javascript/highlight/styles/github.css'
245
+        api_get_path(WEB_LIBRARY_PATH).'javascript/highlight/styles/github.css'
246 246
     );
247 247
     $htmlHeadXtra[] = '
248 248
     <script>
@@ -253,7 +253,7 @@  discard block
 block discarded – undo
253 253
 $execute_iframe = true;
254 254
 if ($jplayer_supported) {
255 255
     $extension = api_strtolower($pathinfo['extension']);
256
-    if ($extension == 'mp4')  {
256
+    if ($extension == 'mp4') {
257 257
         $extension = 'm4v';
258 258
     }
259 259
     $js_path = api_get_path(WEB_LIBRARY_PATH).'javascript/';
@@ -294,12 +294,12 @@  discard block
 block discarded – undo
294 294
     $execute_iframe = false;
295 295
 }
296 296
 
297
-$is_freemind_available = $pathinfo['extension']=='mm' && api_get_setting('enable_freemind') == 'true';
297
+$is_freemind_available = $pathinfo['extension'] == 'mm' && api_get_setting('enable_freemind') == 'true';
298 298
 if ($is_freemind_available) {
299 299
     $execute_iframe = false;
300 300
 }
301 301
 
302
-$is_nanogong_available = $pathinfo['extension']=='wav' && preg_match('/_chnano_.wav/i', $file_url_web) && api_get_setting('enable_nanogong') == 'true';
302
+$is_nanogong_available = $pathinfo['extension'] == 'wav' && preg_match('/_chnano_.wav/i', $file_url_web) && api_get_setting('enable_nanogong') == 'true';
303 303
 if ($is_nanogong_available) {
304 304
     $execute_iframe = false;
305 305
 }
@@ -339,20 +339,20 @@  discard block
 block discarded – undo
339 339
 $file_url_web = $file_url.'?'.api_get_cidreq();
340 340
 
341 341
 if (!$is_nanogong_available) {
342
-    if (in_array(strtolower($pathinfo['extension']) , array('html', "htm"))) {
342
+    if (in_array(strtolower($pathinfo['extension']), array('html', "htm"))) {
343 343
         echo '<a class="btn btn-default" href="'.$file_url_web.'" target="_blank">'.get_lang('CutPasteLink').'</a>';
344 344
     }
345 345
 }
346 346
 
347 347
 if ($show_web_odf) {
348 348
     $browser = api_get_navigator();
349
-    $pdfUrl = api_get_path(WEB_LIBRARY_PATH) . 'javascript/ViewerJS/index.html#' . $file_url;
349
+    $pdfUrl = api_get_path(WEB_LIBRARY_PATH).'javascript/ViewerJS/index.html#'.$file_url;
350 350
     if ($browser['name'] == 'Mozilla' && preg_match('|.*\.pdf|i', $header_file)) {
351 351
         $pdfUrl = $file_url;
352 352
     }
353 353
     echo '<div id="viewerJS">';
354 354
     echo '<iframe id="viewerJSContent" frameborder="0" allowfullscreen="allowfullscreen" webkitallowfullscreen style="width:100%;"
355
-            src="' . $pdfUrl. '">
355
+            src="' . $pdfUrl.'">
356 356
         </iframe>';
357 357
     echo '</div>';
358 358
 } else {
Please login to merge, or discard this patch.
main/document/document_quota.php 2 patches
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -32,11 +32,11 @@  discard block
 block discarded – undo
32 32
 $session = array();
33 33
 $user_name = $user_info['complete_name'];
34 34
 
35
-$course_list = SessionManager::get_course_list_by_session_id ($session_id);
35
+$course_list = SessionManager::get_course_list_by_session_id($session_id);
36 36
 $session_list = SessionManager::get_session_by_course($course_id);
37 37
 $total_quota_bytes = DocumentManager::get_course_quota();
38
-$quota_bytes = DocumentManager::documents_total_space($course_id, 0 , 0);
39
-$quota_percentage = round($quota_bytes/$total_quota_bytes, 2)*100;
38
+$quota_bytes = DocumentManager::documents_total_space($course_id, 0, 0);
39
+$quota_percentage = round($quota_bytes / $total_quota_bytes, 2) * 100;
40 40
 
41 41
 $session[] = array(get_lang('Course').' ('.format_file_size($quota_bytes).')', $quota_percentage);
42 42
 
@@ -46,11 +46,11 @@  discard block
 block discarded – undo
46 46
     foreach ($session_list as $session_data) {
47 47
         $quota_percentage = 0;
48 48
         $quota_bytes = intval(DocumentManager::documents_total_space($course_id, null, $session_data['id']));
49
-        if (!empty($quota_bytes))  {
50
-            $quota_percentage = round($quota_bytes/$total_quota_bytes, 2)*100;
49
+        if (!empty($quota_bytes)) {
50
+            $quota_percentage = round($quota_bytes / $total_quota_bytes, 2) * 100;
51 51
         }
52 52
         if ($session_id == $session_data['id']) {
53
-            $session_data['name'] = $session_data['name'] . ' * ';
53
+            $session_data['name'] = $session_data['name'].' * ';
54 54
         }
55 55
         $used_quota_bytes += $quota_bytes;
56 56
         $session[] = array(
@@ -66,11 +66,11 @@  discard block
 block discarded – undo
66 66
         $quota_percentage = 0;
67 67
         $my_group_id = $group_data['id'];
68 68
         $quota_bytes = intval(DocumentManager::documents_total_space($course_id, $my_group_id, 0));
69
-        if (!empty($quota_bytes))  {
70
-            $quota_percentage = round($quota_bytes/$total_quota_bytes, 2)*100;
69
+        if (!empty($quota_bytes)) {
70
+            $quota_percentage = round($quota_bytes / $total_quota_bytes, 2) * 100;
71 71
         }
72 72
         if ($group_id == $my_group_id) {
73
-            $group_data['name'] = $group_data['name'] . ' * ';
73
+            $group_data['name'] = $group_data['name'].' * ';
74 74
         }
75 75
         $used_quota_bytes += $quota_bytes;
76 76
         $session[] = array(addslashes(get_lang('Group').': '.$group_data['name']).' ('.format_file_size($quota_bytes).')', $quota_percentage);
@@ -85,7 +85,7 @@  discard block
 block discarded – undo
85 85
         }
86 86
     }
87 87
     if ($quota_bytes != 0) {
88
-       $quota_percentage = round($quota_bytes/$total_quota_bytes, 2)*100;
88
+       $quota_percentage = round($quota_bytes / $total_quota_bytes, 2) * 100;
89 89
     }
90 90
 
91 91
     $session[] = array(addslashes(get_lang('Teacher').': '.$user_name).' ('.format_file_size($quota_bytes).')', $quota_percentage);
@@ -98,15 +98,15 @@  discard block
 block discarded – undo
98 98
                 $total_quota_bytes += DocumentManager::get_course_quota($course_data['id']);
99 99
             }
100 100
             if ($quota_bytes != 0) {
101
-                $quota_percentage = round($quota_bytes/$total_quota_bytes, 2)*100;
101
+                $quota_percentage = round($quota_bytes / $total_quota_bytes, 2) * 100;
102 102
             }
103 103
         }
104
-        $session[] = array(addslashes(sprintf(get_lang('TeacherXInSession'),$user_name)), $quota_percentage);
104
+        $session[] = array(addslashes(sprintf(get_lang('TeacherXInSession'), $user_name)), $quota_percentage);
105 105
 
106 106
    }
107 107
 }
108 108
 
109
-$quota_percentage = round(($total_quota_bytes - $used_quota_bytes)/$total_quota_bytes, 2)*100;
109
+$quota_percentage = round(($total_quota_bytes - $used_quota_bytes) / $total_quota_bytes, 2) * 100;
110 110
 $session[] = array(addslashes(get_lang('ShowCourseQuotaUse')).' ('.format_file_size($total_quota_bytes - $used_quota_bytes).') ', $quota_percentage);
111 111
 $quota_data = json_encode($session);
112 112
 
Please login to merge, or discard this patch.
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -85,7 +85,7 @@  discard block
 block discarded – undo
85 85
         }
86 86
     }
87 87
     if ($quota_bytes != 0) {
88
-       $quota_percentage = round($quota_bytes/$total_quota_bytes, 2)*100;
88
+        $quota_percentage = round($quota_bytes/$total_quota_bytes, 2)*100;
89 89
     }
90 90
 
91 91
     $session[] = array(addslashes(get_lang('Teacher').': '.$user_name).' ('.format_file_size($quota_bytes).')', $quota_percentage);
@@ -103,7 +103,7 @@  discard block
 block discarded – undo
103 103
         }
104 104
         $session[] = array(addslashes(sprintf(get_lang('TeacherXInSession'),$user_name)), $quota_percentage);
105 105
 
106
-   }
106
+    }
107 107
 }
108 108
 
109 109
 $quota_percentage = round(($total_quota_bytes - $used_quota_bytes)/$total_quota_bytes, 2)*100;
Please login to merge, or discard this patch.