chamilo / chamilo-lms

main/document/webcam_clip.php

Indentation +22 added lines, -22 removed lines

@@ -34,7 +34,7 @@ 
 //make some vars
 $webcamdir=$dir;
 if($webcamdir=="/"){
- $webcamdir="";
+    $webcamdir="";
 }
 
 
@@ -43,49 +43,49 @@ 
 // Please, do not modify this dirname formatting
 
 if (strstr($dir, '..')) {
-	$dir = '/';
+    $dir = '/';
 }
 
 if ($dir[0] == '.') {
-	$dir = substr($dir, 1);
+    $dir = substr($dir, 1);
 }
 
 if ($dir[0] != '/') {
-	$dir = '/'.$dir;
+    $dir = '/'.$dir;
 }
 
 if ($dir[strlen($dir) - 1] != '/') {
-	$dir .= '/';
+    $dir .= '/';
 }
 
 $filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document'.$dir;
 
 if (!is_dir($filepath)) {
-	$filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document/';
-	$dir = '/';
+    $filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document/';
+    $dir = '/';
 }
 
 $groupId = api_get_group_id();
 
 if (!empty($groupId)) {
-	$interbreadcrumb[] = array ("url" => "../group/group_space.php?".api_get_cidreq(), "name" => get_lang('GroupSpace'));
-	$noPHP_SELF = true;
-	$group = GroupManager :: get_group_properties($groupId);
-	$path = explode('/', $dir);
-	if ('/'.$path[1] != $group['directory']) {
-		api_not_allowed(true);
-	}
+    $interbreadcrumb[] = array ("url" => "../group/group_space.php?".api_get_cidreq(), "name" => get_lang('GroupSpace'));
+    $noPHP_SELF = true;
+    $group = GroupManager :: get_group_properties($groupId);
+    $path = explode('/', $dir);
+    if ('/'.$path[1] != $group['directory']) {
+        api_not_allowed(true);
+    }
 }
 
 $interbreadcrumb[] = array ("url" => "./document.php?id=".$document_id."&".api_get_cidreq(), "name" => get_lang('Documents'));
 
 if (!$is_allowed_in_course) {
-	api_not_allowed(true);
+    api_not_allowed(true);
 }
 
 if (!($is_allowed_to_edit || $_SESSION['group_member_with_upload_rights'] ||
-	DocumentManager::is_my_shared_folder(api_get_user_id(), Security::remove_XSS($dir),api_get_session_id()))) {
-	api_not_allowed(true);
+    DocumentManager::is_my_shared_folder(api_get_user_id(), Security::remove_XSS($dir),api_get_session_id()))) {
+    api_not_allowed(true);
 }
 
 /*	Header */
@@ -93,10 +93,10 @@ 
 
 $display_dir = $dir;
 if (isset ($group)) {
-	$display_dir = explode('/', $dir);
-	unset ($display_dir[0]);
-	unset ($display_dir[1]);
-	$display_dir = implode('/', $display_dir);
+    $display_dir = explode('/', $dir);
+    unset ($display_dir[0]);
+    unset ($display_dir[1]);
+    $display_dir = implode('/', $display_dir);
 }
 
 // Interbreadcrumb for the current directory root path
@@ -121,7 +121,7 @@ 
 Display :: display_header($nameTools, 'Doc');
 echo '<div class="actions">';
 echo '<a href="document.php?id='.$document_id.'">'.
-	Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('DocumentsOverview'),'',ICON_SIZE_MEDIUM).'</a>';
+    Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('DocumentsOverview'),'',ICON_SIZE_MEDIUM).'</a>';
 echo '</div>';
 ?>
 

Spacing +9 added lines, -9 removed lines

@@ -32,9 +32,9 @@ 
 $dir = $document_data['path'];
 
 //make some vars
-$webcamdir=$dir;
-if($webcamdir=="/"){
- $webcamdir="";
+$webcamdir = $dir;
+if ($webcamdir == "/") {
+ $webcamdir = "";
 }
 
 
@@ -68,7 +68,7 @@ 
 $groupId = api_get_group_id();
 
 if (!empty($groupId)) {
-	$interbreadcrumb[] = array ("url" => "../group/group_space.php?".api_get_cidreq(), "name" => get_lang('GroupSpace'));
+	$interbreadcrumb[] = array("url" => "../group/group_space.php?".api_get_cidreq(), "name" => get_lang('GroupSpace'));
 	$noPHP_SELF = true;
 	$group = GroupManager :: get_group_properties($groupId);
 	$path = explode('/', $dir);
@@ -77,14 +77,14 @@ 
 	}
 }
 
-$interbreadcrumb[] = array ("url" => "./document.php?id=".$document_id."&".api_get_cidreq(), "name" => get_lang('Documents'));
+$interbreadcrumb[] = array("url" => "./document.php?id=".$document_id."&".api_get_cidreq(), "name" => get_lang('Documents'));
 
 if (!$is_allowed_in_course) {
 	api_not_allowed(true);
 }
 
 if (!($is_allowed_to_edit || $_SESSION['group_member_with_upload_rights'] ||
-	DocumentManager::is_my_shared_folder(api_get_user_id(), Security::remove_XSS($dir),api_get_session_id()))) {
+	DocumentManager::is_my_shared_folder(api_get_user_id(), Security::remove_XSS($dir), api_get_session_id()))) {
 	api_not_allowed(true);
 }
 
@@ -102,7 +102,7 @@ 
 // Interbreadcrumb for the current directory root path
 $counter = 0;
 if (isset($document_data['parents'])) {
-    foreach($document_data['parents'] as $document_sub_data) {
+    foreach ($document_data['parents'] as $document_sub_data) {
         //fixing double group folder in breadcrumb
         if (api_get_group_id()) {
             if ($counter == 0) {
@@ -116,12 +116,12 @@ 
 }
 
 //make some vars
-$webcamuserid=api_get_user_id();
+$webcamuserid = api_get_user_id();
 
 Display :: display_header($nameTools, 'Doc');
 echo '<div class="actions">';
 echo '<a href="document.php?id='.$document_id.'">'.
-	Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('DocumentsOverview'),'',ICON_SIZE_MEDIUM).'</a>';
+	Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('DocumentsOverview'), '', ICON_SIZE_MEDIUM).'</a>';
 echo '</div>';
 ?>
 

main/document/edit_draw.php

Braces +3 added lines, -2 removed lines

@@ -87,10 +87,11 @@
 
 $is_certificate_mode = DocumentManager::is_certificate_mode($dir);
 
-if (!$is_certificate_mode)
+if (!$is_certificate_mode) {
 	$interbreadcrumb[]= array("url" => "./document.php?curdirpath=".urlencode($my_cur_dir_path).$req_gid, "name"=> get_lang('Documents'));
-else
+} else {
 	$interbreadcrumb[]= array ('url' => '../gradebook/'.$_SESSION['gradebook_dest'], 'name' => get_lang('Gradebook'));
+}
 
 // Interbreadcrumb for the current directory root path
 if (empty($document_data['parents'])) {

Indentation +21 added lines, -21 removed lines

@@ -43,7 +43,7 @@ 
 //path for svg-edit save
 $_SESSION['draw_dir'] = Security::remove_XSS($dir);
 if ($_SESSION['draw_dir'] == '/') {
-	$_SESSION['draw_dir'] = '';
+    $_SESSION['draw_dir'] = '';
 }
 $_SESSION['draw_file'] = basename(Security::remove_XSS($file_path));
 $get_file = Security::remove_XSS($file_path);
@@ -59,26 +59,26 @@ 
 /* Please, do not modify this dirname formatting */
 
 if (strstr($dir, '..')) {
-	$dir = '/';
+    $dir = '/';
 }
 
 if ($dir[0] == '.') {
-	$dir = substr($dir, 1);
+    $dir = substr($dir, 1);
 }
 
 if ($dir[0] != '/') {
-	$dir = '/'.$dir;
+    $dir = '/'.$dir;
 }
 
 if ($dir[strlen($dir) - 1] != '/') {
-	$dir .= '/';
+    $dir .= '/';
 }
 
 $filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document'.$dir;
 
 if (!is_dir($filepath)) {
-	$filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document/';
-	$dir = '/';
+    $filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document/';
+    $dir = '/';
 }
 
 //groups //TODO:clean
@@ -87,8 +87,8 @@ 
         'url' => api_get_path(WEB_CODE_PATH).'group/group_space.php?'.api_get_cidreq(),
         'name' => get_lang('GroupSpace'),
     );
-	$group_document = true;
-	$noPHP_SELF = true;
+    $group_document = true;
+    $noPHP_SELF = true;
 }
 
 $is_certificate_mode = DocumentManager::is_certificate_mode($dir);
@@ -114,10 +114,10 @@ 
 }
 
 $is_allowedToEdit = api_is_allowed_to_edit(null, true) || $_SESSION['group_member_with_upload_rights'] ||
-	DocumentManager::is_my_shared_folder(api_get_user_id(), $dir, $current_session_id);
+    DocumentManager::is_my_shared_folder(api_get_user_id(), $dir, $current_session_id);
 
 if (!$is_allowedToEdit) {
-	api_not_allowed(true);
+    api_not_allowed(true);
 }
 
 Event::event_access_tool(TOOL_DOCUMENT);
@@ -131,13 +131,13 @@ 
 echo '</div>';
 
 if (api_browser_support('svg')) {
-	//automatic loading the course language
-	$svgedit_code_translation_table = array('' => 'en', 'pt' => 'pt-Pt', 'sr' => 'sr_latn');
-	$langsvgedit  = api_get_language_isocode();
-	$langsvgedit = isset($svgedit_code_translation_table[$langsvgedit]) ? $svgedit_code_translation_table[$langsvgedit] : $langsvgedit;
-	$langsvgedit = file_exists(api_get_path(LIBRARY_PATH).'javascript/svgedit/locale/lang.'.$langsvgedit.'.js') ? $langsvgedit : 'en';
-	$svg_url = api_get_path(WEB_LIBRARY_PATH).'javascript/svgedit/svg-editor.php?url=../../../../../courses/'.$courseDir.$dir.$file.'&lang='.$langsvgedit;
-	?>
+    //automatic loading the course language
+    $svgedit_code_translation_table = array('' => 'en', 'pt' => 'pt-Pt', 'sr' => 'sr_latn');
+    $langsvgedit  = api_get_language_isocode();
+    $langsvgedit = isset($svgedit_code_translation_table[$langsvgedit]) ? $svgedit_code_translation_table[$langsvgedit] : $langsvgedit;
+    $langsvgedit = file_exists(api_get_path(LIBRARY_PATH).'javascript/svgedit/locale/lang.'.$langsvgedit.'.js') ? $langsvgedit : 'en';
+    $svg_url = api_get_path(WEB_LIBRARY_PATH).'javascript/svgedit/svg-editor.php?url=../../../../../courses/'.$courseDir.$dir.$file.'&lang='.$langsvgedit;
+    ?>
 	<script>
 	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>');
 	function resizeIframe() {
@@ -155,9 +155,9 @@ 
 
     <?php
     echo '<noscript>';
-	echo '<iframe style="height: 550px; width: 100%;" scrolling="no" frameborder="0\' src="'.$svg_url.'"<noframes><p>Sorry, your browser does not handle frames</p></noframes></iframe>';
-	echo '</noscript>';
+    echo '<iframe style="height: 550px; width: 100%;" scrolling="no" frameborder="0\' src="'.$svg_url.'"<noframes><p>Sorry, your browser does not handle frames</p></noframes></iframe>';
+    echo '</noscript>';
 } else {
-	Display::display_error_message(get_lang('BrowserDontSupportsSVG'));
+    Display::display_error_message(get_lang('BrowserDontSupportsSVG'));
 }
 Display::display_footer();

Spacing +6 added lines, -6 removed lines

@@ -37,7 +37,7 @@ 
 $dir = str_replace('\\', '/', $dir);
 
 /* Constants & Variables */
-$current_session_id=api_get_session_id();
+$current_session_id = api_get_session_id();
 $group_id = api_get_group_id();
 
 //path for svg-edit save
@@ -50,8 +50,8 @@ 
 $file = basename($get_file);
 $temp_file = explode(".", $file);
 $filename = $temp_file[0];
-$nameTools = get_lang('EditDocument') . ': ' . $filename;
-$courseDir = $_course['path'] . '/document';
+$nameTools = get_lang('EditDocument').': '.$filename;
+$courseDir = $_course['path'].'/document';
 $is_allowed_to_edit = api_is_allowed_to_edit(null, true);
 
 /*	Other initialization code */
@@ -125,15 +125,15 @@ 
 Display :: display_header($nameTools, 'Doc');
 echo '<div class="actions">';
 echo '<a href="document.php?id='.$parent_id.'">'.
-    Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('DocumentsOverview'),'',ICON_SIZE_MEDIUM).'</a>';
+    Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('DocumentsOverview'), '', ICON_SIZE_MEDIUM).'</a>';
 echo '<a href="edit_document.php?'.api_get_cidreq().'&id='.$document_id.'&origin=editdraw">'.
-    Display::return_icon('edit.png',get_lang('Rename').'/'.get_lang('Comments'),'',ICON_SIZE_MEDIUM).'</a>';
+    Display::return_icon('edit.png', get_lang('Rename').'/'.get_lang('Comments'), '', ICON_SIZE_MEDIUM).'</a>';
 echo '</div>';
 
 if (api_browser_support('svg')) {
 	//automatic loading the course language
 	$svgedit_code_translation_table = array('' => 'en', 'pt' => 'pt-Pt', 'sr' => 'sr_latn');
-	$langsvgedit  = api_get_language_isocode();
+	$langsvgedit = api_get_language_isocode();
 	$langsvgedit = isset($svgedit_code_translation_table[$langsvgedit]) ? $svgedit_code_translation_table[$langsvgedit] : $langsvgedit;
 	$langsvgedit = file_exists(api_get_path(LIBRARY_PATH).'javascript/svgedit/locale/lang.'.$langsvgedit.'.js') ? $langsvgedit : 'en';
 	$svg_url = api_get_path(WEB_LIBRARY_PATH).'javascript/svgedit/svg-editor.php?url=../../../../../courses/'.$courseDir.$dir.$file.'&lang='.$langsvgedit;

main/document/download.php

Indentation +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
 $doc_url = str_replace(array('../', '\\..', '\\0', '..\\'), array('', '', '', ''), $doc_url); //echo $doc_url;
 
 if (strpos($doc_url, '../') OR strpos($doc_url, '/..')) {
-   $doc_url = '';
+    $doc_url = '';
 }
 
 // Dealing with image included into survey: when users receive a link towards a

Spacing +1 added lines, -1 removed lines

@@ -95,7 +95,7 @@
     }
 
     if (!api_is_allowed_to_edit() && !$is_visible) {
-        Display::display_error_message(get_lang('ProtectedDocument'));//api_not_allowed backbutton won't work.
+        Display::display_error_message(get_lang('ProtectedDocument')); //api_not_allowed backbutton won't work.
         exit; // You shouldn't be here anyway.
     }
     // Launch event

main/document/webcam_receiver.php

Indentation +17 added lines, -17 removed lines

@@ -14,18 +14,18 @@ 
 parse_str($_SERVER['QUERY_STRING'], $params);
 
 if(isset($params['webcamname']) && isset($params['webcamdir']) && isset($params['webcamuserid'])) {
-	$webcamname = $params['webcamname'];
-	$webcamdir = $params['webcamdir'];
-	$webcamuserid = $params['webcamuserid'];
+    $webcamname = $params['webcamname'];
+    $webcamdir = $params['webcamdir'];
+    $webcamuserid = $params['webcamuserid'];
 }
 else {
-	api_not_allowed();
-	die();
+    api_not_allowed();
+    die();
 }
 
 if ($webcamuserid!= api_get_user_id() || api_get_user_id()==0 || $webcamuserid==0) {
-	api_not_allowed();
-	die();
+    api_not_allowed();
+    die();
 }
 
 
@@ -42,7 +42,7 @@ 
 $ext = strtolower($ext[sizeof($ext) - 1]);
 
 if($ext!= 'jpg'){
-	die();
+    die();
 }
 
 //Do not use here check Fileinfo method because return: text/plain                //CHECK THIS BEFORE COMMIT
@@ -57,11 +57,11 @@ 
 $title_to_save=str_replace('_',' ',$webcamname);
 $webcamname_noex=basename($webcamname, ".jpg");
 if (file_exists($saveDir.'/'.$webcamname_noex.'.'.$ext)){
-		$i = 1;
-		while (file_exists($saveDir.'/'.$webcamname_noex.'_'.$i.'.'.$ext)) $i++;
-		$webcamname_to_save = $webcamname_noex . '_' . $i . '.'.$ext;
-		$title_to_save = $webcamname_noex . '_' . $i . '.'.$ext;
-		$title_to_save = str_replace('_',' ',$title_to_save);
+        $i = 1;
+        while (file_exists($saveDir.'/'.$webcamname_noex.'_'.$i.'.'.$ext)) $i++;
+        $webcamname_to_save = $webcamname_noex . '_' . $i . '.'.$ext;
+        $title_to_save = $webcamname_noex . '_' . $i . '.'.$ext;
+        $title_to_save = str_replace('_',' ',$title_to_save);
 }
 
 $documentPath = $saveDir.'/'.$webcamname_to_save;
@@ -70,13 +70,13 @@ 
 //Change to move_uploaded_file() function instead file_get_contents() to adapt the new lib
 $content = move_uploaded_file($_FILES['webcam']['tmp_name'], $documentPath);
 if (!$content) {
-	print "PHP ERROR: Failed to read data\n";
-	exit();
+    print "PHP ERROR: Failed to read data\n";
+    exit();
 }
 
 //add document to database
-	$doc_id = add_document($_course, $webcamdir.'/'.$webcamname_to_save, 'file', filesize($documentPath), $title_to_save);
-	api_item_property_update($_course, TOOL_DOCUMENT, $doc_id, 'DocumentAdded', $_user['user_id'], $groupId, null, null, null, $current_session_id);
+    $doc_id = add_document($_course, $webcamdir.'/'.$webcamname_to_save, 'file', filesize($documentPath), $title_to_save);
+    api_item_property_update($_course, TOOL_DOCUMENT, $doc_id, 'DocumentAdded', $_user['user_id'], $groupId, null, null, null, $current_session_id);
 ///
 $url = 'http://' . $_SERVER['HTTP_HOST'] . dirname($_SERVER['REQUEST_URI']) . '/' . $documentPath;
 print get_lang('ClipSent');

Spacing +11 added lines, -11 removed lines

@@ -13,7 +13,7 @@ 
 # Save the audio to a URL-accessible directory for playback.
 parse_str($_SERVER['QUERY_STRING'], $params);
 
-if(isset($params['webcamname']) && isset($params['webcamdir']) && isset($params['webcamuserid'])) {
+if (isset($params['webcamname']) && isset($params['webcamdir']) && isset($params['webcamuserid'])) {
 	$webcamname = $params['webcamname'];
 	$webcamdir = $params['webcamdir'];
 	$webcamuserid = $params['webcamuserid'];
@@ -23,7 +23,7 @@ 
 	die();
 }
 
-if ($webcamuserid!= api_get_user_id() || api_get_user_id()==0 || $webcamuserid==0) {
+if ($webcamuserid != api_get_user_id() || api_get_user_id() == 0 || $webcamuserid == 0) {
 	api_not_allowed();
 	die();
 }
@@ -41,7 +41,7 @@ 
 $ext = explode('.', $webcamname);
 $ext = strtolower($ext[sizeof($ext) - 1]);
 
-if($ext!= 'jpg'){
+if ($ext != 'jpg') {
 	die();
 }
 
@@ -53,15 +53,15 @@ 
 $groupId = api_get_group_id();
 
 //Avoid duplicates
-$webcamname_to_save=$webcamname;
-$title_to_save=str_replace('_',' ',$webcamname);
-$webcamname_noex=basename($webcamname, ".jpg");
-if (file_exists($saveDir.'/'.$webcamname_noex.'.'.$ext)){
+$webcamname_to_save = $webcamname;
+$title_to_save = str_replace('_', ' ', $webcamname);
+$webcamname_noex = basename($webcamname, ".jpg");
+if (file_exists($saveDir.'/'.$webcamname_noex.'.'.$ext)) {
 		$i = 1;
 		while (file_exists($saveDir.'/'.$webcamname_noex.'_'.$i.'.'.$ext)) $i++;
-		$webcamname_to_save = $webcamname_noex . '_' . $i . '.'.$ext;
-		$title_to_save = $webcamname_noex . '_' . $i . '.'.$ext;
-		$title_to_save = str_replace('_',' ',$title_to_save);
+		$webcamname_to_save = $webcamname_noex.'_'.$i.'.'.$ext;
+		$title_to_save = $webcamname_noex.'_'.$i.'.'.$ext;
+		$title_to_save = str_replace('_', ' ', $title_to_save);
 }
 
 $documentPath = $saveDir.'/'.$webcamname_to_save;
@@ -78,5 +78,5 @@ 
 	$doc_id = add_document($_course, $webcamdir.'/'.$webcamname_to_save, 'file', filesize($documentPath), $title_to_save);
 	api_item_property_update($_course, TOOL_DOCUMENT, $doc_id, 'DocumentAdded', $_user['user_id'], $groupId, null, null, null, $current_session_id);
 ///
-$url = 'http://' . $_SERVER['HTTP_HOST'] . dirname($_SERVER['REQUEST_URI']) . '/' . $documentPath;
+$url = 'http://'.$_SERVER['HTTP_HOST'].dirname($_SERVER['REQUEST_URI']).'/'.$documentPath;
 print get_lang('ClipSent');

Braces +4 added lines, -3 removed lines

@@ -17,8 +17,7 @@ 
 	$webcamname = $params['webcamname'];
 	$webcamdir = $params['webcamdir'];
 	$webcamuserid = $params['webcamuserid'];
-}
-else {
+} else {
 	api_not_allowed();
 	die();
 }
@@ -58,7 +57,9 @@ 
 $webcamname_noex=basename($webcamname, ".jpg");
 if (file_exists($saveDir.'/'.$webcamname_noex.'.'.$ext)){
 		$i = 1;
-		while (file_exists($saveDir.'/'.$webcamname_noex.'_'.$i.'.'.$ext)) $i++;
+		while (file_exists($saveDir.'/'.$webcamname_noex.'_'.$i.'.'.$ext)) {
+		    $i++;
+		}
 		$webcamname_to_save = $webcamname_noex . '_' . $i . '.'.$ext;
 		$title_to_save = $webcamname_noex . '_' . $i . '.'.$ext;
 		$title_to_save = str_replace('_',' ',$title_to_save);

main/document/edit_paint.php

Braces +4 added lines, -4 removed lines

@@ -93,10 +93,11 @@ 
 
 $is_certificate_mode = DocumentManager::is_certificate_mode($dir);
 
-if (!$is_certificate_mode)
+if (!$is_certificate_mode) {
 	$interbreadcrumb[]= array("url" => "./document.php?curdirpath=".urlencode($my_cur_dir_path).'&'.api_get_cidreq(), "name"=> get_lang('Documents'));
-else
+} else {
 	$interbreadcrumb[]= array ('url' => '../gradebook/'.$_SESSION['gradebook_dest'], 'name' => get_lang('Gradebook'));
+}
 
 // Interbreadcrumb for the current directory root path
 if (empty($document_data['parents'])) {
@@ -158,8 +159,7 @@ 
 		@file_put_contents($path_and_file, $crossdomain);
 	}
 	$credentials="true";
-}
-else {
+} else {
 	$credentials="false";
 }
 

Spacing +45 added lines, -45 removed lines

@@ -33,26 +33,26 @@ 
     $my_cur_dir_path = isset($_GET['curdirpath']) ? Security::remove_XSS($_GET['curdirpath']) : null;
 }
 
-$dir= str_replace('\\', '/', $dir);//and urlencode each url $curdirpath (hack clean $curdirpath under Windows - Bug #3261)
+$dir = str_replace('\\', '/', $dir); //and urlencode each url $curdirpath (hack clean $curdirpath under Windows - Bug #3261)
 
 /* Constants & Variables */
-$current_session_id=api_get_session_id();
+$current_session_id = api_get_session_id();
 //path for pixlr save
-$_SESSION['paint_dir']=Security::remove_XSS($dir);
-if($_SESSION['paint_dir']=='/'){
-    $_SESSION['paint_dir']='';
+$_SESSION['paint_dir'] = Security::remove_XSS($dir);
+if ($_SESSION['paint_dir'] == '/') {
+    $_SESSION['paint_dir'] = '';
 }
-$_SESSION['paint_file']=basename(Security::remove_XSS($file_path));
+$_SESSION['paint_file'] = basename(Security::remove_XSS($file_path));
 
 $get_file = Security::remove_XSS($file_path);
 
 $file = basename($get_file);
 
-$temp_file = explode(".",$file);
-$filename=$temp_file[0];
-$nameTools = get_lang('EditDocument') . ': '.$filename;
+$temp_file = explode(".", $file);
+$filename = $temp_file[0];
+$nameTools = get_lang('EditDocument').': '.$filename;
 
-$courseDir   = $_course['path'].'/document';
+$courseDir = $_course['path'].'/document';
 
 $is_allowed_to_edit = api_is_allowed_to_edit(null, true);
 
@@ -96,15 +96,15 @@ 
 $is_certificate_mode = DocumentManager::is_certificate_mode($dir);
 
 if (!$is_certificate_mode)
-	$interbreadcrumb[]= array("url" => "./document.php?curdirpath=".urlencode($my_cur_dir_path).'&'.api_get_cidreq(), "name"=> get_lang('Documents'));
+	$interbreadcrumb[] = array("url" => "./document.php?curdirpath=".urlencode($my_cur_dir_path).'&'.api_get_cidreq(), "name"=> get_lang('Documents'));
 else
-	$interbreadcrumb[]= array ('url' => '../gradebook/'.$_SESSION['gradebook_dest'], 'name' => get_lang('Gradebook'));
+	$interbreadcrumb[] = array('url' => '../gradebook/'.$_SESSION['gradebook_dest'], 'name' => get_lang('Gradebook'));
 
 // Interbreadcrumb for the current directory root path
 if (empty($document_data['parents'])) {
     $interbreadcrumb[] = array('url' => '#', 'name' => $document_data['title']);
 } else {
-    foreach($document_data['parents'] as $document_sub_data) {
+    foreach ($document_data['parents'] as $document_sub_data) {
         if ($document_data['title'] == $document_sub_data['title']) {
             continue;
         }
@@ -124,33 +124,33 @@ 
 Display :: display_header($nameTools, 'Doc');
 echo '<div class="actions">';
 echo '<a href="document.php?id='.$parent_id.'&'.api_get_cidreq().'">'.
-    Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('DocumentsOverview'),'',ICON_SIZE_MEDIUM).'</a>';
+    Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('DocumentsOverview'), '', ICON_SIZE_MEDIUM).'</a>';
 echo '<a href="edit_document.php?'.api_get_cidreq().'&id='.$document_id.'&'.api_get_cidreq().'&origin=editpaint">'.
-    Display::return_icon('edit.png', get_lang('Rename').'/'.get_lang('Comment'),'',ICON_SIZE_MEDIUM).'</a>';
+    Display::return_icon('edit.png', get_lang('Rename').'/'.get_lang('Comment'), '', ICON_SIZE_MEDIUM).'</a>';
 echo '</div>';
 
 ///pixlr
-$title=$file;//disk name. No sql name because pixlr return this when save
+$title = $file; //disk name. No sql name because pixlr return this when save
 $pixlr_code_translation_table = array('' => 'en', 'pt' => 'pt-Pt', 'sr' => 'sr_latn');
-$langpixlr  = api_get_language_isocode();
+$langpixlr = api_get_language_isocode();
 $langpixlr = isset($pixlr_code_translation_table[$langpixlr]) ? $pixlredit_code_translation_table[$langpixlr] : $langpixlr;
-$loc=$langpixlr;// deprecated ?? TODO:check pixlr read user browser
+$loc = $langpixlr; // deprecated ?? TODO:check pixlr read user browser
 
-$exit_path=api_get_path(WEB_CODE_PATH).'document/exit_pixlr.php';
-$_SESSION['exit_pixlr']= Security::remove_XSS($parent_id);
+$exit_path = api_get_path(WEB_CODE_PATH).'document/exit_pixlr.php';
+$_SESSION['exit_pixlr'] = Security::remove_XSS($parent_id);
 
-$referrer="Chamilo";
+$referrer = "Chamilo";
 
-$target_path=api_get_path(WEB_CODE_PATH).'document/save_pixlr.php';
-$target=$target_path;
+$target_path = api_get_path(WEB_CODE_PATH).'document/save_pixlr.php';
+$target = $target_path;
 
-$locktarget="true";
-$locktitle="false";
+$locktarget = "true";
+$locktitle = "false";
 
-if ($_SERVER['HTTP_HOST']=="localhost") {
-	$path_and_file= api_get_path(SYS_PATH).'/crossdomain.xml';
+if ($_SERVER['HTTP_HOST'] == "localhost") {
+	$path_and_file = api_get_path(SYS_PATH).'/crossdomain.xml';
 	if (!file_exists($path_and_file)) {
-		$crossdomain='<?xml version="1.0"?>
+		$crossdomain = '<?xml version="1.0"?>
 			<!DOCTYPE cross-domain-policy SYSTEM "http://www.adobe.com/xml/dtds/cross-domain-policy.dtd">
 			<cross-domain-policy>
 				<allow-access-from domain="cdn.pixlr.com" />
@@ -159,23 +159,23 @@ 
 			</cross-domain-policy>';//more open domain="*"
 		@file_put_contents($path_and_file, $crossdomain);
 	}
-	$credentials="true";
+	$credentials = "true";
 }
 else {
-	$credentials="false";
+	$credentials = "false";
 }
 
 //make temp images
-$temp_folder=api_get_path(SYS_ARCHIVE_PATH).'temp/images';
+$temp_folder = api_get_path(SYS_ARCHIVE_PATH).'temp/images';
 if (!file_exists($temp_folder)) {
-    @mkdir($temp_folder, api_get_permissions_for_new_directories(), true);//TODO:check $permissions value, now empty;
+    @mkdir($temp_folder, api_get_permissions_for_new_directories(), true); //TODO:check $permissions value, now empty;
 }
 
 //make htaccess with allow from all, and file index.html into temp/images
-$htaccess=api_get_path(SYS_ARCHIVE_PATH).'temp/images/.htaccess';
+$htaccess = api_get_path(SYS_ARCHIVE_PATH).'temp/images/.htaccess';
 if (!file_exists($htaccess)) {
 
-	$htaccess_content="order deny,allow\r\nallow from all\r\nOptions -Indexes";
+	$htaccess_content = "order deny,allow\r\nallow from all\r\nOptions -Indexes";
 
 	$fp = @ fopen(api_get_path(SYS_ARCHIVE_PATH).'temp/images/.htaccess', 'w');
 	if ($fp) {
@@ -184,9 +184,9 @@ 
 	}
 }
 
-$html_index=api_get_path(SYS_ARCHIVE_PATH).'temp/images/index.html';
+$html_index = api_get_path(SYS_ARCHIVE_PATH).'temp/images/index.html';
 if (!file_exists($html_index)) {
-	$html_index_content="<html><head></head><body></body></html>";
+	$html_index_content = "<html><head></head><body></body></html>";
 	$fp = @ fopen(api_get_path(SYS_ARCHIVE_PATH).'temp/images/index.html', 'w');
 	if ($fp) {
 		fwrite($fp, $html_index_content);
@@ -195,20 +195,20 @@ 
 }
 
 //encript temp name file
-$name_crip=sha1(uniqid());//encript
-$findext= explode(".", $file);
-$extension= $findext[count($findext)-1];
-$file_crip=$name_crip.'.'.$extension;
+$name_crip = sha1(uniqid()); //encript
+$findext = explode(".", $file);
+$extension = $findext[count($findext) - 1];
+$file_crip = $name_crip.'.'.$extension;
 
 //copy file to temp/images directory
-$from=$filepath.$file;
-$to=api_get_path(SYS_ARCHIVE_PATH).'temp/images/'.$file_crip;
+$from = $filepath.$file;
+$to = api_get_path(SYS_ARCHIVE_PATH).'temp/images/'.$file_crip;
 copy($from, $to);
-$_SESSION['temp_realpath_image']=$to;
+$_SESSION['temp_realpath_image'] = $to;
 
 //load image to url
-$to_url=api_get_path(WEB_ARCHIVE_PATH).'temp/images/'.$file_crip;
-$image=urlencode($to_url);
+$to_url = api_get_path(WEB_ARCHIVE_PATH).'temp/images/'.$file_crip;
+$image = urlencode($to_url);
 $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;
 
 //make frame an send image

Indentation +35 added lines, -35 removed lines

@@ -61,44 +61,44 @@ 
 /* Please, do not modify this dirname formatting */
 
 if (strstr($dir, '..')) {
-	$dir = '/';
+    $dir = '/';
 }
 
 if ($dir[0] == '.') {
-	$dir = substr($dir, 1);
+    $dir = substr($dir, 1);
 }
 
 if ($dir[0] != '/') {
-	$dir = '/'.$dir;
+    $dir = '/'.$dir;
 }
 
 if ($dir[strlen($dir) - 1] != '/') {
-	$dir .= '/';
+    $dir .= '/';
 }
 
 $filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document'.$dir;
 
 if (!is_dir($filepath)) {
-	$filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document/';
-	$dir = '/';
+    $filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document/';
+    $dir = '/';
 }
 
 //groups //TODO:clean
 if (!empty($groupId)) {
-	$interbreadcrumb[] = array(
-		'url' => api_get_path(WEB_CODE_PATH).'group/group_space.php?'.api_get_cidreq(),
-		'name' => get_lang('GroupSpace'),
-	);
-	$group_document = true;
-	$noPHP_SELF = true;
+    $interbreadcrumb[] = array(
+        'url' => api_get_path(WEB_CODE_PATH).'group/group_space.php?'.api_get_cidreq(),
+        'name' => get_lang('GroupSpace'),
+    );
+    $group_document = true;
+    $noPHP_SELF = true;
 }
 
 $is_certificate_mode = DocumentManager::is_certificate_mode($dir);
 
 if (!$is_certificate_mode)
-	$interbreadcrumb[]= array("url" => "./document.php?curdirpath=".urlencode($my_cur_dir_path).'&'.api_get_cidreq(), "name"=> get_lang('Documents'));
+    $interbreadcrumb[]= array("url" => "./document.php?curdirpath=".urlencode($my_cur_dir_path).'&'.api_get_cidreq(), "name"=> get_lang('Documents'));
 else
-	$interbreadcrumb[]= array ('url' => '../gradebook/'.$_SESSION['gradebook_dest'], 'name' => get_lang('Gradebook'));
+    $interbreadcrumb[]= array ('url' => '../gradebook/'.$_SESSION['gradebook_dest'], 'name' => get_lang('Gradebook'));
 
 // Interbreadcrumb for the current directory root path
 if (empty($document_data['parents'])) {
@@ -113,10 +113,10 @@ 
 }
 
 $is_allowedToEdit = api_is_allowed_to_edit(null, true) || $_SESSION['group_member_with_upload_rights'] ||
-	DocumentManager::is_my_shared_folder(api_get_user_id(), $dir, $current_session_id);
+    DocumentManager::is_my_shared_folder(api_get_user_id(), $dir, $current_session_id);
 
 if (!$is_allowedToEdit) {
-	api_not_allowed(true);
+    api_not_allowed(true);
 }
 
 Event::event_access_tool(TOOL_DOCUMENT);
@@ -148,21 +148,21 @@ 
 $locktitle="false";
 
 if ($_SERVER['HTTP_HOST']=="localhost") {
-	$path_and_file= api_get_path(SYS_PATH).'/crossdomain.xml';
-	if (!file_exists($path_and_file)) {
-		$crossdomain='<?xml version="1.0"?>
+    $path_and_file= api_get_path(SYS_PATH).'/crossdomain.xml';
+    if (!file_exists($path_and_file)) {
+        $crossdomain='<?xml version="1.0"?>
 			<!DOCTYPE cross-domain-policy SYSTEM "http://www.adobe.com/xml/dtds/cross-domain-policy.dtd">
 			<cross-domain-policy>
 				<allow-access-from domain="cdn.pixlr.com" />
 				<site-control permitted-cross-domain-policies="master-only"/>
 				<allow-http-request-headers-from domain="cnd.pixlr.com" headers="*" secure="true"/>
 			</cross-domain-policy>';//more open domain="*"
-		@file_put_contents($path_and_file, $crossdomain);
-	}
-	$credentials="true";
+        @file_put_contents($path_and_file, $crossdomain);
+    }
+    $credentials="true";
 }
 else {
-	$credentials="false";
+    $credentials="false";
 }
 
 //make temp images
@@ -175,23 +175,23 @@ 
 $htaccess=api_get_path(SYS_ARCHIVE_PATH).'temp/images/.htaccess';
 if (!file_exists($htaccess)) {
 
-	$htaccess_content="order deny,allow\r\nallow from all\r\nOptions -Indexes";
+    $htaccess_content="order deny,allow\r\nallow from all\r\nOptions -Indexes";
 
-	$fp = @ fopen(api_get_path(SYS_ARCHIVE_PATH).'temp/images/.htaccess', 'w');
-	if ($fp) {
-		fwrite($fp, $htaccess_content);
-		fclose($fp);
-	}
+    $fp = @ fopen(api_get_path(SYS_ARCHIVE_PATH).'temp/images/.htaccess', 'w');
+    if ($fp) {
+        fwrite($fp, $htaccess_content);
+        fclose($fp);
+    }
 }
 
 $html_index=api_get_path(SYS_ARCHIVE_PATH).'temp/images/index.html';
 if (!file_exists($html_index)) {
-	$html_index_content="<html><head></head><body></body></html>";
-	$fp = @ fopen(api_get_path(SYS_ARCHIVE_PATH).'temp/images/index.html', 'w');
-	if ($fp) {
-		fwrite($fp, $html_index_content);
-		fclose($fp);
-	}
+    $html_index_content="<html><head></head><body></body></html>";
+    $fp = @ fopen(api_get_path(SYS_ARCHIVE_PATH).'temp/images/index.html', 'w');
+    if ($fp) {
+        fwrite($fp, $html_index_content);
+        fclose($fp);
+    }
 }
 
 //encript temp name file

main/document/document_slideshow.inc.php

Indentation +13 added lines, -13 removed lines

@@ -29,8 +29,8 @@ 
 
 // Resetting the images of the slideshow = destroying the slideshow
 if (isset($_GET['action']) && $_GET['action'] == 'exit_slideshow') {
-	$_SESSION['image_files_only'] = null;
-	unset($image_files_only);
+    $_SESSION['image_files_only'] = null;
+    unset($image_files_only);
 }
 
 // We check if there are images in this folder by searching the extensions for .jpg, .gif, .png
@@ -39,10 +39,10 @@ 
 $array_to_search = !empty($documentAndFolders) && is_array($documentAndFolders) ? $documentAndFolders : array();
 
 if (count($array_to_search) > 0) {
-	while (list($key) = each($array_to_search)) {
-		$all_files[] = basename($array_to_search[$key]['path']);
-		//echo basename($array_to_search[$key]['path']).'<br />';
-	}
+    while (list($key) = each($array_to_search)) {
+        $all_files[] = basename($array_to_search[$key]['path']);
+        //echo basename($array_to_search[$key]['path']).'<br />';
+    }
 }
 
 // Always show gallery.
@@ -62,9 +62,9 @@ 
 
 $tablename_column = isset($_GET['tablename_column']) ? Security::remove_XSS($_GET['tablename_column']) : 0;
 if ($tablename_column == 0) {
-	$tablename_column = 1;
+    $tablename_column = 1;
 } else {
-	$tablename_column = intval($tablename_column) - 1;
+    $tablename_column = intval($tablename_column) - 1;
 }
 $tablename_direction = isset($_GET['tablename_direction']) ? Security::remove_XSS($_GET['tablename_direction']) : 'ASC';
 
@@ -98,15 +98,15 @@ 
         $final_array[] = $file_array[1];
     }
 
-	return $final_array;
+    return $final_array;
 }
 
 function sort_table($a, $b) {
-	global $tablename_column;
-	return strnatcmp($a[$tablename_column], $b[$tablename_column]);
+    global $tablename_column;
+    return strnatcmp($a[$tablename_column], $b[$tablename_column]);
 }
 
 function rsort_table($a, $b) {
-	global $tablename_column;
-	return strnatcmp($b[$tablename_column], $a[$tablename_column]);
+    global $tablename_column;
+    return strnatcmp($b[$tablename_column], $a[$tablename_column]);
 }

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
  *	too much things in one file , I decided to put the code for document.php here and to include this
  *	file into document.php
  */
-$accepted_extensions = array('.jpg', '.jpeg', '.gif', '.png', '.bmp','.svg');
+$accepted_extensions = array('.jpg', '.jpeg', '.gif', '.png', '.bmp', '.svg');
 
 // Resetting the images of the slideshow = destroying the slideshow
 if (isset($_GET['action']) && $_GET['action'] == 'exit_slideshow') {

main/document/downloadfolder.inc.php

Spacing +5 added lines, -5 removed lines

@@ -51,7 +51,7 @@ 
 
 // A student should not be able to download a root shared directory
 if (($path == '/shared_folder' ||
-    $path == '/shared_folder_session_' . api_get_session_id()) &&
+    $path == '/shared_folder_session_'.api_get_session_id()) &&
     (!api_is_allowed_to_edit() || !api_is_platform_admin())
 ) {
     api_not_allowed(true);
@@ -149,7 +149,7 @@ 
                 (props.session_id IN ('0', '$sessionId') OR props.session_id IS NULL) AND
                 docs.c_id = ".$courseId." ";
 
-    $sql.= DocumentManager::getSessionFolderFilters($querypath, $sessionId);
+    $sql .= DocumentManager::getSessionFolderFilters($querypath, $sessionId);
 
     $result = Database::query($sql);
 
@@ -214,7 +214,7 @@ 
                 $groupCondition
             ";
 
-    $sql.= DocumentManager::getSessionFolderFilters($querypath, $sessionId);
+    $sql .= DocumentManager::getSessionFolderFilters($querypath, $sessionId);
     $result = Database::query($sql);
 
     $files = array();
@@ -294,9 +294,9 @@ 
     // Add all files in our final array to the zipfile
     for ($i = 0; $i < count($files_for_zipfile); $i++) {
         $zip->add(
-            $sysCoursePath . $courseInfo['path'] . '/document' . $files_for_zipfile[$i],
+            $sysCoursePath.$courseInfo['path'].'/document'.$files_for_zipfile[$i],
             PCLZIP_OPT_REMOVE_PATH,
-            $sysCoursePath . $courseInfo['path'] . '/document' . $remove_dir,
+            $sysCoursePath.$courseInfo['path'].'/document'.$remove_dir,
             PCLZIP_CB_PRE_ADD,
             'fixDocumentNameCallback'
         );

Doc Comments +1 added lines, -1 removed lines

@@ -212,7 +212,7 @@
  * @param array $arr1 first array
  * @param array $arr2 second array
  *
- * @return array difference between the two arrays
+ * @return string difference between the two arrays
  */
 function diff($arr1, $arr2)
 {

main/document/save_pixlr.php

Spacing +34 added lines, -34 removed lines

@@ -16,36 +16,36 @@ 
 api_protect_course_script();
 api_block_anonymous_users();
 
-if ($_user['user_id']!= api_get_user_id() || api_get_user_id()==0 || $_user['user_id']==0) {
+if ($_user['user_id'] != api_get_user_id() || api_get_user_id() == 0 || $_user['user_id'] == 0) {
 	api_not_allowed();
 	die();
 }
 
-if(!isset($_GET['title']) || !isset($_GET['type']) || !isset($_GET['image'])) {
+if (!isset($_GET['title']) || !isset($_GET['type']) || !isset($_GET['image'])) {
 	api_not_allowed();
 	die();
 }
 
-if(!isset($_SESSION['paint_dir']) || !isset($_SESSION['whereami']) ){
+if (!isset($_SESSION['paint_dir']) || !isset($_SESSION['whereami'])) {
 	api_not_allowed();
 	die();
 }
 
 //pixlr return
 
-$filename=Security::remove_XSS($_GET['title']);//The user preferred file name of the image.
-$extension=Security::remove_XSS($_GET['type']);//The image type, "pdx", "jpg", "bmp" or "png".
-$urlcontents=Security::remove_XSS($_GET['image']);//A URL to the image on Pixlr.com server or the raw file post of the saved image.
+$filename = Security::remove_XSS($_GET['title']); //The user preferred file name of the image.
+$extension = Security::remove_XSS($_GET['type']); //The image type, "pdx", "jpg", "bmp" or "png".
+$urlcontents = Security::remove_XSS($_GET['image']); //A URL to the image on Pixlr.com server or the raw file post of the saved image.
 
 //make variables
 
-$title = Database::escape_string(str_replace('_',' ',$filename));
+$title = Database::escape_string(str_replace('_', ' ', $filename));
 $current_session_id = api_get_session_id();
-$groupId= api_get_group_id();
-$relativeUrlPath=$_SESSION['paint_dir'];
-$currentTool=$_SESSION['whereami'];
+$groupId = api_get_group_id();
+$relativeUrlPath = $_SESSION['paint_dir'];
+$currentTool = $_SESSION['whereami'];
 $dirBaseDocuments = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document';
-$saveDir=$dirBaseDocuments.$_SESSION['paint_dir'];
+$saveDir = $dirBaseDocuments.$_SESSION['paint_dir'];
 
 $contents = file_get_contents($urlcontents);
 
@@ -71,8 +71,8 @@ 
 $filename = api_replace_dangerous_char($filename);
 $filename = disable_dangerous_file($filename);
 
-if (strlen(trim($filename))==0) {
-	 echo "The title is empty";//if title is empty, headers Content-Type = application/octet-stream, then not create a new title here please
+if (strlen(trim($filename)) == 0) {
+	 echo "The title is empty"; //if title is empty, headers Content-Type = application/octet-stream, then not create a new title here please
 	 exit;
 }
 
@@ -83,11 +83,11 @@ 
 }
 
 // Extension security
-if($extension!= 'jpg' && $extension!= 'png' && $extension!= 'pxd'){
+if ($extension != 'jpg' && $extension != 'png' && $extension != 'pxd') {
 	die();
 }
-if($extension=='pxd') {
-	echo "pxd file type does not supported";// not secure because check security headers and finfo() return  Content-Type = application/octet-stream
+if ($extension == 'pxd') {
+	echo "pxd file type does not supported"; // not secure because check security headers and finfo() return  Content-Type = application/octet-stream
     exit;
 }
 
@@ -101,9 +101,9 @@ 
 
 //Verify that the file is an image. Fileinfo method
 $finfo = new finfo(FILEINFO_MIME);
-$current_mime=$finfo->buffer($contents);
+$current_mime = $finfo->buffer($contents);
 finfo_close($finfo);
-if(strpos($current_mime, 'image')===false) {
+if (strpos($current_mime, 'image') === false) {
     echo "Invalid mime type file";
     exit;
 }
@@ -113,46 +113,46 @@ 
 $paintFileName = $filename.'.'.$extension;
 $title = $title.'.'.$extension;
 
-if($currentTool=='document/createpaint'){
+if ($currentTool == 'document/createpaint') {
 	//check save as and prevent rewrite an older file with same name
-	if (0 != $groupId){
-        $group_properties  = GroupManager :: get_group_properties($groupId);
+	if (0 != $groupId) {
+        $group_properties = GroupManager :: get_group_properties($groupId);
         $groupPath = $group_properties['directory'];
 	} else {
-		$groupPath ='';
+		$groupPath = '';
 	}
 
-	if (file_exists($saveDir.'/'.$filename.'.'.$extension)){
+	if (file_exists($saveDir.'/'.$filename.'.'.$extension)) {
 		$i = 1;
 		while (file_exists($saveDir.'/'.$filename.'_'.$i.'.'.$extension)) $i++;
-		$paintFileName = $filename . '_' . $i . '.'.$extension;
-		$title = $filename . '_' . $i . '.'.$extension;
+		$paintFileName = $filename.'_'.$i.'.'.$extension;
+		$title = $filename.'_'.$i.'.'.$extension;
 	}
 
 	//
 	$documentPath = $saveDir.'/'.$paintFileName;
 	//add new document to disk
-	file_put_contents( $documentPath, $contents );
+	file_put_contents($documentPath, $contents);
 	//add document to database
 	$doc_id = add_document($_course, $relativeUrlPath.'/'.$paintFileName, 'file', filesize($documentPath), $title);
 	api_item_property_update($_course, TOOL_DOCUMENT, $doc_id, 'DocumentAdded', $_user['user_id'], $groupId, null, null, null, $current_session_id);
 
-}elseif($currentTool=='document/editpaint'){
+}elseif ($currentTool == 'document/editpaint') {
 
 	$documentPath = $saveDir.'/'.$paintFileName;
 	//add new document to disk
-	file_put_contents( $documentPath, $contents );
+	file_put_contents($documentPath, $contents);
 
 	//check path
-	if(!isset($_SESSION['paint_file'])){
+	if (!isset($_SESSION['paint_file'])) {
 		api_not_allowed();
 		die();
 	}
-	if($_SESSION['paint_file']==$paintFileName){
+	if ($_SESSION['paint_file'] == $paintFileName) {
 		$document_id = DocumentManager::get_document_id($_course, $relativeUrlPath.'/'.$paintFileName);
 		update_existing_document($_course, $document_id, filesize($documentPath), null);
 		api_item_property_update($_course, TOOL_DOCUMENT, $document_id, 'DocumentUpdated', $_user['user_id'], $groupId, null, null, null, $current_session_id);
-	}else{
+	} else {
 		//add a new document
 		$doc_id = add_document($_course, $relativeUrlPath.'/'.$paintFileName, 'file', filesize($documentPath), $title);
 		api_item_property_update($_course, TOOL_DOCUMENT, $doc_id, 'DocumentAdded', $_user['user_id'], $groupId, null, null, null, $current_session_id);
@@ -161,7 +161,7 @@ 
 
 
 //delete temporal file
-$temp_file_2delete=$_SESSION['temp_realpath_image'];
+$temp_file_2delete = $_SESSION['temp_realpath_image'];
 unlink($temp_file_2delete);
 
 //Clean sessions and return to Chamilo file list
@@ -171,12 +171,12 @@ 
 unset($_SESSION['temp_realpath_image']);
 
 if (!isset($_SESSION['exit_pixlr'])) {
-	$location=api_get_path(WEB_CODE_PATH).'document/document.php';
+	$location = api_get_path(WEB_CODE_PATH).'document/document.php';
 	echo '<script>window.parent.location.href="'.$location.'"</script>';
 	api_not_allowed(true);
 } else {
 	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>';
-	$location=api_get_path(WEB_CODE_PATH).'document/document.php?id='.Security::remove_XSS($_SESSION['exit_pixlr']);
+	$location = api_get_path(WEB_CODE_PATH).'document/document.php?id='.Security::remove_XSS($_SESSION['exit_pixlr']);
 	echo '<script>window.parent.location.href="'.$location.'"</script>';
 	unset($_SESSION['exit_pixlr']);
 }

Braces +5 added lines, -3 removed lines

@@ -124,7 +124,9 @@ 
 
 	if (file_exists($saveDir.'/'.$filename.'.'.$extension)){
 		$i = 1;
-		while (file_exists($saveDir.'/'.$filename.'_'.$i.'.'.$extension)) $i++;
+		while (file_exists($saveDir.'/'.$filename.'_'.$i.'.'.$extension)) {
+		    $i++;
+		}
 		$paintFileName = $filename . '_' . $i . '.'.$extension;
 		$title = $filename . '_' . $i . '.'.$extension;
 	}
@@ -137,7 +139,7 @@ 
 	$doc_id = add_document($_course, $relativeUrlPath.'/'.$paintFileName, 'file', filesize($documentPath), $title);
 	api_item_property_update($_course, TOOL_DOCUMENT, $doc_id, 'DocumentAdded', $_user['user_id'], $groupId, null, null, null, $current_session_id);
 
-}elseif($currentTool=='document/editpaint'){
+} elseif($currentTool=='document/editpaint'){
 
 	$documentPath = $saveDir.'/'.$paintFileName;
 	//add new document to disk
@@ -152,7 +154,7 @@ 
 		$document_id = DocumentManager::get_document_id($_course, $relativeUrlPath.'/'.$paintFileName);
 		update_existing_document($_course, $document_id, filesize($documentPath), null);
 		api_item_property_update($_course, TOOL_DOCUMENT, $document_id, 'DocumentUpdated', $_user['user_id'], $groupId, null, null, null, $current_session_id);
-	}else{
+	} else{
 		//add a new document
 		$doc_id = add_document($_course, $relativeUrlPath.'/'.$paintFileName, 'file', filesize($documentPath), $title);
 		api_item_property_update($_course, TOOL_DOCUMENT, $doc_id, 'DocumentAdded', $_user['user_id'], $groupId, null, null, null, $current_session_id);

Indentation +58 added lines, -58 removed lines

@@ -17,18 +17,18 @@ 
 api_block_anonymous_users();
 
 if ($_user['user_id']!= api_get_user_id() || api_get_user_id()==0 || $_user['user_id']==0) {
-	api_not_allowed();
-	die();
+    api_not_allowed();
+    die();
 }
 
 if(!isset($_GET['title']) || !isset($_GET['type']) || !isset($_GET['image'])) {
-	api_not_allowed();
-	die();
+    api_not_allowed();
+    die();
 }
 
 if(!isset($_SESSION['paint_dir']) || !isset($_SESSION['whereami']) ){
-	api_not_allowed();
-	die();
+    api_not_allowed();
+    die();
 }
 
 //pixlr return
@@ -72,22 +72,22 @@ 
 $filename = disable_dangerous_file($filename);
 
 if (strlen(trim($filename))==0) {
-	 echo "The title is empty";//if title is empty, headers Content-Type = application/octet-stream, then not create a new title here please
-	 exit;
+        echo "The title is empty";//if title is empty, headers Content-Type = application/octet-stream, then not create a new title here please
+        exit;
 }
 
 //check file_get_contents
 if ($contents === false) {
-	echo "I cannot read: ".$urlcontents;
+    echo "I cannot read: ".$urlcontents;
     exit;
 }
 
 // Extension security
 if($extension!= 'jpg' && $extension!= 'png' && $extension!= 'pxd'){
-	die();
+    die();
 }
 if($extension=='pxd') {
-	echo "pxd file type does not supported";// not secure because check security headers and finfo() return  Content-Type = application/octet-stream
+    echo "pxd file type does not supported";// not secure because check security headers and finfo() return  Content-Type = application/octet-stream
     exit;
 }
 
@@ -95,8 +95,8 @@ 
 $headers = get_headers($urlcontents, 1);
 $content_type = explode("/", $headers['Content-Type']);
 if ($content_type[0] != "image") {
-	echo "Invalid file type";
-	exit;
+    echo "Invalid file type";
+    exit;
 }
 
 //Verify that the file is an image. Fileinfo method
@@ -114,49 +114,49 @@ 
 $title = $title.'.'.$extension;
 
 if($currentTool=='document/createpaint'){
-	//check save as and prevent rewrite an older file with same name
-	if (0 != $groupId){
+    //check save as and prevent rewrite an older file with same name
+    if (0 != $groupId){
         $group_properties  = GroupManager :: get_group_properties($groupId);
         $groupPath = $group_properties['directory'];
-	} else {
-		$groupPath ='';
-	}
-
-	if (file_exists($saveDir.'/'.$filename.'.'.$extension)){
-		$i = 1;
-		while (file_exists($saveDir.'/'.$filename.'_'.$i.'.'.$extension)) $i++;
-		$paintFileName = $filename . '_' . $i . '.'.$extension;
-		$title = $filename . '_' . $i . '.'.$extension;
-	}
-
-	//
-	$documentPath = $saveDir.'/'.$paintFileName;
-	//add new document to disk
-	file_put_contents( $documentPath, $contents );
-	//add document to database
-	$doc_id = add_document($_course, $relativeUrlPath.'/'.$paintFileName, 'file', filesize($documentPath), $title);
-	api_item_property_update($_course, TOOL_DOCUMENT, $doc_id, 'DocumentAdded', $_user['user_id'], $groupId, null, null, null, $current_session_id);
+    } else {
+        $groupPath ='';
+    }
+
+    if (file_exists($saveDir.'/'.$filename.'.'.$extension)){
+        $i = 1;
+        while (file_exists($saveDir.'/'.$filename.'_'.$i.'.'.$extension)) $i++;
+        $paintFileName = $filename . '_' . $i . '.'.$extension;
+        $title = $filename . '_' . $i . '.'.$extension;
+    }
+
+    //
+    $documentPath = $saveDir.'/'.$paintFileName;
+    //add new document to disk
+    file_put_contents( $documentPath, $contents );
+    //add document to database
+    $doc_id = add_document($_course, $relativeUrlPath.'/'.$paintFileName, 'file', filesize($documentPath), $title);
+    api_item_property_update($_course, TOOL_DOCUMENT, $doc_id, 'DocumentAdded', $_user['user_id'], $groupId, null, null, null, $current_session_id);
 
 }elseif($currentTool=='document/editpaint'){
 
-	$documentPath = $saveDir.'/'.$paintFileName;
-	//add new document to disk
-	file_put_contents( $documentPath, $contents );
-
-	//check path
-	if(!isset($_SESSION['paint_file'])){
-		api_not_allowed();
-		die();
-	}
-	if($_SESSION['paint_file']==$paintFileName){
-		$document_id = DocumentManager::get_document_id($_course, $relativeUrlPath.'/'.$paintFileName);
-		update_existing_document($_course, $document_id, filesize($documentPath), null);
-		api_item_property_update($_course, TOOL_DOCUMENT, $document_id, 'DocumentUpdated', $_user['user_id'], $groupId, null, null, null, $current_session_id);
-	}else{
-		//add a new document
-		$doc_id = add_document($_course, $relativeUrlPath.'/'.$paintFileName, 'file', filesize($documentPath), $title);
-		api_item_property_update($_course, TOOL_DOCUMENT, $doc_id, 'DocumentAdded', $_user['user_id'], $groupId, null, null, null, $current_session_id);
-	}
+    $documentPath = $saveDir.'/'.$paintFileName;
+    //add new document to disk
+    file_put_contents( $documentPath, $contents );
+
+    //check path
+    if(!isset($_SESSION['paint_file'])){
+        api_not_allowed();
+        die();
+    }
+    if($_SESSION['paint_file']==$paintFileName){
+        $document_id = DocumentManager::get_document_id($_course, $relativeUrlPath.'/'.$paintFileName);
+        update_existing_document($_course, $document_id, filesize($documentPath), null);
+        api_item_property_update($_course, TOOL_DOCUMENT, $document_id, 'DocumentUpdated', $_user['user_id'], $groupId, null, null, null, $current_session_id);
+    }else{
+        //add a new document
+        $doc_id = add_document($_course, $relativeUrlPath.'/'.$paintFileName, 'file', filesize($documentPath), $title);
+        api_item_property_update($_course, TOOL_DOCUMENT, $doc_id, 'DocumentAdded', $_user['user_id'], $groupId, null, null, null, $current_session_id);
+    }
 }
 
 
@@ -171,12 +171,12 @@ 
 unset($_SESSION['temp_realpath_image']);
 
 if (!isset($_SESSION['exit_pixlr'])) {
-	$location=api_get_path(WEB_CODE_PATH).'document/document.php';
-	echo '<script>window.parent.location.href="'.$location.'"</script>';
-	api_not_allowed(true);
+    $location=api_get_path(WEB_CODE_PATH).'document/document.php';
+    echo '<script>window.parent.location.href="'.$location.'"</script>';
+    api_not_allowed(true);
 } else {
-	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>';
-	$location=api_get_path(WEB_CODE_PATH).'document/document.php?id='.Security::remove_XSS($_SESSION['exit_pixlr']);
-	echo '<script>window.parent.location.href="'.$location.'"</script>';
-	unset($_SESSION['exit_pixlr']);
+    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>';
+    $location=api_get_path(WEB_CODE_PATH).'document/document.php?id='.Security::remove_XSS($_SESSION['exit_pixlr']);
+    echo '<script>window.parent.location.href="'.$location.'"</script>';
+    unset($_SESSION['exit_pixlr']);
 }

main/document/slideshowoptions.php

Indentation +12 added lines, -12 removed lines

@@ -77,7 +77,7 @@ 
                     if ($image_resizing == 'noresizing' || $image_resizing == '') {
                             echo ' checked';
                     }
-		?>>
+        ?>>
             </label>
             <?php echo '<b>'. get_lang('NoResizing') . '</b>, ' . get_lang('NoResizingComment') ;?>
         </div>
@@ -87,7 +87,7 @@ 
                         if ($image_resizing == 'resizing_auto' || $image_resizing == '') {
                                 echo ' checked';
                         }
-		?>>
+        ?>>
             </label>
             <?php echo '<b>'. get_lang('ResizingAuto') . '</b>, ' . get_lang('ResizingAutoComment');?>
 	</div>
@@ -99,7 +99,7 @@ 
                             $width = $_SESSION['image_resizing_width'];
                             $height = $_SESSION['image_resizing_height'];
                     }
-		?>>
+        ?>>
             </label>
             <?php echo '<b>'. get_lang('Resizing') . '</b>, ' . get_lang('ResizingComment'); ?>
 	</div>
@@ -107,13 +107,13 @@ 
             <label class="col-sm-1 control-label"><?php echo get_lang('Width'); ?></label>
             <div class="col-sm-3">
                 <input class="form-control" name="width" type="text" id="width" <?php
-		if ($image_resizing == 'resizing') {
-			echo ' value="'.$width.'"';
-			echo ' class="enabled_input"';
+        if ($image_resizing == 'resizing') {
+            echo ' value="'.$width.'"';
+            echo ' class="enabled_input"';
                     } else {
                     echo ' class="disabled_input"';
                 }
-		?> >
+        ?> >
             </div>
             <div class="col-sm-8"></div>
         </div>
@@ -121,13 +121,13 @@ 
             <label class="col-sm-1 control-label"><?php echo get_lang('Height'); ?></label>
             <div class="col-sm-3">
                 <input class="form-control" name="height" type="text" id="height" <?php
-		if ($image_resizing == 'resizing') {
-			echo ' value="'.$height.'"';
-			echo ' class="enabled_input"';
-		} else {
+        if ($image_resizing == 'resizing') {
+            echo ' value="'.$height.'"';
+            echo ' class="enabled_input"';
+        } else {
                         echo ' class="disabled_input"';
                 }
-		?> >
+        ?> >
             </div>
             <div class="col-sm-8"></div>
         </div>

Spacing +6 added lines, -6 removed lines

@@ -39,7 +39,7 @@ 
 // bypass the $nametools thing and use <b></b> tags in the $interbreadcrump array
 $url = 'slideshowoptions.php?curdirpath='.$pathurl;
 $originaltoolname = '<b>'.get_lang('SlideshowOptions').'</b>';
-$interbreadcrumb[] = array('url' => $url, 'name' => $originaltoolname );
+$interbreadcrumb[] = array('url' => $url, 'name' => $originaltoolname);
 
 Display::display_header($originalToolName, 'Doc');
 $image_resizing = isset($_SESSION['image_resizing']) ? $_SESSION['image_resizing'] : null;
@@ -63,8 +63,8 @@ 
 </script>
 
 <?php
-$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>';
-$actions .= '<a href="slideshow.php?curdirpath='.$pathurl.'">'.Display::return_icon('slideshow.png',get_lang('BackTo').' '.get_lang('SlideShow'),'',ICON_SIZE_MEDIUM).'</a>';
+$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>';
+$actions .= '<a href="slideshow.php?curdirpath='.$pathurl.'">'.Display::return_icon('slideshow.png', get_lang('BackTo').' '.get_lang('SlideShow'), '', ICON_SIZE_MEDIUM).'</a>';
 Display::toolbarAction('toolbar-slideshow', $content)
 ?>
 <div class="panel panel-default">
@@ -79,7 +79,7 @@ 
                     }
 		?>>
             </label>
-            <?php echo '<b>'. get_lang('NoResizing') . '</b>, ' . get_lang('NoResizingComment') ;?>
+            <?php echo '<b>'.get_lang('NoResizing').'</b>, '.get_lang('NoResizingComment'); ?>
         </div>
         <div class="radio">
             <label>
@@ -89,7 +89,7 @@ 
                         }
 		?>>
             </label>
-            <?php echo '<b>'. get_lang('ResizingAuto') . '</b>, ' . get_lang('ResizingAutoComment');?>
+            <?php echo '<b>'.get_lang('ResizingAuto').'</b>, '.get_lang('ResizingAutoComment'); ?>
 	</div>
 	<div class="radio">
             <label>
@@ -101,7 +101,7 @@ 
                     }
 		?>>
             </label>
-            <?php echo '<b>'. get_lang('Resizing') . '</b>, ' . get_lang('ResizingComment'); ?>
+            <?php echo '<b>'.get_lang('Resizing').'</b>, '.get_lang('ResizingComment'); ?>
 	</div>
         <div class="form-group">
             <label class="col-sm-1 control-label"><?php echo get_lang('Width'); ?></label>