Passed
Push — 1.10.x ( f9cbcd...83c791 )
by Yannick
657:30 queued 614:41
created
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/create_audio.php 1 patch
Spacing   +49 added lines, -49 removed lines patch added patch discarded remove patch
@@ -87,7 +87,7 @@  discard block
 block discarded – undo
87 87
 	}
88 88
 }
89 89
 
90
-$interbreadcrumb[] = array ("url" => "./document.php?curdirpath=".urlencode($dir)."&".api_get_cidreq(), "name" => get_lang('Documents'));
90
+$interbreadcrumb[] = array("url" => "./document.php?curdirpath=".urlencode($dir)."&".api_get_cidreq(), "name" => get_lang('Documents'));
91 91
 
92 92
 if (!$is_allowed_in_course) {
93 93
 	api_not_allowed(true);
@@ -125,7 +125,7 @@  discard block
 block discarded – undo
125 125
 for ($i = 0; $i < $array_len; $i++) {
126 126
 	$url_dir = 'document.php?&curdirpath='.$dir_acum.$dir_array[$i];
127 127
 	//Max char 80
128
-	$url_to_who = cut($dir_array[$i],80);
128
+	$url_to_who = cut($dir_array[$i], 80);
129 129
 	$interbreadcrumb[] = array('url' => $url_dir, 'name' => $url_to_who);
130 130
 	$dir_acum .= $dir_array[$i].'/';
131 131
 }
@@ -134,11 +134,11 @@  discard block
 block discarded – undo
134 134
 
135 135
 echo '<div class="actions">';
136 136
 echo '<a href="document.php?id='.$document_id.'">'.
137
-		Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('DocumentsOverview'),'',ICON_SIZE_MEDIUM).'</a>';
137
+		Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('DocumentsOverview'), '', ICON_SIZE_MEDIUM).'</a>';
138 138
 echo '<a href="create_audio.php?'.api_get_cidreq().'&amp;id='.$document_id.'&amp;dt2a=google">'.
139
-		Display::return_icon('google.png',get_lang('GoogleAudio'),'',ICON_SIZE_MEDIUM).'</a>';
139
+		Display::return_icon('google.png', get_lang('GoogleAudio'), '', ICON_SIZE_MEDIUM).'</a>';
140 140
 echo '<a href="create_audio.php?'.api_get_cidreq().'&amp;id='.$document_id.'&amp;dt2a=pediaphon">'.
141
-	Display::return_icon('pediaphon.png', get_lang('Pediaphon'),'',ICON_SIZE_MEDIUM).'</a>';
141
+	Display::return_icon('pediaphon.png', get_lang('Pediaphon'), '', ICON_SIZE_MEDIUM).'</a>';
142 142
 echo '</div>';
143 143
 
144 144
 ?>
@@ -204,17 +204,17 @@  discard block
 block discarded – undo
204 204
 $selected_language = null;
205 205
 
206 206
 while ($row = Database::fetch_array($result_select)) {
207
-	$options[$row['isocode']] =$row['original_name'].' ('.$row['english_name'].')';
208
-	if (in_array($row['isocode'], array('de', 'en', 'es', 'fr'))){
209
-		$options_pedia[$row['isocode']] =$row['original_name'].' ('.$row['english_name'].')';
207
+	$options[$row['isocode']] = $row['original_name'].' ('.$row['english_name'].')';
208
+	if (in_array($row['isocode'], array('de', 'en', 'es', 'fr'))) {
209
+		$options_pedia[$row['isocode']] = $row['original_name'].' ('.$row['english_name'].')';
210 210
 	}
211 211
 }
212 212
 
213
-$icon = Display::return_icon('text2audio.png', get_lang('HelpText2Audio'),'',ICON_SIZE_MEDIUM);
213
+$icon = Display::return_icon('text2audio.png', get_lang('HelpText2Audio'), '', ICON_SIZE_MEDIUM);
214 214
 echo '<div class="page-header"><h2>'.$icon.get_lang('HelpText2Audio').'</h2></div>';
215 215
 
216 216
 if (Security::remove_XSS($_GET['dt2a']) == 'google') {
217
-	$selected_language = api_get_language_isocode();//lang default is the course language
217
+	$selected_language = api_get_language_isocode(); //lang default is the course language
218 218
 	echo '<div>';
219 219
 	$form = new FormValidator('form1', 'post', null, '', array('id' => 'form1'));
220 220
 	$form->addElement('hidden', 'text2voice_mode', 'google');
@@ -235,12 +235,12 @@  discard block
 block discarded – undo
235 235
 if (Security::remove_XSS($_GET['dt2a']) == 'pediaphon') {
236 236
 	//lang default is a default message
237 237
 	$selected_language = "defaultmessage";
238
-	$options_pedia['defaultmessage'] =get_lang('FirstSelectALanguage');
239
-	$options['defaultmessage'] =get_lang('FirstSelectALanguage');
238
+	$options_pedia['defaultmessage'] = get_lang('FirstSelectALanguage');
239
+	$options['defaultmessage'] = get_lang('FirstSelectALanguage');
240 240
 	echo '<div>';
241 241
 
242 242
 	$form = new FormValidator('form2', 'post', null, '', array('id' => 'form2'));
243
-	$form->addElement('hidden', 'text2voice_mode','pediaphon');
243
+	$form->addElement('hidden', 'text2voice_mode', 'pediaphon');
244 244
 	$form->addElement('hidden', 'id', $document_id);
245 245
 	$form->addElement('text', 'title', get_lang('Title'));
246 246
 	$form->addElement('select', 'lang', get_lang('Language'), $options_pedia, array('onclick' => 'update_voices(this.selectedIndex);'));
@@ -350,7 +350,7 @@  discard block
 block discarded – undo
350 350
  */
351 351
 function downloadMP3_google($filepath, $dir)
352 352
 {
353
-    $location='create_audio.php?'.api_get_cidreq().'&id='.intval($_POST['id']).'&dt2a=google';
353
+    $location = 'create_audio.php?'.api_get_cidreq().'&id='.intval($_POST['id']).'&dt2a=google';
354 354
 
355 355
 	//security
356 356
 	if (!isset($_POST['lang']) && !isset($_POST['text']) && !isset($_POST['title']) && !isset($filepath) && !isset($dir)) {
@@ -361,30 +361,30 @@  discard block
 block discarded – undo
361 361
 	$_course = api_get_course_info();
362 362
 	$_user = api_get_user_info();
363 363
 
364
-	$clean_title=trim($_POST['title']);
365
-	$clean_text=trim($_POST['text']);
366
-	if(empty($clean_title) || empty($clean_text)){
364
+	$clean_title = trim($_POST['title']);
365
+	$clean_text = trim($_POST['text']);
366
+	if (empty($clean_title) || empty($clean_text)) {
367 367
 		echo '<script>window.location.href="'.$location.'"</script>';
368 368
 		return;
369 369
 	}
370 370
 	$clean_title = Security::remove_XSS($clean_title);
371 371
 	$clean_title = Database::escape_string($clean_title);
372
-	$clean_title = str_replace(' ', '_', $clean_title);//compound file names
372
+	$clean_title = str_replace(' ', '_', $clean_title); //compound file names
373 373
 
374 374
 	$clean_text = Security::remove_XSS($clean_text);
375 375
 	$clean_lang = Security::remove_XSS($_POST['lang']);
376 376
 
377
-	$extension='mp3';
378
-	$audio_filename=$clean_title.'.'.$extension;
379
-	$audio_title = str_replace('_',' ',$clean_title);
377
+	$extension = 'mp3';
378
+	$audio_filename = $clean_title.'.'.$extension;
379
+	$audio_title = str_replace('_', ' ', $clean_title);
380 380
 
381 381
 	//prevent duplicates
382
-	if (file_exists($filepath.'/'.$clean_title.'.'.$extension)){
382
+	if (file_exists($filepath.'/'.$clean_title.'.'.$extension)) {
383 383
 		$i = 1;
384 384
 		while (file_exists($filepath.'/'.$clean_title.'_'.$i.'.'.$extension)) $i++;
385
-		$audio_filename = $clean_title . '_' . $i . '.'.$extension;
386
-		$audio_title = $clean_title . '_' . $i . '.'.$extension;
387
-		$audio_title = str_replace('_',' ',$audio_title);
385
+		$audio_filename = $clean_title.'_'.$i.'.'.$extension;
386
+		$audio_title = $clean_title.'_'.$i.'.'.$extension;
387
+		$audio_title = str_replace('_', ' ', $audio_title);
388 388
 	}
389 389
 
390 390
 	$documentPath = $filepath.'/'.$audio_filename;
@@ -426,7 +426,7 @@  discard block
 block discarded – undo
426 426
 	// add document to database
427 427
 	$current_session_id = api_get_session_id();
428 428
 	$groupId = api_get_group_id();
429
-	$relativeUrlPath=$dir;
429
+	$relativeUrlPath = $dir;
430 430
 	$doc_id = add_document(
431 431
 		$_course,
432 432
 		$relativeUrlPath.$audio_filename,
@@ -461,40 +461,40 @@  discard block
 block discarded – undo
461 461
  */
462 462
 function downloadMP3_pediaphon($filepath, $dir)
463 463
 {
464
-	$location='create_audio.php?'.api_get_cidreq().'&id='.intval($_POST['id']).'&dt2a=pediaphon';
464
+	$location = 'create_audio.php?'.api_get_cidreq().'&id='.intval($_POST['id']).'&dt2a=pediaphon';
465 465
 	//security
466
-	if(!isset($_POST['lang']) && !isset($_POST['text']) && !isset($_POST['title']) && !isset($filepath) && !isset($dir)) {
466
+	if (!isset($_POST['lang']) && !isset($_POST['text']) && !isset($_POST['title']) && !isset($filepath) && !isset($dir)) {
467 467
 		echo '<script>window.location.href="'.$location.'"</script>';
468 468
 		return;
469 469
 	}
470 470
 	$_course = api_get_course_info();
471 471
 	$_user = api_get_user_info();
472
-	$clean_title=trim($_POST['title']);
473
-	$clean_title= Database::escape_string($clean_title);
474
-	$clean_text=trim($_POST['text']);
475
-	$clean_voices=Security::remove_XSS($_POST['voices']);
476
-	if(empty($clean_title) || empty($clean_text) || empty($clean_voices)){
472
+	$clean_title = trim($_POST['title']);
473
+	$clean_title = Database::escape_string($clean_title);
474
+	$clean_text = trim($_POST['text']);
475
+	$clean_voices = Security::remove_XSS($_POST['voices']);
476
+	if (empty($clean_title) || empty($clean_text) || empty($clean_voices)) {
477 477
 		echo '<script>window.location.href="'.$location.'"</script>';
478 478
 		return;
479 479
 	}
480 480
 	$clean_title = Security::remove_XSS($clean_title);
481 481
 	$clean_title = Database::escape_string($clean_title);
482
-	$clean_title = str_replace(' ', '_', $clean_title);//compound file names
482
+	$clean_title = str_replace(' ', '_', $clean_title); //compound file names
483 483
 	$clean_text = Security::remove_XSS($clean_text);
484 484
 	$clean_lang = Security::remove_XSS($_POST['lang']);
485 485
 	$clean_speed = Security::remove_XSS($_POST['speed']);
486 486
 
487
-	$extension='mp3';
488
-	$audio_filename=$clean_title.'.'.$extension;
489
-	$audio_title = str_replace('_',' ',$clean_title);
487
+	$extension = 'mp3';
488
+	$audio_filename = $clean_title.'.'.$extension;
489
+	$audio_title = str_replace('_', ' ', $clean_title);
490 490
 
491 491
 	//prevent duplicates
492
-	if (file_exists($filepath.'/'.$clean_title.'.'.$extension)){
492
+	if (file_exists($filepath.'/'.$clean_title.'.'.$extension)) {
493 493
 		$i = 1;
494 494
 		while (file_exists($filepath.'/'.$clean_title.'_'.$i.'.'.$extension)) $i++;
495
-		$audio_filename = $clean_title . '_' . $i . '.'.$extension;
496
-		$audio_title = $clean_title . '_' . $i . '.'.$extension;
497
-		$audio_title = str_replace('_',' ',$audio_title);
495
+		$audio_filename = $clean_title.'_'.$i.'.'.$extension;
496
+		$audio_title = $clean_title.'_'.$i.'.'.$extension;
497
+		$audio_title = str_replace('_', ' ', $audio_title);
498 498
 	}
499 499
 
500 500
 	$documentPath = $filepath.'/'.$audio_filename;
@@ -516,26 +516,26 @@  discard block
 block discarded – undo
516 516
 
517 517
 	//adding the file
518 518
 
519
-	if ($clean_lang=='de') {
520
-		$url_pediaphon='http://www.pediaphon.org/~bischoff/radiopedia/sprich_multivoice.cgi';
519
+	if ($clean_lang == 'de') {
520
+		$url_pediaphon = 'http://www.pediaphon.org/~bischoff/radiopedia/sprich_multivoice.cgi';
521 521
 		$find_t2v = '/http\:\/\/www\.pediaphon\.org\/\~bischoff\/radiopedia\/mp3\/(.*)\.mp3\"/';
522 522
 	} else {
523
-		$url_pediaphon='http://www.pediaphon.org/~bischoff/radiopedia/sprich_multivoice_'.$clean_lang.'.cgi';//en, es, fr
523
+		$url_pediaphon = 'http://www.pediaphon.org/~bischoff/radiopedia/sprich_multivoice_'.$clean_lang.'.cgi'; //en, es, fr
524 524
 		$find_t2v = '/http\:\/\/www\.pediaphon\.org\/\~bischoff\/radiopedia\/mp3\/'.$clean_lang.'\/(.*)\.mp3\"/';
525 525
 	}
526 526
 
527
-	$data="stimme=".$clean_voices."&inputtext=".$clean_text."&speed=".$clean_speed."&go=speak";
527
+	$data = "stimme=".$clean_voices."&inputtext=".$clean_text."&speed=".$clean_speed."&go=speak";
528 528
 	$opts = array('http' =>
529 529
 		array(
530 530
 		 'method'  => 'POST',
531 531
 		 'header'  =>"Content-Type: application/x-www-form-urlencoded\r\n",
532
-		 "Content-Length: " . strlen($data) . "\r\n",
532
+		 "Content-Length: ".strlen($data)."\r\n",
533 533
 		 'content' => $data
534 534
 		)
535 535
 	);
536
-	$context  = stream_context_create($opts);
536
+	$context = stream_context_create($opts);
537 537
 	// Download the whole HTML page
538
-	$previous_returntext2voice = file_get_contents($url_pediaphon,false,$context);
538
+	$previous_returntext2voice = file_get_contents($url_pediaphon, false, $context);
539 539
 
540 540
 	//extract the audio file path
541 541
 	$search_source = preg_match($find_t2v, $previous_returntext2voice, $hits);
@@ -550,7 +550,7 @@  discard block
 block discarded – undo
550 550
 	//add document to database
551 551
 	$current_session_id = api_get_session_id();
552 552
 	$groupId = api_get_group_id();
553
-	$relativeUrlPath=$dir;
553
+	$relativeUrlPath = $dir;
554 554
 	$doc_id = add_document($_course, $relativeUrlPath.$audio_filename, 'file', filesize($documentPath), $audio_title);
555 555
 	api_item_property_update($_course, TOOL_DOCUMENT, $doc_id, 'DocumentAdded', $_user['user_id'], $groupId, null, null, null, $current_session_id);
556 556
     Display::display_confirmation_message(get_lang('DocumentCreated'));
Please login to merge, or discard this patch.
main/document/create_draw.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -36,8 +36,8 @@  discard block
 block discarded – undo
36 36
 
37 37
 //path for svg-edit save
38 38
 $_SESSION['draw_dir'] = Security::remove_XSS($dir);
39
-if ($_SESSION['draw_dir']=='/'){
40
-    $_SESSION['draw_dir']='';
39
+if ($_SESSION['draw_dir'] == '/') {
40
+    $_SESSION['draw_dir'] = '';
41 41
 }
42 42
 
43 43
 $dir = isset($dir) ? Security::remove_XSS($dir) : (isset($_POST['dir']) ? Security::remove_XSS($_POST['dir']) : '/');
@@ -71,7 +71,7 @@  discard block
 block discarded – undo
71 71
 $groupId = api_get_group_id();
72 72
 
73 73
 if (!empty($groupId)) {
74
-	$interbreadcrumb[] = array ("url" => "../group/group_space.php?".api_get_cidreq(), "name" => get_lang('GroupSpace'));
74
+	$interbreadcrumb[] = array("url" => "../group/group_space.php?".api_get_cidreq(), "name" => get_lang('GroupSpace'));
75 75
 	$noPHP_SELF = true;
76 76
 	$group = GroupManager :: get_group_properties($groupId);
77 77
 	$path = explode('/', $dir);
@@ -80,7 +80,7 @@  discard block
 block discarded – undo
80 80
 	}
81 81
 }
82 82
 
83
-$interbreadcrumb[] = array ("url" => "./document.php?".api_get_cidreq(), "name" => get_lang('Documents'));
83
+$interbreadcrumb[] = array("url" => "./document.php?".api_get_cidreq(), "name" => get_lang('Documents'));
84 84
 
85 85
 if (!$is_allowed_in_course) {
86 86
 	api_not_allowed(true);
@@ -111,7 +111,7 @@  discard block
 block discarded – undo
111 111
 if (empty($document_data['parents'])) {
112 112
     $interbreadcrumb[] = array('url' => '#', 'name' => $document_data['title']);
113 113
 } else {
114
-    foreach($document_data['parents'] as $document_sub_data) {
114
+    foreach ($document_data['parents'] as $document_sub_data) {
115 115
         $interbreadcrumb[] = array('url' => $document_sub_data['document_url'], 'name' => $document_sub_data['title']);
116 116
     }
117 117
 }
@@ -119,17 +119,17 @@  discard block
 block discarded – undo
119 119
 
120 120
 echo '<div class="actions">';
121 121
 echo '<a href="document.php?id='.$document_id.'">'.
122
-    Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('DocumentsOverview'),'',ICON_SIZE_MEDIUM).'</a>';
122
+    Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('DocumentsOverview'), '', ICON_SIZE_MEDIUM).'</a>';
123 123
 echo '</div>';
124 124
 
125 125
 if (api_browser_support('svg')) {
126 126
 
127 127
 	//automatic loading the course language
128 128
 	$svgedit_code_translation_table = array('' => 'en', 'pt' => 'pt-Pt', 'sr' => 'sr_latn');
129
-	$langsvgedit  = api_get_language_isocode();
129
+	$langsvgedit = api_get_language_isocode();
130 130
 	$langsvgedit = isset($svgedit_code_translation_table[$langsvgedit]) ? $svgedit_code_translation_table[$langsvgedit] : $langsvgedit;
131 131
 	$langsvgedit = file_exists(api_get_path(LIBRARY_PATH).'svg-edit/locale/lang.'.$langsvgedit.'.js') ? $langsvgedit : 'en';
132
-	$svg_url= api_get_path(WEB_LIBRARY_PATH).'svg-edit/svg-editor.php?lang='.$langsvgedit;
132
+	$svg_url = api_get_path(WEB_LIBRARY_PATH).'svg-edit/svg-editor.php?lang='.$langsvgedit;
133 133
 	?>
134 134
 	<script>
135 135
 		document.write ('<iframe id="frame" frameborder="0" scrolling="no" src="<?php echo  $svg_url; ?>" width="100%" height="100%"><noframes><p>Sorry, your browser does not handle frames</p></noframes></iframe>');
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/edit_paint.php 1 patch
Spacing   +46 added lines, -46 removed lines patch added patch discarded remove patch
@@ -33,26 +33,26 @@  discard block
 block discarded – undo
33 33
     $my_cur_dir_path = isset($_GET['curdirpath']) ? Security::remove_XSS($_GET['curdirpath']) : null;
34 34
 }
35 35
 
36
-$dir= str_replace('\\', '/', $dir);//and urlencode each url $curdirpath (hack clean $curdirpath under Windows - Bug #3261)
36
+$dir = str_replace('\\', '/', $dir); //and urlencode each url $curdirpath (hack clean $curdirpath under Windows - Bug #3261)
37 37
 
38 38
 /* Constants & Variables */
39
-$current_session_id=api_get_session_id();
39
+$current_session_id = api_get_session_id();
40 40
 //path for pixlr save
41
-$_SESSION['paint_dir']=Security::remove_XSS($dir);
42
-if($_SESSION['paint_dir']=='/'){
43
-    $_SESSION['paint_dir']='';
41
+$_SESSION['paint_dir'] = Security::remove_XSS($dir);
42
+if ($_SESSION['paint_dir'] == '/') {
43
+    $_SESSION['paint_dir'] = '';
44 44
 }
45
-$_SESSION['paint_file']=basename(Security::remove_XSS($file_path));
45
+$_SESSION['paint_file'] = basename(Security::remove_XSS($file_path));
46 46
 
47 47
 $get_file = Security::remove_XSS($file_path);
48 48
 
49 49
 $file = basename($get_file);
50 50
 
51
-$temp_file = explode(".",$file);
52
-$filename=$temp_file[0];
53
-$nameTools = get_lang('EditDocument') . ': '.$filename;
51
+$temp_file = explode(".", $file);
52
+$filename = $temp_file[0];
53
+$nameTools = get_lang('EditDocument').': '.$filename;
54 54
 
55
-$courseDir   = $_course['path'].'/document';
55
+$courseDir = $_course['path'].'/document';
56 56
 
57 57
 $is_allowed_to_edit = api_is_allowed_to_edit(null, true);
58 58
 
@@ -85,7 +85,7 @@  discard block
 block discarded – undo
85 85
 
86 86
 //groups //TODO:clean
87 87
 if (!empty($groupId)) {
88
-	$interbreadcrumb[] = array ('url' => '../group/group_space.php?'.api_get_cidreq(), 'name' => get_lang('GroupSpace'));
88
+	$interbreadcrumb[] = array('url' => '../group/group_space.php?'.api_get_cidreq(), 'name' => get_lang('GroupSpace'));
89 89
 	$group_document = true;
90 90
 	$noPHP_SELF = true;
91 91
 }
@@ -94,15 +94,15 @@  discard block
 block discarded – undo
94 94
 $is_certificate_mode = DocumentManager::is_certificate_mode($dir);
95 95
 
96 96
 if (!$is_certificate_mode)
97
-	$interbreadcrumb[]= array("url" => "./document.php?curdirpath=".urlencode($my_cur_dir_path).'&'.api_get_cidreq(), "name"=> get_lang('Documents'));
97
+	$interbreadcrumb[] = array("url" => "./document.php?curdirpath=".urlencode($my_cur_dir_path).'&'.api_get_cidreq(), "name"=> get_lang('Documents'));
98 98
 else
99
-	$interbreadcrumb[]= array ('url' => '../gradebook/'.$_SESSION['gradebook_dest'], 'name' => get_lang('Gradebook'));
99
+	$interbreadcrumb[] = array('url' => '../gradebook/'.$_SESSION['gradebook_dest'], 'name' => get_lang('Gradebook'));
100 100
 
101 101
 // Interbreadcrumb for the current directory root path
102 102
 if (empty($document_data['parents'])) {
103 103
     $interbreadcrumb[] = array('url' => '#', 'name' => $document_data['title']);
104 104
 } else {
105
-    foreach($document_data['parents'] as $document_sub_data) {
105
+    foreach ($document_data['parents'] as $document_sub_data) {
106 106
         if ($document_data['title'] == $document_sub_data['title']) {
107 107
             continue;
108 108
         }
@@ -122,33 +122,33 @@  discard block
 block discarded – undo
122 122
 Display :: display_header($nameTools, 'Doc');
123 123
 echo '<div class="actions">';
124 124
 echo '<a href="document.php?id='.$parent_id.'&'.api_get_cidreq().'">'.
125
-    Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('DocumentsOverview'),'',ICON_SIZE_MEDIUM).'</a>';
125
+    Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('DocumentsOverview'), '', ICON_SIZE_MEDIUM).'</a>';
126 126
 echo '<a href="edit_document.php?'.api_get_cidreq().'&id='.$document_id.'&'.api_get_cidreq().'&origin=editpaint">'.
127
-    Display::return_icon('edit.png', get_lang('Rename').'/'.get_lang('Comment'),'',ICON_SIZE_MEDIUM).'</a>';
127
+    Display::return_icon('edit.png', get_lang('Rename').'/'.get_lang('Comment'), '', ICON_SIZE_MEDIUM).'</a>';
128 128
 echo '</div>';
129 129
 
130 130
 ///pixlr
131
-$title=$file;//disk name. No sql name because pixlr return this when save
131
+$title = $file; //disk name. No sql name because pixlr return this when save
132 132
 $pixlr_code_translation_table = array('' => 'en', 'pt' => 'pt-Pt', 'sr' => 'sr_latn');
133
-$langpixlr  = api_get_language_isocode();
133
+$langpixlr = api_get_language_isocode();
134 134
 $langpixlr = isset($pixlr_code_translation_table[$langpixlr]) ? $pixlredit_code_translation_table[$langpixlr] : $langpixlr;
135
-$loc=$langpixlr;// deprecated ?? TODO:check pixlr read user browser
135
+$loc = $langpixlr; // deprecated ?? TODO:check pixlr read user browser
136 136
 
137
-$exit_path=api_get_path(WEB_CODE_PATH).'document/exit_pixlr.php';
138
-$_SESSION['exit_pixlr']= Security::remove_XSS($parent_id);
137
+$exit_path = api_get_path(WEB_CODE_PATH).'document/exit_pixlr.php';
138
+$_SESSION['exit_pixlr'] = Security::remove_XSS($parent_id);
139 139
 
140
-$referrer="Chamilo";
140
+$referrer = "Chamilo";
141 141
 
142
-$target_path=api_get_path(WEB_CODE_PATH).'document/save_pixlr.php';
143
-$target=$target_path;
142
+$target_path = api_get_path(WEB_CODE_PATH).'document/save_pixlr.php';
143
+$target = $target_path;
144 144
 
145
-$locktarget="true";
146
-$locktitle="false";
145
+$locktarget = "true";
146
+$locktitle = "false";
147 147
 
148
-if ($_SERVER['HTTP_HOST']=="localhost") {
149
-	$path_and_file= api_get_path(SYS_SERVER_ROOT_PATH).'/crossdomain.xml';
148
+if ($_SERVER['HTTP_HOST'] == "localhost") {
149
+	$path_and_file = api_get_path(SYS_SERVER_ROOT_PATH).'/crossdomain.xml';
150 150
 	if (!file_exists($path_and_file)) {
151
-		$crossdomain='<?xml version="1.0"?>
151
+		$crossdomain = '<?xml version="1.0"?>
152 152
 			<!DOCTYPE cross-domain-policy SYSTEM "http://www.adobe.com/xml/dtds/cross-domain-policy.dtd">
153 153
 			<cross-domain-policy>
154 154
 				<allow-access-from domain="cdn.pixlr.com" />
@@ -157,23 +157,23 @@  discard block
 block discarded – undo
157 157
 			</cross-domain-policy>';//more open domain="*"
158 158
 		@file_put_contents($path_and_file, $crossdomain);
159 159
 	}
160
-	$credentials="true";
160
+	$credentials = "true";
161 161
 }
162 162
 else {
163
-	$credentials="false";
163
+	$credentials = "false";
164 164
 }
165 165
 
166 166
 //make temp images
167
-$temp_folder=api_get_path(SYS_ARCHIVE_PATH).'temp/images';
167
+$temp_folder = api_get_path(SYS_ARCHIVE_PATH).'temp/images';
168 168
 if (!file_exists($temp_folder)) {
169
-    @mkdir($temp_folder, api_get_permissions_for_new_directories(), true);//TODO:check $permissions value, now empty;
169
+    @mkdir($temp_folder, api_get_permissions_for_new_directories(), true); //TODO:check $permissions value, now empty;
170 170
 }
171 171
 
172 172
 //make htaccess with allow from all, and file index.html into temp/images
173
-$htaccess=api_get_path(SYS_ARCHIVE_PATH).'temp/images/.htaccess';
173
+$htaccess = api_get_path(SYS_ARCHIVE_PATH).'temp/images/.htaccess';
174 174
 if (!file_exists($htaccess)) {
175 175
 
176
-	$htaccess_content="order deny,allow\r\nallow from all\r\nOptions -Indexes";
176
+	$htaccess_content = "order deny,allow\r\nallow from all\r\nOptions -Indexes";
177 177
 
178 178
 	$fp = @ fopen(api_get_path(SYS_ARCHIVE_PATH).'temp/images/.htaccess', 'w');
179 179
 	if ($fp) {
@@ -182,9 +182,9 @@  discard block
 block discarded – undo
182 182
 	}
183 183
 }
184 184
 
185
-$html_index=api_get_path(SYS_ARCHIVE_PATH).'temp/images/index.html';
185
+$html_index = api_get_path(SYS_ARCHIVE_PATH).'temp/images/index.html';
186 186
 if (!file_exists($html_index)) {
187
-	$html_index_content="<html><head></head><body></body></html>";
187
+	$html_index_content = "<html><head></head><body></body></html>";
188 188
 	$fp = @ fopen(api_get_path(SYS_ARCHIVE_PATH).'temp/images/index.html', 'w');
189 189
 	if ($fp) {
190 190
 		fwrite($fp, $html_index_content);
@@ -193,20 +193,20 @@  discard block
 block discarded – undo
193 193
 }
194 194
 
195 195
 //encript temp name file
196
-$name_crip=sha1(uniqid());//encript
197
-$findext= explode(".", $file);
198
-$extension= $findext[count($findext)-1];
199
-$file_crip=$name_crip.'.'.$extension;
196
+$name_crip = sha1(uniqid()); //encript
197
+$findext = explode(".", $file);
198
+$extension = $findext[count($findext) - 1];
199
+$file_crip = $name_crip.'.'.$extension;
200 200
 
201 201
 //copy file to temp/images directory
202
-$from=$filepath.$file;
203
-$to=api_get_path(SYS_ARCHIVE_PATH).'temp/images/'.$file_crip;
202
+$from = $filepath.$file;
203
+$to = api_get_path(SYS_ARCHIVE_PATH).'temp/images/'.$file_crip;
204 204
 copy($from, $to);
205
-$_SESSION['temp_realpath_image']=$to;
205
+$_SESSION['temp_realpath_image'] = $to;
206 206
 
207 207
 //load image to url
208
-$to_url=api_get_path(WEB_ARCHIVE_PATH).'temp/images/'.$file_crip;
209
-$image=urlencode($to_url);
208
+$to_url = api_get_path(WEB_ARCHIVE_PATH).'temp/images/'.$file_crip;
209
+$image = urlencode($to_url);
210 210
 $pixlr_url = api_get_protocol().'://pixlr.com/editor/?title='.$title.'&image='.$image.'&loc='.$loc.'&referrer='.$referrer.'&target='.$target.'&exit='.$exit_path.'&locktarget='.$locktarget.'&locktitle='.$locktitle.'&credentials='.$credentials;
211 211
 
212 212
 //make frame an send image
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.