chamilo / chamilo-lms

main/document/document.php

Spacing +35 added lines, -37 removed lines

@@ -49,10 +49,10 @@ 
 }
 $_user = api_get_user_info();
 $courseInfo = api_get_course_info();
-$course_dir = $courseInfo['directory'] . '/document';
+$course_dir = $courseInfo['directory'].'/document';
 $sys_course_path = api_get_path(SYS_COURSE_PATH);
-$base_work_dir = $sys_course_path . $course_dir;
-$http_www = api_get_path(WEB_COURSE_PATH).$courseInfo['directory'] . '/document';
+$base_work_dir = $sys_course_path.$course_dir;
+$http_www = api_get_path(WEB_COURSE_PATH).$courseInfo['directory'].'/document';
 $document_path = $base_work_dir;
 $usePpt2lp = api_get_setting('service_ppt2lp', 'active') == 'true';
 
@@ -230,7 +230,7 @@ 
                             $certificateId
                         );
                         Display::addFlash(Display::return_message(
-                            get_lang('DocDeleted') . ': ' . $documentInfo['title'],
+                            get_lang('DocDeleted').': '.$documentInfo['title'],
                             'success'
                         ));
                     } else {
@@ -419,11 +419,9 @@ 
     case 'convertToPdf':
         // PDF format as target by default
         $formatTarget = $_REQUEST['formatTarget'] ?
-            strtolower(Security::remove_XSS($_REQUEST['formatTarget'])) :
-            'pdf';
+            strtolower(Security::remove_XSS($_REQUEST['formatTarget'])) : 'pdf';
         $formatType = $_REQUEST['formatType'] ?
-            strtolower(Security::remove_XSS($_REQUEST['formatType'])) :
-            'text';
+            strtolower(Security::remove_XSS($_REQUEST['formatType'])) : 'text';
         // Get the document data from the ID
         $document_info = DocumentManager::get_document_data_by_id(
             $document_id,
@@ -431,8 +429,8 @@ 
             true,
             $session_id
         );
-        $file = $sys_course_path . $courseInfo['directory'] .
-            '/document' . $document_info['path'];
+        $file = $sys_course_path.$courseInfo['directory'].
+            '/document'.$document_info['path'];
         $fileInfo = pathinfo($file);
         if ($fileInfo['extension'] == $formatTarget) {
             Display::addFlash(Display::return_message(
@@ -463,9 +461,9 @@ 
                 'warning'
             ));
         } else {
-            $convertedFile = $fileInfo['dirname'] . DIRECTORY_SEPARATOR .
-                $fileInfo['filename'] . '_from_' . $fileInfo['extension'] .
-                '.' . $formatTarget;
+            $convertedFile = $fileInfo['dirname'].DIRECTORY_SEPARATOR.
+                $fileInfo['filename'].'_from_'.$fileInfo['extension'].
+                '.'.$formatTarget;
             $convertedTitle = $document_info['title'];
             $obj = new OpenofficePresentation(true);
             if (file_exists($convertedFile)) {
@@ -490,13 +488,13 @@ 
                     $gidReq = Security::remove_XSS($_GET['gidReq']);
                     $file_link = Display::url(
                         get_lang('SeeFile'),
-                        api_get_path(WEB_CODE_PATH) .
-                        'document/showinframes.php?' . 'cidReq=' . $cidReq .
-                        '&id_session=' . $id_session . '&' .
-                        'gidReq=' . $gidReq . '&id=' . current($result)
+                        api_get_path(WEB_CODE_PATH).
+                        'document/showinframes.php?'.'cidReq='.$cidReq.
+                        '&id_session='.$id_session.'&'.
+                        'gidReq='.$gidReq.'&id='.current($result)
                     );
                     Display::addFlash(Display::return_message(
-                        get_lang('CopyMade') . ' ' . $file_link,
+                        get_lang('CopyMade').' '.$file_link,
                         'confirmation',
                         false
                     ));
@@ -653,7 +651,7 @@ 
             $new_content_html
         );
         $new_content_html = str_replace(
-            SYS_CODE_PATH . 'img/',
+            SYS_CODE_PATH.'img/',
             api_get_path(WEB_IMG_PATH),
             $new_content_html
         );
@@ -709,11 +707,11 @@ 
     $("#convertSelect").change(function() {
         var formatTarget = $(this).val();
         window.location.href = "'.
-            api_get_self() . '?' . api_get_cidreq() .
-            '&curdirpath=' . $curdirpath .
-            '&action=convertToPdf&formatTarget=' .
-            '" + formatTarget + "&id=" + id + "&' .
-            api_get_cidreq() . '&formatType=" + format;
+            api_get_self().'?'.api_get_cidreq().
+            '&curdirpath='.$curdirpath.
+            '&action=convertToPdf&formatTarget='.
+            '" + formatTarget + "&id=" + id + "&'.
+            api_get_cidreq().'&formatType=" + format;
     });
     $("#convertModal").on("hidden", function(){
         $("." + format + "FormatType").hide();
@@ -1044,7 +1042,7 @@ 
                 update_db_info(
                     'update',
                     $document_to_move['path'],
-                    $moveTo . '/' . basename($document_to_move['path'])
+                    $moveTo.'/'.basename($document_to_move['path'])
                 );
 
                 //update database item property
@@ -1276,7 +1274,7 @@ 
 
             if (!empty($newFolderData)) {
                 $message = Display::return_message(
-                    get_lang('DirCr') . ' ' . $newFolderData['title'],
+                    get_lang('DirCr').' '.$newFolderData['title'],
                     'confirmation'
                 );
             } else {
@@ -1361,27 +1359,27 @@ 
 
         // Create the form that asks for the directory name
         $templateForm .= '
-            <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">
+            <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">
                 <fieldset>
-                    <legend>' . get_lang('AddAsTemplate') . '</legend>
+                    <legend>' . get_lang('AddAsTemplate').'</legend>
                     <div class="form-group">
-                        <label for="template_title" class="col-sm-2 control-label">' . get_lang('TemplateName') . '</label>
+                        <label for="template_title" class="col-sm-2 control-label">' . get_lang('TemplateName').'</label>
                         <div class="col-sm-10">
                             <input type="text" class="form-control" id="template_title" name="template_title">
                         </div>
                     </div>
                     <div class="form-group">
-                        <label for="template_image" class="col-sm-2 control-label">' . get_lang('TemplateImage') . '</label>
+                        <label for="template_image" class="col-sm-2 control-label">' . get_lang('TemplateImage').'</label>
                         <div class="col-sm-10">
                             <input type="file" name="template_image" id="template_image">
                         </div>
                     </div>
                     <div class="form-group">
                         <div class="col-sm-offset-2 col-sm-10">
-                            <button type="submit" name="create_template" class="btn btn-primary">' . get_lang('CreateTemplate') . '</button>
+                            <button type="submit" name="create_template" class="btn btn-primary">' . get_lang('CreateTemplate').'</button>
                         </div>
                     </div>
-                    <input type="hidden" name="curdirpath" value="' . $curdirpath . '" />
+                    <input type="hidden" name="curdirpath" value="' . $curdirpath.'" />
                 </fieldset>
             </form>
             <hr>
@@ -2026,18 +2024,18 @@ 
         <div class="modal-dialog">
             <div class="modal-content">
                 <div class="modal-header" style="text-align: center;">
-                <button type="button" class="close" data-dismiss="modal" aria-label="' . get_lang('Close') . '">
+                <button type="button" class="close" data-dismiss="modal" aria-label="' . get_lang('Close').'">
                     <span aria-hidden="true">&times;</span>
                 </button>
-                <h4 class="modal-title">' . get_lang('Convert') . '</h4>
+                <h4 class="modal-title">' . get_lang('Convert').'</h4>
             </div>
             <div class="modal-body">
               <form action="#" class="form-horizontal">
                   <div class="form-group">
-                      <label class="col-sm-4 control-label" for="convertSelect">' . get_lang('ConvertFormats') . '</label>
+                      <label class="col-sm-4 control-label" for="convertSelect">' . get_lang('ConvertFormats').'</label>
                       <div class="col-sm-8">
                           <select id="convertSelect">
-                              <option value="">' . get_lang('Select') . '</option>
+                              <option value="">' . get_lang('Select').'</option>
                               <option value="pdf">
                                   PDF - Portable Document File
                               </option>
@@ -2056,7 +2054,7 @@ 
               </form>
             </div>
             <div class="modal-footer">
-              <button type="button" class="btn btn-default" data-dismiss="modal">' . get_lang('Close') . '</button>
+              <button type="button" class="btn btn-default" data-dismiss="modal">' . get_lang('Close').'</button>
             </div>
         </div>
     </div>';

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";
 }
 

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_SERVER_ROOT_PATH).'/crossdomain.xml';
-	if (!file_exists($path_and_file)) {
-		$crossdomain='<?xml version="1.0"?>
+    $path_and_file= api_get_path(SYS_SERVER_ROOT_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

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_SERVER_ROOT_PATH).'/crossdomain.xml';
+if ($_SERVER['HTTP_HOST'] == "localhost") {
+	$path_and_file = api_get_path(SYS_SERVER_ROOT_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

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/create_document.php

Spacing +31 added lines, -31 removed lines

@@ -55,7 +55,7 @@ 
     $.ajax({
         contentType: "application/x-www-form-urlencoded",
         data: "dirValue="+dirValue,
-        url: "' . api_get_path(WEB_AJAX_PATH) . 'document.ajax.php?a=document_destination",
+        url: "' . api_get_path(WEB_AJAX_PATH).'document.ajax.php?a=document_destination",
         type: "POST",
         success: function(response) {
             $("[name=\'dirValue\']").val(response)
@@ -152,14 +152,14 @@ 
 }
 
 if ($is_certificate_mode) {
-	$document_id 	= DocumentManager::get_document_id(api_get_course_info(), '/certificates');
-	$document_data 	= DocumentManager::get_document_data_by_id($document_id, api_get_course_id(), true);
+	$document_id = DocumentManager::get_document_id(api_get_course_info(), '/certificates');
+	$document_data = DocumentManager::get_document_data_by_id($document_id, api_get_course_id(), true);
 	$folder_id = $document_data['id'];
 	$dir = '/certificates/';
 }
 
 $doc_tree  = explode('/', $dir);
-$count_dir = count($doc_tree) -2; // "2" because at the begin and end there are 2 "/"
+$count_dir = count($doc_tree) - 2; // "2" because at the begin and end there are 2 "/"
 
 if (api_is_in_group()) {
     $group_properties = GroupManager::get_group_properties(api_get_group_id());
@@ -174,7 +174,7 @@ 
 	$relative_url .= '../';
 }
 
-if ($relative_url== '') {
+if ($relative_url == '') {
 	$relative_url = '/';
 }
 
@@ -211,7 +211,7 @@ 
 
 if (!$is_certificate_mode) {
 	if (api_is_in_group()) {
-		$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;
 		$to_group_id = api_get_group_id();
 		$path = explode('/', $dir);
@@ -221,7 +221,7 @@ 
 	}
 	$interbreadcrumb[] = array("url" => "./document.php?curdirpath=".urlencode($dir)."&".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'));
 }
 
 if (!$is_allowed_in_course) {
@@ -260,9 +260,9 @@ 
 $form->addElement('header', $nameTools);
 
 if ($is_certificate_mode) {//added condition for certicate in gradebook
-	$form->addElement('hidden','certificate','true',array('id'=>'certificate'));
+	$form->addElement('hidden', 'certificate', 'true', array('id'=>'certificate'));
 	if (isset($_GET['selectcat'])) {
-		$form->addElement('hidden','selectcat', $select_cat);
+		$form->addElement('hidden', 'selectcat', $select_cat);
     }
 }
 
@@ -302,13 +302,13 @@ 
 
 // Show read-only box only in groups
 if (!empty($groupId)) {
-	$group[]= $form->createElement('checkbox', 'readonly', '', get_lang('ReadOnly'));
+	$group[] = $form->createElement('checkbox', 'readonly', '', get_lang('ReadOnly'));
 }
 $form->addRule('title', get_lang('ThisFieldIsRequired'), 'required');
 $form->addRule('title', get_lang('FileExists'), 'callback', 'document_exists');
 
 $current_session_id = api_get_session_id();
-$form->addHtmlEditor('content','', true, true, $editorConfig, true);
+$form->addHtmlEditor('content', '', true, true, $editorConfig, true);
 
 // Comment-field
 $folders = DocumentManager::get_all_document_folders($_course, $to_group_id, $is_allowed_to_edit);
@@ -322,7 +322,7 @@ 
 	$folders = DocumentManager::get_all_document_folders($_course, $to_group_id, $is_allowed_to_edit);
 
 	//$parent_select = $form->addElement('select', 'curdirpath', array(null, get_lang('DestinationDirectory')));
-        $parent_select = $form->addSelect('curdirpath', get_lang('DestinationDirectory'),null, array('cols-size' => [2, 10, 0]) );
+        $parent_select = $form->addSelect('curdirpath', get_lang('DestinationDirectory'), null, array('cols-size' => [2, 10, 0]));
 	// Following two conditions copied from document.inc.php::build_directory_selector()
 	$folder_titles = array();
 
@@ -330,19 +330,19 @@ 
         $escaped_folders = array();
         foreach ($folders as $key => & $val) {
             // Hide some folders
-            if ($val=='/HotPotatoes_files' || $val=='/certificates' || basename($val)=='css'){
+            if ($val == '/HotPotatoes_files' || $val == '/certificates' || basename($val) == 'css') {
                 continue;
             }
             // Admin setting for Hide/Show the folders of all users
-            if (api_get_setting('show_users_folders') == 'false' && (strstr($val, '/shared_folder') || strstr($val, 'shared_folder_session_'))){
+            if (api_get_setting('show_users_folders') == 'false' && (strstr($val, '/shared_folder') || strstr($val, 'shared_folder_session_'))) {
                 continue;
             }
             // Admin setting for Hide/Show Default folders to all users
-            if (api_get_setting('show_default_folders') == 'false' && ($val=='/images' || $val=='/flash' || $val=='/audio' || $val=='/video' || strstr($val, '/images/gallery') || $val=='/video/flv')){
+            if (api_get_setting('show_default_folders') == 'false' && ($val == '/images' || $val == '/flash' || $val == '/audio' || $val == '/video' || strstr($val, '/images/gallery') || $val == '/video/flv')) {
                 continue;
             }
             // Admin setting for Hide/Show chat history folder
-            if (api_get_setting('show_chat_folder') == 'false' && $val=='/chat_files'){
+            if (api_get_setting('show_chat_folder') == 'false' && $val == '/chat_files') {
                 continue;
             }
 
@@ -367,13 +367,13 @@ 
 		if (is_array($folders)) {
 			foreach ($folders as & $folder) {
 				//Hide some folders
-				if ($folder=='/HotPotatoes_files' || $folder=='/certificates' || basename($folder)=='css') {
+				if ($folder == '/HotPotatoes_files' || $folder == '/certificates' || basename($folder) == 'css') {
                     continue;
 				}
 				//Admin setting for Hide/Show the folders of all users
 				if (api_get_setting('show_users_folders') == 'false' &&
                     (strstr($folder, '/shared_folder') || strstr($folder, 'shared_folder_session_'))
-                ){
+                ) {
 					continue;
 				}
 				//Admin setting for Hide/Show Default folders to all users
@@ -386,20 +386,20 @@ 
                         strstr($folder, '/images/gallery') ||
                         $folder == '/video/flv'
                     )
-                ){
+                ) {
 					continue;
 				}
 				//Admin setting for Hide/Show chat history folder
 				if (api_get_setting('show_chat_folder') == 'false' &&
-                    $folder=='/chat_files'
-                ){
+                    $folder == '/chat_files'
+                ) {
 					continue;
 				}
 
-				$selected = (substr($dir,0,-1) == $folder) ? ' selected="selected"' : '';
+				$selected = (substr($dir, 0, -1) == $folder) ? ' selected="selected"' : '';
 				$path_parts = explode('/', $folder);
 				$folder_titles[$folder] = cut($folder_titles[$folder], 80);
-                $space_counter =count($path_parts) - 2;
+                $space_counter = count($path_parts) - 2;
                 if ($space_counter > 0) {
                     $label = str_repeat('   ', $space_counter).' — '.$folder_titles[$folder];
                 } else {
@@ -413,7 +413,7 @@ 
 		}
 	} else {
 		foreach ($folders as & $folder) {
-			$selected = (substr($dir,0,-1)==$folder) ? ' selected="selected"' : '';
+			$selected = (substr($dir, 0, -1) == $folder) ? ' selected="selected"' : '';
 			$label = $folder_titles[$folder];
 			if ($folder == $group_dir) {
 				$label = '/ ('.get_lang('HomeDirectory').')';
@@ -559,7 +559,7 @@ 
                     );
                 }
 			}
-			$dir= substr($dir,0,-1);
+			$dir = substr($dir, 0, -1);
 			$selectcat = '';
 			if (isset($_REQUEST['selectcat']))
 				$selectcat = "&selectcat=".Security::remove_XSS($_REQUEST['selectcat']);
@@ -567,7 +567,7 @@ 
 			if ($is_certificate_mode) {
 				$df = DocumentManager::get_default_certificate_id($_course['code']);
                 if (!isset($df)) {
-                    DocumentManager::attach_gradebook_certificate ($_course['code'],$document_id);
+                    DocumentManager::attach_gradebook_certificate($_course['code'], $document_id);
 				}
 				$certificate_condition = '&certificate=true&curdirpath=/certificates';
 			}
@@ -611,11 +611,11 @@ 
 
 	// link back to the documents overview
 	if ($is_certificate_mode) {
-		$actionsLeft =  '<a href="document.php?certificate=true&id='.$folder_id.'&selectcat=' . Security::remove_XSS($_GET['selectcat']).'">'.
-            Display::return_icon('back.png',get_lang('Back').' '.get_lang('To').' '.get_lang('CertificateOverview'),'',ICON_SIZE_MEDIUM).'</a>';
+		$actionsLeft = '<a href="document.php?certificate=true&id='.$folder_id.'&selectcat='.Security::remove_XSS($_GET['selectcat']).'">'.
+            Display::return_icon('back.png', get_lang('Back').' '.get_lang('To').' '.get_lang('CertificateOverview'), '', ICON_SIZE_MEDIUM).'</a>';
         } else {
 		$actionsLeft = '<a href="document.php?curdirpath='.Security::remove_XSS($dir).'">'.
-            Display::return_icon('back.png',get_lang('Back').' '.get_lang('To').' '.get_lang('DocumentsOverview'),'',ICON_SIZE_MEDIUM).'</a>';
+            Display::return_icon('back.png', get_lang('Back').' '.get_lang('To').' '.get_lang('DocumentsOverview'), '', ICON_SIZE_MEDIUM).'</a>';
         }
         
         echo $toolbar = Display::toolbarAction('actions-documents', array(0 => $actionsLeft, 1 => ''));
@@ -626,10 +626,10 @@ 
 
 		$str_info = '';
 		foreach ($all_information_by_create_certificate[0] as $info_value) {
-			$str_info.=$info_value.'<br/>';
+			$str_info .= $info_value.'<br/>';
 		}
 		$create_certificate = get_lang('CreateCertificateWithTags');
-		Display::display_normal_message($create_certificate.': <br /><br/>'.$str_info,false);
+		Display::display_normal_message($create_certificate.': <br /><br/>'.$str_info, false);
 	}
     // HTML-editor
     echo '<div class="row" style="overflow:hidden">

Braces +3 added lines, -2 removed lines

@@ -561,8 +561,9 @@
 			}
 			$dir= substr($dir,0,-1);
 			$selectcat = '';
-			if (isset($_REQUEST['selectcat']))
-				$selectcat = "&selectcat=".Security::remove_XSS($_REQUEST['selectcat']);
+			if (isset($_REQUEST['selectcat'])) {
+							$selectcat = "&selectcat=".Security::remove_XSS($_REQUEST['selectcat']);
+			}
 			$certificate_condition = '';
 			if ($is_certificate_mode) {
 				$df = DocumentManager::get_default_certificate_id($_course['code']);

Indentation +168 added lines, -168 removed lines

@@ -77,13 +77,13 @@ 
 $is_certificate_mode = false;
 
 if (isset($_REQUEST['certificate']) && $_REQUEST['certificate'] == 'true') {
-	$is_certificate_mode = true;
+    $is_certificate_mode = true;
 }
 
 if ($is_certificate_mode) {
-	$nameTools = get_lang('CreateCertificate');
+    $nameTools = get_lang('CreateCertificate');
 } else {
-	$nameTools = get_lang('CreateDocument');
+    $nameTools = get_lang('CreateDocument');
 }
 
 /*	Constants and variables */
@@ -136,26 +136,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 .= '/';
 }
 
 if ($is_certificate_mode) {
-	$document_id 	= DocumentManager::get_document_id(api_get_course_info(), '/certificates');
-	$document_data 	= DocumentManager::get_document_data_by_id($document_id, api_get_course_id(), true);
-	$folder_id = $document_data['id'];
-	$dir = '/certificates/';
+    $document_id 	= DocumentManager::get_document_id(api_get_course_info(), '/certificates');
+    $document_data 	= DocumentManager::get_document_data_by_id($document_id, api_get_course_id(), true);
+    $folder_id = $document_data['id'];
+    $dir = '/certificates/';
 }
 
 $doc_tree  = explode('/', $dir);
@@ -166,16 +166,16 @@ 
 
     // Level correction for group documents.
     if (!empty($group_properties['directory'])) {
-    	$count_dir = $count_dir > 0 ? $count_dir - 1 : 0;
+        $count_dir = $count_dir > 0 ? $count_dir - 1 : 0;
     }
 }
 $relative_url = '';
 for ($i = 0; $i < ($count_dir); $i++) {
-	$relative_url .= '../';
+    $relative_url .= '../';
 }
 
 if ($relative_url== '') {
-	$relative_url = '/';
+    $relative_url = '/';
 }
 
 $is_allowed_to_edit = api_is_allowed_to_edit(null, true);
@@ -187,11 +187,11 @@ 
     'cols-size' => [2, 10, 0],
     'FullPage' => true,
     'InDocument' => true,
-	'CreateDocumentDir'    => $relative_url,
-	'CreateDocumentWebDir' => (empty($group_properties['directory']))
-                        		? api_get_path(WEB_COURSE_PATH).$_course['path'].'/document/'
-                        		: api_get_path(WEB_COURSE_PATH).api_get_course_path().'/document'.$group_properties['directory'].'/',
-	'BaseHref'             => api_get_path(WEB_COURSE_PATH).$_course['path'].'/document'.$dir
+    'CreateDocumentDir'    => $relative_url,
+    'CreateDocumentWebDir' => (empty($group_properties['directory']))
+                                ? api_get_path(WEB_COURSE_PATH).$_course['path'].'/document/'
+                                : api_get_path(WEB_COURSE_PATH).api_get_course_path().'/document'.$group_properties['directory'].'/',
+    'BaseHref'             => api_get_path(WEB_COURSE_PATH).$_course['path'].'/document'.$dir
 );
 
 if ($is_certificate_mode) {
@@ -203,36 +203,36 @@ 
 $filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document';
 
 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 = '/';
 }
 
 $to_group_id = 0;
 
 if (!$is_certificate_mode) {
-	if (api_is_in_group()) {
-		$interbreadcrumb[] = array ("url" => "../group/group_space.php?".api_get_cidreq(), "name" => get_lang('GroupSpace'));
-		$noPHP_SELF = true;
-		$to_group_id = api_get_group_id();
-		$path = explode('/', $dir);
-		if ('/'.$path[1] != $group_properties['directory']) {
-			api_not_allowed(true);
-		}
-	}
-	$interbreadcrumb[] = array("url" => "./document.php?curdirpath=".urlencode($dir)."&".api_get_cidreq(), "name" => get_lang('Documents'));
+    if (api_is_in_group()) {
+        $interbreadcrumb[] = array ("url" => "../group/group_space.php?".api_get_cidreq(), "name" => get_lang('GroupSpace'));
+        $noPHP_SELF = true;
+        $to_group_id = api_get_group_id();
+        $path = explode('/', $dir);
+        if ('/'.$path[1] != $group_properties['directory']) {
+            api_not_allowed(true);
+        }
+    }
+    $interbreadcrumb[] = array("url" => "./document.php?curdirpath=".urlencode($dir)."&".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'));
 }
 
 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($userId, $dir, api_get_session_id()))
 ) {
-	api_not_allowed(true);
+    api_not_allowed(true);
 }
 
 /*	Header */
@@ -240,10 +240,10 @@ 
 
 $display_dir = $dir;
 if (isset($group_properties)) {
-	$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);
 }
 
 $select_cat = isset($_GET['selectcat']) ? intval($_GET['selectcat']) : null;
@@ -260,9 +260,9 @@ 
 $form->addElement('header', $nameTools);
 
 if ($is_certificate_mode) {//added condition for certicate in gradebook
-	$form->addElement('hidden','certificate','true',array('id'=>'certificate'));
-	if (isset($_GET['selectcat'])) {
-		$form->addElement('hidden','selectcat', $select_cat);
+    $form->addElement('hidden','certificate','true',array('id'=>'certificate'));
+    if (isset($_GET['selectcat'])) {
+        $form->addElement('hidden','selectcat', $select_cat);
     }
 }
 
@@ -297,12 +297,12 @@ 
 if ($is_certificate_mode) {
     $form->addText('title', get_lang('CertificateName'), true, array('cols-size' => [2, 10, 0], 'autofocus'));
 } else {
-	$form->addText('title', get_lang('Title'), true, array('cols-size' => [2, 10, 0], 'autofocus'));
+    $form->addText('title', get_lang('Title'), true, array('cols-size' => [2, 10, 0], 'autofocus'));
 }
 
 // Show read-only box only in groups
 if (!empty($groupId)) {
-	$group[]= $form->createElement('checkbox', 'readonly', '', get_lang('ReadOnly'));
+    $group[]= $form->createElement('checkbox', 'readonly', '', get_lang('ReadOnly'));
 }
 $form->addRule('title', get_lang('ThisFieldIsRequired'), 'required');
 $form->addRule('title', get_lang('FileExists'), 'callback', 'document_exists');
@@ -317,14 +317,14 @@ 
 // new document created
 
 if (!$is_certificate_mode &&
-	!DocumentManager::is_my_shared_folder($userId, $dir, $current_session_id)
+    !DocumentManager::is_my_shared_folder($userId, $dir, $current_session_id)
 ) {
-	$folders = DocumentManager::get_all_document_folders($_course, $to_group_id, $is_allowed_to_edit);
+    $folders = DocumentManager::get_all_document_folders($_course, $to_group_id, $is_allowed_to_edit);
 
-	//$parent_select = $form->addElement('select', 'curdirpath', array(null, get_lang('DestinationDirectory')));
+    //$parent_select = $form->addElement('select', 'curdirpath', array(null, get_lang('DestinationDirectory')));
         $parent_select = $form->addSelect('curdirpath', get_lang('DestinationDirectory'),null, array('cols-size' => [2, 10, 0]) );
-	// Following two conditions copied from document.inc.php::build_directory_selector()
-	$folder_titles = array();
+    // Following two conditions copied from document.inc.php::build_directory_selector()
+    $folder_titles = array();
 
     if (is_array($folders)) {
         $escaped_folders = array();
@@ -362,22 +362,22 @@ 
         }
     }
 
-	if (empty($group_dir)) {
-		$parent_select -> addOption(get_lang('HomeDirectory'), '/');
-		if (is_array($folders)) {
-			foreach ($folders as & $folder) {
-				//Hide some folders
-				if ($folder=='/HotPotatoes_files' || $folder=='/certificates' || basename($folder)=='css') {
+    if (empty($group_dir)) {
+        $parent_select -> addOption(get_lang('HomeDirectory'), '/');
+        if (is_array($folders)) {
+            foreach ($folders as & $folder) {
+                //Hide some folders
+                if ($folder=='/HotPotatoes_files' || $folder=='/certificates' || basename($folder)=='css') {
                     continue;
-				}
-				//Admin setting for Hide/Show the folders of all users
-				if (api_get_setting('show_users_folders') == 'false' &&
+                }
+                //Admin setting for Hide/Show the folders of all users
+                if (api_get_setting('show_users_folders') == 'false' &&
                     (strstr($folder, '/shared_folder') || strstr($folder, 'shared_folder_session_'))
                 ){
-					continue;
-				}
-				//Admin setting for Hide/Show Default folders to all users
-				if (api_get_setting('show_default_folders') == 'false' &&
+                    continue;
+                }
+                //Admin setting for Hide/Show Default folders to all users
+                if (api_get_setting('show_default_folders') == 'false' &&
                     (
                         $folder == '/images' ||
                         $folder == '/flash' ||
@@ -387,80 +387,80 @@ 
                         $folder == '/video/flv'
                     )
                 ){
-					continue;
-				}
-				//Admin setting for Hide/Show chat history folder
-				if (api_get_setting('show_chat_folder') == 'false' &&
+                    continue;
+                }
+                //Admin setting for Hide/Show chat history folder
+                if (api_get_setting('show_chat_folder') == 'false' &&
                     $folder=='/chat_files'
                 ){
-					continue;
-				}
+                    continue;
+                }
 
-				$selected = (substr($dir,0,-1) == $folder) ? ' selected="selected"' : '';
-				$path_parts = explode('/', $folder);
-				$folder_titles[$folder] = cut($folder_titles[$folder], 80);
+                $selected = (substr($dir,0,-1) == $folder) ? ' selected="selected"' : '';
+                $path_parts = explode('/', $folder);
+                $folder_titles[$folder] = cut($folder_titles[$folder], 80);
                 $space_counter =count($path_parts) - 2;
                 if ($space_counter > 0) {
                     $label = str_repeat('&nbsp;&nbsp;&nbsp;', $space_counter).' &mdash; '.$folder_titles[$folder];
                 } else {
                     $label = ' &mdash; '.$folder_titles[$folder];
                 }
-				$parent_select -> addOption($label, $folder);
-				if ($selected != '') {
-					$parent_select->setSelected($folder);
-				}
-			}
-		}
-	} else {
-		foreach ($folders as & $folder) {
-			$selected = (substr($dir,0,-1)==$folder) ? ' selected="selected"' : '';
-			$label = $folder_titles[$folder];
-			if ($folder == $group_dir) {
-				$label = '/ ('.get_lang('HomeDirectory').')';
-			} else {
-				$path_parts = explode('/', str_replace($group_dir, '', $folder));
-				$label = cut($label, 80);
-				$label = str_repeat('&nbsp;&nbsp;&nbsp;', count($path_parts) - 2).' &mdash; '.$label;
-			}
-			$parent_select -> addOption($label, $folder);
-			if ($selected != '') {
-				$parent_select->setSelected($folder);
-			}
-		}
-	}
+                $parent_select -> addOption($label, $folder);
+                if ($selected != '') {
+                    $parent_select->setSelected($folder);
+                }
+            }
+        }
+    } else {
+        foreach ($folders as & $folder) {
+            $selected = (substr($dir,0,-1)==$folder) ? ' selected="selected"' : '';
+            $label = $folder_titles[$folder];
+            if ($folder == $group_dir) {
+                $label = '/ ('.get_lang('HomeDirectory').')';
+            } else {
+                $path_parts = explode('/', str_replace($group_dir, '', $folder));
+                $label = cut($label, 80);
+                $label = str_repeat('&nbsp;&nbsp;&nbsp;', count($path_parts) - 2).' &mdash; '.$label;
+            }
+            $parent_select -> addOption($label, $folder);
+            if ($selected != '') {
+                $parent_select->setSelected($folder);
+            }
+        }
+    }
 }
 
 $form->addHidden('dirValue', '');
 
 if ($is_certificate_mode) {
-	$form->addButtonCreate(get_lang('CreateCertificate'));
+    $form->addButtonCreate(get_lang('CreateCertificate'));
 } else {
-	$form->addButtonCreate(get_lang('CreateDoc'));
+    $form->addButtonCreate(get_lang('CreateDoc'));
 }
 
 $form->setDefaults($defaults);
 
 // If form validates -> save the new document
 if ($form->validate()) {
-	$values = $form->exportValues();
-	$readonly = isset($values['readonly']) ? 1 : 0;
-	$values['title'] = trim($values['title']);
+    $values = $form->exportValues();
+    $readonly = isset($values['readonly']) ? 1 : 0;
+    $values['title'] = trim($values['title']);
     
     if (!empty($values['dirValue'])) {
         $dir = $values['dirValue'];
     }
 
     if ($dir[strlen($dir) - 1] != '/') {
-		$dir .= '/';
-	}
+        $dir .= '/';
+    }
     $filepath = $filepath.$dir;
 
     // Setting the filename
-	$filename = $values['title'];
-	$filename = addslashes(trim($filename));
-	$filename = Security::remove_XSS($filename);
-	$filename = api_replace_dangerous_char($filename);
-	$filename = disable_dangerous_file($filename);
+    $filename = $values['title'];
+    $filename = addslashes(trim($filename));
+    $filename = Security::remove_XSS($filename);
+    $filename = api_replace_dangerous_char($filename);
+    $filename = disable_dangerous_file($filename);
     $filename .= DocumentManager::getDocumentSuffix(
         $_course,
         api_get_session_id(),
@@ -468,14 +468,14 @@ 
     );
 
     // Setting the title
-	$title = $values['title'];
+    $title = $values['title'];
 
     // Setting the extension
-	$extension = 'html';
+    $extension = 'html';
 
-	$content = Security::remove_XSS($values['content'], COURSEMANAGERLOWSECURITY);
+    $content = Security::remove_XSS($values['content'], COURSEMANAGERLOWSECURITY);
 
-	/*if (strpos($content, '/css/frames.css') == false) {
+    /*if (strpos($content, '/css/frames.css') == false) {
 		$content = str_replace('</head>', '<link rel="stylesheet" href="./css/frames.css" type="text/css" /><style> body{margin:50px;}</style></head>', $content);
 	}*/
 
@@ -488,12 +488,12 @@ 
         exit;
     }
 
-	if ($fp = @fopen($filepath.$filename.'.'.$extension, 'w')) {
-		$content = str_replace(api_get_path(WEB_COURSE_PATH), $_configuration['url_append'].'/courses/', $content);
+    if ($fp = @fopen($filepath.$filename.'.'.$extension, 'w')) {
+        $content = str_replace(api_get_path(WEB_COURSE_PATH), $_configuration['url_append'].'/courses/', $content);
 
-		fputs($fp, $content);
-		fclose($fp);
-		chmod($filepath.$filename.'.'.$extension, api_get_permissions_for_new_files());
+        fputs($fp, $content);
+        fclose($fp);
+        chmod($filepath.$filename.'.'.$extension, api_get_permissions_for_new_files());
 
         /*
 		if (!is_dir($filepath.'css')) {
@@ -511,8 +511,8 @@ 
 			api_item_property_update($_course, TOOL_DOCUMENT, $doc_id, 'invisible', $userId, null, null, null, null, $current_session_id);
 		}*/
 
-		$file_size = filesize($filepath.$filename.'.'.$extension);
-		$save_file_path = $dir.$filename.'.'.$extension;
+        $file_size = filesize($filepath.$filename.'.'.$extension);
+        $save_file_path = $dir.$filename.'.'.$extension;
 
         $document_id = add_document(
             $_course,
@@ -524,8 +524,8 @@ 
             $readonly
         );
 
-		if ($document_id) {
-			api_item_property_update(
+        if ($document_id) {
+            api_item_property_update(
                 $_course,
                 TOOL_DOCUMENT,
                 $document_id,
@@ -537,13 +537,13 @@ 
                 null,
                 $current_session_id
             );
-			// Update parent folders
-			item_property_update_on_folder($_course, $dir, $userId);
-			$new_comment = isset($_POST['comment']) ? trim($_POST['comment']) : '';
-			$new_title = isset($_POST['title']) ? trim($_POST['title']) : '';
+            // Update parent folders
+            item_property_update_on_folder($_course, $dir, $userId);
+            $new_comment = isset($_POST['comment']) ? trim($_POST['comment']) : '';
+            $new_title = isset($_POST['title']) ? trim($_POST['title']) : '';
             $new_title = htmlspecialchars($new_title);
-			if ($new_comment || $new_title) {
-				$ct = '';
+            if ($new_comment || $new_title) {
+                $ct = '';
                 $params = [];
                 if ($new_comment) {
                     $params['comment'] = $new_comment;
@@ -558,38 +558,38 @@ 
                         ['c_id = ? AND id = ?' => [$course_id, $document_id]]
                     );
                 }
-			}
-			$dir= substr($dir,0,-1);
-			$selectcat = '';
-			if (isset($_REQUEST['selectcat']))
-				$selectcat = "&selectcat=".Security::remove_XSS($_REQUEST['selectcat']);
-			$certificate_condition = '';
-			if ($is_certificate_mode) {
-				$df = DocumentManager::get_default_certificate_id($_course['code']);
+            }
+            $dir= substr($dir,0,-1);
+            $selectcat = '';
+            if (isset($_REQUEST['selectcat']))
+                $selectcat = "&selectcat=".Security::remove_XSS($_REQUEST['selectcat']);
+            $certificate_condition = '';
+            if ($is_certificate_mode) {
+                $df = DocumentManager::get_default_certificate_id($_course['code']);
                 if (!isset($df)) {
                     DocumentManager::attach_gradebook_certificate ($_course['code'],$document_id);
-				}
-				$certificate_condition = '&certificate=true&curdirpath=/certificates';
-			}
-
-			header('Location: document.php?'.api_get_cidreq().'&id='.$folder_id.$selectcat.$certificate_condition);
-			exit();
-		} else {
-			Display :: display_header($nameTools, 'Doc');
-			Display :: display_error_message(get_lang('Impossible'));
-			Display :: display_footer();
-		}
-	} else {
-		Display :: display_header($nameTools, 'Doc');
-		Display :: display_error_message(get_lang('Impossible'));
-		Display :: display_footer();
-	}
+                }
+                $certificate_condition = '&certificate=true&curdirpath=/certificates';
+            }
+
+            header('Location: document.php?'.api_get_cidreq().'&id='.$folder_id.$selectcat.$certificate_condition);
+            exit();
+        } else {
+            Display :: display_header($nameTools, 'Doc');
+            Display :: display_error_message(get_lang('Impossible'));
+            Display :: display_footer();
+        }
+    } else {
+        Display :: display_header($nameTools, 'Doc');
+        Display :: display_error_message(get_lang('Impossible'));
+        Display :: display_footer();
+    }
 } else {
-	// Copied from document.php
-	$dir_array = explode('/', $dir);
-	$array_len = count($dir_array);
+    // Copied from document.php
+    $dir_array = explode('/', $dir);
+    $array_len = count($dir_array);
 
-	// Breadcrumb for the current directory root path
+    // Breadcrumb for the current directory root path
     if (!empty($document_data)) {
         if (empty($document_data['parents'])) {
             $interbreadcrumb[] = array(
@@ -606,31 +606,31 @@ 
         }
     }
 
-	Display :: display_header($nameTools, "Doc");
-	// actions
+    Display :: display_header($nameTools, "Doc");
+    // actions
 
-	// link back to the documents overview
-	if ($is_certificate_mode) {
-		$actionsLeft =  '<a href="document.php?certificate=true&id='.$folder_id.'&selectcat=' . Security::remove_XSS($_GET['selectcat']).'">'.
+    // link back to the documents overview
+    if ($is_certificate_mode) {
+        $actionsLeft =  '<a href="document.php?certificate=true&id='.$folder_id.'&selectcat=' . Security::remove_XSS($_GET['selectcat']).'">'.
             Display::return_icon('back.png',get_lang('Back').' '.get_lang('To').' '.get_lang('CertificateOverview'),'',ICON_SIZE_MEDIUM).'</a>';
         } else {
-		$actionsLeft = '<a href="document.php?curdirpath='.Security::remove_XSS($dir).'">'.
+        $actionsLeft = '<a href="document.php?curdirpath='.Security::remove_XSS($dir).'">'.
             Display::return_icon('back.png',get_lang('Back').' '.get_lang('To').' '.get_lang('DocumentsOverview'),'',ICON_SIZE_MEDIUM).'</a>';
         }
         
         echo $toolbar = Display::toolbarAction('actions-documents', array(0 => $actionsLeft, 1 => ''));
                 
 
-	if ($is_certificate_mode) {
-		$all_information_by_create_certificate = DocumentManager::get_all_info_to_certificate(api_get_user_id(), api_get_course_id());
+    if ($is_certificate_mode) {
+        $all_information_by_create_certificate = DocumentManager::get_all_info_to_certificate(api_get_user_id(), api_get_course_id());
 
-		$str_info = '';
-		foreach ($all_information_by_create_certificate[0] as $info_value) {
-			$str_info.=$info_value.'<br/>';
-		}
-		$create_certificate = get_lang('CreateCertificateWithTags');
-		Display::display_normal_message($create_certificate.': <br /><br/>'.$str_info,false);
-	}
+        $str_info = '';
+        foreach ($all_information_by_create_certificate[0] as $info_value) {
+            $str_info.=$info_value.'<br/>';
+        }
+        $create_certificate = get_lang('CreateCertificateWithTags');
+        Display::display_normal_message($create_certificate.': <br /><br/>'.$str_info,false);
+    }
     // HTML-editor
     echo '<div class="row" style="overflow:hidden">
             <div id="template_col" class="col-md-2">
@@ -647,5 +647,5 @@ 
                 '.$form->returnForm().'
             </div>
           </div>';
-	Display :: display_footer();
+    Display :: display_footer();
 }

main/document/show_content.php

Spacing +2 added lines, -2 removed lines

@@ -90,7 +90,7 @@ 
 $file_url_web = api_get_path(WEB_COURSE_PATH).$_course['path'].'/document'.$header_file.'?'.api_get_cidreq();
 $pathinfo = pathinfo($header_file);
 
-if ($pathinfo['extension']=='wav' && preg_match('/_chnano_.wav/i', $file_url_web) && api_get_setting('enable_nanogong') == 'true'){
+if ($pathinfo['extension'] == 'wav' && preg_match('/_chnano_.wav/i', $file_url_web) && api_get_setting('enable_nanogong') == 'true') {
 	echo '<div align="center">';
 		echo '<br/>';
 		echo '<applet id="applet" archive="../inc/lib/nanogong/nanogong.jar" code="gong.NanoGong" width="160" height="95" >';
@@ -101,6 +101,6 @@ 
 		echo '</applet>';
 	echo '</div>';
 } else {
-	if ($pathinfo['extension']=='swf') { $width='83%'; $height='83%';} else {$width='100%'; $height='100%';}
+	if ($pathinfo['extension'] == 'swf') { $width = '83%'; $height = '83%'; } else {$width = '100%'; $height = '100%'; }
 	echo '<iframe border="0" frameborder="0" scrolling="no" style="width:'.$width.'; height:'.$height.';background-color:#ffffff;" id="mainFrame" name="mainFrame" src="'.$file_url_web.'?'.api_get_cidreq().'&amp;rand='.mt_rand(1, 1000).'"></iframe>';
 }

Indentation +11 added lines, -11 removed lines

@@ -91,16 +91,16 @@
 $pathinfo = pathinfo($header_file);
 
 if ($pathinfo['extension']=='wav' && preg_match('/_chnano_.wav/i', $file_url_web) && api_get_setting('enable_nanogong') == 'true'){
-	echo '<div align="center">';
-		echo '<br/>';
-		echo '<applet id="applet" archive="../inc/lib/nanogong/nanogong.jar" code="gong.NanoGong" width="160" height="95" >';
-			echo '<param name="SoundFileURL" value="'.$file_url_web.'" />';
-			echo '<param name="ShowSaveButton" value="false" />';
-			echo '<param name="ShowTime" value="true" />';
-			echo '<param name="ShowRecordButton" value="false" />';
-		echo '</applet>';
-	echo '</div>';
+    echo '<div align="center">';
+        echo '<br/>';
+        echo '<applet id="applet" archive="../inc/lib/nanogong/nanogong.jar" code="gong.NanoGong" width="160" height="95" >';
+            echo '<param name="SoundFileURL" value="'.$file_url_web.'" />';
+            echo '<param name="ShowSaveButton" value="false" />';
+            echo '<param name="ShowTime" value="true" />';
+            echo '<param name="ShowRecordButton" value="false" />';
+        echo '</applet>';
+    echo '</div>';
 } else {
-	if ($pathinfo['extension']=='swf') { $width='83%'; $height='83%';} else {$width='100%'; $height='100%';}
-	echo '<iframe border="0" frameborder="0" scrolling="no" style="width:'.$width.'; height:'.$height.';background-color:#ffffff;" id="mainFrame" name="mainFrame" src="'.$file_url_web.'?'.api_get_cidreq().'&amp;rand='.mt_rand(1, 1000).'"></iframe>';
+    if ($pathinfo['extension']=='swf') { $width='83%'; $height='83%';} else {$width='100%'; $height='100%';}
+    echo '<iframe border="0" frameborder="0" scrolling="no" style="width:'.$width.'; height:'.$height.';background-color:#ffffff;" id="mainFrame" name="mainFrame" src="'.$file_url_web.'?'.api_get_cidreq().'&amp;rand='.mt_rand(1, 1000).'"></iframe>';
 }