Completed
Push — 1.10.x ( c82817...6a93c3 )
by Yannick
202:42 queued 149:59
created
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/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.
main/document/save_pixlr.php 1 patch
Spacing   +34 added lines, -34 removed lines patch added patch discarded remove patch
@@ -16,36 +16,36 @@  discard block
 block discarded – undo
16 16
 api_protect_course_script();
17 17
 api_block_anonymous_users();
18 18
 
19
-if ($_user['user_id']!= api_get_user_id() || api_get_user_id()==0 || $_user['user_id']==0) {
19
+if ($_user['user_id'] != api_get_user_id() || api_get_user_id() == 0 || $_user['user_id'] == 0) {
20 20
 	api_not_allowed();
21 21
 	die();
22 22
 }
23 23
 
24
-if(!isset($_GET['title']) || !isset($_GET['type']) || !isset($_GET['image'])) {
24
+if (!isset($_GET['title']) || !isset($_GET['type']) || !isset($_GET['image'])) {
25 25
 	api_not_allowed();
26 26
 	die();
27 27
 }
28 28
 
29
-if(!isset($_SESSION['paint_dir']) || !isset($_SESSION['whereami']) ){
29
+if (!isset($_SESSION['paint_dir']) || !isset($_SESSION['whereami'])) {
30 30
 	api_not_allowed();
31 31
 	die();
32 32
 }
33 33
 
34 34
 //pixlr return
35 35
 
36
-$filename=Security::remove_XSS($_GET['title']);//The user preferred file name of the image.
37
-$extension=Security::remove_XSS($_GET['type']);//The image type, "pdx", "jpg", "bmp" or "png".
38
-$urlcontents=Security::remove_XSS($_GET['image']);//A URL to the image on Pixlr.com server or the raw file post of the saved image.
36
+$filename = Security::remove_XSS($_GET['title']); //The user preferred file name of the image.
37
+$extension = Security::remove_XSS($_GET['type']); //The image type, "pdx", "jpg", "bmp" or "png".
38
+$urlcontents = Security::remove_XSS($_GET['image']); //A URL to the image on Pixlr.com server or the raw file post of the saved image.
39 39
 
40 40
 //make variables
41 41
 
42
-$title = Database::escape_string(str_replace('_',' ',$filename));
42
+$title = Database::escape_string(str_replace('_', ' ', $filename));
43 43
 $current_session_id = api_get_session_id();
44
-$groupId= api_get_group_id();
45
-$relativeUrlPath=$_SESSION['paint_dir'];
46
-$currentTool=$_SESSION['whereami'];
44
+$groupId = api_get_group_id();
45
+$relativeUrlPath = $_SESSION['paint_dir'];
46
+$currentTool = $_SESSION['whereami'];
47 47
 $dirBaseDocuments = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document';
48
-$saveDir=$dirBaseDocuments.$_SESSION['paint_dir'];
48
+$saveDir = $dirBaseDocuments.$_SESSION['paint_dir'];
49 49
 
50 50
 $contents = file_get_contents($urlcontents);
51 51
 
@@ -71,8 +71,8 @@  discard block
 block discarded – undo
71 71
 $filename = api_replace_dangerous_char($filename);
72 72
 $filename = disable_dangerous_file($filename);
73 73
 
74
-if (strlen(trim($filename))==0) {
75
-	 echo "The title is empty";//if title is empty, headers Content-Type = application/octet-stream, then not create a new title here please
74
+if (strlen(trim($filename)) == 0) {
75
+	 echo "The title is empty"; //if title is empty, headers Content-Type = application/octet-stream, then not create a new title here please
76 76
 	 exit;
77 77
 }
78 78
 
@@ -83,11 +83,11 @@  discard block
 block discarded – undo
83 83
 }
84 84
 
85 85
 // Extension security
86
-if($extension!= 'jpg' && $extension!= 'png' && $extension!= 'pxd'){
86
+if ($extension != 'jpg' && $extension != 'png' && $extension != 'pxd') {
87 87
 	die();
88 88
 }
89
-if($extension=='pxd') {
90
-	echo "pxd file type does not supported";// not secure because check security headers and finfo() return  Content-Type = application/octet-stream
89
+if ($extension == 'pxd') {
90
+	echo "pxd file type does not supported"; // not secure because check security headers and finfo() return  Content-Type = application/octet-stream
91 91
     exit;
92 92
 }
93 93
 
@@ -101,9 +101,9 @@  discard block
 block discarded – undo
101 101
 
102 102
 //Verify that the file is an image. Fileinfo method
103 103
 $finfo = new finfo(FILEINFO_MIME);
104
-$current_mime=$finfo->buffer($contents);
104
+$current_mime = $finfo->buffer($contents);
105 105
 finfo_close($finfo);
106
-if(strpos($current_mime, 'image')===false) {
106
+if (strpos($current_mime, 'image') === false) {
107 107
     echo "Invalid mime type file";
108 108
     exit;
109 109
 }
@@ -113,46 +113,46 @@  discard block
 block discarded – undo
113 113
 $paintFileName = $filename.'.'.$extension;
114 114
 $title = $title.'.'.$extension;
115 115
 
116
-if($currentTool=='document/createpaint'){
116
+if ($currentTool == 'document/createpaint') {
117 117
 	//check save as and prevent rewrite an older file with same name
118
-	if (0 != $groupId){
119
-        $group_properties  = GroupManager :: get_group_properties($groupId);
118
+	if (0 != $groupId) {
119
+        $group_properties = GroupManager :: get_group_properties($groupId);
120 120
         $groupPath = $group_properties['directory'];
121 121
 	} else {
122
-		$groupPath ='';
122
+		$groupPath = '';
123 123
 	}
124 124
 
125
-	if (file_exists($saveDir.'/'.$filename.'.'.$extension)){
125
+	if (file_exists($saveDir.'/'.$filename.'.'.$extension)) {
126 126
 		$i = 1;
127 127
 		while (file_exists($saveDir.'/'.$filename.'_'.$i.'.'.$extension)) $i++;
128
-		$paintFileName = $filename . '_' . $i . '.'.$extension;
129
-		$title = $filename . '_' . $i . '.'.$extension;
128
+		$paintFileName = $filename.'_'.$i.'.'.$extension;
129
+		$title = $filename.'_'.$i.'.'.$extension;
130 130
 	}
131 131
 
132 132
 	//
133 133
 	$documentPath = $saveDir.'/'.$paintFileName;
134 134
 	//add new document to disk
135
-	file_put_contents( $documentPath, $contents );
135
+	file_put_contents($documentPath, $contents);
136 136
 	//add document to database
137 137
 	$doc_id = add_document($_course, $relativeUrlPath.'/'.$paintFileName, 'file', filesize($documentPath), $title);
138 138
 	api_item_property_update($_course, TOOL_DOCUMENT, $doc_id, 'DocumentAdded', $_user['user_id'], $groupId, null, null, null, $current_session_id);
139 139
 
140
-}elseif($currentTool=='document/editpaint'){
140
+}elseif ($currentTool == 'document/editpaint') {
141 141
 
142 142
 	$documentPath = $saveDir.'/'.$paintFileName;
143 143
 	//add new document to disk
144
-	file_put_contents( $documentPath, $contents );
144
+	file_put_contents($documentPath, $contents);
145 145
 
146 146
 	//check path
147
-	if(!isset($_SESSION['paint_file'])){
147
+	if (!isset($_SESSION['paint_file'])) {
148 148
 		api_not_allowed();
149 149
 		die();
150 150
 	}
151
-	if($_SESSION['paint_file']==$paintFileName){
151
+	if ($_SESSION['paint_file'] == $paintFileName) {
152 152
 		$document_id = DocumentManager::get_document_id($_course, $relativeUrlPath.'/'.$paintFileName);
153 153
 		update_existing_document($_course, $document_id, filesize($documentPath), null);
154 154
 		api_item_property_update($_course, TOOL_DOCUMENT, $document_id, 'DocumentUpdated', $_user['user_id'], $groupId, null, null, null, $current_session_id);
155
-	}else{
155
+	} else {
156 156
 		//add a new document
157 157
 		$doc_id = add_document($_course, $relativeUrlPath.'/'.$paintFileName, 'file', filesize($documentPath), $title);
158 158
 		api_item_property_update($_course, TOOL_DOCUMENT, $doc_id, 'DocumentAdded', $_user['user_id'], $groupId, null, null, null, $current_session_id);
@@ -161,7 +161,7 @@  discard block
 block discarded – undo
161 161
 
162 162
 
163 163
 //delete temporal file
164
-$temp_file_2delete=$_SESSION['temp_realpath_image'];
164
+$temp_file_2delete = $_SESSION['temp_realpath_image'];
165 165
 unlink($temp_file_2delete);
166 166
 
167 167
 //Clean sessions and return to Chamilo file list
@@ -171,12 +171,12 @@  discard block
 block discarded – undo
171 171
 unset($_SESSION['temp_realpath_image']);
172 172
 
173 173
 if (!isset($_SESSION['exit_pixlr'])) {
174
-	$location=api_get_path(WEB_CODE_PATH).'document/document.php';
174
+	$location = api_get_path(WEB_CODE_PATH).'document/document.php';
175 175
 	echo '<script>window.parent.location.href="'.$location.'"</script>';
176 176
 	api_not_allowed(true);
177 177
 } else {
178 178
 	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>';
179
-	$location=api_get_path(WEB_CODE_PATH).'document/document.php?id='.Security::remove_XSS($_SESSION['exit_pixlr']);
179
+	$location = api_get_path(WEB_CODE_PATH).'document/document.php?id='.Security::remove_XSS($_SESSION['exit_pixlr']);
180 180
 	echo '<script>window.parent.location.href="'.$location.'"</script>';
181 181
 	unset($_SESSION['exit_pixlr']);
182 182
 }
Please login to merge, or discard this patch.
main/document/create_document.php 1 patch
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('&nbsp;&nbsp;&nbsp;', $space_counter).' &mdash; '.$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.
main/document/show_content.php 1 patch
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.
main/document/slideshowoptions.php 1 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.