Completed
Push — 1.10.x ( 60fa62...2aecf0 )
by Yannick
42:06
created
main/document/record_audio_wami.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -33,9 +33,9 @@  discard block
 block discarded – undo
33 33
 $dir = $document_data['path'];
34 34
 
35 35
 //make some vars
36
-$wamidir=$dir;
37
-if($wamidir=="/"){
38
- $wamidir="";
36
+$wamidir = $dir;
37
+if ($wamidir == "/") {
38
+ $wamidir = "";
39 39
 }
40 40
 $wamiurlplay = api_get_path(WEB_COURSE_PATH).api_get_course_path().'/document'.$wamidir."/";
41 41
 $groupId = api_get_group_id();
@@ -69,7 +69,7 @@  discard block
 block discarded – undo
69 69
 
70 70
 //groups //TODO: clean
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
 	$noPHP_SELF = true;
74 74
 	$group = GroupManager :: get_group_properties($groupId);
75 75
 	$path = explode('/', $dir);
@@ -85,7 +85,7 @@  discard block
 block discarded – undo
85 85
 }
86 86
 
87 87
 if (!($is_allowed_to_edit || $_SESSION['group_member_with_upload_rights'] ||
88
-	DocumentManager::is_my_shared_folder(api_get_user_id(), Security::remove_XSS($dir),api_get_session_id()))) {
88
+	DocumentManager::is_my_shared_folder(api_get_user_id(), Security::remove_XSS($dir), api_get_session_id()))) {
89 89
 	api_not_allowed(true);
90 90
 }
91 91
 
@@ -103,7 +103,7 @@  discard block
 block discarded – undo
103 103
 // Interbreadcrumb for the current directory root path
104 104
 $counter = 0;
105 105
 if (isset($document_data['parents'])) {
106
-    foreach($document_data['parents'] as $document_sub_data) {
106
+    foreach ($document_data['parents'] as $document_sub_data) {
107 107
         //fixing double group folder in breadcrumb
108 108
         if (api_get_group_id()) {
109 109
             if ($counter == 0) {
@@ -121,7 +121,7 @@  discard block
 block discarded – undo
121 121
 
122 122
 Display :: display_header($nameTools, 'Doc');
123 123
 echo '<div class="actions">';
124
-		echo '<a href="document.php?id='.$document_id.'">'.Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('DocumentsOverview'),'',ICON_SIZE_MEDIUM).'</a>';
124
+		echo '<a href="document.php?id='.$document_id.'">'.Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('DocumentsOverview'), '', ICON_SIZE_MEDIUM).'</a>';
125 125
 echo '</div>';
126 126
 ?>
127 127
 <!-- swfobject is a commonly used library to embed Flash content https://ajax.googleapis.com/ajax/libs/swfobject/2.2/ -->
Please login to merge, or discard this patch.
main/document/edit_odf.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
 $web_odf_supported_files = DocumentManager::get_web_odf_extension_list();
35 35
 
36 36
 if (in_array(strtolower($pathinfo['extension']), $web_odf_supported_files)) {
37
-    $show_web_odf  = true;
37
+    $show_web_odf = true;
38 38
 }
39 39
 
40 40
 $file_url_web = api_get_path(WEB_COURSE_PATH).$_course['path'].'/document'.$header_file;
@@ -85,8 +85,8 @@  discard block
 block discarded – undo
85 85
 echo Display::display_header('');
86 86
 
87 87
 echo '<div class="actions">';
88
-echo '<a href="document.php?id='.$parent_id.'">'.Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('DocumentsOverview'),'',ICON_SIZE_MEDIUM).'</a>';
89
-echo '<a href="edit_document.php?'.api_get_cidreq().'&id='.$document_id.$req_gid.'&origin=editodf">'.Display::return_icon('edit.png',get_lang('Rename').'/'.get_lang('Comments'),'',ICON_SIZE_MEDIUM).'</a>';
88
+echo '<a href="document.php?id='.$parent_id.'">'.Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('DocumentsOverview'), '', ICON_SIZE_MEDIUM).'</a>';
89
+echo '<a href="edit_document.php?'.api_get_cidreq().'&id='.$document_id.$req_gid.'&origin=editodf">'.Display::return_icon('edit.png', get_lang('Rename').'/'.get_lang('Comments'), '', ICON_SIZE_MEDIUM).'</a>';
90 90
 echo '</div>';
91 91
 
92 92
 // echo '<div id="odf"></div>';
Please login to merge, or discard this patch.
main/document/webcam_clip.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -32,9 +32,9 @@  discard block
 block discarded – undo
32 32
 $dir = $document_data['path'];
33 33
 
34 34
 //make some vars
35
-$webcamdir=$dir;
36
-if($webcamdir=="/"){
37
- $webcamdir="";
35
+$webcamdir = $dir;
36
+if ($webcamdir == "/") {
37
+ $webcamdir = "";
38 38
 }
39 39
 
40 40
 
@@ -68,7 +68,7 @@  discard block
 block discarded – undo
68 68
 $groupId = api_get_group_id();
69 69
 
70 70
 if (!empty($groupId)) {
71
-	$interbreadcrumb[] = array ("url" => "../group/group_space.php?".api_get_cidreq(), "name" => get_lang('GroupSpace'));
71
+	$interbreadcrumb[] = array("url" => "../group/group_space.php?".api_get_cidreq(), "name" => get_lang('GroupSpace'));
72 72
 	$noPHP_SELF = true;
73 73
 	$group = GroupManager :: get_group_properties($groupId);
74 74
 	$path = explode('/', $dir);
@@ -77,14 +77,14 @@  discard block
 block discarded – undo
77 77
 	}
78 78
 }
79 79
 
80
-$interbreadcrumb[] = array ("url" => "./document.php?id=".$document_id."&".api_get_cidreq(), "name" => get_lang('Documents'));
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 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()))) {
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) {
@@ -116,12 +116,12 @@  discard block
 block discarded – undo
116 116
 }
117 117
 
118 118
 //make some vars
119
-$webcamuserid=api_get_user_id();
119
+$webcamuserid = api_get_user_id();
120 120
 
121 121
 Display :: display_header($nameTools, 'Doc');
122 122
 echo '<div class="actions">';
123 123
 echo '<a href="document.php?id='.$document_id.'">'.
124
-	Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('DocumentsOverview'),'',ICON_SIZE_MEDIUM).'</a>';
124
+	Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('DocumentsOverview'), '', ICON_SIZE_MEDIUM).'</a>';
125 125
 echo '</div>';
126 126
 ?>
127 127
 
Please login to merge, or discard this patch.
main/document/edit_document.php 1 patch
Spacing   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -125,7 +125,7 @@  discard block
 block discarded – undo
125 125
 }
126 126
 
127 127
 $editorConfig = array(
128
-    'ToolbarSet' => (api_is_allowed_to_edit(null, true) ? 'Documents' :'DocumentsStudent'),
128
+    'ToolbarSet' => (api_is_allowed_to_edit(null, true) ? 'Documents' : 'DocumentsStudent'),
129 129
     'Width' => '100%',
130 130
     'Height' => '400',
131 131
     'cols-size' => [2, 10, 0],
@@ -144,7 +144,7 @@  discard block
 block discarded – undo
144 144
     $editorConfig['BaseHref']             = api_get_path(WEB_COURSE_PATH).$_course['path'].'/document'.$dir;
145 145
 }
146 146
 
147
-$is_allowed_to_edit = api_is_allowed_to_edit(null, true) || $_SESSION['group_member_with_upload_rights']||
147
+$is_allowed_to_edit = api_is_allowed_to_edit(null, true) || $_SESSION['group_member_with_upload_rights'] ||
148 148
 	DocumentManager::is_my_shared_folder(api_get_user_id(), $dir, $sessionId);
149 149
 $noPHP_SELF = true;
150 150
 
@@ -168,14 +168,14 @@  discard block
 block discarded – undo
168 168
         "name" => get_lang('Documents'),
169 169
     );
170 170
 } else {
171
-    $interbreadcrumb[]= array('url' => '../gradebook/'.$_SESSION['gradebook_dest'], 'name' => get_lang('Gradebook'));
171
+    $interbreadcrumb[] = array('url' => '../gradebook/'.$_SESSION['gradebook_dest'], 'name' => get_lang('Gradebook'));
172 172
 }
173 173
 
174 174
 // Interbreadcrumb for the current directory root path
175 175
 if (empty($document_data['parents'])) {
176 176
     $interbreadcrumb[] = array('url' => '#', 'name' => $document_data['title']);
177 177
 } else {
178
-    foreach($document_data['parents'] as $document_sub_data) {
178
+    foreach ($document_data['parents'] as $document_sub_data) {
179 179
         if ($document_data['title'] == $document_sub_data['title']) {
180 180
             continue;
181 181
         }
@@ -359,7 +359,7 @@  discard block
 block discarded – undo
359 359
 								$dir,
360 360
 								api_get_user_id()
361 361
 							);
362
-							header('Location: document.php?id=' . $document_data['parent_id'] . '&' . api_get_cidreq() . ($is_certificate_mode?'&curdirpath=/certificates&selectcat=1':''));
362
+							header('Location: document.php?id='.$document_data['parent_id'].'&'.api_get_cidreq().($is_certificate_mode ? '&curdirpath=/certificates&selectcat=1' : ''));
363 363
 							exit;
364 364
 						} else {
365 365
                             Display::addFlash(Display::return_message(get_lang('Impossible'), 'warning'));
@@ -402,7 +402,7 @@  discard block
 block discarded – undo
402 402
 /*	Display user interface */
403 403
 
404 404
 // Display the header
405
-$nameTools = get_lang('EditDocument') . ': '.Security::remove_XSS($document_data['title']);
405
+$nameTools = get_lang('EditDocument').': '.Security::remove_XSS($document_data['title']);
406 406
 Display::display_header($nameTools, 'Doc');
407 407
 
408 408
 $document_info = api_get_item_property_info(
@@ -484,7 +484,7 @@  discard block
 block discarded – undo
484 484
 	$form->addElement('textarea', 'comment', get_lang('Comment'), ['cols-size' => [2, 10, 0]]);
485 485
 
486 486
 	if ($owner_id == api_get_user_id() || api_is_platform_admin()) {
487
-		$checked =& $form->addElement('checkbox', 'readonly', null, get_lang('ReadOnly'));
487
+		$checked = & $form->addElement('checkbox', 'readonly', null, get_lang('ReadOnly'));
488 488
 		if ($readonly == 1) {
489 489
 			$checked->setChecked(true);
490 490
 		}
@@ -524,14 +524,14 @@  discard block
 block discarded – undo
524 524
 		foreach ($all_information_by_create_certificate[0] as $info_value) {
525 525
 			$str_info .= $info_value.'<br/>';
526 526
 		}
527
-		$create_certificate=get_lang('CreateCertificateWithTags');
527
+		$create_certificate = get_lang('CreateCertificateWithTags');
528 528
 		Display::display_normal_message(
529 529
 			$create_certificate.': <br /><br />'.$str_info,
530 530
 			false
531 531
 		);
532 532
 	}
533 533
 
534
-	if ($extension=='svg' && !api_browser_support('svg') && api_get_setting('enabled_support_svg') == 'true'){
534
+	if ($extension == 'svg' && !api_browser_support('svg') && api_get_setting('enabled_support_svg') == 'true') {
535 535
 		Display::display_warning_message(get_lang('BrowserDontSupportsSVG'));
536 536
 	}
537 537
     echo '<div class="row" style="overflow:hidden">
@@ -584,7 +584,7 @@  discard block
 block discarded – undo
584 584
 }
585 585
 
586 586
 //return button back to
587
-function show_return($document_id, $path, $call_from_tool='', $slide_id=0, $is_certificate_mode=false)
587
+function show_return($document_id, $path, $call_from_tool = '', $slide_id = 0, $is_certificate_mode = false)
588 588
 {
589 589
     global $parent_id;
590 590
 	echo '<div class="actions">';
@@ -592,26 +592,26 @@  discard block
 block discarded – undo
592 592
     $url = api_get_path(WEB_CODE_PATH).'document/document.php?'.api_get_cidreq().'&id='.$parent_id;
593 593
 
594 594
 	if ($is_certificate_mode) {
595
-		echo '<a href="document.php?curdirpath='.Security::remove_XSS($_GET['curdirpath']).'&selectcat=' . Security::remove_XSS($_GET['selectcat']).'">'.
596
-            Display::return_icon('back.png',get_lang('Back').' '.get_lang('To').' '.get_lang('CertificateOverview'),'',ICON_SIZE_MEDIUM).'</a>';
597
-	} elseif($call_from_tool=='slideshow') {
595
+		echo '<a href="document.php?curdirpath='.Security::remove_XSS($_GET['curdirpath']).'&selectcat='.Security::remove_XSS($_GET['selectcat']).'">'.
596
+            Display::return_icon('back.png', get_lang('Back').' '.get_lang('To').' '.get_lang('CertificateOverview'), '', ICON_SIZE_MEDIUM).'</a>';
597
+	} elseif ($call_from_tool == 'slideshow') {
598 598
 		echo '<a href="'.api_get_path(WEB_PATH).'main/document/slideshow.php?slide_id='.$slide_id.'&curdirpath='.Security::remove_XSS(urlencode($_GET['curdirpath'])).'">'.
599
-            Display::return_icon('slideshow.png', get_lang('BackTo').' '.get_lang('ViewSlideshow'),'',ICON_SIZE_MEDIUM).'</a>';
600
-	} elseif($call_from_tool=='editdraw') {
599
+            Display::return_icon('slideshow.png', get_lang('BackTo').' '.get_lang('ViewSlideshow'), '', ICON_SIZE_MEDIUM).'</a>';
600
+	} elseif ($call_from_tool == 'editdraw') {
601 601
 		echo '<a href="'.$url.'">'.
602
-            Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('DocumentsOverview'),'',ICON_SIZE_MEDIUM).'</a>';
602
+            Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('DocumentsOverview'), '', ICON_SIZE_MEDIUM).'</a>';
603 603
 		echo '<a href="javascript:history.back(1)">'.Display::return_icon('draw.png', get_lang('BackTo').' '.get_lang('Draw'), array(), 32).'</a>';
604
-	} elseif($call_from_tool=='editodf') {
604
+	} elseif ($call_from_tool == 'editodf') {
605 605
         echo '<a href="'.$url.'">'.
606
-            Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('DocumentsOverview'),'',ICON_SIZE_MEDIUM).'</a>';
606
+            Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('DocumentsOverview'), '', ICON_SIZE_MEDIUM).'</a>';
607 607
         echo '<a href="javascript:history.back(1)">'.Display::return_icon('draw.png', get_lang('BackTo').' '.get_lang('Write'), array(), 32).'</a>';
608
-    } elseif($call_from_tool=='editpaint'){
608
+    } elseif ($call_from_tool == 'editpaint') {
609 609
 		echo '<a href="'.$url.'">'.
610 610
             Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('DocumentsOverview'), array(), ICON_SIZE_MEDIUM).'</a>';
611 611
 		echo '<a href="javascript:history.back(1)">'.Display::return_icon('paint.png', get_lang('BackTo').' '.get_lang('Paint'), array(), 32).'</a>';
612 612
 	} else {
613 613
 		echo '<a href="'.$url.'">'.
614
-            Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('DocumentsOverview'),'',ICON_SIZE_MEDIUM).'</a>';
614
+            Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('DocumentsOverview'), '', ICON_SIZE_MEDIUM).'</a>';
615 615
 	}
616 616
 	echo '</div>';
617 617
 }
Please login to merge, or discard this patch.
main/document/document.php 1 patch
Spacing   +35 added lines, -37 removed lines patch added patch discarded remove patch
@@ -49,10 +49,10 @@  discard block
 block discarded – undo
49 49
 }
50 50
 $_user = api_get_user_info();
51 51
 $courseInfo = api_get_course_info();
52
-$course_dir = $courseInfo['directory'] . '/document';
52
+$course_dir = $courseInfo['directory'].'/document';
53 53
 $sys_course_path = api_get_path(SYS_COURSE_PATH);
54
-$base_work_dir = $sys_course_path . $course_dir;
55
-$http_www = api_get_path(WEB_COURSE_PATH).$courseInfo['directory'] . '/document';
54
+$base_work_dir = $sys_course_path.$course_dir;
55
+$http_www = api_get_path(WEB_COURSE_PATH).$courseInfo['directory'].'/document';
56 56
 $document_path = $base_work_dir;
57 57
 $usePpt2lp = api_get_setting('service_ppt2lp', 'active') == 'true';
58 58
 
@@ -230,7 +230,7 @@  discard block
 block discarded – undo
230 230
                             $certificateId
231 231
                         );
232 232
                         Display::addFlash(Display::return_message(
233
-                            get_lang('DocDeleted') . ': ' . $documentInfo['title'],
233
+                            get_lang('DocDeleted').': '.$documentInfo['title'],
234 234
                             'success'
235 235
                         ));
236 236
                     } else {
@@ -419,11 +419,9 @@  discard block
 block discarded – undo
419 419
     case 'convertToPdf':
420 420
         // PDF format as target by default
421 421
         $formatTarget = $_REQUEST['formatTarget'] ?
422
-            strtolower(Security::remove_XSS($_REQUEST['formatTarget'])) :
423
-            'pdf';
422
+            strtolower(Security::remove_XSS($_REQUEST['formatTarget'])) : 'pdf';
424 423
         $formatType = $_REQUEST['formatType'] ?
425
-            strtolower(Security::remove_XSS($_REQUEST['formatType'])) :
426
-            'text';
424
+            strtolower(Security::remove_XSS($_REQUEST['formatType'])) : 'text';
427 425
         // Get the document data from the ID
428 426
         $document_info = DocumentManager::get_document_data_by_id(
429 427
             $document_id,
@@ -431,8 +429,8 @@  discard block
 block discarded – undo
431 429
             true,
432 430
             $session_id
433 431
         );
434
-        $file = $sys_course_path . $courseInfo['directory'] .
435
-            '/document' . $document_info['path'];
432
+        $file = $sys_course_path.$courseInfo['directory'].
433
+            '/document'.$document_info['path'];
436 434
         $fileInfo = pathinfo($file);
437 435
         if ($fileInfo['extension'] == $formatTarget) {
438 436
             Display::addFlash(Display::return_message(
@@ -463,9 +461,9 @@  discard block
 block discarded – undo
463 461
                 'warning'
464 462
             ));
465 463
         } else {
466
-            $convertedFile = $fileInfo['dirname'] . DIRECTORY_SEPARATOR .
467
-                $fileInfo['filename'] . '_from_' . $fileInfo['extension'] .
468
-                '.' . $formatTarget;
464
+            $convertedFile = $fileInfo['dirname'].DIRECTORY_SEPARATOR.
465
+                $fileInfo['filename'].'_from_'.$fileInfo['extension'].
466
+                '.'.$formatTarget;
469 467
             $convertedTitle = $document_info['title'];
470 468
             $obj = new OpenofficePresentation(true);
471 469
             if (file_exists($convertedFile)) {
@@ -490,13 +488,13 @@  discard block
 block discarded – undo
490 488
                     $gidReq = Security::remove_XSS($_GET['gidReq']);
491 489
                     $file_link = Display::url(
492 490
                         get_lang('SeeFile'),
493
-                        api_get_path(WEB_CODE_PATH) .
494
-                        'document/showinframes.php?' . 'cidReq=' . $cidReq .
495
-                        '&id_session=' . $id_session . '&' .
496
-                        'gidReq=' . $gidReq . '&id=' . current($result)
491
+                        api_get_path(WEB_CODE_PATH).
492
+                        'document/showinframes.php?'.'cidReq='.$cidReq.
493
+                        '&id_session='.$id_session.'&'.
494
+                        'gidReq='.$gidReq.'&id='.current($result)
497 495
                     );
498 496
                     Display::addFlash(Display::return_message(
499
-                        get_lang('CopyMade') . ' ' . $file_link,
497
+                        get_lang('CopyMade').' '.$file_link,
500 498
                         'confirmation',
501 499
                         false
502 500
                     ));
@@ -653,7 +651,7 @@  discard block
 block discarded – undo
653 651
             $new_content_html
654 652
         );
655 653
         $new_content_html = str_replace(
656
-            SYS_CODE_PATH . 'img/',
654
+            SYS_CODE_PATH.'img/',
657 655
             api_get_path(WEB_IMG_PATH),
658 656
             $new_content_html
659 657
         );
@@ -709,11 +707,11 @@  discard block
 block discarded – undo
709 707
     $("#convertSelect").change(function() {
710 708
         var formatTarget = $(this).val();
711 709
         window.location.href = "'.
712
-            api_get_self() . '?' . api_get_cidreq() .
713
-            '&curdirpath=' . $curdirpath .
714
-            '&action=convertToPdf&formatTarget=' .
715
-            '" + formatTarget + "&id=" + id + "&' .
716
-            api_get_cidreq() . '&formatType=" + format;
710
+            api_get_self().'?'.api_get_cidreq().
711
+            '&curdirpath='.$curdirpath.
712
+            '&action=convertToPdf&formatTarget='.
713
+            '" + formatTarget + "&id=" + id + "&'.
714
+            api_get_cidreq().'&formatType=" + format;
717 715
     });
718 716
     $("#convertModal").on("hidden", function(){
719 717
         $("." + format + "FormatType").hide();
@@ -1044,7 +1042,7 @@  discard block
 block discarded – undo
1044 1042
                 update_db_info(
1045 1043
                     'update',
1046 1044
                     $document_to_move['path'],
1047
-                    $moveTo . '/' . basename($document_to_move['path'])
1045
+                    $moveTo.'/'.basename($document_to_move['path'])
1048 1046
                 );
1049 1047
 
1050 1048
                 //update database item property
@@ -1276,7 +1274,7 @@  discard block
 block discarded – undo
1276 1274
 
1277 1275
             if (!empty($newFolderData)) {
1278 1276
                 $message = Display::return_message(
1279
-                    get_lang('DirCr') . ' ' . $newFolderData['title'],
1277
+                    get_lang('DirCr').' '.$newFolderData['title'],
1280 1278
                     'confirmation'
1281 1279
                 );
1282 1280
             } else {
@@ -1361,27 +1359,27 @@  discard block
 block discarded – undo
1361 1359
 
1362 1360
         // Create the form that asks for the directory name
1363 1361
         $templateForm .= '
1364
-            <form name="set_document_as_new_template" class="form-horizontal" enctype="multipart/form-data" action="' . api_get_self() . '?add_as_template=' . $document_id_for_template . '" method="post">
1362
+            <form name="set_document_as_new_template" class="form-horizontal" enctype="multipart/form-data" action="' . api_get_self().'?add_as_template='.$document_id_for_template.'" method="post">
1365 1363
                 <fieldset>
1366
-                    <legend>' . get_lang('AddAsTemplate') . '</legend>
1364
+                    <legend>' . get_lang('AddAsTemplate').'</legend>
1367 1365
                     <div class="form-group">
1368
-                        <label for="template_title" class="col-sm-2 control-label">' . get_lang('TemplateName') . '</label>
1366
+                        <label for="template_title" class="col-sm-2 control-label">' . get_lang('TemplateName').'</label>
1369 1367
                         <div class="col-sm-10">
1370 1368
                             <input type="text" class="form-control" id="template_title" name="template_title">
1371 1369
                         </div>
1372 1370
                     </div>
1373 1371
                     <div class="form-group">
1374
-                        <label for="template_image" class="col-sm-2 control-label">' . get_lang('TemplateImage') . '</label>
1372
+                        <label for="template_image" class="col-sm-2 control-label">' . get_lang('TemplateImage').'</label>
1375 1373
                         <div class="col-sm-10">
1376 1374
                             <input type="file" name="template_image" id="template_image">
1377 1375
                         </div>
1378 1376
                     </div>
1379 1377
                     <div class="form-group">
1380 1378
                         <div class="col-sm-offset-2 col-sm-10">
1381
-                            <button type="submit" name="create_template" class="btn btn-primary">' . get_lang('CreateTemplate') . '</button>
1379
+                            <button type="submit" name="create_template" class="btn btn-primary">' . get_lang('CreateTemplate').'</button>
1382 1380
                         </div>
1383 1381
                     </div>
1384
-                    <input type="hidden" name="curdirpath" value="' . $curdirpath . '" />
1382
+                    <input type="hidden" name="curdirpath" value="' . $curdirpath.'" />
1385 1383
                 </fieldset>
1386 1384
             </form>
1387 1385
             <hr>
@@ -2026,18 +2024,18 @@  discard block
 block discarded – undo
2026 2024
         <div class="modal-dialog">
2027 2025
             <div class="modal-content">
2028 2026
                 <div class="modal-header" style="text-align: center;">
2029
-                <button type="button" class="close" data-dismiss="modal" aria-label="' . get_lang('Close') . '">
2027
+                <button type="button" class="close" data-dismiss="modal" aria-label="' . get_lang('Close').'">
2030 2028
                     <span aria-hidden="true">&times;</span>
2031 2029
                 </button>
2032
-                <h4 class="modal-title">' . get_lang('Convert') . '</h4>
2030
+                <h4 class="modal-title">' . get_lang('Convert').'</h4>
2033 2031
             </div>
2034 2032
             <div class="modal-body">
2035 2033
               <form action="#" class="form-horizontal">
2036 2034
                   <div class="form-group">
2037
-                      <label class="col-sm-4 control-label" for="convertSelect">' . get_lang('ConvertFormats') . '</label>
2035
+                      <label class="col-sm-4 control-label" for="convertSelect">' . get_lang('ConvertFormats').'</label>
2038 2036
                       <div class="col-sm-8">
2039 2037
                           <select id="convertSelect">
2040
-                              <option value="">' . get_lang('Select') . '</option>
2038
+                              <option value="">' . get_lang('Select').'</option>
2041 2039
                               <option value="pdf">
2042 2040
                                   PDF - Portable Document File
2043 2041
                               </option>
@@ -2056,7 +2054,7 @@  discard block
 block discarded – undo
2056 2054
               </form>
2057 2055
             </div>
2058 2056
             <div class="modal-footer">
2059
-              <button type="button" class="btn btn-default" data-dismiss="modal">' . get_lang('Close') . '</button>
2057
+              <button type="button" class="btn btn-default" data-dismiss="modal">' . get_lang('Close').'</button>
2060 2058
             </div>
2061 2059
         </div>
2062 2060
     </div>';
Please login to merge, or discard this patch.
main/document/download.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -95,7 +95,7 @@
 block discarded – undo
95 95
     }
96 96
 
97 97
     if (!api_is_allowed_to_edit() && !$is_visible) {
98
-        Display::display_error_message(get_lang('ProtectedDocument'));//api_not_allowed backbutton won't work.
98
+        Display::display_error_message(get_lang('ProtectedDocument')); //api_not_allowed backbutton won't work.
99 99
         exit; // You shouldn't be here anyway.
100 100
     }
101 101
     // Launch event
Please login to merge, or discard this patch.
main/document/webcam_receiver.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -13,7 +13,7 @@  discard block
 block discarded – undo
13 13
 # Save the audio to a URL-accessible directory for playback.
14 14
 parse_str($_SERVER['QUERY_STRING'], $params);
15 15
 
16
-if(isset($params['webcamname']) && isset($params['webcamdir']) && isset($params['webcamuserid'])) {
16
+if (isset($params['webcamname']) && isset($params['webcamdir']) && isset($params['webcamuserid'])) {
17 17
 	$webcamname = $params['webcamname'];
18 18
 	$webcamdir = $params['webcamdir'];
19 19
 	$webcamuserid = $params['webcamuserid'];
@@ -23,7 +23,7 @@  discard block
 block discarded – undo
23 23
 	die();
24 24
 }
25 25
 
26
-if ($webcamuserid!= api_get_user_id() || api_get_user_id()==0 || $webcamuserid==0) {
26
+if ($webcamuserid != api_get_user_id() || api_get_user_id() == 0 || $webcamuserid == 0) {
27 27
 	api_not_allowed();
28 28
 	die();
29 29
 }
@@ -41,7 +41,7 @@  discard block
 block discarded – undo
41 41
 $ext = explode('.', $webcamname);
42 42
 $ext = strtolower($ext[sizeof($ext) - 1]);
43 43
 
44
-if($ext!= 'jpg'){
44
+if ($ext != 'jpg') {
45 45
 	die();
46 46
 }
47 47
 
@@ -53,15 +53,15 @@  discard block
 block discarded – undo
53 53
 $groupId = api_get_group_id();
54 54
 
55 55
 //Avoid duplicates
56
-$webcamname_to_save=$webcamname;
57
-$title_to_save=str_replace('_',' ',$webcamname);
58
-$webcamname_noex=basename($webcamname, ".jpg");
59
-if (file_exists($saveDir.'/'.$webcamname_noex.'.'.$ext)){
56
+$webcamname_to_save = $webcamname;
57
+$title_to_save = str_replace('_', ' ', $webcamname);
58
+$webcamname_noex = basename($webcamname, ".jpg");
59
+if (file_exists($saveDir.'/'.$webcamname_noex.'.'.$ext)) {
60 60
 		$i = 1;
61 61
 		while (file_exists($saveDir.'/'.$webcamname_noex.'_'.$i.'.'.$ext)) $i++;
62
-		$webcamname_to_save = $webcamname_noex . '_' . $i . '.'.$ext;
63
-		$title_to_save = $webcamname_noex . '_' . $i . '.'.$ext;
64
-		$title_to_save = str_replace('_',' ',$title_to_save);
62
+		$webcamname_to_save = $webcamname_noex.'_'.$i.'.'.$ext;
63
+		$title_to_save = $webcamname_noex.'_'.$i.'.'.$ext;
64
+		$title_to_save = str_replace('_', ' ', $title_to_save);
65 65
 }
66 66
 
67 67
 $documentPath = $saveDir.'/'.$webcamname_to_save;
@@ -78,5 +78,5 @@  discard block
 block discarded – undo
78 78
 	$doc_id = add_document($_course, $webcamdir.'/'.$webcamname_to_save, 'file', filesize($documentPath), $title_to_save);
79 79
 	api_item_property_update($_course, TOOL_DOCUMENT, $doc_id, 'DocumentAdded', $_user['user_id'], $groupId, null, null, null, $current_session_id);
80 80
 ///
81
-$url = 'http://' . $_SERVER['HTTP_HOST'] . dirname($_SERVER['REQUEST_URI']) . '/' . $documentPath;
81
+$url = 'http://'.$_SERVER['HTTP_HOST'].dirname($_SERVER['REQUEST_URI']).'/'.$documentPath;
82 82
 print get_lang('ClipSent');
Please login to merge, or discard this patch.
main/document/document_slideshow.inc.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@
 block discarded – undo
25 25
  *	too much things in one file , I decided to put the code for document.php here and to include this
26 26
  *	file into document.php
27 27
  */
28
-$accepted_extensions = array('.jpg', '.jpeg', '.gif', '.png', '.bmp','.svg');
28
+$accepted_extensions = array('.jpg', '.jpeg', '.gif', '.png', '.bmp', '.svg');
29 29
 
30 30
 // Resetting the images of the slideshow = destroying the slideshow
31 31
 if (isset($_GET['action']) && $_GET['action'] == 'exit_slideshow') {
Please login to merge, or discard this patch.
main/document/downloadfolder.inc.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -51,7 +51,7 @@  discard block
 block discarded – undo
51 51
 
52 52
 // A student should not be able to download a root shared directory
53 53
 if (($path == '/shared_folder' ||
54
-    $path == '/shared_folder_session_' . api_get_session_id()) &&
54
+    $path == '/shared_folder_session_'.api_get_session_id()) &&
55 55
     (!api_is_allowed_to_edit() || !api_is_platform_admin())
56 56
 ) {
57 57
     api_not_allowed(true);
@@ -149,7 +149,7 @@  discard block
 block discarded – undo
149 149
                 (props.session_id IN ('0', '$sessionId') OR props.session_id IS NULL) AND
150 150
                 docs.c_id = ".$courseId." ";
151 151
 
152
-    $sql.= DocumentManager::getSessionFolderFilters($querypath, $sessionId);
152
+    $sql .= DocumentManager::getSessionFolderFilters($querypath, $sessionId);
153 153
 
154 154
     $result = Database::query($sql);
155 155
 
@@ -214,7 +214,7 @@  discard block
 block discarded – undo
214 214
                 $groupCondition
215 215
             ";
216 216
 
217
-    $sql.= DocumentManager::getSessionFolderFilters($querypath, $sessionId);
217
+    $sql .= DocumentManager::getSessionFolderFilters($querypath, $sessionId);
218 218
     $result = Database::query($sql);
219 219
 
220 220
     $files = array();
@@ -294,9 +294,9 @@  discard block
 block discarded – undo
294 294
     // Add all files in our final array to the zipfile
295 295
     for ($i = 0; $i < count($files_for_zipfile); $i++) {
296 296
         $zip->add(
297
-            $sysCoursePath . $courseInfo['path'] . '/document' . $files_for_zipfile[$i],
297
+            $sysCoursePath.$courseInfo['path'].'/document'.$files_for_zipfile[$i],
298 298
             PCLZIP_OPT_REMOVE_PATH,
299
-            $sysCoursePath . $courseInfo['path'] . '/document' . $remove_dir,
299
+            $sysCoursePath.$courseInfo['path'].'/document'.$remove_dir,
300 300
             PCLZIP_CB_PRE_ADD,
301 301
             'fixDocumentNameCallback'
302 302
         );
Please login to merge, or discard this patch.