chamilo / chamilo-lms

main/work/work_missing.php

Spacing +3 added lines, -3 removed lines

@@ -2,7 +2,7 @@ 
 /* For licensing terms, see /license.txt */
 
 require_once '../inc/global.inc.php';
-$current_course_tool  = TOOL_STUDENTPUBLICATION;
+$current_course_tool = TOOL_STUDENTPUBLICATION;
 
 /*	Configuration settings */
 
@@ -56,7 +56,7 @@ 
 $token = Security::get_token();
 
 if (!empty($group_id)) {
-    $group_properties  = GroupManager::get_group_properties($group_id);
+    $group_properties = GroupManager::get_group_properties($group_id);
     $show_work = false;
 
     if (api_is_allowed_to_edit(false, true)) {
@@ -108,7 +108,7 @@ 
 if (!empty($workId)) {
     if (empty($_GET['list']) or Security::remove_XSS($_GET['list']) == 'with') {
         $output .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&id='.$workId.'&list=without">'.
-            Display::return_icon('exercice_uncheck.png', get_lang('ViewUsersWithoutTask'),'',ICON_SIZE_MEDIUM)."</a>";
+            Display::return_icon('exercice_uncheck.png', get_lang('ViewUsersWithoutTask'), '', ICON_SIZE_MEDIUM)."</a>";
     } else {
         if (!isset($_GET['action']) || (isset($_GET['action']) && $_GET['action'] != 'send_mail')) {
             $output .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&id='.$workId.'&list=without&action=send_mail&sec_token='.$token.'">'.

main/dropbox/recover_dropbox_files.php

Spacing +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
 $result = Database::query($sql);
 
 if (Database::num_rows($result)) {
-    $files  = Database::store_result($result);
+    $files = Database::store_result($result);
     $rows = array();
     foreach ($files as $file) {
         //Check if I have this file:

main/dropbox/dropbox_init.inc.php

Indentation +29 added lines, -29 removed lines

@@ -221,7 +221,7 @@ 
     //sentArray keeps list of all files still available in the sent files list
     //of the user.
     //This is used to show or hide the overwrite file-radio button of the upload form
-	$javascript .= "
+    $javascript .= "
 		var sentArray = new Array(";
     if (isset($dropbox_person)) {
         for ($i = 0; $i < count($dropbox_person->sentWork); $i++) {
@@ -231,7 +231,7 @@ 
             $javascript .= "'".$dropbox_person->sentWork[$i]->title."'";
         }
     }
-	$javascript .= ");
+    $javascript .= ");
 
 		function checkfile(str)
 		{
@@ -296,12 +296,12 @@ 
 
 $checked_files = false;
 if (!$view || $view == 'received') {
-	$part = 'received';
+    $part = 'received';
 } elseif ($view = 'sent') {
-	$part = 'sent';
+    $part = 'sent';
 } else {
-	header('location: index.php?view='.$view.'&error=Error');
-	exit;
+    header('location: index.php?view='.$view.'&error=Error');
+    exit;
 }
 
 if (($postAction == 'download_received' || $postAction == 'download_sent') and !$_POST['store_feedback']) {
@@ -325,7 +325,7 @@ 
     } else {
         api_not_allowed();
     }
-	exit();
+    exit();
 }
 
 /*	BREADCRUMBS */
@@ -335,45 +335,45 @@ 
         'url' => api_get_path(WEB_CODE_PATH).'dropbox/index.php?'.api_get_cidreq(),
         'name' => get_lang('Dropbox', ''),
     );
-	$nameTools = get_lang('ReceivedFiles');
+    $nameTools = get_lang('ReceivedFiles');
 
-	if ($action == 'addreceivedcategory') {
+    if ($action == 'addreceivedcategory') {
         $interbreadcrumb[] = array(
             'url' => api_get_path(WEB_CODE_PATH).'dropbox/index.php?view=received&'.api_get_cidreq(),
             'name' => get_lang('ReceivedFiles'),
         );
-		$nameTools = get_lang('AddNewCategory');
-	}
+        $nameTools = get_lang('AddNewCategory');
+    }
 }
 
 if ($view == 'sent' || empty($view)) {
     $interbreadcrumb[] = array(
         'url' => api_get_path(WEB_CODE_PATH).'dropbox/index.php?'.api_get_cidreq(),
-		'name' => get_lang('Dropbox')
+        'name' => get_lang('Dropbox')
     );
-	$nameTools = get_lang('SentFiles');
-
-	if ($action == 'addsentcategory') {
-		$interbreadcrumb[] = array(
-			'url' => api_get_path(WEB_CODE_PATH).'dropbox/index.php?view=sent&'.api_get_cidreq(),
-			'name' => get_lang('SentFiles'),
-		);
-		$nameTools = get_lang('AddNewCategory');
-	}
-	if ($action == 'add') {
-		$interbreadcrumb[] = array(
-			'url' => api_get_path(WEB_CODE_PATH).'dropbox/index.php?view=sent&'.api_get_cidreq(),
-			'name' => get_lang('SentFiles'),
-		);
-		$nameTools = get_lang('UploadNewFile');
-	}
+    $nameTools = get_lang('SentFiles');
+
+    if ($action == 'addsentcategory') {
+        $interbreadcrumb[] = array(
+            'url' => api_get_path(WEB_CODE_PATH).'dropbox/index.php?view=sent&'.api_get_cidreq(),
+            'name' => get_lang('SentFiles'),
+        );
+        $nameTools = get_lang('AddNewCategory');
+    }
+    if ($action == 'add') {
+        $interbreadcrumb[] = array(
+            'url' => api_get_path(WEB_CODE_PATH).'dropbox/index.php?view=sent&'.api_get_cidreq(),
+            'name' => get_lang('SentFiles'),
+        );
+        $nameTools = get_lang('UploadNewFile');
+    }
 }
 
 /*	HEADER & TITLE */
 
 if (isset($origin) && $origin == 'learnpath') {
     $htmlHeadXtra[] = $javascript;
-	Display::display_reduced_header($nameTools, 'Dropbox');
+    Display::display_reduced_header($nameTools, 'Dropbox');
 } else {
     Display::display_header($nameTools, 'Dropbox');
 }

Spacing +4 added lines, -4 removed lines

@@ -126,7 +126,7 @@ 
 $is_courseTutor = api_is_course_tutor();
 $is_courseAdmin = api_is_course_admin();
 
-$current_course_tool  = TOOL_DROPBOX;
+$current_course_tool = TOOL_DROPBOX;
 
 // the dropbox configuration parameters
 $dropbox_cnf = require_once 'dropbox_config.inc.php';
@@ -278,10 +278,10 @@ 
 $javascript .= "
 	</script>";
 $htmlHeadXtra[] = $javascript;
-$htmlHeadXtra[] ="<script>
+$htmlHeadXtra[] = "<script>
 function confirmation (name)
 {
-	if (confirm(\" ". get_lang("AreYouSureToDeleteJS") ." \"+ name + \" ?\"))
+	if (confirm(\" ". get_lang("AreYouSureToDeleteJS")." \"+ name + \" ?\"))
 		{return true;}
 	else
 		{return false;}
@@ -321,7 +321,7 @@ 
 
 if ((!$is_allowed_in_course || !$is_course_member) && !api_is_allowed_to_edit(null, true)) {
     if ($origin != 'learnpath') {
-        api_not_allowed(true);//print headers/footers
+        api_not_allowed(true); //print headers/footers
     } else {
         api_not_allowed();
     }

main/dropbox/index.php

Spacing +30 added lines, -30 removed lines

@@ -220,23 +220,23 @@ 
 
 		if (api_get_session_id() == 0) {
 			echo '<div class="actions">';
-			if ($view_dropbox_category_received != 0  && api_is_allowed_to_session_edit(false, true)) {
-				echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category=0&view_sent_category='.$viewSentCategory.'&view='.$view.'">'.Display::return_icon('folder_up.png', get_lang('Up').' '.get_lang('Root'),'',ICON_SIZE_MEDIUM)."</a>";
+			if ($view_dropbox_category_received != 0 && api_is_allowed_to_session_edit(false, true)) {
+				echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category=0&view_sent_category='.$viewSentCategory.'&view='.$view.'">'.Display::return_icon('folder_up.png', get_lang('Up').' '.get_lang('Root'), '', ICON_SIZE_MEDIUM)."</a>";
 				echo get_lang('Category').': <strong>'.Security::remove_XSS($dropbox_categories[$view_dropbox_category_received]['cat_name']).'</strong> ';
 				$movelist[0] = 'Root'; // move_received selectbox content
 			} else {
-				echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&action=addreceivedcategory&view='.$view.'">'.Display::return_icon('new_folder.png', get_lang('AddNewCategory'),'',ICON_SIZE_MEDIUM).'</a>';
+				echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&action=addreceivedcategory&view='.$view.'">'.Display::return_icon('new_folder.png', get_lang('AddNewCategory'), '', ICON_SIZE_MEDIUM).'</a>';
 			}
 			echo '</div>';
 		} else {
 			if (api_is_allowed_to_session_edit(false, true)) {
 				echo '<div class="actions">';
 				if ($view_dropbox_category_received != 0 && api_is_allowed_to_session_edit(false, true)) {
-					echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category=0&view_sent_category='.$viewSentCategory.'&view='.$view.'">'.Display::return_icon('folder_up.png', get_lang('Up').' '.get_lang('Root'),'',ICON_SIZE_MEDIUM)."</a>";
+					echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category=0&view_sent_category='.$viewSentCategory.'&view='.$view.'">'.Display::return_icon('folder_up.png', get_lang('Up').' '.get_lang('Root'), '', ICON_SIZE_MEDIUM)."</a>";
 					echo get_lang('Category').': <strong>'.Security::remove_XSS($dropbox_categories[$view_dropbox_category_received]['cat_name']).'</strong> ';
 					$movelist[0] = 'Root'; // move_received selectbox content
 				} else {
-					echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&action=addreceivedcategory&view='.$view.'">'.Display::return_icon('new_folder.png', get_lang('AddNewCategory'),'',ICON_SIZE_MEDIUM).'</a>';
+					echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&action=addreceivedcategory&view='.$view.'">'.Display::return_icon('new_folder.png', get_lang('AddNewCategory'), '', ICON_SIZE_MEDIUM).'</a>';
 				}
 				echo '</div>';
 			}
@@ -256,13 +256,13 @@ 
 		if (api_get_session_id() == 0) {
 			echo '<div class="actions">';
 			if ($view_dropbox_category_sent != 0) {
-				echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category=0&view='.$view.'">'.Display::return_icon('folder_up.png', get_lang('Up').' '.get_lang('Root'),'',ICON_SIZE_MEDIUM)."</a>";
+				echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category=0&view='.$view.'">'.Display::return_icon('folder_up.png', get_lang('Up').' '.get_lang('Root'), '', ICON_SIZE_MEDIUM)."</a>";
 				echo get_lang('Category').': <strong>'.Security::remove_XSS($dropbox_categories[$view_dropbox_category_sent]['cat_name']).'</strong> ';
 			} else {
-				echo "<a href=\"".api_get_self()."?".api_get_cidreq()."&view=".$view."&action=addsentcategory\">".Display::return_icon('new_folder.png', get_lang('AddNewCategory'),'',ICON_SIZE_MEDIUM)."</a>\n";
+				echo "<a href=\"".api_get_self()."?".api_get_cidreq()."&view=".$view."&action=addsentcategory\">".Display::return_icon('new_folder.png', get_lang('AddNewCategory'), '', ICON_SIZE_MEDIUM)."</a>\n";
 			}
 			if (empty($viewSentCategory)) {
-				echo "<a href=\"".api_get_self()."?".api_get_cidreq()."&view=".$view."&action=add\">".Display::return_icon('upload_file.png', get_lang('UploadNewFile'),'',ICON_SIZE_MEDIUM)."</a>";
+				echo "<a href=\"".api_get_self()."?".api_get_cidreq()."&view=".$view."&action=add\">".Display::return_icon('upload_file.png', get_lang('UploadNewFile'), '', ICON_SIZE_MEDIUM)."</a>";
 			}
 			echo '</div>';
 		} else {
@@ -270,12 +270,12 @@ 
 				echo '<div class="actions">';
 				if ($view_dropbox_category_sent != 0) {
 					echo get_lang('CurrentlySeeing').': <strong>'.Security::remove_XSS($dropbox_categories[$view_dropbox_category_sent]['cat_name']).'</strong> ';
-					echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category=0&view='.$view.'">'.Display::return_icon('folder_up.png', get_lang('Up').' '.get_lang('Root'),'',ICON_SIZE_MEDIUM)."</a>";
+					echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category=0&view='.$view.'">'.Display::return_icon('folder_up.png', get_lang('Up').' '.get_lang('Root'), '', ICON_SIZE_MEDIUM)."</a>";
 				} else {
-					echo "<a href=\"".api_get_self()."?".api_get_cidreq()."&view=".$view."&action=addsentcategory\">".Display::return_icon('new_folder.png', get_lang('AddNewCategory'),'',ICON_SIZE_MEDIUM)."</a>\n";
+					echo "<a href=\"".api_get_self()."?".api_get_cidreq()."&view=".$view."&action=addsentcategory\">".Display::return_icon('new_folder.png', get_lang('AddNewCategory'), '', ICON_SIZE_MEDIUM)."</a>\n";
 				}
 				if (empty($viewSentCategory)) {
-					echo "<a href=\"".api_get_self()."?".api_get_cidreq()."&view=".$view."&action=add\">".Display::return_icon('upload_file.png', get_lang('UploadNewFile'),'',ICON_SIZE_MEDIUM)."</a>";
+					echo "<a href=\"".api_get_self()."?".api_get_cidreq()."&view=".$view."&action=add\">".Display::return_icon('upload_file.png', get_lang('UploadNewFile'), '', ICON_SIZE_MEDIUM)."</a>";
 				}
 				echo '</div>';
 			}
@@ -328,7 +328,7 @@ 
 
 		if (api_get_session_id() == 0) {
 			$column_header[] = array(get_lang('Modify'), false, '', 'nowrap style="text-align: right"');
-		} elseif (api_is_allowed_to_session_edit(false,true)) {
+		} elseif (api_is_allowed_to_session_edit(false, true)) {
 			$column_header[] = array(get_lang('Modify'), false, '', 'nowrap style="text-align: right"');
 		}
 
@@ -373,13 +373,13 @@ 
 				if ($dropbox_file->last_upload_date > $last_access &&
                     !in_array($dropbox_file->id, $_SESSION['_seen'][$_course['id']][TOOL_DROPBOX])
                 ) {
-					$new_icon = '&nbsp;'.Display::return_icon('new_dropbox_message.png', get_lang('New'),'',ICON_SIZE_SMALL);
+					$new_icon = '&nbsp;'.Display::return_icon('new_dropbox_message.png', get_lang('New'), '', ICON_SIZE_SMALL);
 				}
 
 				$link_open = '<a href="'.api_get_path(WEB_CODE_PATH).'dropbox/dropbox_download.php?'.api_get_cidreq().'&id='.$dropbox_file->id.'">';
 				$dropbox_file_data[] = $link_open.DocumentManager::build_document_icon_tag('file', $dropbox_file->title).'</a>';
 				$dropbox_file_data[] = '<a href="'.api_get_path(WEB_CODE_PATH).'dropbox/dropbox_download.php?'.api_get_cidreq().'&id='.$dropbox_file->id.'&action=download">'.
-                    Display::return_icon('save.png', get_lang('Download'), array('style' => 'float:right;'),ICON_SIZE_SMALL).'</a>'.$link_open.$dropbox_file->title.'</a>'.$new_icon.'<br />'.$dropbox_file->description;
+                    Display::return_icon('save.png', get_lang('Download'), array('style' => 'float:right;'), ICON_SIZE_SMALL).'</a>'.$link_open.$dropbox_file->title.'</a>'.$new_icon.'<br />'.$dropbox_file->description;
 				$file_size = $dropbox_file->filesize;
 				$dropbox_file_data[] = format_file_size($file_size);
 				$dropbox_file_data[] = $dropbox_file->author;
@@ -389,10 +389,10 @@ 
                     api_format_date($last_upload_date).'</span>';
 
 				$action_icons = check_number_feedback($dropbox_file->id, $number_feedback).' '.get_lang('Feedback').'
-                <a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category='.$viewSentCategory.'&view='.$view.'&action=viewfeedback&id='.$dropbox_file->id.'&'.$sort_params.'">'.Display::return_icon('discuss.png', get_lang('Comment'),'',ICON_SIZE_SMALL).'</a>
-                <a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category='.$viewSentCategory.'&view='.$view.'&action=movereceived&move_id='.$dropbox_file->id.'&'.$sort_params.'">'.Display::return_icon('move.png', get_lang('Move'),'',ICON_SIZE_SMALL).'</a>
+                <a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category='.$viewSentCategory.'&view='.$view.'&action=viewfeedback&id='.$dropbox_file->id.'&'.$sort_params.'">'.Display::return_icon('discuss.png', get_lang('Comment'), '', ICON_SIZE_SMALL).'</a>
+                <a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category='.$viewSentCategory.'&view='.$view.'&action=movereceived&move_id='.$dropbox_file->id.'&'.$sort_params.'">'.Display::return_icon('move.png', get_lang('Move'), '', ICON_SIZE_SMALL).'</a>
                 <a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category='.$viewSentCategory.'&view='.$view.'&action=deletereceivedfile&id='.$dropbox_file->id.'&'.$sort_params.'" onclick="javascript: return confirmation(\''.$dropbox_file->title.'\');">'.
-                Display::return_icon('delete.png', get_lang('Delete'),'',ICON_SIZE_SMALL).'</a>';
+                Display::return_icon('delete.png', get_lang('Delete'), '', ICON_SIZE_SMALL).'</a>';
 
 				// This is a hack to have an additional row in a sortable table
 
@@ -426,12 +426,12 @@ 
 					// The icon of the category
 					$link_open = '<a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$category['cat_id'].'&view_sent_category='.$viewSentCategory.'&view='.$view.'">';
 					$dropbox_category_data[] = $link_open.DocumentManager::build_document_icon_tag('folder', $category['cat_name']).'</a>';
-					$dropbox_category_data[] = '<a href="'.api_get_path(WEB_CODE_PATH).'dropbox/dropbox_download.php?'.api_get_cidreq().'&cat_id='.$category['cat_id'].'&action=downloadcategory&sent_received=received">'.Display::return_icon('save_pack.png', get_lang('Save'), array('style' => 'float:right;'),ICON_SIZE_SMALL).'</a>'.$link_open.$category['cat_name'].'</a>';
+					$dropbox_category_data[] = '<a href="'.api_get_path(WEB_CODE_PATH).'dropbox/dropbox_download.php?'.api_get_cidreq().'&cat_id='.$category['cat_id'].'&action=downloadcategory&sent_received=received">'.Display::return_icon('save_pack.png', get_lang('Save'), array('style' => 'float:right;'), ICON_SIZE_SMALL).'</a>'.$link_open.$category['cat_name'].'</a>';
 					$dropbox_category_data[] = '';
 					$dropbox_category_data[] = '';
 					$dropbox_category_data[] = '';
-					$dropbox_category_data[] = '<a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category='.$viewSentCategory.'&view='.$view.'&action=editcategory&id='.$category['cat_id'].'">'.Display::return_icon('edit.png',get_lang('Edit'),'',ICON_SIZE_SMALL).'</a>
-										  <a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category='.$viewSentCategory.'&view='.$view.'&action=deletereceivedcategory&id='.$category['cat_id'].'" onclick="javascript: return confirmation(\''.Security::remove_XSS($category['cat_name']).'\');">'.Display::return_icon('delete.png', get_lang('Delete'),'',ICON_SIZE_SMALL).'</a>';
+					$dropbox_category_data[] = '<a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category='.$viewSentCategory.'&view='.$view.'&action=editcategory&id='.$category['cat_id'].'">'.Display::return_icon('edit.png', get_lang('Edit'), '', ICON_SIZE_SMALL).'</a>
+										  <a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category='.$viewSentCategory.'&view='.$view.'&action=deletereceivedcategory&id='.$category['cat_id'].'" onclick="javascript: return confirmation(\''.Security::remove_XSS($category['cat_name']).'\');">'.Display::return_icon('delete.png', get_lang('Delete'), '', ICON_SIZE_SMALL).'</a>';
 				}
 				if (is_array($dropbox_category_data) && count($dropbox_category_data) > 0) {
 					$dropbox_data_recieved[] = $dropbox_category_data;
@@ -451,8 +451,8 @@ 
         );
 
 		if (is_array($movelist)) {
-			foreach ($movelist as $catid => $catname){
-				$selectlist['move_received_'.$catid] = get_lang('Move') . '->'. Security::remove_XSS($catname);
+			foreach ($movelist as $catid => $catname) {
+				$selectlist['move_received_'.$catid] = get_lang('Move').'->'.Security::remove_XSS($catname);
 			}
 		}
 
@@ -546,7 +546,7 @@ 
 				$link_open = '<a href="'.api_get_path(WEB_CODE_PATH).'dropbox/dropbox_download.php?'.api_get_cidreq().'&id='.$dropbox_file->id.'">';
 				$dropbox_file_data[] = $link_open.DocumentManager::build_document_icon_tag('file', $dropbox_file->title).'</a>';
 				$dropbox_file_data[] = '<a href="'.api_get_path(WEB_CODE_PATH).'dropbox/dropbox_download.php?'.api_get_cidreq().'&id='.$dropbox_file->id.'&action=download">'.
-                    Display::return_icon('save.png', get_lang('Save'), array('style' => 'float:right;'),ICON_SIZE_SMALL).'</a>'.$link_open.$dropbox_file->title.'</a><br />'.$dropbox_file->description;
+                    Display::return_icon('save.png', get_lang('Save'), array('style' => 'float:right;'), ICON_SIZE_SMALL).'</a>'.$link_open.$dropbox_file->title.'</a><br />'.$dropbox_file->description;
 				$file_size = $dropbox_file->filesize;
 				$dropbox_file_data[] = format_file_size($file_size);
                 $receivers_celldata = null;
@@ -563,9 +563,9 @@ 
 				$receivers_celldata = '';
 
 				$action_icons = check_number_feedback($dropbox_file->id, $number_feedback).' '.get_lang('Feedback').'
-                    <a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category='.$viewSentCategory.'&view='.$view.'&action=viewfeedback&id='.$dropbox_file->id.'&'.$sort_params.'">'.Display::return_icon('discuss.png', get_lang('Comment'),'',ICON_SIZE_SMALL).'</a>
-                    <a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category='.$viewSentCategory.'&view='.$view.'&action=movesent&move_id='.$dropbox_file->id.'&'.$sort_params.'">'.Display::return_icon('move.png', get_lang('Move'),'',ICON_SIZE_SMALL).'</a>
-                    <a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category='.$viewSentCategory.'&view='.$view.'&action=deletesentfile&id='.$dropbox_file->id.'&'.$sort_params.'" onclick="javascript: return confirmation(\''.$dropbox_file->title.'\');">'.Display::return_icon('delete.png', get_lang('Delete'),'',ICON_SIZE_SMALL).'</a>';
+                    <a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category='.$viewSentCategory.'&view='.$view.'&action=viewfeedback&id='.$dropbox_file->id.'&'.$sort_params.'">'.Display::return_icon('discuss.png', get_lang('Comment'), '', ICON_SIZE_SMALL).'</a>
+                    <a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category='.$viewSentCategory.'&view='.$view.'&action=movesent&move_id='.$dropbox_file->id.'&'.$sort_params.'">'.Display::return_icon('move.png', get_lang('Move'), '', ICON_SIZE_SMALL).'</a>
+                    <a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category='.$viewSentCategory.'&view='.$view.'&action=deletesentfile&id='.$dropbox_file->id.'&'.$sort_params.'" onclick="javascript: return confirmation(\''.$dropbox_file->title.'\');">'.Display::return_icon('delete.png', get_lang('Delete'), '', ICON_SIZE_SMALL).'</a>';
 				// This is a hack to have an additional row in a sortable table
 				if ($action == 'viewfeedback' && isset($_GET['id']) && is_numeric($_GET['id']) && $dropbox_file->id == $_GET['id']) {
 					$action_icons .= "</td></tr>\n"; // ending the normal row of the sortable table
@@ -594,16 +594,16 @@ 
 					// This is where the checkbox icon for the files appear.
 					$link_open = '<a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category='.$category['cat_id'].'&view='.$view.'">';
 					$dropbox_category_data[] = $link_open.DocumentManager::build_document_icon_tag('folder', Security::remove_XSS($category['cat_name'])).'</a>';
-					$dropbox_category_data[] = '<a href="'.api_get_path(WEB_CODE_PATH).'dropbox/dropbox_download.php?'.api_get_cidreq().'&cat_id='.$category['cat_id'].'&action=downloadcategory&sent_received=sent">'.Display::return_icon('save_pack.png', get_lang('Save'), array('style' => 'float:right;'),ICON_SIZE_SMALL).'</a>'.$link_open.Security::remove_XSS($category['cat_name']).'</a>';
+					$dropbox_category_data[] = '<a href="'.api_get_path(WEB_CODE_PATH).'dropbox/dropbox_download.php?'.api_get_cidreq().'&cat_id='.$category['cat_id'].'&action=downloadcategory&sent_received=sent">'.Display::return_icon('save_pack.png', get_lang('Save'), array('style' => 'float:right;'), ICON_SIZE_SMALL).'</a>'.$link_open.Security::remove_XSS($category['cat_name']).'</a>';
 					//$dropbox_category_data[] = '';
 					$dropbox_category_data[] = '';
 					//$dropbox_category_data[] = '';
 					$dropbox_category_data[] = '';
 					$dropbox_category_data[] = '';
 					$dropbox_category_data[] = '<a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category='.$viewSentCategory.'&view='.$view.'&action=editcategory&id='.$category['cat_id'].'">'.
-                                    Display::return_icon('edit.png', get_lang('Edit'),'',ICON_SIZE_SMALL).'</a>
+                                    Display::return_icon('edit.png', get_lang('Edit'), '', ICON_SIZE_SMALL).'</a>
 									<a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category='.$viewSentCategory.'&view='.$view.'&action=deletesentcategory&id='.$category['cat_id'].'" onclick="javascript: return confirmation(\''.Security::remove_XSS($category['cat_name']).'\');">'.
-                                    Display::return_icon('delete.png', get_lang('Delete'),'',ICON_SIZE_SMALL).'</a>';
+                                    Display::return_icon('delete.png', get_lang('Delete'), '', ICON_SIZE_SMALL).'</a>';
 				}
 				if (is_array($dropbox_category_data) && count($dropbox_category_data) > 0) {
 					$dropbox_data_sent[] = $dropbox_category_data;
@@ -625,7 +625,7 @@ 
 
         if (!empty($moveList)) {
             foreach ($moveList as $catid => $catname) {
-                $selectlist['move_sent_'.$catid] = get_lang('Move') . '->'. Security::remove_XSS($catname);
+                $selectlist['move_sent_'.$catid] = get_lang('Move').'->'.Security::remove_XSS($catname);
             }
         }
 

Indentation +428 added lines, -428 removed lines

@@ -7,12 +7,12 @@ 
 $last_access = '';
 // get the last time the user accessed the tool
 if (isset($_SESSION[$_course['id']]) && $_SESSION[$_course['id']]['last_access'][TOOL_DROPBOX] == '') {
-	$last_access = get_last_tool_access(TOOL_DROPBOX);
-	$_SESSION[$_course['id']]['last_access'][TOOL_DROPBOX] = $last_access;
+    $last_access = get_last_tool_access(TOOL_DROPBOX);
+    $_SESSION[$_course['id']]['last_access'][TOOL_DROPBOX] = $last_access;
 } else {
-	if (isset($_SESSION[$_course['id']])) {
-		$last_access = $_SESSION[$_course['id']]['last_access'][TOOL_DROPBOX];
-	}
+    if (isset($_SESSION[$_course['id']])) {
+        $last_access = $_SESSION[$_course['id']]['last_access'][TOOL_DROPBOX];
+    }
 }
 
 $postAction = isset($_POST['action']) ? $_POST['action'] : null;
@@ -49,9 +49,9 @@ 
 
 // Display the form for adding a new dropbox item.
 if ($action == 'add') {
-	if (api_get_session_id() != 0 && !api_is_allowed_to_session_edit(false, true)) {
-		api_not_allowed();
-	}
+    if (api_get_session_id() != 0 && !api_is_allowed_to_session_edit(false, true)) {
+        api_not_allowed();
+    }
     display_add_form(
         $dropbox_unid,
         $viewReceivedCategory,
@@ -61,56 +61,56 @@ 
 }
 
 if (isset($_POST['submitWork'])) {
-	$check = Security::check_token();
-	if ($check) {
+    $check = Security::check_token();
+    if ($check) {
         store_add_dropbox();
-	}
+    }
 }
 
 // Display the form for adding a category
 if ($action == 'addreceivedcategory' || $action == 'addsentcategory') {
-	if (api_get_session_id() != 0 && !api_is_allowed_to_session_edit(false, true)) {
-		api_not_allowed();
-	}
-	$categoryName = isset($_POST['category_name']) ? $_POST['category_name'] : '';
-	display_addcategory_form($categoryName, '', $_GET['action']);
+    if (api_get_session_id() != 0 && !api_is_allowed_to_session_edit(false, true)) {
+        api_not_allowed();
+    }
+    $categoryName = isset($_POST['category_name']) ? $_POST['category_name'] : '';
+    display_addcategory_form($categoryName, '', $_GET['action']);
 }
 
 // Editing a category: displaying the form
 if ($action == 'editcategory' && isset($_GET['id'])) {
-	if (api_get_session_id() != 0 && !api_is_allowed_to_session_edit(false, true)) {
-		api_not_allowed();
-	}
-	if (!$_POST) {
-		if (api_get_session_id() != 0 && !api_is_allowed_to_session_edit(false, true)) {
-			api_not_allowed();
-		}
-		display_addcategory_form('', $_GET['id'], 'editcategory');
-	}
+    if (api_get_session_id() != 0 && !api_is_allowed_to_session_edit(false, true)) {
+        api_not_allowed();
+    }
+    if (!$_POST) {
+        if (api_get_session_id() != 0 && !api_is_allowed_to_session_edit(false, true)) {
+            api_not_allowed();
+        }
+        display_addcategory_form('', $_GET['id'], 'editcategory');
+    }
 }
 
 // Storing a new or edited category
 if (isset($_POST['StoreCategory'])) {
-	if (api_get_session_id() != 0 && !api_is_allowed_to_session_edit(false, true)) {
-		api_not_allowed();
-	}
-	$return_information = store_addcategory();
-	if ($return_information['type'] == 'confirmation') {
-		Display :: display_confirmation_message($return_information['message']);
-	}
-	if ($return_information['type'] == 'error') {
-		Display :: display_error_message(get_lang('FormHasErrorsPleaseComplete').'<br />'.$return_information['message']);
-		display_addcategory_form($_POST['category_name'], $_POST['edit_id'], $postAction);
-	}
+    if (api_get_session_id() != 0 && !api_is_allowed_to_session_edit(false, true)) {
+        api_not_allowed();
+    }
+    $return_information = store_addcategory();
+    if ($return_information['type'] == 'confirmation') {
+        Display :: display_confirmation_message($return_information['message']);
+    }
+    if ($return_information['type'] == 'error') {
+        Display :: display_error_message(get_lang('FormHasErrorsPleaseComplete').'<br />'.$return_information['message']);
+        display_addcategory_form($_POST['category_name'], $_POST['edit_id'], $postAction);
+    }
 }
 
 
 // Move a File
 if (($action == 'movesent' || $action == 'movereceived') AND isset($_GET['move_id'])) {
-	if (api_get_session_id() != 0 && !api_is_allowed_to_session_edit(false, true)) {
-		api_not_allowed();
-	}
-	display_move_form(
+    if (api_get_session_id() != 0 && !api_is_allowed_to_session_edit(false, true)) {
+        api_not_allowed();
+    }
+    display_move_form(
         str_replace('move', '', $action),
         $_GET['move_id'],
         get_dropbox_categories(str_replace('move', '', $action)),
@@ -121,33 +121,33 @@ 
     );
 }
 if (isset($_POST['do_move'])) {
-	Display :: display_confirmation_message(store_move($_POST['id'], $_POST['move_target'], $_POST['part']));
+    Display :: display_confirmation_message(store_move($_POST['id'], $_POST['move_target'], $_POST['part']));
 }
 
 // Delete a file
 if (($action == 'deletereceivedfile' || $action == 'deletesentfile') AND isset($_GET['id']) AND is_numeric($_GET['id'])) {
-	if (api_get_session_id() != 0 && !api_is_allowed_to_session_edit(false, true)) {
-		api_not_allowed();
-	}
-	$dropboxfile = new Dropbox_Person(api_get_user_id(), $is_courseAdmin, $is_courseTutor);
-	if ($action == 'deletereceivedfile') {
-		$dropboxfile->deleteReceivedWork($_GET['id']);
-		$message = get_lang('ReceivedFileDeleted');
-	}
-	if ($action == 'deletesentfile') {
-		$dropboxfile->deleteSentWork($_GET['id']);
-		$message = get_lang('SentFileDeleted');
-	}
-	Display :: display_confirmation_message($message);
+    if (api_get_session_id() != 0 && !api_is_allowed_to_session_edit(false, true)) {
+        api_not_allowed();
+    }
+    $dropboxfile = new Dropbox_Person(api_get_user_id(), $is_courseAdmin, $is_courseTutor);
+    if ($action == 'deletereceivedfile') {
+        $dropboxfile->deleteReceivedWork($_GET['id']);
+        $message = get_lang('ReceivedFileDeleted');
+    }
+    if ($action == 'deletesentfile') {
+        $dropboxfile->deleteSentWork($_GET['id']);
+        $message = get_lang('SentFileDeleted');
+    }
+    Display :: display_confirmation_message($message);
 }
 
 // Delete a category
 if (($action == 'deletereceivedcategory' || $action == 'deletesentcategory') AND isset($_GET['id']) AND is_numeric($_GET['id'])) {
-	if (api_get_session_id() != 0 && !api_is_allowed_to_session_edit(false, true)) {
-		api_not_allowed();
-	}
-	$message = delete_category($action, $_GET['id']);
-	Display :: display_confirmation_message($message);
+    if (api_get_session_id() != 0 && !api_is_allowed_to_session_edit(false, true)) {
+        api_not_allowed();
+    }
+    $message = delete_category($action, $_GET['id']);
+    Display :: display_confirmation_message($message);
 }
 
 // Do an action on multiple files
@@ -162,27 +162,27 @@ 
     $postAction == 'delete_sent' ||
     $postAction == 'download_sent')
 ) {
-	$display_message = handle_multiple_actions();
-	Display :: display_normal_message($display_message);
+    $display_message = handle_multiple_actions();
+    Display :: display_normal_message($display_message);
 }
 
 // Store Feedback
 
 if (isset($_POST['feedback'])) {
-	if (api_get_session_id() != 0 && !api_is_allowed_to_session_edit(false, true)) {
-		api_not_allowed();
-	}
-	$check = Security::check_token();
-	if ($check) {
-		$display_message = store_feedback();
-		Display :: display_normal_message($display_message);
-		Security::check_token();
-	}
+    if (api_get_session_id() != 0 && !api_is_allowed_to_session_edit(false, true)) {
+        api_not_allowed();
+    }
+    $check = Security::check_token();
+    if ($check) {
+        $display_message = store_feedback();
+        Display :: display_normal_message($display_message);
+        Security::check_token();
+    }
 }
 
 // Error Message
 if (isset($_GET['error']) AND !empty($_GET['error'])) {
-	Display :: display_normal_message(get_lang($_GET['error']));
+    Display :: display_normal_message(get_lang($_GET['error']));
 }
 
 $dropbox_data_sent = array();
@@ -190,96 +190,96 @@ 
 $dropbox_data_recieved = array();
 
 if ($action != 'add') {
-	// Getting all the categories in the dropbox for the given user
-	$dropbox_categories = get_dropbox_categories();
-	// Greating the arrays with the categories for the received files and for the sent files
-	foreach ($dropbox_categories as $category) {
-		if ($category['received'] == '1') {
-			$dropbox_received_category[] = $category;
-		}
-		if ($category['sent'] == '1') {
-			$dropbox_sent_category[] = $category;
-		}
-	}
-
-	// ACTIONS
-	if ($view == 'received' || !$dropbox_cnf['sent_received_tabs']) {
-		//echo '<h3>'.get_lang('ReceivedFiles').'</h3>';
-
-		// This is for the categories
-		if (isset($viewReceivedCategory) AND $viewReceivedCategory != '') {
-			$view_dropbox_category_received = $viewReceivedCategory;
-		} else {
-			$view_dropbox_category_received = 0;
-		}
-
-		/* Menu Received */
-
-		if (api_get_session_id() == 0) {
-			echo '<div class="actions">';
-			if ($view_dropbox_category_received != 0  && api_is_allowed_to_session_edit(false, true)) {
-				echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category=0&view_sent_category='.$viewSentCategory.'&view='.$view.'">'.Display::return_icon('folder_up.png', get_lang('Up').' '.get_lang('Root'),'',ICON_SIZE_MEDIUM)."</a>";
-				echo get_lang('Category').': <strong>'.Security::remove_XSS($dropbox_categories[$view_dropbox_category_received]['cat_name']).'</strong> ';
-				$movelist[0] = 'Root'; // move_received selectbox content
-			} else {
-				echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&action=addreceivedcategory&view='.$view.'">'.Display::return_icon('new_folder.png', get_lang('AddNewCategory'),'',ICON_SIZE_MEDIUM).'</a>';
-			}
-			echo '</div>';
-		} else {
-			if (api_is_allowed_to_session_edit(false, true)) {
-				echo '<div class="actions">';
-				if ($view_dropbox_category_received != 0 && api_is_allowed_to_session_edit(false, true)) {
-					echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category=0&view_sent_category='.$viewSentCategory.'&view='.$view.'">'.Display::return_icon('folder_up.png', get_lang('Up').' '.get_lang('Root'),'',ICON_SIZE_MEDIUM)."</a>";
-					echo get_lang('Category').': <strong>'.Security::remove_XSS($dropbox_categories[$view_dropbox_category_received]['cat_name']).'</strong> ';
-					$movelist[0] = 'Root'; // move_received selectbox content
-				} else {
-					echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&action=addreceivedcategory&view='.$view.'">'.Display::return_icon('new_folder.png', get_lang('AddNewCategory'),'',ICON_SIZE_MEDIUM).'</a>';
-				}
-				echo '</div>';
-			}
-		}
-	}
-
-	if (!$view || $view == 'sent' || !$dropbox_cnf['sent_received_tabs']) {
-		// This is for the categories
-		if (isset($viewSentCategory) AND $viewSentCategory != '') {
-			$view_dropbox_category_sent = $viewSentCategory;
-		} else {
-			$view_dropbox_category_sent = 0;
-		}
-
-		/* Menu Sent */
-
-		if (api_get_session_id() == 0) {
-			echo '<div class="actions">';
-			if ($view_dropbox_category_sent != 0) {
-				echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category=0&view='.$view.'">'.Display::return_icon('folder_up.png', get_lang('Up').' '.get_lang('Root'),'',ICON_SIZE_MEDIUM)."</a>";
-				echo get_lang('Category').': <strong>'.Security::remove_XSS($dropbox_categories[$view_dropbox_category_sent]['cat_name']).'</strong> ';
-			} else {
-				echo "<a href=\"".api_get_self()."?".api_get_cidreq()."&view=".$view."&action=addsentcategory\">".Display::return_icon('new_folder.png', get_lang('AddNewCategory'),'',ICON_SIZE_MEDIUM)."</a>\n";
-			}
-			if (empty($viewSentCategory)) {
-				echo "<a href=\"".api_get_self()."?".api_get_cidreq()."&view=".$view."&action=add\">".Display::return_icon('upload_file.png', get_lang('UploadNewFile'),'',ICON_SIZE_MEDIUM)."</a>";
-			}
-			echo '</div>';
-		} else {
-			if (api_is_allowed_to_session_edit(false, true)) {
-				echo '<div class="actions">';
-				if ($view_dropbox_category_sent != 0) {
-					echo get_lang('CurrentlySeeing').': <strong>'.Security::remove_XSS($dropbox_categories[$view_dropbox_category_sent]['cat_name']).'</strong> ';
-					echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category=0&view='.$view.'">'.Display::return_icon('folder_up.png', get_lang('Up').' '.get_lang('Root'),'',ICON_SIZE_MEDIUM)."</a>";
-				} else {
-					echo "<a href=\"".api_get_self()."?".api_get_cidreq()."&view=".$view."&action=addsentcategory\">".Display::return_icon('new_folder.png', get_lang('AddNewCategory'),'',ICON_SIZE_MEDIUM)."</a>\n";
-				}
-				if (empty($viewSentCategory)) {
-					echo "<a href=\"".api_get_self()."?".api_get_cidreq()."&view=".$view."&action=add\">".Display::return_icon('upload_file.png', get_lang('UploadNewFile'),'',ICON_SIZE_MEDIUM)."</a>";
-				}
-				echo '</div>';
-			}
-		}
-	}
-	/*	THE MENU TABS */
-	if ($dropbox_cnf['sent_received_tabs']) {
+    // Getting all the categories in the dropbox for the given user
+    $dropbox_categories = get_dropbox_categories();
+    // Greating the arrays with the categories for the received files and for the sent files
+    foreach ($dropbox_categories as $category) {
+        if ($category['received'] == '1') {
+            $dropbox_received_category[] = $category;
+        }
+        if ($category['sent'] == '1') {
+            $dropbox_sent_category[] = $category;
+        }
+    }
+
+    // ACTIONS
+    if ($view == 'received' || !$dropbox_cnf['sent_received_tabs']) {
+        //echo '<h3>'.get_lang('ReceivedFiles').'</h3>';
+
+        // This is for the categories
+        if (isset($viewReceivedCategory) AND $viewReceivedCategory != '') {
+            $view_dropbox_category_received = $viewReceivedCategory;
+        } else {
+            $view_dropbox_category_received = 0;
+        }
+
+        /* Menu Received */
+
+        if (api_get_session_id() == 0) {
+            echo '<div class="actions">';
+            if ($view_dropbox_category_received != 0  && api_is_allowed_to_session_edit(false, true)) {
+                echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category=0&view_sent_category='.$viewSentCategory.'&view='.$view.'">'.Display::return_icon('folder_up.png', get_lang('Up').' '.get_lang('Root'),'',ICON_SIZE_MEDIUM)."</a>";
+                echo get_lang('Category').': <strong>'.Security::remove_XSS($dropbox_categories[$view_dropbox_category_received]['cat_name']).'</strong> ';
+                $movelist[0] = 'Root'; // move_received selectbox content
+            } else {
+                echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&action=addreceivedcategory&view='.$view.'">'.Display::return_icon('new_folder.png', get_lang('AddNewCategory'),'',ICON_SIZE_MEDIUM).'</a>';
+            }
+            echo '</div>';
+        } else {
+            if (api_is_allowed_to_session_edit(false, true)) {
+                echo '<div class="actions">';
+                if ($view_dropbox_category_received != 0 && api_is_allowed_to_session_edit(false, true)) {
+                    echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category=0&view_sent_category='.$viewSentCategory.'&view='.$view.'">'.Display::return_icon('folder_up.png', get_lang('Up').' '.get_lang('Root'),'',ICON_SIZE_MEDIUM)."</a>";
+                    echo get_lang('Category').': <strong>'.Security::remove_XSS($dropbox_categories[$view_dropbox_category_received]['cat_name']).'</strong> ';
+                    $movelist[0] = 'Root'; // move_received selectbox content
+                } else {
+                    echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&action=addreceivedcategory&view='.$view.'">'.Display::return_icon('new_folder.png', get_lang('AddNewCategory'),'',ICON_SIZE_MEDIUM).'</a>';
+                }
+                echo '</div>';
+            }
+        }
+    }
+
+    if (!$view || $view == 'sent' || !$dropbox_cnf['sent_received_tabs']) {
+        // This is for the categories
+        if (isset($viewSentCategory) AND $viewSentCategory != '') {
+            $view_dropbox_category_sent = $viewSentCategory;
+        } else {
+            $view_dropbox_category_sent = 0;
+        }
+
+        /* Menu Sent */
+
+        if (api_get_session_id() == 0) {
+            echo '<div class="actions">';
+            if ($view_dropbox_category_sent != 0) {
+                echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category=0&view='.$view.'">'.Display::return_icon('folder_up.png', get_lang('Up').' '.get_lang('Root'),'',ICON_SIZE_MEDIUM)."</a>";
+                echo get_lang('Category').': <strong>'.Security::remove_XSS($dropbox_categories[$view_dropbox_category_sent]['cat_name']).'</strong> ';
+            } else {
+                echo "<a href=\"".api_get_self()."?".api_get_cidreq()."&view=".$view."&action=addsentcategory\">".Display::return_icon('new_folder.png', get_lang('AddNewCategory'),'',ICON_SIZE_MEDIUM)."</a>\n";
+            }
+            if (empty($viewSentCategory)) {
+                echo "<a href=\"".api_get_self()."?".api_get_cidreq()."&view=".$view."&action=add\">".Display::return_icon('upload_file.png', get_lang('UploadNewFile'),'',ICON_SIZE_MEDIUM)."</a>";
+            }
+            echo '</div>';
+        } else {
+            if (api_is_allowed_to_session_edit(false, true)) {
+                echo '<div class="actions">';
+                if ($view_dropbox_category_sent != 0) {
+                    echo get_lang('CurrentlySeeing').': <strong>'.Security::remove_XSS($dropbox_categories[$view_dropbox_category_sent]['cat_name']).'</strong> ';
+                    echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category=0&view='.$view.'">'.Display::return_icon('folder_up.png', get_lang('Up').' '.get_lang('Root'),'',ICON_SIZE_MEDIUM)."</a>";
+                } else {
+                    echo "<a href=\"".api_get_self()."?".api_get_cidreq()."&view=".$view."&action=addsentcategory\">".Display::return_icon('new_folder.png', get_lang('AddNewCategory'),'',ICON_SIZE_MEDIUM)."</a>\n";
+                }
+                if (empty($viewSentCategory)) {
+                    echo "<a href=\"".api_get_self()."?".api_get_cidreq()."&view=".$view."&action=add\">".Display::return_icon('upload_file.png', get_lang('UploadNewFile'),'',ICON_SIZE_MEDIUM)."</a>";
+                }
+                echo '</div>';
+            }
+        }
+    }
+    /*	THE MENU TABS */
+    if ($dropbox_cnf['sent_received_tabs']) {
 ?>
 <ul class="nav nav-tabs">
     <li <?php if (!$view || $view == 'sent') { echo 'class="active"'; } ?> >
@@ -293,150 +293,150 @@ 
     </li>
 </ul>
 <?php
-	}
+    }
     /*	RECEIVED FILES */
-	if ($view == 'received' || !$dropbox_cnf['sent_received_tabs']) {
-		// This is for the categories
-		if (isset($viewReceivedCategory) AND $viewReceivedCategory != '') {
-			$view_dropbox_category_received = $viewReceivedCategory;
-		} else {
-			$view_dropbox_category_received = 0;
-		}
-
-		// Object initialisation
-		$dropbox_person = new Dropbox_Person(api_get_user_id(), $is_courseAdmin, $is_courseTutor);
-		 // note: are the $is_courseAdmin and $is_courseTutor parameters needed????
-
-		// Constructing the array that contains the total number of feedback messages per document.
-		$number_feedback = get_total_number_feedback();
-
-		// Sorting and paging options
-		$sorting_options = array();
-		$paging_options = array();
-
-		// The headers of the sortable tables
-		$column_header = array();
-		$column_header[] = array('', false, '');
-		$column_header[] = array(get_lang('Type'), true, 'style="width:40px"', 'style="text-align:center"');
-		$column_header[] = array(get_lang('ReceivedTitle'), true, '');
-		$column_header[] = array(get_lang('Size'), true, '');
-		$column_header[] = array(get_lang('Authors'), true, '');
-		$column_header[] = array(get_lang('LastResent'), true);
-
-		if (api_get_session_id() == 0) {
-			$column_header[] = array(get_lang('Modify'), false, '', 'nowrap style="text-align: right"');
-		} elseif (api_is_allowed_to_session_edit(false,true)) {
-			$column_header[] = array(get_lang('Modify'), false, '', 'nowrap style="text-align: right"');
-		}
-
-		$column_header[] = array('RealDate', true);
-		$column_header[] = array('RealSize', true);
-
-		// An array with the setting of the columns -> 1: columns that we will show, 0:columns that will be hide
-		$column_show[] = 1;
-		$column_show[] = 1;
-		$column_show[] = 1;
-		$column_show[] = 1;
-		$column_show[] = 1;
-		$column_show[] = 1;
-
-		if (api_get_session_id() == 0) {
-			$column_show[] = 1;
-		} elseif (api_is_allowed_to_session_edit(false, true)) {
-			$column_show[] = 1;
-		}
-		$column_show[] = 0;
-
-		// Here we change the way how the columns are going to be sort
-		// in this case the the column of LastResent ( 4th element in $column_header) we will be order like the column RealDate
-		// because in the column RealDate we have the days in a correct format "2008-03-12 10:35:48"
-
-		$column_order[3] = 8;
-		$column_order[5] = 7;
-
-		// The content of the sortable table = the received files
-		foreach ($dropbox_person -> receivedWork as $dropbox_file) {
-			$dropbox_file_data = array();
-			if ($view_dropbox_category_received == $dropbox_file->category) {
+    if ($view == 'received' || !$dropbox_cnf['sent_received_tabs']) {
+        // This is for the categories
+        if (isset($viewReceivedCategory) AND $viewReceivedCategory != '') {
+            $view_dropbox_category_received = $viewReceivedCategory;
+        } else {
+            $view_dropbox_category_received = 0;
+        }
+
+        // Object initialisation
+        $dropbox_person = new Dropbox_Person(api_get_user_id(), $is_courseAdmin, $is_courseTutor);
+            // note: are the $is_courseAdmin and $is_courseTutor parameters needed????
+
+        // Constructing the array that contains the total number of feedback messages per document.
+        $number_feedback = get_total_number_feedback();
+
+        // Sorting and paging options
+        $sorting_options = array();
+        $paging_options = array();
+
+        // The headers of the sortable tables
+        $column_header = array();
+        $column_header[] = array('', false, '');
+        $column_header[] = array(get_lang('Type'), true, 'style="width:40px"', 'style="text-align:center"');
+        $column_header[] = array(get_lang('ReceivedTitle'), true, '');
+        $column_header[] = array(get_lang('Size'), true, '');
+        $column_header[] = array(get_lang('Authors'), true, '');
+        $column_header[] = array(get_lang('LastResent'), true);
+
+        if (api_get_session_id() == 0) {
+            $column_header[] = array(get_lang('Modify'), false, '', 'nowrap style="text-align: right"');
+        } elseif (api_is_allowed_to_session_edit(false,true)) {
+            $column_header[] = array(get_lang('Modify'), false, '', 'nowrap style="text-align: right"');
+        }
+
+        $column_header[] = array('RealDate', true);
+        $column_header[] = array('RealSize', true);
+
+        // An array with the setting of the columns -> 1: columns that we will show, 0:columns that will be hide
+        $column_show[] = 1;
+        $column_show[] = 1;
+        $column_show[] = 1;
+        $column_show[] = 1;
+        $column_show[] = 1;
+        $column_show[] = 1;
+
+        if (api_get_session_id() == 0) {
+            $column_show[] = 1;
+        } elseif (api_is_allowed_to_session_edit(false, true)) {
+            $column_show[] = 1;
+        }
+        $column_show[] = 0;
+
+        // Here we change the way how the columns are going to be sort
+        // in this case the the column of LastResent ( 4th element in $column_header) we will be order like the column RealDate
+        // because in the column RealDate we have the days in a correct format "2008-03-12 10:35:48"
+
+        $column_order[3] = 8;
+        $column_order[5] = 7;
+
+        // The content of the sortable table = the received files
+        foreach ($dropbox_person -> receivedWork as $dropbox_file) {
+            $dropbox_file_data = array();
+            if ($view_dropbox_category_received == $dropbox_file->category) {
                 // we only display the files that are in the category that we are in.
-				$dropbox_file_data[] = $dropbox_file->id;
+                $dropbox_file_data[] = $dropbox_file->id;
 
-				if (!is_array($_SESSION['_seen'][$_course['id']][TOOL_DROPBOX])) {
-					$_SESSION['_seen'][$_course['id']][TOOL_DROPBOX] = array();
-				}
+                if (!is_array($_SESSION['_seen'][$_course['id']][TOOL_DROPBOX])) {
+                    $_SESSION['_seen'][$_course['id']][TOOL_DROPBOX] = array();
+                }
 
-				// New icon
-				$new_icon = '';
-				if ($dropbox_file->last_upload_date > $last_access &&
+                // New icon
+                $new_icon = '';
+                if ($dropbox_file->last_upload_date > $last_access &&
                     !in_array($dropbox_file->id, $_SESSION['_seen'][$_course['id']][TOOL_DROPBOX])
                 ) {
-					$new_icon = '&nbsp;'.Display::return_icon('new_dropbox_message.png', get_lang('New'),'',ICON_SIZE_SMALL);
-				}
+                    $new_icon = '&nbsp;'.Display::return_icon('new_dropbox_message.png', get_lang('New'),'',ICON_SIZE_SMALL);
+                }
 
-				$link_open = '<a href="'.api_get_path(WEB_CODE_PATH).'dropbox/dropbox_download.php?'.api_get_cidreq().'&id='.$dropbox_file->id.'">';
-				$dropbox_file_data[] = $link_open.DocumentManager::build_document_icon_tag('file', $dropbox_file->title).'</a>';
-				$dropbox_file_data[] = '<a href="'.api_get_path(WEB_CODE_PATH).'dropbox/dropbox_download.php?'.api_get_cidreq().'&id='.$dropbox_file->id.'&action=download">'.
+                $link_open = '<a href="'.api_get_path(WEB_CODE_PATH).'dropbox/dropbox_download.php?'.api_get_cidreq().'&id='.$dropbox_file->id.'">';
+                $dropbox_file_data[] = $link_open.DocumentManager::build_document_icon_tag('file', $dropbox_file->title).'</a>';
+                $dropbox_file_data[] = '<a href="'.api_get_path(WEB_CODE_PATH).'dropbox/dropbox_download.php?'.api_get_cidreq().'&id='.$dropbox_file->id.'&action=download">'.
                     Display::return_icon('save.png', get_lang('Download'), array('style' => 'float:right;'),ICON_SIZE_SMALL).'</a>'.$link_open.$dropbox_file->title.'</a>'.$new_icon.'<br />'.$dropbox_file->description;
-				$file_size = $dropbox_file->filesize;
-				$dropbox_file_data[] = format_file_size($file_size);
-				$dropbox_file_data[] = $dropbox_file->author;
+                $file_size = $dropbox_file->filesize;
+                $dropbox_file_data[] = format_file_size($file_size);
+                $dropbox_file_data[] = $dropbox_file->author;
 
-				$last_upload_date = api_get_local_time($dropbox_file->last_upload_date);
-				$dropbox_file_data[] = date_to_str_ago($dropbox_file->last_upload_date).'<br /><span class="dropbox_date">'.
+                $last_upload_date = api_get_local_time($dropbox_file->last_upload_date);
+                $dropbox_file_data[] = date_to_str_ago($dropbox_file->last_upload_date).'<br /><span class="dropbox_date">'.
                     api_format_date($last_upload_date).'</span>';
 
-				$action_icons = check_number_feedback($dropbox_file->id, $number_feedback).' '.get_lang('Feedback').'
+                $action_icons = check_number_feedback($dropbox_file->id, $number_feedback).' '.get_lang('Feedback').'
                 <a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category='.$viewSentCategory.'&view='.$view.'&action=viewfeedback&id='.$dropbox_file->id.'&'.$sort_params.'">'.Display::return_icon('discuss.png', get_lang('Comment'),'',ICON_SIZE_SMALL).'</a>
                 <a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category='.$viewSentCategory.'&view='.$view.'&action=movereceived&move_id='.$dropbox_file->id.'&'.$sort_params.'">'.Display::return_icon('move.png', get_lang('Move'),'',ICON_SIZE_SMALL).'</a>
                 <a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category='.$viewSentCategory.'&view='.$view.'&action=deletereceivedfile&id='.$dropbox_file->id.'&'.$sort_params.'" onclick="javascript: return confirmation(\''.$dropbox_file->title.'\');">'.
                 Display::return_icon('delete.png', get_lang('Delete'),'',ICON_SIZE_SMALL).'</a>';
 
-				// This is a hack to have an additional row in a sortable table
-
-				if ($action == 'viewfeedback' AND isset($_GET['id']) and is_numeric($_GET['id']) AND $dropbox_file->id == $_GET['id']) {
-					$action_icons .= "</td></tr>"; // Ending the normal row of the sortable table
-					$action_icons .= '<tr><td colspan="2"><a href="'.api_get_path(WEB_CODE_PATH).'dropbox/index.php?"'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory."&view_sent_category=".$viewSentCategory."&view=".$view.'&'.$sort_params."\">".get_lang('CloseFeedback')."</a></td><td colspan=\"7\">".feedback($dropbox_file->feedback2)."</td></tr>";
-				}
-				if (api_get_session_id() == 0) {
-					$dropbox_file_data[] = $action_icons;
-				} elseif (api_is_allowed_to_session_edit(false, true)) {
-					$dropbox_file_data[] = $action_icons;
-				}
-				$action_icons = '';
-				$dropbox_file_data[] = $last_upload_date;
-				$dropbox_file_data[] = $file_size;
-				$dropbox_data_recieved[] = $dropbox_file_data;
-			}
-		}
-
-		// The content of the sortable table = the categories (if we are not in the root)
-		if ($view_dropbox_category_received == 0) {
-			foreach ($dropbox_categories as $category) {
-			    /*  Note: This can probably be shortened since the categories
+                // This is a hack to have an additional row in a sortable table
+
+                if ($action == 'viewfeedback' AND isset($_GET['id']) and is_numeric($_GET['id']) AND $dropbox_file->id == $_GET['id']) {
+                    $action_icons .= "</td></tr>"; // Ending the normal row of the sortable table
+                    $action_icons .= '<tr><td colspan="2"><a href="'.api_get_path(WEB_CODE_PATH).'dropbox/index.php?"'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory."&view_sent_category=".$viewSentCategory."&view=".$view.'&'.$sort_params."\">".get_lang('CloseFeedback')."</a></td><td colspan=\"7\">".feedback($dropbox_file->feedback2)."</td></tr>";
+                }
+                if (api_get_session_id() == 0) {
+                    $dropbox_file_data[] = $action_icons;
+                } elseif (api_is_allowed_to_session_edit(false, true)) {
+                    $dropbox_file_data[] = $action_icons;
+                }
+                $action_icons = '';
+                $dropbox_file_data[] = $last_upload_date;
+                $dropbox_file_data[] = $file_size;
+                $dropbox_data_recieved[] = $dropbox_file_data;
+            }
+        }
+
+        // The content of the sortable table = the categories (if we are not in the root)
+        if ($view_dropbox_category_received == 0) {
+            foreach ($dropbox_categories as $category) {
+                /*  Note: This can probably be shortened since the categories
 			    for the received files are already in the
 			    $dropbox_received_category array;*/
-				$dropbox_category_data = array();
-				if ($category['received'] == '1') {
-					$movelist[$category['cat_id']] = $category['cat_name'];
+                $dropbox_category_data = array();
+                if ($category['received'] == '1') {
+                    $movelist[$category['cat_id']] = $category['cat_name'];
                     // This is where the checkbox icon for the files appear
-					$dropbox_category_data[] = $category['cat_id'];
-					// The icon of the category
-					$link_open = '<a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$category['cat_id'].'&view_sent_category='.$viewSentCategory.'&view='.$view.'">';
-					$dropbox_category_data[] = $link_open.DocumentManager::build_document_icon_tag('folder', $category['cat_name']).'</a>';
-					$dropbox_category_data[] = '<a href="'.api_get_path(WEB_CODE_PATH).'dropbox/dropbox_download.php?'.api_get_cidreq().'&cat_id='.$category['cat_id'].'&action=downloadcategory&sent_received=received">'.Display::return_icon('save_pack.png', get_lang('Save'), array('style' => 'float:right;'),ICON_SIZE_SMALL).'</a>'.$link_open.$category['cat_name'].'</a>';
-					$dropbox_category_data[] = '';
-					$dropbox_category_data[] = '';
-					$dropbox_category_data[] = '';
-					$dropbox_category_data[] = '<a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category='.$viewSentCategory.'&view='.$view.'&action=editcategory&id='.$category['cat_id'].'">'.Display::return_icon('edit.png',get_lang('Edit'),'',ICON_SIZE_SMALL).'</a>
+                    $dropbox_category_data[] = $category['cat_id'];
+                    // The icon of the category
+                    $link_open = '<a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$category['cat_id'].'&view_sent_category='.$viewSentCategory.'&view='.$view.'">';
+                    $dropbox_category_data[] = $link_open.DocumentManager::build_document_icon_tag('folder', $category['cat_name']).'</a>';
+                    $dropbox_category_data[] = '<a href="'.api_get_path(WEB_CODE_PATH).'dropbox/dropbox_download.php?'.api_get_cidreq().'&cat_id='.$category['cat_id'].'&action=downloadcategory&sent_received=received">'.Display::return_icon('save_pack.png', get_lang('Save'), array('style' => 'float:right;'),ICON_SIZE_SMALL).'</a>'.$link_open.$category['cat_name'].'</a>';
+                    $dropbox_category_data[] = '';
+                    $dropbox_category_data[] = '';
+                    $dropbox_category_data[] = '';
+                    $dropbox_category_data[] = '<a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category='.$viewSentCategory.'&view='.$view.'&action=editcategory&id='.$category['cat_id'].'">'.Display::return_icon('edit.png',get_lang('Edit'),'',ICON_SIZE_SMALL).'</a>
 										  <a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category='.$viewSentCategory.'&view='.$view.'&action=deletereceivedcategory&id='.$category['cat_id'].'" onclick="javascript: return confirmation(\''.Security::remove_XSS($category['cat_name']).'\');">'.Display::return_icon('delete.png', get_lang('Delete'),'',ICON_SIZE_SMALL).'</a>';
-				}
-				if (is_array($dropbox_category_data) && count($dropbox_category_data) > 0) {
-					$dropbox_data_recieved[] = $dropbox_category_data;
-				}
-			}
-		}
-
-		// Displaying the table
+                }
+                if (is_array($dropbox_category_data) && count($dropbox_category_data) > 0) {
+                    $dropbox_data_recieved[] = $dropbox_category_data;
+                }
+            }
+        }
+
+        // Displaying the table
         $additional_get_parameters = array(
             'view' => $view,
             'view_received_category' => $viewReceivedCategory,
@@ -447,15 +447,15 @@ 
             'download_received' => get_lang('Download')
         );
 
-		if (is_array($movelist)) {
-			foreach ($movelist as $catid => $catname){
-				$selectlist['move_received_'.$catid] = get_lang('Move') . '->'. Security::remove_XSS($catname);
-			}
-		}
+        if (is_array($movelist)) {
+            foreach ($movelist as $catid => $catname){
+                $selectlist['move_received_'.$catid] = get_lang('Move') . '->'. Security::remove_XSS($catname);
+            }
+        }
 
-		if (api_get_session_id() != 0 && !api_is_allowed_to_session_edit(false, true)) {
-			$selectlist = array();
-		}
+        if (api_get_session_id() != 0 && !api_is_allowed_to_session_edit(false, true)) {
+            $selectlist = array();
+        }
         echo '<div class="files-table">';
         Display::display_sortable_config_table(
             'dropbox',
@@ -469,154 +469,154 @@ 
             $selectlist
         );
         echo '</div>';
-	}
-
-	/*	SENT FILES */
-
-	if (!$view || $view == 'sent' || !$dropbox_cnf['sent_received_tabs']) {
-		// This is for the categories
-		if (isset($viewSentCategory) AND $viewSentCategory != '') {
-			$view_dropbox_category_sent = $viewSentCategory;
-		} else {
-			$view_dropbox_category_sent = 0;
-		}
-
-		// Object initialisation
-		$dropbox_person = new Dropbox_Person(api_get_user_id(), $is_courseAdmin, $is_courseTutor);
-
-		// Constructing the array that contains the total number of feedback messages per document.
-		$number_feedback = get_total_number_feedback();
-
-		// Sorting and paging options
-		$sorting_options = array();
-		$paging_options = array();
-
-		// The headers of the sortable tables
-		$column_header = array();
-
-		$column_header[] = array('', false, '');
-		$column_header[] = array(get_lang('Type'), true, 'style="width:40px"', 'style="text-align:center"');
-		$column_header[] = array(get_lang('SentTitle'), true, '');
-		$column_header[] = array(get_lang('Size'), true, '');
-		$column_header[] = array(get_lang('SentTo'), true, '');
-		$column_header[] = array(get_lang('LastResent'), true, '');
-
-		if (api_get_session_id() == 0) {
-			$column_header[] = array(get_lang('Modify'), false, '', 'nowrap style="text-align: right"');
-		} elseif (api_is_allowed_to_session_edit(false, true)) {
-			$column_header[] = array(get_lang('Modify'), false, '', 'nowrap style="text-align: right"');
-		}
-
-		$column_header[] = array('RealDate', true);
-		$column_header[] = array('RealSize', true);
-
-		$column_show = array();
-		$column_order = array();
-
-		// An array with the setting of the columns -> 1: columns that we will show, 0:columns that will be hide
-		$column_show[] = 1;
-		$column_show[] = 1;
-		$column_show[] = 1;
-		$column_show[] = 1;
-		$column_show[] = 1;
-		$column_show[] = 1;
-		if (api_get_session_id() == 0) {
-			$column_show[] = 1;
-		} elseif (api_is_allowed_to_session_edit(false, true)) {
-			$column_show[] = 1;
-		}
-		$column_show[] = 0;
-
-		// Here we change the way how the colums are going to be sort
-		// in this case the the column of LastResent ( 4th element in $column_header) we will be order like the column RealDate
-		// because in the column RealDate we have the days in a correct format "2008-03-12 10:35:48"
-
-		$column_order[3] = 8;
-		$column_order[5] = 7;
-
-		// The content of the sortable table = the received files
-		foreach ($dropbox_person->sentWork as $dropbox_file) {
-			$dropbox_file_data = array();
-
-			if ($view_dropbox_category_sent == $dropbox_file->category) {
-				$dropbox_file_data[] = $dropbox_file->id;
-				$link_open = '<a href="'.api_get_path(WEB_CODE_PATH).'dropbox/dropbox_download.php?'.api_get_cidreq().'&id='.$dropbox_file->id.'">';
-				$dropbox_file_data[] = $link_open.DocumentManager::build_document_icon_tag('file', $dropbox_file->title).'</a>';
-				$dropbox_file_data[] = '<a href="'.api_get_path(WEB_CODE_PATH).'dropbox/dropbox_download.php?'.api_get_cidreq().'&id='.$dropbox_file->id.'&action=download">'.
+    }
+
+    /*	SENT FILES */
+
+    if (!$view || $view == 'sent' || !$dropbox_cnf['sent_received_tabs']) {
+        // This is for the categories
+        if (isset($viewSentCategory) AND $viewSentCategory != '') {
+            $view_dropbox_category_sent = $viewSentCategory;
+        } else {
+            $view_dropbox_category_sent = 0;
+        }
+
+        // Object initialisation
+        $dropbox_person = new Dropbox_Person(api_get_user_id(), $is_courseAdmin, $is_courseTutor);
+
+        // Constructing the array that contains the total number of feedback messages per document.
+        $number_feedback = get_total_number_feedback();
+
+        // Sorting and paging options
+        $sorting_options = array();
+        $paging_options = array();
+
+        // The headers of the sortable tables
+        $column_header = array();
+
+        $column_header[] = array('', false, '');
+        $column_header[] = array(get_lang('Type'), true, 'style="width:40px"', 'style="text-align:center"');
+        $column_header[] = array(get_lang('SentTitle'), true, '');
+        $column_header[] = array(get_lang('Size'), true, '');
+        $column_header[] = array(get_lang('SentTo'), true, '');
+        $column_header[] = array(get_lang('LastResent'), true, '');
+
+        if (api_get_session_id() == 0) {
+            $column_header[] = array(get_lang('Modify'), false, '', 'nowrap style="text-align: right"');
+        } elseif (api_is_allowed_to_session_edit(false, true)) {
+            $column_header[] = array(get_lang('Modify'), false, '', 'nowrap style="text-align: right"');
+        }
+
+        $column_header[] = array('RealDate', true);
+        $column_header[] = array('RealSize', true);
+
+        $column_show = array();
+        $column_order = array();
+
+        // An array with the setting of the columns -> 1: columns that we will show, 0:columns that will be hide
+        $column_show[] = 1;
+        $column_show[] = 1;
+        $column_show[] = 1;
+        $column_show[] = 1;
+        $column_show[] = 1;
+        $column_show[] = 1;
+        if (api_get_session_id() == 0) {
+            $column_show[] = 1;
+        } elseif (api_is_allowed_to_session_edit(false, true)) {
+            $column_show[] = 1;
+        }
+        $column_show[] = 0;
+
+        // Here we change the way how the colums are going to be sort
+        // in this case the the column of LastResent ( 4th element in $column_header) we will be order like the column RealDate
+        // because in the column RealDate we have the days in a correct format "2008-03-12 10:35:48"
+
+        $column_order[3] = 8;
+        $column_order[5] = 7;
+
+        // The content of the sortable table = the received files
+        foreach ($dropbox_person->sentWork as $dropbox_file) {
+            $dropbox_file_data = array();
+
+            if ($view_dropbox_category_sent == $dropbox_file->category) {
+                $dropbox_file_data[] = $dropbox_file->id;
+                $link_open = '<a href="'.api_get_path(WEB_CODE_PATH).'dropbox/dropbox_download.php?'.api_get_cidreq().'&id='.$dropbox_file->id.'">';
+                $dropbox_file_data[] = $link_open.DocumentManager::build_document_icon_tag('file', $dropbox_file->title).'</a>';
+                $dropbox_file_data[] = '<a href="'.api_get_path(WEB_CODE_PATH).'dropbox/dropbox_download.php?'.api_get_cidreq().'&id='.$dropbox_file->id.'&action=download">'.
                     Display::return_icon('save.png', get_lang('Save'), array('style' => 'float:right;'),ICON_SIZE_SMALL).'</a>'.$link_open.$dropbox_file->title.'</a><br />'.$dropbox_file->description;
-				$file_size = $dropbox_file->filesize;
-				$dropbox_file_data[] = format_file_size($file_size);
+                $file_size = $dropbox_file->filesize;
+                $dropbox_file_data[] = format_file_size($file_size);
                 $receivers_celldata = null;
-				foreach ($dropbox_file->recipients as $recipient) {
-					$userInfo = api_get_user_info($recipient['user_id']);
-					$receivers_celldata = UserManager::getUserProfileLink($userInfo).', '.$receivers_celldata;
-				}
-				$receivers_celldata = trim(trim($receivers_celldata), ','); // Removing the trailing comma.
-				$dropbox_file_data[] = $receivers_celldata;
-				$last_upload_date = api_get_local_time($dropbox_file->last_upload_date);
-				$dropbox_file_data[] = date_to_str_ago($dropbox_file->last_upload_date).'<br /><span class="dropbox_date">'.
-					api_format_date($last_upload_date).'</span>';
-
-				//$dropbox_file_data[] = $dropbox_file->author;
-				$receivers_celldata = '';
-
-				$action_icons = check_number_feedback($dropbox_file->id, $number_feedback).' '.get_lang('Feedback').'
+                foreach ($dropbox_file->recipients as $recipient) {
+                    $userInfo = api_get_user_info($recipient['user_id']);
+                    $receivers_celldata = UserManager::getUserProfileLink($userInfo).', '.$receivers_celldata;
+                }
+                $receivers_celldata = trim(trim($receivers_celldata), ','); // Removing the trailing comma.
+                $dropbox_file_data[] = $receivers_celldata;
+                $last_upload_date = api_get_local_time($dropbox_file->last_upload_date);
+                $dropbox_file_data[] = date_to_str_ago($dropbox_file->last_upload_date).'<br /><span class="dropbox_date">'.
+                    api_format_date($last_upload_date).'</span>';
+
+                //$dropbox_file_data[] = $dropbox_file->author;
+                $receivers_celldata = '';
+
+                $action_icons = check_number_feedback($dropbox_file->id, $number_feedback).' '.get_lang('Feedback').'
                     <a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category='.$viewSentCategory.'&view='.$view.'&action=viewfeedback&id='.$dropbox_file->id.'&'.$sort_params.'">'.Display::return_icon('discuss.png', get_lang('Comment'),'',ICON_SIZE_SMALL).'</a>
                     <a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category='.$viewSentCategory.'&view='.$view.'&action=movesent&move_id='.$dropbox_file->id.'&'.$sort_params.'">'.Display::return_icon('move.png', get_lang('Move'),'',ICON_SIZE_SMALL).'</a>
                     <a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category='.$viewSentCategory.'&view='.$view.'&action=deletesentfile&id='.$dropbox_file->id.'&'.$sort_params.'" onclick="javascript: return confirmation(\''.$dropbox_file->title.'\');">'.Display::return_icon('delete.png', get_lang('Delete'),'',ICON_SIZE_SMALL).'</a>';
-				// This is a hack to have an additional row in a sortable table
-				if ($action == 'viewfeedback' && isset($_GET['id']) && is_numeric($_GET['id']) && $dropbox_file->id == $_GET['id']) {
-					$action_icons .= "</td></tr>\n"; // ending the normal row of the sortable table
-					$action_icons .= "<tr><td colspan=\"2\">";
-					$action_icons .= "<a href=\"".api_get_path(WEB_CODE_PATH)."dropbox/index.php?".api_get_cidreq()."&view_received_category=".$viewReceivedCategory."&view_sent_category=".$viewSentCategory."&view=".$view.'&'.$sort_params."\">".get_lang('CloseFeedback')."</a>";
-					$action_icons .= "</td><td colspan=\"7\">".feedback($dropbox_file->feedback2)."</td></tr>";
-				}
-				$dropbox_file_data[] = $action_icons;
-				$dropbox_file_data[] = $last_upload_date;
-				$dropbox_file_data[] = $file_size;
-				$action_icons = '';
-				$dropbox_data_sent[] = $dropbox_file_data;
-			}
-		}
+                // This is a hack to have an additional row in a sortable table
+                if ($action == 'viewfeedback' && isset($_GET['id']) && is_numeric($_GET['id']) && $dropbox_file->id == $_GET['id']) {
+                    $action_icons .= "</td></tr>\n"; // ending the normal row of the sortable table
+                    $action_icons .= "<tr><td colspan=\"2\">";
+                    $action_icons .= "<a href=\"".api_get_path(WEB_CODE_PATH)."dropbox/index.php?".api_get_cidreq()."&view_received_category=".$viewReceivedCategory."&view_sent_category=".$viewSentCategory."&view=".$view.'&'.$sort_params."\">".get_lang('CloseFeedback')."</a>";
+                    $action_icons .= "</td><td colspan=\"7\">".feedback($dropbox_file->feedback2)."</td></tr>";
+                }
+                $dropbox_file_data[] = $action_icons;
+                $dropbox_file_data[] = $last_upload_date;
+                $dropbox_file_data[] = $file_size;
+                $action_icons = '';
+                $dropbox_data_sent[] = $dropbox_file_data;
+            }
+        }
 
         $moveList = array();
-		// The content of the sortable table = the categories (if we are not in the root)
-		if ($view_dropbox_category_sent == 0) {
-			foreach ($dropbox_categories as $category) {
-				$dropbox_category_data = array();
+        // The content of the sortable table = the categories (if we are not in the root)
+        if ($view_dropbox_category_sent == 0) {
+            foreach ($dropbox_categories as $category) {
+                $dropbox_category_data = array();
 
-				if ($category['sent'] == '1') {
+                if ($category['sent'] == '1') {
 
                     $moveList[$category['cat_id']] = $category['cat_name'];
-					$dropbox_category_data[] = $category['cat_id'];
-					// This is where the checkbox icon for the files appear.
-					$link_open = '<a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category='.$category['cat_id'].'&view='.$view.'">';
-					$dropbox_category_data[] = $link_open.DocumentManager::build_document_icon_tag('folder', Security::remove_XSS($category['cat_name'])).'</a>';
-					$dropbox_category_data[] = '<a href="'.api_get_path(WEB_CODE_PATH).'dropbox/dropbox_download.php?'.api_get_cidreq().'&cat_id='.$category['cat_id'].'&action=downloadcategory&sent_received=sent">'.Display::return_icon('save_pack.png', get_lang('Save'), array('style' => 'float:right;'),ICON_SIZE_SMALL).'</a>'.$link_open.Security::remove_XSS($category['cat_name']).'</a>';
-					//$dropbox_category_data[] = '';
-					$dropbox_category_data[] = '';
-					//$dropbox_category_data[] = '';
-					$dropbox_category_data[] = '';
-					$dropbox_category_data[] = '';
-					$dropbox_category_data[] = '<a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category='.$viewSentCategory.'&view='.$view.'&action=editcategory&id='.$category['cat_id'].'">'.
+                    $dropbox_category_data[] = $category['cat_id'];
+                    // This is where the checkbox icon for the files appear.
+                    $link_open = '<a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category='.$category['cat_id'].'&view='.$view.'">';
+                    $dropbox_category_data[] = $link_open.DocumentManager::build_document_icon_tag('folder', Security::remove_XSS($category['cat_name'])).'</a>';
+                    $dropbox_category_data[] = '<a href="'.api_get_path(WEB_CODE_PATH).'dropbox/dropbox_download.php?'.api_get_cidreq().'&cat_id='.$category['cat_id'].'&action=downloadcategory&sent_received=sent">'.Display::return_icon('save_pack.png', get_lang('Save'), array('style' => 'float:right;'),ICON_SIZE_SMALL).'</a>'.$link_open.Security::remove_XSS($category['cat_name']).'</a>';
+                    //$dropbox_category_data[] = '';
+                    $dropbox_category_data[] = '';
+                    //$dropbox_category_data[] = '';
+                    $dropbox_category_data[] = '';
+                    $dropbox_category_data[] = '';
+                    $dropbox_category_data[] = '<a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category='.$viewSentCategory.'&view='.$view.'&action=editcategory&id='.$category['cat_id'].'">'.
                                     Display::return_icon('edit.png', get_lang('Edit'),'',ICON_SIZE_SMALL).'</a>
 									<a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category='.$viewSentCategory.'&view='.$view.'&action=deletesentcategory&id='.$category['cat_id'].'" onclick="javascript: return confirmation(\''.Security::remove_XSS($category['cat_name']).'\');">'.
                                     Display::return_icon('delete.png', get_lang('Delete'),'',ICON_SIZE_SMALL).'</a>';
-				}
-				if (is_array($dropbox_category_data) && count($dropbox_category_data) > 0) {
-					$dropbox_data_sent[] = $dropbox_category_data;
-				}
-			}
-		}
-
-		// Displaying the table
-		$additional_get_parameters = array(
+                }
+                if (is_array($dropbox_category_data) && count($dropbox_category_data) > 0) {
+                    $dropbox_data_sent[] = $dropbox_category_data;
+                }
+            }
+        }
+
+        // Displaying the table
+        $additional_get_parameters = array(
             'view' => $view,
             'view_received_category' => $viewReceivedCategory,
             'view_sent_category' => $viewSentCategory
         );
 
-		$selectlist = array(
+        $selectlist = array(
             'delete_received' => get_lang('Delete'),
             'download_received' => get_lang('Download')
         );
@@ -627,12 +627,12 @@ 
             }
         }
 
-		if (api_get_session_id() != 0 && !api_is_allowed_to_session_edit(false, true)) {
-			$selectlist = array('download_received' => get_lang('Download'));
-		}
+        if (api_get_session_id() != 0 && !api_is_allowed_to_session_edit(false, true)) {
+            $selectlist = array('download_received' => get_lang('Download'));
+        }
 
         echo '<div class="files-table">';
-		Display::display_sortable_config_table(
+        Display::display_sortable_config_table(
             'dropbox',
             $column_header,
             $dropbox_data_sent,
@@ -644,7 +644,7 @@ 
             $selectlist
         );
         echo '</div>';
-	}
+    }
 }
 
 Display::display_footer();

main/inc/ajax/install.ajax.php

Indentation +3 added lines, -3 removed lines

@@ -9,7 +9,7 @@ 
 $action = $_GET['a'];
 
 switch ($action) {
-	case 'send_contact_information':
+    case 'send_contact_information':
         if (!empty($_POST)) {
             // get params from contact form
             $person_name = $_POST['person_name'];
@@ -60,7 +60,7 @@ 
 
             }
         break;
-	default:
-		echo '';
+    default:
+        echo '';
 }
 exit;

main/inc/lib/webservices/MessagesWebService.class.php

Spacing +2 added lines, -2 removed lines

@@ -118,7 +118,7 @@ 
                 'hasAttachments' => $hasAttachments,
                 'platform' => array(
                     'website' => api_get_path(WEB_PATH),
-                    'messagingTool' => api_get_path(WEB_PATH) . 'main/messages/inbox.php'
+                    'messagingTool' => api_get_path(WEB_PATH).'main/messages/inbox.php'
                 )
             );
         }
@@ -201,7 +201,7 @@ 
         }
 
         $headers = [
-            'Authorization: key=' . $gdcApiKey,
+            'Authorization: key='.$gdcApiKey,
             'Content-Type: application/json'
         ];
 

main/inc/lib/geometry.lib.php

Spacing +55 added lines, -55 removed lines

@@ -13,8 +13,8 @@ 
  * @returns an array such as: for all i in [0..max[x][ : for all j in [0..max[y][ : array[i][j] = FALSE
  */
 function poly_init($max) {
-    return array_fill(0, $max["x"]-1,
-            array_fill(0, $max["y"]-1, FALSE));
+    return array_fill(0, $max["x"] - 1,
+            array_fill(0, $max["y"] - 1, FALSE));
 }
 
 
@@ -69,18 +69,18 @@ 
     	array_push($bords[$poly[0]['y']], $poly[0]['x']);
 
     $i = 1; // we re-use $i and $old_pente bellow the loop
-    $old_pente=0;
-    for (    ;    // for each points of the polygon but the first
-        $i<sizeof($poly) && (!empty($poly[$i]['x']) && !empty($poly[$i]['y'])); $i++) {
+    $old_pente = 0;
+    for (;    // for each points of the polygon but the first
+        $i < sizeof($poly) && (!empty($poly[$i]['x']) && !empty($poly[$i]['y'])); $i++) {
 
         /* special cases */
-        if ($poly[$i-1]['y'] == $poly[$i]['y']) {
-            if ($poly[$i-1]['x'] == $poly[$i]['x'])
+        if ($poly[$i - 1]['y'] == $poly[$i]['y']) {
+            if ($poly[$i - 1]['x'] == $poly[$i]['x'])
                 continue; // twice the same point
             else {    //  infinite elevation of the edge
             	if (is_array($bords[$poly[$i]['y']]))
-                	array_push($bords[$poly[$i]['y']],$poly[$i]['x']);
-                $old_pente=0;
+                	array_push($bords[$poly[$i]['y']], $poly[$i]['x']);
+                $old_pente = 0;
                 continue;
             }
         }
@@ -93,17 +93,17 @@ 
 
         /* computing the elevation of the edge going */
         //        from $poly[$i-1] to $poly[$i]
-        $pente = ($poly[$i-1]['x']-$poly[$i]['x'])/
-                 ($poly[$i-1]['y']-$poly[$i]['y']);
+        $pente = ($poly[$i - 1]['x'] - $poly[$i]['x']) /
+                 ($poly[$i - 1]['y'] - $poly[$i]['y']);
 
         // if the sign of the elevation change from the one of the
         // previous edge, the point must be added a second time inside
         // $bords
-        if ($i>1)
-            if (($old_pente<0 && $pente>0)
-                    || ($old_pente>0 && $pente<0)) {
+        if ($i > 1)
+            if (($old_pente < 0 && $pente > 0)
+                    || ($old_pente > 0 && $pente < 0)) {
 				if (is_array($bords[$poly[$i]['y']])) //avoid warning
-                	array_push($bords[$poly[$i]['y']],$poly[$i]['x']);
+                	array_push($bords[$poly[$i]['y']], $poly[$i]['x']);
 
                 if (DEBUG)
                     echo '*('.$poly[$i]['x'].
@@ -111,8 +111,8 @@ 
         	}
 
         /* detect the direction of the elevation in Y */
-        $dy_inc = ($poly[$i]['y']-$poly[$i-1]['y']) > 0 ? 1 : -1;
-        $x = $poly[$i-1]['x'];
+        $dy_inc = ($poly[$i]['y'] - $poly[$i - 1]['y']) > 0 ? 1 : -1;
+        $x = $poly[$i - 1]['x'];
 //        if (DEBUG) echo "init: ".$poly[$i-1]['y']."  dy_inc: ".$dy_inc.
 //            "   end: ".$poly[$i]['y']."   pente:".$pente;
 
@@ -121,10 +121,10 @@ 
 
         // we iterate w/ $dy in ]$poly[$i-1]['y'],$poly[$i-1]['y'][
         //    w/ $dy_inc as increment
-        for ($dy = $poly[$i-1]['y']+$dy_inc;
+        for ($dy = $poly[$i - 1]['y'] + $dy_inc;
             $dy != $poly[$i]['y'];
             $dy += $dy_inc) {
-            $x += $pente*$dy_inc;
+            $x += $pente * $dy_inc;
             array_push($bords[$dy], $x);
 //            if (DEBUG) echo '/('.$x.';'.$dy.')   ';
         }
@@ -132,47 +132,47 @@ 
     }
 
     // closing the polygone (the edge between $poly[$i-1] and $poly[0])
-    if ($poly[$i-1]['y']!=$poly[0]['y']) {// droite--> rien à faire
+    if ($poly[$i - 1]['y'] != $poly[0]['y']) {// droite--> rien à faire
 
         // elevation between $poly[0]['x'] and $poly[1]['x'])
-        $rest = $poly[0]['y']-$poly[1]['y'];
-        if ($rest!=0)
-        	$pente1 = ($poly[0]['x']-$poly[1]['x'])/($rest);
+        $rest = $poly[0]['y'] - $poly[1]['y'];
+        if ($rest != 0)
+        	$pente1 = ($poly[0]['x'] - $poly[1]['x']) / ($rest);
         else
 			$pente1 = 0;
 
         // elevation between $poly[$i-1]['x'] and $poly[0]['x'])
-        $pente = ($poly[$i-1]['x']-$poly[0]['x'])/
-            ($poly[$i-1]['y']-$poly[0]['y']);
+        $pente = ($poly[$i - 1]['x'] - $poly[0]['x']) /
+            ($poly[$i - 1]['y'] - $poly[0]['y']);
 
 //        if (DEBUG) echo 'start('.$poly[$i-1]['x'].','.$poly[$i-1]['y'].
 //                ')-end('.$poly[0]['x'].','.$poly[0]['y'].
 //                ')-pente'.$pente;
 
         // doubling the first point if needed (see above)
-        if (($pente1<0 && $pente>0) || ($pente1>0 && $pente<0)) {
+        if (($pente1 < 0 && $pente > 0) || ($pente1 > 0 && $pente < 0)) {
         	if (is_array($bords[$poly[$i - 1]['y']]))
-            	array_push($bords[$poly[$i - 1]['y']],  round($poly[$i - 1]['x']));
+            	array_push($bords[$poly[$i - 1]['y']], round($poly[$i - 1]['x']));
             //if (DEBUG) echo '('.$poly[$i-1]['x'].';'.$poly[$i-1]['y'].')   ';
         }
         //  doubling the last point if neededd
-        if (($old_pente<0 && $pente>0) || ($old_pente>0 && $pente<0)) {
-        	if (is_array($bords[$poly[$i-1]['y']])) //avoid warning
-            	array_push($bords[$poly[$i-1]['y']], round($poly[$i-1]['x']));
+        if (($old_pente < 0 && $pente > 0) || ($old_pente > 0 && $pente < 0)) {
+        	if (is_array($bords[$poly[$i - 1]['y']])) //avoid warning
+            	array_push($bords[$poly[$i - 1]['y']], round($poly[$i - 1]['x']));
             //if (DEBUG) echo '*('.$poly[$i-1]['x'].';'.$poly[$i-1]['y'].')   ';
         }
 
 
-        $dy_inc = ($poly[0]['y']-$poly[$i-1]['y']) > 0 ? 1 : -1;
-        $x = $poly[$i-1]['x'];
+        $dy_inc = ($poly[0]['y'] - $poly[$i - 1]['y']) > 0 ? 1 : -1;
+        $x = $poly[$i - 1]['x'];
 //        if (DEBUG) echo "init: ".$poly[$i-1]['y']."  dy_inc: ".$dy_inc.
 //            "   end: ".$poly[0]['y'];
 
-        for ($dy = $poly[$i-1]['y']+$dy_inc;
+        for ($dy = $poly[$i - 1]['y'] + $dy_inc;
             $dy != $poly[0]['y'];
             $dy += $dy_inc)
         {
-            $x += $pente*$dy_inc;
+            $x += $pente * $dy_inc;
             array_push($bords[$dy], round($x));
 //            if (DEBUG) echo '/('.$x.';'.$dy.')   ';
         }
@@ -182,20 +182,20 @@ 
     /* basic idea: we sort a column of edges.
         For each pair of point, we color the points in between */
     $n = count($bords);
-    for ($i = 0; $i<$n; $i++) {  // Y
+    for ($i = 0; $i < $n; $i++) {  // Y
         //error_log(__FILE__.' - Border Num '.$i,0);
         if (is_array($bords[$i])) {
        		sort($bords[$i]);
         }
 
-        for ($j = 0; $j<sizeof($bords[$i]);$j+=2) { // bords
+        for ($j = 0; $j < sizeof($bords[$i]); $j += 2) { // bords
             if (!isset($bords[$i][$j + 1])) {
                 break;
             }
 
-            for ($k = round($bords[$i][$j]); $k<=$bords[$i][$j+1];$k++) {
+            for ($k = round($bords[$i][$j]); $k <= $bords[$i][$j + 1]; $k++) {
                 $res[$k][$i] = true; //filling the array with trues
-                if ($test == 1)  {
+                if ($test == 1) {
                 	/*how to draw the polygon in a human way:
                 	In ubuntu : sudo apt-get install gnuplot
                 	Create an empty file with all points with the result of this echos (No commas, no point, no headers)
@@ -222,19 +222,19 @@ 
  *
  * @return string     html code of the representation of the polygone image
  */
-function poly_dump(&$poly, $max, $format='raw') {
+function poly_dump(&$poly, $max, $format = 'raw') {
     if ($format == 'html') {
         $s = "<div style='font-size: 8px; line-height:3px'><pre>\n";
     }
-    for ($i=0; $i<$max['y']; $i++) {
-        for($j=0; $j<$max['x']; $j++)
-            if($poly[$j][$i] == TRUE)
-                $s .= ($format=='html'?"<b>1</b>":'1');
+    for ($i = 0; $i < $max['y']; $i++) {
+        for ($j = 0; $j < $max['x']; $j++)
+            if ($poly[$j][$i] == TRUE)
+                $s .= ($format == 'html' ? "<b>1</b>" : '1');
             else
                 $s .= "0";
-        $s .= ($format=='html'?"<br />\n":"\n");
+        $s .= ($format == 'html' ? "<br />\n" : "\n");
     }
-    $s .= ($format=='html'?"</pre></div>\n":"\n");
+    $s .= ($format == 'html' ? "</pre></div>\n" : "\n");
     return $s;
 }
 
@@ -252,8 +252,8 @@ 
     $surfaceOf1 = 0;
     $surfaceOf2 = 0;
 
-    for ($i=0; $i<$max['x']; $i++)
-        for($j=0; $j<$max['y']; $j++) {
+    for ($i = 0; $i < $max['x']; $i++)
+        for ($j = 0; $j < $max['y']; $j++) {
             if (isset($poly1[$i][$j]) && ($poly1[$i][$j] == TRUE)) {
                 $surfaceOf1++;
                 if (isset($poly2[$i][$j]) && ($poly2[$i][$j] == FALSE))
@@ -263,7 +263,7 @@ 
                 $surfaceOf2++;
         }
 
-    return array (
+    return array(
         "s1" => $surfaceOf1,
         "s2" => $surfaceOf2,
         "both" => $surfaceOf1 - $onlyIn1,
@@ -282,8 +282,8 @@ 
  */
 function poly_touch(&$poly1, &$poly2, $max) {
 
-    for ($i=0; $i<$max['x']; $i++) {
-        for($j=0; $j<$max['y']; $j++) {
+    for ($i = 0; $i < $max['x']; $i++) {
+        for ($j = 0; $j < $max['y']; $j++) {
             if (isset($poly1[$i][$j]) && ($poly1[$i][$j] == true)
                 && isset($poly2[$i][$j]) && ($poly2[$i][$j] == true)) {
                     return true;
@@ -301,12 +301,12 @@ 
  * @return  array   An array of points in the right format to use with the
  *                  local functions
  */
-function convert_coordinates($coords,$sep='|') {
+function convert_coordinates($coords, $sep = '|') {
     $points = array();
-    $pairs = explode($sep,$coords);
+    $pairs = explode($sep, $coords);
     foreach ($pairs as $idx => $pcoord) {
-        list($x,$y) = explode(';',$pcoord);
-        $points[] = array('x'=>$x,'y'=>$y);
+        list($x, $y) = explode(';', $pcoord);
+        $points[] = array('x'=>$x, 'y'=>$y);
     }
 	return $points;
 }
@@ -336,7 +336,7 @@ 
             $my = $coord['y'];
         }
     }
-    return array('x'=>$mx,'y'=>$my);
+    return array('x'=>$mx, 'y'=>$my);
 }
 
 /**

Braces +49 added lines, -28 removed lines

@@ -65,8 +65,10 @@ 
     $bords = array_fill(0, $bord_lenght, array()); // building this array
 
     /* adding the first point of the polygone */
-    if (is_array($bords[$poly[0]['y']])) //avoid warning
+    if (is_array($bords[$poly[0]['y']])) {
+        //avoid warning
     	array_push($bords[$poly[0]['y']], $poly[0]['x']);
+    }
 
     $i = 1; // we re-use $i and $old_pente bellow the loop
     $old_pente=0;
@@ -75,11 +77,14 @@ 
 
         /* special cases */
         if ($poly[$i-1]['y'] == $poly[$i]['y']) {
-            if ($poly[$i-1]['x'] == $poly[$i]['x'])
-                continue; // twice the same point
+            if ($poly[$i-1]['x'] == $poly[$i]['x']) {
+                            continue;
+            }
+            // twice the same point
             else {    //  infinite elevation of the edge
-            	if (is_array($bords[$poly[$i]['y']]))
-                	array_push($bords[$poly[$i]['y']],$poly[$i]['x']);
+            	if (is_array($bords[$poly[$i]['y']])) {
+            	                	array_push($bords[$poly[$i]['y']],$poly[$i]['x']);
+            	}
                 $old_pente=0;
                 continue;
             }
@@ -87,9 +92,13 @@ 
 
 		//echo 'point:'.$poly[$i]['y']; bug here
         // adding the point as a part of an edge
-        if (is_array($bords[$poly[$i]['y']])) //avoid warning
+        if (is_array($bords[$poly[$i]['y']])) {
+            //avoid warning
         array_push($bords[$poly[$i]['y']], $poly[$i]['x']);
-        if (DEBUG) echo '('.$poly[$i]['x'].';'.$poly[$i]['y'].')   ';
+        }
+        if (DEBUG) {
+            echo '('.$poly[$i]['x'].';'.$poly[$i]['y'].')   ';
+        }
 
         /* computing the elevation of the edge going */
         //        from $poly[$i-1] to $poly[$i]
@@ -99,15 +108,17 @@ 
         // if the sign of the elevation change from the one of the
         // previous edge, the point must be added a second time inside
         // $bords
-        if ($i>1)
-            if (($old_pente<0 && $pente>0)
+        if ($i>1) {
+                    if (($old_pente<0 && $pente>0)
                     || ($old_pente>0 && $pente<0)) {
 				if (is_array($bords[$poly[$i]['y']])) //avoid warning
                 	array_push($bords[$poly[$i]['y']],$poly[$i]['x']);
+        }
 
-                if (DEBUG)
-                    echo '*('.$poly[$i]['x'].
+                if (DEBUG) {
+                                    echo '*('.$poly[$i]['x'].
                         ';'.$poly[$i]['y'].')   ';
+                }
         	}
 
         /* detect the direction of the elevation in Y */
@@ -136,10 +147,11 @@ 
 
         // elevation between $poly[0]['x'] and $poly[1]['x'])
         $rest = $poly[0]['y']-$poly[1]['y'];
-        if ($rest!=0)
-        	$pente1 = ($poly[0]['x']-$poly[1]['x'])/($rest);
-        else
-			$pente1 = 0;
+        if ($rest!=0) {
+                	$pente1 = ($poly[0]['x']-$poly[1]['x'])/($rest);
+        } else {
+        			$pente1 = 0;
+        }
 
         // elevation between $poly[$i-1]['x'] and $poly[0]['x'])
         $pente = ($poly[$i-1]['x']-$poly[0]['x'])/
@@ -151,14 +163,17 @@ 
 
         // doubling the first point if needed (see above)
         if (($pente1<0 && $pente>0) || ($pente1>0 && $pente<0)) {
-        	if (is_array($bords[$poly[$i - 1]['y']]))
-            	array_push($bords[$poly[$i - 1]['y']],  round($poly[$i - 1]['x']));
+        	if (is_array($bords[$poly[$i - 1]['y']])) {
+        	            	array_push($bords[$poly[$i - 1]['y']],  round($poly[$i - 1]['x']));
+        	}
             //if (DEBUG) echo '('.$poly[$i-1]['x'].';'.$poly[$i-1]['y'].')   ';
         }
         //  doubling the last point if neededd
         if (($old_pente<0 && $pente>0) || ($old_pente>0 && $pente<0)) {
-        	if (is_array($bords[$poly[$i-1]['y']])) //avoid warning
+        	if (is_array($bords[$poly[$i-1]['y']])) {
+        	    //avoid warning
             	array_push($bords[$poly[$i-1]['y']], round($poly[$i-1]['x']));
+        	}
             //if (DEBUG) echo '*('.$poly[$i-1]['x'].';'.$poly[$i-1]['y'].')   ';
         }
 
@@ -227,11 +242,13 @@ 
         $s = "<div style='font-size: 8px; line-height:3px'><pre>\n";
     }
     for ($i=0; $i<$max['y']; $i++) {
-        for($j=0; $j<$max['x']; $j++)
-            if($poly[$j][$i] == TRUE)
+        for($j=0; $j<$max['x']; $j++) {
+                    if($poly[$j][$i] == TRUE)
                 $s .= ($format=='html'?"<b>1</b>":'1');
-            else
-                $s .= "0";
+        }
+            else {
+                            $s .= "0";
+            }
         $s .= ($format=='html'?"<br />\n":"\n");
     }
     $s .= ($format=='html'?"</pre></div>\n":"\n");
@@ -252,15 +269,19 @@ 
     $surfaceOf1 = 0;
     $surfaceOf2 = 0;
 
-    for ($i=0; $i<$max['x']; $i++)
-        for($j=0; $j<$max['y']; $j++) {
+    for ($i=0; $i<$max['x']; $i++) {
+            for($j=0;
+    }
+    $j<$max['y']; $j++) {
             if (isset($poly1[$i][$j]) && ($poly1[$i][$j] == TRUE)) {
                 $surfaceOf1++;
-                if (isset($poly2[$i][$j]) && ($poly2[$i][$j] == FALSE))
-                    $onlyIn1++;
+                if (isset($poly2[$i][$j]) && ($poly2[$i][$j] == FALSE)) {
+                                    $onlyIn1++;
+                }
+            }
+            if (isset($poly2[$i][$j]) && ($poly2[$i][$j] == TRUE)) {
+                            $surfaceOf2++;
             }
-            if (isset($poly2[$i][$j]) && ($poly2[$i][$j] == TRUE))
-                $surfaceOf2++;
         }
 
     return array (

Indentation +22 added lines, -22 removed lines

@@ -56,9 +56,9 @@ 
      *        for all j in [O..max[y][ : for all i in bords[$j] :
      *            (i,j) is a point inside an edge of the polygone
      */
-	$bord_lenght = $max['x'];
+    $bord_lenght = $max['x'];
     if ($max['y'] > $bord_lenght) {
-     	$bord_lenght = $max['y'];
+            $bord_lenght = $max['y'];
     }
 
     //$bords = array_fill(0, $bord_lenght-1, array()); // building this array
@@ -66,7 +66,7 @@ 
 
     /* adding the first point of the polygone */
     if (is_array($bords[$poly[0]['y']])) //avoid warning
-    	array_push($bords[$poly[0]['y']], $poly[0]['x']);
+        array_push($bords[$poly[0]['y']], $poly[0]['x']);
 
     $i = 1; // we re-use $i and $old_pente bellow the loop
     $old_pente=0;
@@ -78,14 +78,14 @@ 
             if ($poly[$i-1]['x'] == $poly[$i]['x'])
                 continue; // twice the same point
             else {    //  infinite elevation of the edge
-            	if (is_array($bords[$poly[$i]['y']]))
-                	array_push($bords[$poly[$i]['y']],$poly[$i]['x']);
+                if (is_array($bords[$poly[$i]['y']]))
+                    array_push($bords[$poly[$i]['y']],$poly[$i]['x']);
                 $old_pente=0;
                 continue;
             }
         }
 
-		//echo 'point:'.$poly[$i]['y']; bug here
+        //echo 'point:'.$poly[$i]['y']; bug here
         // adding the point as a part of an edge
         if (is_array($bords[$poly[$i]['y']])) //avoid warning
         array_push($bords[$poly[$i]['y']], $poly[$i]['x']);
@@ -102,13 +102,13 @@ 
         if ($i>1)
             if (($old_pente<0 && $pente>0)
                     || ($old_pente>0 && $pente<0)) {
-				if (is_array($bords[$poly[$i]['y']])) //avoid warning
-                	array_push($bords[$poly[$i]['y']],$poly[$i]['x']);
+                if (is_array($bords[$poly[$i]['y']])) //avoid warning
+                    array_push($bords[$poly[$i]['y']],$poly[$i]['x']);
 
                 if (DEBUG)
                     echo '*('.$poly[$i]['x'].
                         ';'.$poly[$i]['y'].')   ';
-        	}
+            }
 
         /* detect the direction of the elevation in Y */
         $dy_inc = ($poly[$i]['y']-$poly[$i-1]['y']) > 0 ? 1 : -1;
@@ -137,9 +137,9 @@ 
         // elevation between $poly[0]['x'] and $poly[1]['x'])
         $rest = $poly[0]['y']-$poly[1]['y'];
         if ($rest!=0)
-        	$pente1 = ($poly[0]['x']-$poly[1]['x'])/($rest);
+            $pente1 = ($poly[0]['x']-$poly[1]['x'])/($rest);
         else
-			$pente1 = 0;
+            $pente1 = 0;
 
         // elevation between $poly[$i-1]['x'] and $poly[0]['x'])
         $pente = ($poly[$i-1]['x']-$poly[0]['x'])/
@@ -151,14 +151,14 @@ 
 
         // doubling the first point if needed (see above)
         if (($pente1<0 && $pente>0) || ($pente1>0 && $pente<0)) {
-        	if (is_array($bords[$poly[$i - 1]['y']]))
-            	array_push($bords[$poly[$i - 1]['y']],  round($poly[$i - 1]['x']));
+            if (is_array($bords[$poly[$i - 1]['y']]))
+                array_push($bords[$poly[$i - 1]['y']],  round($poly[$i - 1]['x']));
             //if (DEBUG) echo '('.$poly[$i-1]['x'].';'.$poly[$i-1]['y'].')   ';
         }
         //  doubling the last point if neededd
         if (($old_pente<0 && $pente>0) || ($old_pente>0 && $pente<0)) {
-        	if (is_array($bords[$poly[$i-1]['y']])) //avoid warning
-            	array_push($bords[$poly[$i-1]['y']], round($poly[$i-1]['x']));
+            if (is_array($bords[$poly[$i-1]['y']])) //avoid warning
+                array_push($bords[$poly[$i-1]['y']], round($poly[$i-1]['x']));
             //if (DEBUG) echo '*('.$poly[$i-1]['x'].';'.$poly[$i-1]['y'].')   ';
         }
 
@@ -185,7 +185,7 @@ 
     for ($i = 0; $i<$n; $i++) {  // Y
         //error_log(__FILE__.' - Border Num '.$i,0);
         if (is_array($bords[$i])) {
-       		sort($bords[$i]);
+                sort($bords[$i]);
         }
 
         for ($j = 0; $j<sizeof($bords[$i]);$j+=2) { // bords
@@ -196,7 +196,7 @@ 
             for ($k = round($bords[$i][$j]); $k<=$bords[$i][$j+1];$k++) {
                 $res[$k][$i] = true; //filling the array with trues
                 if ($test == 1)  {
-                	/*how to draw the polygon in a human way:
+                    /*how to draw the polygon in a human way:
                 	In ubuntu : sudo apt-get install gnuplot
                 	Create an empty file with all points with the result of this echos (No commas, no point, no headers)
                 	In gnuplot:
@@ -204,7 +204,7 @@ 
                 	For 2 polygons:  plot "/home/jmontoya/test", "/home/jmontoya/test2"
                 	A new window will appear with the plot
                 	*/
-                	echo $k.'  '.$i; echo '<br />';
+                    echo $k.'  '.$i; echo '<br />';
                 }
             }
         }
@@ -308,7 +308,7 @@ 
         list($x,$y) = explode(';',$pcoord);
         $points[] = array('x'=>$x,'y'=>$y);
     }
-	return $points;
+    return $points;
 }
 
 /**
@@ -321,11 +321,11 @@ 
     $mx = 0;
     $my = 0;
     foreach ($coords1 as $coord) {
-    	if ($coord['x'] > $mx) {
+        if ($coord['x'] > $mx) {
             $mx = $coord['x'];
-    	}
+        }
         if ($coord['y'] > $my) {
-        	$my = $coord['y'];
+            $my = $coord['y'];
         }
     }
     foreach ($coords2 as $coord) {

main/forum/viewthread.php

Spacing +25 added lines, -25 removed lines

@@ -7,7 +7,7 @@ 
  */
 
 require_once '../inc/global.inc.php';
-$current_course_tool  = TOOL_FORUM;
+$current_course_tool = TOOL_FORUM;
 
 $this_section = SECTION_COURSES;
 
@@ -23,7 +23,7 @@ 
 // Are we in a lp ?
 $origin = '';
 if (isset($_GET['origin'])) {
-    $origin =  Security::remove_XSS($_GET['origin']);
+    $origin = Security::remove_XSS($_GET['origin']);
 }
 $my_search = null;
 $gradebook = null;
@@ -36,10 +36,10 @@ 
 // Note pcool: I tried to use only one sql statement (and function) for this,
 // but the problem is that the visibility of the forum AND forum category are stored in the item_property table.
 // Note: This has to be validated that it is an existing thread
-$current_thread	= get_thread_information($_GET['thread']);
+$current_thread = get_thread_information($_GET['thread']);
 // Note: This has to be validated that it is an existing forum.
-$current_forum	= get_forum_information($current_thread['forum_id']);
-$current_forum_category	= get_forumcategory_information($current_forum['forum_category']);
+$current_forum = get_forum_information($current_thread['forum_id']);
+$current_forum_category = get_forumcategory_information($current_forum['forum_category']);
 $whatsnew_post_info = isset($_SESSION['whatsnew_post_info']) ? $_SESSION['whatsnew_post_info'] : null;
 /* Header and Breadcrumbs */
 
@@ -49,8 +49,8 @@ 
 }
 
 if (!empty($gradebook) && $gradebook == 'view') {
-    $interbreadcrumb[] = array (
-        'url' => '../gradebook/' . $_SESSION['gradebook_dest'],
+    $interbreadcrumb[] = array(
+        'url' => '../gradebook/'.$_SESSION['gradebook_dest'],
         'name' => get_lang('ToolGradebook')
     );
 }
@@ -65,15 +65,15 @@ 
         'name' => get_lang('Groups')
     );
     $interbreadcrumb[] = array(
-        'url' => api_get_path(WEB_CODE_PATH).'group/group_space.php?' . api_get_cidreq(),
-        'name' => get_lang('GroupSpace') . ' ' . $group_properties['name']
+        'url' => api_get_path(WEB_CODE_PATH).'group/group_space.php?'.api_get_cidreq(),
+        'name' => get_lang('GroupSpace').' '.$group_properties['name']
     );
     $interbreadcrumb[] = array(
-        'url' => api_get_path(WEB_CODE_PATH).'forum/viewforum.php?forum=' . intval($_GET['forum']) . '&' . api_get_cidreq(). "&search=" . Security::remove_XSS(urlencode($my_search)),
+        'url' => api_get_path(WEB_CODE_PATH).'forum/viewforum.php?forum='.intval($_GET['forum']).'&'.api_get_cidreq()."&search=".Security::remove_XSS(urlencode($my_search)),
         'name' => Security::remove_XSS($current_forum['forum_title'])
     );
     $interbreadcrumb[] = array(
-        'url' => api_get_path(WEB_CODE_PATH).'forum/viewthread.php?forum=' . intval($_GET['forum']) . '&' . api_get_cidreq(). '&thread=' . intval($_GET['thread']),
+        'url' => api_get_path(WEB_CODE_PATH).'forum/viewthread.php?forum='.intval($_GET['forum']).'&'.api_get_cidreq().'&thread='.intval($_GET['thread']),
         'name' => Security::remove_XSS($current_thread['thread_title'])
     );
 
@@ -84,15 +84,15 @@ 
         Display::display_reduced_header();
     } else {
         $interbreadcrumb[] = array(
-            'url' => api_get_path(WEB_CODE_PATH).'forum/index.php?'.api_get_cidreq().'&search=' . Security::remove_XSS(urlencode($my_search)),
+            'url' => api_get_path(WEB_CODE_PATH).'forum/index.php?'.api_get_cidreq().'&search='.Security::remove_XSS(urlencode($my_search)),
             'name' => $nameTools
         );
         $interbreadcrumb[] = array(
-            'url' => api_get_path(WEB_CODE_PATH).'forum/viewforumcategory.php?forumcategory='. $current_forum_category['cat_id']. "&search=". Security::remove_XSS(urlencode($my_search)),
+            'url' => api_get_path(WEB_CODE_PATH).'forum/viewforumcategory.php?forumcategory='.$current_forum_category['cat_id']."&search=".Security::remove_XSS(urlencode($my_search)),
             'name' => Security::remove_XSS($current_forum_category['cat_title'])
         );
         $interbreadcrumb[] = array(
-            'url' => api_get_path(WEB_CODE_PATH).'forum/viewforum.php?'.api_get_cidreq().'&forum=' . intval($_GET['forum']). "&search=". Security::remove_XSS(urlencode($my_search)),
+            'url' => api_get_path(WEB_CODE_PATH).'forum/viewforum.php?'.api_get_cidreq().'&forum='.intval($_GET['forum'])."&search=".Security::remove_XSS(urlencode($my_search)),
             'name' => Security::remove_XSS($current_forum['forum_title'])
         );
         $interbreadcrumb[] = array(
@@ -161,9 +161,9 @@ 
     echo '<div class="actions">';
     echo '<span style="float:right;">'.search_link().'</span>';
     if ($origin != 'learnpath') {
-        echo '<a href="' . $forumUrl . 'viewforum.php?forum='
-            . intval($_GET['forum']) . '&' . api_get_cidreq() . '">'
-            . Display::return_icon('back.png', get_lang('BackToForum'), '', ICON_SIZE_MEDIUM) . '</a>';
+        echo '<a href="'.$forumUrl.'viewforum.php?forum='
+            . intval($_GET['forum']).'&'.api_get_cidreq().'">'
+            . Display::return_icon('back.png', get_lang('BackToForum'), '', ICON_SIZE_MEDIUM).'</a>';
     }
     // The reply to thread link should only appear when the forum_category is
     // not locked AND the forum is not locked AND the thread is not locked.
@@ -179,9 +179,9 @@ 
         if ($_user['user_id'] || ($current_forum['allow_anonymous'] == 1 && !$_user['user_id'])) {
             // reply link
             if (!api_is_anonymous() && api_is_allowed_to_session_edit(false, true)) {
-                echo '<a href="' . $forumUrl . 'reply.php?' . api_get_cidreq() . '&forum='
-                    . intval($_GET['forum']) . '&thread='
-                    . intval($_GET['thread']) . '&action=replythread">'
+                echo '<a href="'.$forumUrl.'reply.php?'.api_get_cidreq().'&forum='
+                    . intval($_GET['forum']).'&thread='
+                    . intval($_GET['thread']).'&action=replythread">'
                     . Display::return_icon('reply_thread.png', get_lang('ReplyToThread'), '', ICON_SIZE_MEDIUM)
                     . '</a>';
             }
@@ -205,13 +205,13 @@ 
 
     // The different views of the thread.
     if ($origin != 'learnpath') {
-        $my_url = '<a href="' . $forumUrl . 'viewthread.php?' . api_get_cidreq() . '&' . api_get_cidreq()
-            . '&forum=' . intval($_GET['forum']) . '&thread=' . intval($_GET['thread'])
-            . '&search=' . Security::remove_XSS(urlencode($my_search));
-        echo $my_url . '&view=flat">'
+        $my_url = '<a href="'.$forumUrl.'viewthread.php?'.api_get_cidreq().'&'.api_get_cidreq()
+            . '&forum='.intval($_GET['forum']).'&thread='.intval($_GET['thread'])
+            . '&search='.Security::remove_XSS(urlencode($my_search));
+        echo $my_url.'&view=flat">'
             . Display::return_icon('forum_listview.png', get_lang('FlatView'), null, ICON_SIZE_MEDIUM)
             . '</a>';
-        echo $my_url . '&view=nested">'
+        echo $my_url.'&view=nested">'
             . Display::return_icon('forum_nestedview.png', get_lang('NestedView'), null, ICON_SIZE_MEDIUM)
             . '</a>';
     }

main/inc/lib/document.lib.php

Indentation -1 removed lines

@@ -16,7 +16,6 @@
  * @author Patrick Cool
  * @author René Haentjens, added CSV file import (October 2004)
  * @package chamilo.link
-
  */
 
 // Including libraries

Spacing +331 added lines, -331 removed lines

@@ -290,7 +290,7 @@ 
             return true;
         } else {
             $tbl_document = Database::get_course_table(TABLE_DOCUMENT);
-            $tbl_item_property = $this_course . 'item_property';
+            $tbl_item_property = $this_course.'item_property';
             $doc_url = Database::escape_string($doc_url);
             $query = "SELECT 1 FROM $tbl_document AS docs,$tbl_item_property AS props
                       WHERE
@@ -340,18 +340,18 @@ 
             }
 
             header('Content-type: application/octet-stream');
-            header('Content-length: ' . $len);
+            header('Content-length: '.$len);
             if (preg_match("/MSIE 5.5/", $_SERVER['HTTP_USER_AGENT'])) {
-                header('Content-Disposition: filename= ' . $filename);
+                header('Content-Disposition: filename= '.$filename);
             } else {
-                header('Content-Disposition: attachment; filename= ' . $filename);
+                header('Content-Disposition: attachment; filename= '.$filename);
             }
             if (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE')) {
                 header('Pragma: ');
                 header('Cache-Control: ');
                 header('Cache-Control: public'); // IE cannot download from sessions without a cache
             }
-            header('Content-Description: ' . $filename);
+            header('Content-Description: '.$filename);
             header('Content-Transfer-Encoding: binary');
 
             $res = fopen($full_file_name, 'r');
@@ -378,7 +378,7 @@ 
                     } else {
                         $encoding = @api_detect_encoding_html(file_get_contents($full_file_name));
                         if (!empty($encoding)) {
-                            $content_type .= '; charset=' . $encoding;
+                            $content_type .= '; charset='.$encoding;
                         }
                     }
                     break;
@@ -388,7 +388,7 @@ 
                     } else {
                         $encoding = @api_detect_encoding(strip_tags(file_get_contents($full_file_name)));
                         if (!empty($encoding)) {
-                            $content_type .= '; charset=' . $encoding;
+                            $content_type .= '; charset='.$encoding;
                         }
                     }
                     break;
@@ -397,13 +397,13 @@ 
                     header('Content-type: application/octet-stream');
                     break;
             }
-            header('Content-type: ' . $content_type);
-            header('Content-Length: ' . $len);
+            header('Content-type: '.$content_type);
+            header('Content-Length: '.$len);
             $user_agent = strtolower($_SERVER['HTTP_USER_AGENT']);
             if (strpos($user_agent, 'msie')) {
-                header('Content-Disposition: ; filename= ' . $filename);
+                header('Content-Disposition: ; filename= '.$filename);
             } else {
-                header('Content-Disposition: inline; filename= ' . $filename);
+                header('Content-Disposition: inline; filename= '.$filename);
             }
 
             if ($fixLinksHttpToHttps) {
@@ -444,18 +444,18 @@ 
 
             header('Content-type: application/octet-stream');
             //header('Content-Type: application/force-download');
-            header('Content-length: ' . $len);
+            header('Content-length: '.$len);
             if (preg_match("/MSIE 5.5/", $_SERVER['HTTP_USER_AGENT'])) {
-                header('Content-Disposition: filename= ' . $filename);
+                header('Content-Disposition: filename= '.$filename);
             } else {
-                header('Content-Disposition: attachment; filename= ' . $filename);
+                header('Content-Disposition: attachment; filename= '.$filename);
             }
             if (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE')) {
                 header('Pragma: ');
                 header('Cache-Control: ');
                 header('Cache-Control: public'); // IE cannot download from sessions without a cache
             }
-            header('Content-Description: ' . $filename);
+            header('Content-Description: '.$filename);
             header('Content-transfer-encoding: binary');
             echo $full_string;
 
@@ -468,30 +468,30 @@ 
 
             $content_type = self::file_get_mime_type($filename);
             header('Expires: Wed, 01 Jan 1990 00:00:00 GMT');
-            header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
+            header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
             header('Cache-Control: no-cache, must-revalidate');
             header('Pragma: no-cache');
             switch ($content_type) {
                 case 'text/html':
                     $encoding = @api_detect_encoding_html($full_string);
                     if (!empty($encoding)) {
-                        $content_type .= '; charset=' . $encoding;
+                        $content_type .= '; charset='.$encoding;
                     }
                     break;
                 case 'text/plain':
                     $encoding = @api_detect_encoding(strip_tags($full_string));
                     if (!empty($encoding)) {
-                        $content_type .= '; charset=' . $encoding;
+                        $content_type .= '; charset='.$encoding;
                     }
                     break;
             }
-            header('Content-type: ' . $content_type);
-            header('Content-Length: ' . $len);
+            header('Content-type: '.$content_type);
+            header('Content-Length: '.$len);
             $user_agent = strtolower($_SERVER['HTTP_USER_AGENT']);
             if (strpos($user_agent, 'msie')) {
-                header('Content-Disposition: ; filename= ' . $filename);
+                header('Content-Disposition: ; filename= '.$filename);
             } else {
-                header('Content-Disposition: inline; filename= ' . $filename);
+                header('Content-Disposition: inline; filename= '.$filename);
             }
             echo($full_string);
             //You have to ensure that the calling script then stops processing (exit();)
@@ -584,9 +584,9 @@ 
             if (!empty($students)) {
                 $conditionList = array();
                 foreach ($students as $studentId => $studentInfo) {
-                    $conditionList[] = '/shared_folder/sf_user_' . $studentInfo['user_id'];
+                    $conditionList[] = '/shared_folder/sf_user_'.$studentInfo['user_id'];
                 }
-                $sharedCondition .= ' AND docs.path IN ("' . implode('","', $conditionList) . '")';
+                $sharedCondition .= ' AND docs.path IN ("'.implode('","', $conditionList).'")';
             }
         }
 
@@ -612,8 +612,8 @@ 
                     last.c_id = {$_course['real_id']}
                 )
                 WHERE
-                    docs.path LIKE '" . Database::escape_string($path . $added_slash.'%'). "' AND
-                    docs.path NOT LIKE '" . Database::escape_string($path . $added_slash.'%/%')."' AND
+                    docs.path LIKE '".Database::escape_string($path.$added_slash.'%')."' AND
+                    docs.path NOT LIKE '" . Database::escape_string($path.$added_slash.'%/%')."' AND
                     docs.path NOT LIKE '%_DELETED_%' AND
                     $userGroupFilter AND
                     last.visibility $visibility_bit
@@ -654,7 +654,7 @@ 
                     $table_template = Database::get_main_table(TABLE_MAIN_TEMPLATES);
                     $sql = "SELECT id FROM $table_template
                             WHERE
-                                course_code = '" . $_course['code'] . "' AND
+                                course_code = '".$_course['code']."' AND
                                 user_id = '".api_get_user_id()."' AND
                                 ref_doc = '".$row['id']."'";
                     $template_result = Database::query($sql);
@@ -764,7 +764,7 @@ 
         if (!empty($students)) {
             $conditionList = array();
             foreach ($students as $studentId => $studentInfo) {
-                $conditionList[] = '/shared_folder/sf_user_' . $studentInfo['user_id'];
+                $conditionList[] = '/shared_folder/sf_user_'.$studentInfo['user_id'];
             }
         }
 
@@ -788,7 +788,7 @@ 
                        INNER JOIN $TABLE_DOCUMENT  AS docs
                        ON (
                             docs.id = last.ref AND
-                            last.tool = '" . TOOL_DOCUMENT . "' AND
+                            last.tool = '".TOOL_DOCUMENT."' AND
                             last.c_id = {$_course['real_id']} AND
                             docs.c_id = {$_course['real_id']}
                        )
@@ -805,7 +805,7 @@ 
                         INNER JOIN $TABLE_DOCUMENT  AS docs
                         ON (
                             docs.id = last.ref AND
-                            last.tool = '" . TOOL_DOCUMENT . "' AND
+                            last.tool = '".TOOL_DOCUMENT."' AND
                             last.c_id = {$_course['real_id']} AND
                             docs.c_id = {$_course['real_id']}
                         )
@@ -852,7 +852,7 @@ 
                     WHERE
                         docs.id = last.ref AND
                         docs.filetype = 'folder' AND
-                        last.tool = '" . TOOL_DOCUMENT . "' AND
+                        last.tool = '".TOOL_DOCUMENT."' AND
                         $groupCondition AND
                         last.visibility = 1
                         $condition_session AND
@@ -873,7 +873,7 @@ 
                     WHERE
                         docs.id = last.ref AND
                         docs.filetype = 'folder' AND
-                        last.tool = '" . TOOL_DOCUMENT . "' AND
+                        last.tool = '".TOOL_DOCUMENT."' AND
                         $groupCondition AND
                         last.visibility = 0 $condition_session AND
                         last.c_id = {$_course['real_id']} AND
@@ -889,9 +889,9 @@ 
                         FROM $TABLE_ITEMPROPERTY AS last, $TABLE_DOCUMENT AS docs
                         WHERE
                             docs.id = last.ref AND
-                            docs.path LIKE '" . Database::escape_string($row['path'].'/%') . "' AND
+                            docs.path LIKE '".Database::escape_string($row['path'].'/%')."' AND
                             docs.filetype = 'folder' AND
-                            last.tool = '" . TOOL_DOCUMENT . "' AND
+                            last.tool = '" . TOOL_DOCUMENT."' AND
                             $groupCondition AND
                             last.visibility = 1 $condition_session AND
                             last.c_id = {$_course['real_id']} AND
@@ -968,7 +968,7 @@ 
                                 tp.c_id = $course_id AND
                                 td.session_id = $sessionId AND
                                 tp.ref= td.id AND
-                                (path='" . $path . "' OR path LIKE BINARY '" . $path . "/%' ) ";
+                                (path='".$path."' OR path LIKE BINARY '".$path."/%' ) ";
                     // Get all id's of documents that are deleted
                     $what_to_check_result = Database::query($sql);
 
@@ -1311,7 +1311,7 @@ 
             $res = Database::query($sql);
             if (Database::num_rows($res) > 0) {
                 $row2 = Database::fetch_array($res);
-                require_once api_get_path(LIBRARY_PATH) . 'search/ChamiloIndexer.class.php';
+                require_once api_get_path(LIBRARY_PATH).'search/ChamiloIndexer.class.php';
                 $di = new ChamiloIndexer();
                 $di->remove_document((int) $row2['search_did']);
             }
@@ -1320,7 +1320,7 @@ 
             Database::query($sql);
 
             // remove terms from db
-            require_once api_get_path(LIBRARY_PATH) . 'specific_fields_manager.lib.php';
+            require_once api_get_path(LIBRARY_PATH).'specific_fields_manager.lib.php';
             delete_all_values_for_item($course_id, TOOL_DOCUMENT, $document_id);
         }
     }
@@ -1408,12 +1408,12 @@ 
             $path = str_replace('%2F', '/', $url_path);
             $pathinfo = pathinfo($row['path']);
 
-            $row['url'] = api_get_path(WEB_CODE_PATH) . 'document/showinframes.php?cidReq=' . $course_code . '&id=' . $id;
-            $row['document_url'] = api_get_path(WEB_CODE_PATH) . 'document/document.php?cidReq=' . $course_code . '&id=' . $id;
-            $row['absolute_path'] = api_get_path(SYS_COURSE_PATH) . $course_info['path'] . '/document' . $row['path'];
-            $row['absolute_path_from_document'] = '/document' . $row['path'];
-            $row['absolute_parent_path'] = api_get_path(SYS_COURSE_PATH).$course_info['path'].'/document'.$pathinfo['dirname'] . '/';
-            $row['direct_url'] = $www . $path;
+            $row['url'] = api_get_path(WEB_CODE_PATH).'document/showinframes.php?cidReq='.$course_code.'&id='.$id;
+            $row['document_url'] = api_get_path(WEB_CODE_PATH).'document/document.php?cidReq='.$course_code.'&id='.$id;
+            $row['absolute_path'] = api_get_path(SYS_COURSE_PATH).$course_info['path'].'/document'.$row['path'];
+            $row['absolute_path_from_document'] = '/document'.$row['path'];
+            $row['absolute_parent_path'] = api_get_path(SYS_COURSE_PATH).$course_info['path'].'/document'.$pathinfo['dirname'].'/';
+            $row['direct_url'] = $www.$path;
 
             if (dirname($row['path']) == '.') {
                 $row['parent_id'] = '0';
@@ -1432,7 +1432,7 @@ 
                 $real_dir = '';
 
                 for ($i = 1; $i < $array_len; $i++) {
-                    $real_dir .= '/' . (isset($dir_array[$i]) ? $dir_array[$i] : '');
+                    $real_dir .= '/'.(isset($dir_array[$i]) ? $dir_array[$i] : '');
                     $parent_id = self::get_document_id($course_info, $real_dir);
                     if ($session_id != 0 && empty($parent_id)) {
                         $parent_id = self::get_document_id($course_info, $real_dir, 0);
@@ -1506,21 +1506,21 @@ 
         $user_id = intval($user_id);
         $document_id = intval($document_id);
 
-        $sql = 'SELECT id FROM ' . $table_template . '
+        $sql = 'SELECT id FROM '.$table_template.'
                 WHERE
-                    course_code="' . $course_code . '" AND
-                    user_id="' . $user_id . '" AND
-                    ref_doc="' . $document_id . '"';
+                    course_code="' . $course_code.'" AND
+                    user_id="' . $user_id.'" AND
+                    ref_doc="' . $document_id.'"';
         $result = Database::query($sql);
         $template_id = Database::result($result, 0, 0);
 
-        my_delete(api_get_path(SYS_CODE_PATH) . 'upload/template_thumbnails/' . $template_id . '.jpg');
+        my_delete(api_get_path(SYS_CODE_PATH).'upload/template_thumbnails/'.$template_id.'.jpg');
 
-        $sql = 'DELETE FROM ' . $table_template . '
+        $sql = 'DELETE FROM '.$table_template.'
                 WHERE
-                    course_code="' . $course_code . '" AND
-                    user_id="' . $user_id . '" AND
-                    ref_doc="' . $document_id . '"';
+                    course_code="' . $course_code.'" AND
+                    user_id="' . $user_id.'" AND
+                    ref_doc="' . $document_id.'"';
 
         Database::query($sql);
     }
@@ -1581,7 +1581,7 @@ 
                 INNER JOIN $propTable ip
                 ON (d.id = ip.ref AND d.c_id  = $course_id AND ip.c_id = $course_id)
         		WHERE
-        		    ip.tool = '" . TOOL_DOCUMENT . "' $condition AND
+        		    ip.tool = '".TOOL_DOCUMENT."' $condition AND
         			filetype = '$file_type' AND
         			locate(concat(path,'/'), '$doc_path')=1
                 ";
@@ -1745,12 +1745,12 @@ 
         if (empty($session_id)) {
             $sql_session = 'AND (session_id = 0 OR isnull(session_id)) ';
         } elseif ($session_id > 0) {
-            $sql_session = 'AND session_id=' . intval($session_id);
+            $sql_session = 'AND session_id='.intval($session_id);
         } else {
             $sql_session = '';
         }
-        $sql = 'UPDATE ' . $tbl_category . ' SET document_id="' . intval($document_id) . '"
-                WHERE course_code="' . Database::escape_string($course_id) . '" ' . $sql_session;
+        $sql = 'UPDATE '.$tbl_category.' SET document_id="'.intval($document_id).'"
+                WHERE course_code="' . Database::escape_string($course_id).'" '.$sql_session;
         Database::query($sql);
     }
 
@@ -1772,12 +1772,12 @@ 
         if (empty($session_id)) {
             $sql_session = 'AND (session_id = 0 OR isnull(session_id)) ';
         } elseif ($session_id > 0) {
-            $sql_session = 'AND session_id=' . intval($session_id);
+            $sql_session = 'AND session_id='.intval($session_id);
         } else {
             $sql_session = '';
         }
-        $sql = 'SELECT document_id FROM ' . $tbl_category . '
-                WHERE course_code="' . Database::escape_string($course_id) . '" ' . $sql_session;
+        $sql = 'SELECT document_id FROM '.$tbl_category.'
+                WHERE course_code="' . Database::escape_string($course_id).'" '.$sql_session;
 
         $rs = Database::query($sql);
         $num = Database::num_rows($rs);
@@ -1818,7 +1818,7 @@ 
             $all_user_info = array();
             if (Database::num_rows($rs)) {
                 $row = Database::fetch_array($rs);
-                $filepath = api_get_path(SYS_COURSE_PATH) . $course_info['path'] . '/document' . $row['path'];
+                $filepath = api_get_path(SYS_COURSE_PATH).$course_info['path'].'/document'.$row['path'];
                 if (is_file($filepath)) {
                     $my_content_html = file_get_contents($filepath);
                 }
@@ -1901,9 +1901,9 @@ 
             $date_no_time = api_convert_and_format_date(api_get_utc_datetime(), DATE_FORMAT_LONG_NO_DAY);
         }
 
-        $url = api_get_path(WEB_PATH) . 'certificates/index.php?id=' . $info_grade_certificate['id'];
+        $url = api_get_path(WEB_PATH).'certificates/index.php?id='.$info_grade_certificate['id'];
 
-        $externalStyleFile = api_get_path(SYS_CSS_PATH) . 'themes/' . api_get_visual_theme() . '/certificate.css';
+        $externalStyleFile = api_get_path(SYS_CSS_PATH).'themes/'.api_get_visual_theme().'/certificate.css';
         $externalStyle = '';
 
         if (is_file($externalStyleFile)) {
@@ -1925,7 +1925,7 @@ 
             $course_info['name'],
             $info_grade_certificate['grade'],
             $url,
-            '<a href="' . $url . '" target="_blank">' . get_lang('CertificateOnlineLink') . '</a>',
+            '<a href="'.$url.'" target="_blank">'.get_lang('CertificateOnlineLink').'</a>',
             '((certificate_barcode))',
             $externalStyle
         );
@@ -1951,7 +1951,7 @@ 
         if (!empty($extraFields)) {
             foreach ($extraFields as $extraField) {
                 $valueExtra = isset($extra_user_info_data[$extraField['variable']]) ? $extra_user_info_data[$extraField['variable']] : '';
-                $info_to_be_replaced_in_content_html[] = '((' . strtolower($extraField['variable']) . '))';
+                $info_to_be_replaced_in_content_html[] = '(('.strtolower($extraField['variable']).'))';
                 $info_to_replace_in_content_html[] = $valueExtra;
             }
         }
@@ -1979,17 +1979,17 @@ 
             $tbl_category = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_CATEGORY);
             $session_id = api_get_session_id();
             if ($session_id == 0 || is_null($session_id)) {
-                $sql_session = 'AND (session_id=' . intval($session_id) . ' OR isnull(session_id)) ';
+                $sql_session = 'AND (session_id='.intval($session_id).' OR isnull(session_id)) ';
             } elseif ($session_id > 0) {
-                $sql_session = 'AND session_id=' . intval($session_id);
+                $sql_session = 'AND session_id='.intval($session_id);
             } else {
                 $sql_session = '';
             }
 
-            $sql = 'UPDATE ' . $tbl_category . ' SET document_id=null
+            $sql = 'UPDATE '.$tbl_category.' SET document_id=null
                     WHERE
-                        course_code = "' . Database::escape_string($course_id) . '" AND
-                        document_id="' . $default_certificate_id . '" ' . $sql_session;
+                        course_code = "' . Database::escape_string($course_id).'" AND
+                        document_id="' . $default_certificate_id.'" '.$sql_session;
             Database::query($sql);
         }
     }
@@ -2005,10 +2005,10 @@ 
         if (!empty($courseInfo)) {
             $to_group_id = 0;
             $to_user_id = null;
-            $course_dir = $courseInfo['path'] . "/document/";
+            $course_dir = $courseInfo['path']."/document/";
             $sys_course_path = api_get_path(SYS_COURSE_PATH);
-            $base_work_dir = $sys_course_path . $course_dir;
-            $base_work_dir_test = $base_work_dir . 'certificates';
+            $base_work_dir = $sys_course_path.$course_dir;
+            $base_work_dir_test = $base_work_dir.'certificates';
             $dir_name = '/certificates';
             $post_dir_name = get_lang('CertificatesFiles');
             $visibility_command = 'invisible';
@@ -2235,9 +2235,9 @@ 
                                             //$new_abs_path = realpath($dir.'/'.$second_part);
                                             $dir = '';
                                             if (!empty($abs_path)) {
-                                                $dir = dirname($abs_path) . '/';
+                                                $dir = dirname($abs_path).'/';
                                             }
-                                            $new_abs_path = realpath($dir . $second_part);
+                                            $new_abs_path = realpath($dir.$second_part);
                                             $in_files_list[] = self::get_resources_from_source_html($new_abs_path, true, TOOL_DOCUMENT, $recursivity + 1);
                                             if (count($in_files_list) > 0) {
                                                 $files_list = array_merge($files_list, $in_files_list);
@@ -2250,9 +2250,9 @@ 
                                             $files_list[] = array($second_part, 'local', 'rel');
                                             $dir = '';
                                             if (!empty($abs_path)) {
-                                                $dir = dirname($abs_path) . '/';
+                                                $dir = dirname($abs_path).'/';
                                             }
-                                            $new_abs_path = realpath($dir . $second_part);
+                                            $new_abs_path = realpath($dir.$second_part);
                                             $in_files_list[] = self::get_resources_from_source_html($new_abs_path, true, TOOL_DOCUMENT, $recursivity + 1);
                                             if (count($in_files_list) > 0) {
                                                 $files_list = array_merge($files_list, $in_files_list);
@@ -2286,9 +2286,9 @@ 
                                             $files_list[] = array($source, 'local', 'rel');
                                             $dir = '';
                                             if (!empty($abs_path)) {
-                                                $dir = dirname($abs_path) . '/';
+                                                $dir = dirname($abs_path).'/';
                                             }
-                                            $new_abs_path = realpath($dir . $source);
+                                            $new_abs_path = realpath($dir.$source);
                                             $in_files_list[] = self::get_resources_from_source_html($new_abs_path, true, TOOL_DOCUMENT, $recursivity + 1);
                                             if (count($in_files_list) > 0) {
                                                 $files_list = array_merge($files_list, $in_files_list);
@@ -2301,9 +2301,9 @@ 
                                             $files_list[] = array($source, 'local', 'rel');
                                             $dir = '';
                                             if (!empty($abs_path)) {
-                                                $dir = dirname($abs_path) . '/';
+                                                $dir = dirname($abs_path).'/';
                                             }
-                                            $new_abs_path = realpath($dir . $source);
+                                            $new_abs_path = realpath($dir.$source);
                                             $in_files_list[] = self::get_resources_from_source_html($new_abs_path, true, TOOL_DOCUMENT, $recursivity + 1);
                                             if (count($in_files_list) > 0) {
                                                 $files_list = array_merge($files_list, $in_files_list);
@@ -2337,9 +2337,9 @@ 
                                     $files_list[] = array($source, 'local', 'rel');
                                     $dir = '';
                                     if (!empty($abs_path)) {
-                                        $dir = dirname($abs_path) . '/';
+                                        $dir = dirname($abs_path).'/';
                                     }
-                                    $new_abs_path = realpath($dir . $source);
+                                    $new_abs_path = realpath($dir.$source);
                                     $in_files_list[] = self::get_resources_from_source_html($new_abs_path, true, TOOL_DOCUMENT, $recursivity + 1);
                                     if (count($in_files_list) > 0) {
                                         $files_list = array_merge($files_list, $in_files_list);
@@ -2352,9 +2352,9 @@ 
                                     $files_list[] = array($source, 'local', 'rel');
                                     $dir = '';
                                     if (!empty($abs_path)) {
-                                        $dir = dirname($abs_path) . '/';
+                                        $dir = dirname($abs_path).'/';
                                     }
-                                    $new_abs_path = realpath($dir . $source);
+                                    $new_abs_path = realpath($dir.$source);
                                     $in_files_list[] = self::get_resources_from_source_html($new_abs_path, true, TOOL_DOCUMENT, $recursivity + 1);
                                     if (count($in_files_list) > 0) {
                                         $files_list = array_merge($files_list, $in_files_list);
@@ -2413,24 +2413,24 @@ 
             // then possible closing brackets if we were in the opening bracket case
             // OR something like @import()
             $res = preg_match_all(
-                '/(((([A-Za-z_:])([A-Za-z0-9_:\.-]*))' .
+                '/(((([A-Za-z_:])([A-Za-z0-9_:\.-]*))'.
                 // '/(((([A-Za-z_:])([A-Za-z0-9_:\.-]|[^\x00-\x7F])*)' . -> seems to be taking too much
                 // '/(((([A-Za-z_:])([^\x00-\x7F])*)' . -> takes only last letter of parameter name
-                '([ \n\t\r]+)?(' .
+                '([ \n\t\r]+)?('.
                 // '(=([ \n\t\r]+)?("[^"]+"|\'[^\']+\'|[^ \n\t\r]+))' . -> doesn't restrict close enough to the url itself
-                '(=([ \n\t\r]+)?("[^"\)]+"|\'[^\'\)]+\'|[^ \n\t\r\)]+))' .
-                '|' .
+                '(=([ \n\t\r]+)?("[^"\)]+"|\'[^\'\)]+\'|[^ \n\t\r\)]+))'.
+                '|'.
                 // '(\(([ \n\t\r]+)?("[^"]+"|\'[^\']+\'|[^ \n\t\r]+)\))' . -> doesn't restrict close enough to the url itself
-                '(\(([ \n\t\r]+)?("[^"\)]+"|\'[^\'\)]+\'|[^ \n\t\r\)]+)\))' .
-                '))' .
-                '|' .
+                '(\(([ \n\t\r]+)?("[^"\)]+"|\'[^\'\)]+\'|[^ \n\t\r\)]+)\))'.
+                '))'.
+                '|'.
                 // '(@import([ \n\t\r]+)?("[^"]+"|\'[^\']+\'|[^ \n\t\r]+)))?/', -> takes a lot (like 100's of thousands of empty possibilities)
                 '(@import([ \n\t\r]+)?("[^"]+"|\'[^\']+\'|[^ \n\t\r]+)))/',
                 $attrString,
                 $regs
             );
         } catch (Exception $e) {
-            error_log('Caught exception: ' . $e->getMessage(), 0);
+            error_log('Caught exception: '.$e->getMessage(), 0);
         }
         if ($res) {
             for ($i = 0; $i < count($regs[1]); $i++) {
@@ -2508,14 +2508,14 @@ 
                 $orig_course_info_path = $origin_course_info_path;
             }
         } else {
-            $orig_course_path = api_get_path(SYS_COURSE_PATH).$orig_course_info['path'] . '/';
+            $orig_course_path = api_get_path(SYS_COURSE_PATH).$orig_course_info['path'].'/';
             $orig_course_info_path = $orig_course_info['path'];
         }
 
         $destination_course_code = CourseManager::get_course_id_from_path($destination_course_directory);
         $destination_course_info = api_get_course_info($destination_course_code);
-        $dest_course_path = api_get_path(SYS_COURSE_PATH) . $destination_course_directory . '/';
-        $dest_course_path_rel = api_get_path(REL_COURSE_PATH) . $destination_course_directory . '/';
+        $dest_course_path = api_get_path(SYS_COURSE_PATH).$destination_course_directory.'/';
+        $dest_course_path_rel = api_get_path(REL_COURSE_PATH).$destination_course_directory.'/';
 
         $user_id = api_get_user_id();
 
@@ -2524,7 +2524,7 @@ 
 
                 // Get information about source url
                 $real_orig_url = $source[0]; // url
-                $scope_url = $source[1];   // scope (local, remote)
+                $scope_url = $source[1]; // scope (local, remote)
                 $type_url = $source[2]; // type (rel, abs, url)
 
                 // Get path and query from origin url
@@ -2536,7 +2536,7 @@ 
                 $dest_url_query = '';
 
                 if (!empty($real_orig_query)) {
-                    $dest_url_query = '?' . $real_orig_query;
+                    $dest_url_query = '?'.$real_orig_query;
                     if (strpos($dest_url_query, $origin_course_code) !== false) {
                         $dest_url_query = str_replace($origin_course_code, $destination_course_code, $dest_url_query);
                     }
@@ -2617,7 +2617,7 @@ 
 
                                 //$destination_url = $url_course_path . $destination_course_directory . '/' . $document_file . $dest_url_query;
                                 // See BT#7780
-                                $destination_url = $dest_course_path_rel . $document_file . $dest_url_query;
+                                $destination_url = $dest_course_path_rel.$document_file.$dest_url_query;
 
                                 // If the course code doesn't exist in the path? what we do? Nothing! see BT#1985
                                 if (strpos($real_orig_path, $origin_course_code) === false) {
@@ -2652,14 +2652,14 @@ 
     public function replace_urls_inside_content_html_when_moving_file($file_name, $original_path, $destiny_path)
     {
         if (substr($original_path, strlen($original_path) - 1, strlen($original_path)) == '/') {
-            $original = $original_path . $file_name;
+            $original = $original_path.$file_name;
         } else {
-            $original = $original_path . '/' . $file_name;
+            $original = $original_path.'/'.$file_name;
         }
         if (substr($destiny_path, strlen($destiny_path) - 1, strlen($destiny_path)) == '/') {
-            $destination = $destiny_path . $file_name;
+            $destination = $destiny_path.$file_name;
         } else {
-            $destination = $destiny_path . '/' . $file_name;
+            $destination = $destiny_path.'/'.$file_name;
         }
         $original_count = count(explode('/', $original));
         $destination_count = count(explode('/', $destination));
@@ -2673,8 +2673,8 @@ 
             $mode = 'inside';
         }
         //We do not select the $original_path becayse the file was already moved
-        $content_html = file_get_contents($destiny_path . '/' . $file_name);
-        $destination_file = $destiny_path . '/' . $file_name;
+        $content_html = file_get_contents($destiny_path.'/'.$file_name);
+        $destination_file = $destiny_path.'/'.$file_name;
 
         $pre_original = strstr($original_path, 'document');
         $pre_destin = strstr($destiny_path, 'document');
@@ -2696,11 +2696,11 @@ 
         }
 
         if ($pre_original != '') {
-            $pre_original = '..' . $pre_original . '/';
+            $pre_original = '..'.$pre_original.'/';
         }
 
         if ($pre_destin != '') {
-            $pre_destin = '..' . $pre_destin . '/';
+            $pre_destin = '..'.$pre_destin.'/';
         }
 
         $levels = explode('/', $pre_original);
@@ -2718,7 +2718,7 @@ 
         //echo '$count_pre_destination_levels '. $count_pre_destination_levels;
         $pre_remove = '';
         for ($i = 1; $i <= $count_pre_destination_levels; $i++) {
-            $pre_remove .='..\/';
+            $pre_remove .= '..\/';
         }
 
         $orig_source_html = DocumentManager::get_resources_from_source_html($content_html);
@@ -2726,9 +2726,9 @@ 
         foreach ($orig_source_html as $source) {
 
             // get information about source url
-            $real_orig_url = $source[0];   // url
-            $scope_url = $source[1];   // scope (local, remote)
-            $type_url = $source[2];   // tyle (rel, abs, url)
+            $real_orig_url = $source[0]; // url
+            $scope_url = $source[1]; // scope (local, remote)
+            $type_url = $source[2]; // tyle (rel, abs, url)
             // Get path and query from origin url
             $orig_parse_url = parse_url($real_orig_url);
             $real_orig_path = $orig_parse_url['path'];
@@ -2755,11 +2755,11 @@ 
                         $real_orig_url_temp = '';
                         if ($mode == 'inside') {
                             $real_orig_url_temp = str_replace('../', '', $real_orig_url);
-                            $destination_url = $link_to_add . $real_orig_url_temp;
+                            $destination_url = $link_to_add.$real_orig_url_temp;
                         } else {
                             $real_orig_url_temp = $real_orig_url;
 
-                            $destination_url = preg_replace("/" . $pre_remove . "/", '', $real_orig_url, 1);
+                            $destination_url = preg_replace("/".$pre_remove."/", '', $real_orig_url, 1);
                         }
                         if ($real_orig_url == $destination_url) {
                             //echo 'continue2';
@@ -2785,7 +2785,7 @@ 
     {
         $course_data = api_get_course_info($course_code);
         $document_data = self::get_document_data_by_id($document_id, $course_code);
-        $file_path = api_get_path(SYS_COURSE_PATH) . $course_data['path'] . '/document' . $document_data['path'];
+        $file_path = api_get_path(SYS_COURSE_PATH).$course_data['path'].'/document'.$document_data['path'];
         $pdf = new PDF('A4-L', 'L');
         $pdf->html_to_pdf($file_path, $document_data['title'], $course_code);
     }
@@ -2818,9 +2818,9 @@ 
     ) {
         $course_info = api_get_course_info();
         $sessionId = api_get_session_id();
-        $course_dir = $course_info['path'] . '/document';
+        $course_dir = $course_info['path'].'/document';
         $sys_course_path = api_get_path(SYS_COURSE_PATH);
-        $base_work_dir = $sys_course_path . $course_dir;
+        $base_work_dir = $sys_course_path.$course_dir;
 
         if (isset($files[$fileKey])) {
             $upload_ok = process_uploaded_file($files[$fileKey], $show_output);
@@ -3007,7 +3007,7 @@ 
         }
         if (isset($output)) {
             foreach ($output as & $line) {
-                $content .= $line . "\n";
+                $content .= $line."\n";
             }
             return $content;
         } else {
@@ -3039,13 +3039,13 @@ 
         $group_condition = null;
         if (isset($group_id)) {
             $group_id = intval($group_id);
-            $group_condition = " AND props.to_group_id='" . $group_id . "' ";
+            $group_condition = " AND props.to_group_id='".$group_id."' ";
         }
 
         $session_condition = null;
         if (isset($session_id)) {
             $session_id = intval($session_id);
-            $session_condition = " AND props.session_id='" . $session_id . "' ";
+            $session_condition = " AND props.session_id='".$session_id."' ";
         }
 
         $sql = "SELECT SUM(size)
@@ -3055,7 +3055,7 @@ 
                 WHERE
                     props.c_id 	= $course_id AND
                     docs.c_id 	= $course_id AND
-                    props.tool 	= '" . TOOL_DOCUMENT . "' AND
+                    props.tool 	= '".TOOL_DOCUMENT."' AND
                     props.visibility <> 2
                     $group_condition
                     $session_condition
@@ -3078,8 +3078,8 @@ 
         $course_quota_m = round($course_quota / 1048576);
         $already_consumed_space_m = round($already_consumed_space / 1048576);
 
-        $message = get_lang('MaximumAllowedQuota') . ' <strong>' . $course_quota_m . ' megabyte</strong>.<br />';
-        $message .= get_lang('CourseCurrentlyUses') . ' <strong>' . $already_consumed_space_m . ' megabyte</strong>.<br />';
+        $message = get_lang('MaximumAllowedQuota').' <strong>'.$course_quota_m.' megabyte</strong>.<br />';
+        $message .= get_lang('CourseCurrentlyUses').' <strong>'.$already_consumed_space_m.' megabyte</strong>.<br />';
 
         $percentage = round(($already_consumed_space / $course_quota * 100), 1);
 
@@ -3087,33 +3087,33 @@ 
 
         // Decide where to place percentage in graph
         if ($percentage >= 50) {
-            $text_in_filled = '&nbsp;' . $other_percentage . '%';
+            $text_in_filled = '&nbsp;'.$other_percentage.'%';
             $text_in_unfilled = '';
         } else {
-            $text_in_unfilled = '&nbsp;' . $other_percentage . '%';
+            $text_in_unfilled = '&nbsp;'.$other_percentage.'%';
             $text_in_filled = '';
         }
 
         // Decide the background colour of the graph
         if ($percentage < 65) {
-            $colour = '#00BB00';        // Safe - green
+            $colour = '#00BB00'; // Safe - green
         } elseif ($percentage < 90) {
-            $colour = '#ffd400';        // Filling up - yelloworange
+            $colour = '#ffd400'; // Filling up - yelloworange
         } else {
-            $colour = '#DD0000';        // Full - red
+            $colour = '#DD0000'; // Full - red
         }
 
         // This is used for the table width: a table of only 100 pixels looks too small
         $visual_percentage = 4 * $percentage;
         $visual_other_percentage = 4 * $other_percentage;
 
-        $message .= get_lang('PercentageQuotaInUse') . ': <strong>' . $percentage . '%</strong>.<br />' .
-            get_lang('PercentageQuotaFree') . ': <strong>' . $other_percentage . '%</strong>.<br />';
+        $message .= get_lang('PercentageQuotaInUse').': <strong>'.$percentage.'%</strong>.<br />'.
+            get_lang('PercentageQuotaFree').': <strong>'.$other_percentage.'%</strong>.<br />';
 
-        $show_percentage = '&nbsp;' . $percentage . '%';
-        $message .= '<div style="width: 80%; text-align: center; -moz-border-radius: 5px 5px 5px 5px; border: 1px solid #aaa; background-image: url(\'' . api_get_path(WEB_CODE_PATH) . 'css/' . api_get_visual_theme() . '/images/bg-header4.png\');" class="document-quota-bar">' .
-            '<div style="width:' . $percentage . '%; background-color: #bbb; border-right:3px groove #bbb; -moz-border-radius:5px;">&nbsp;</div>' .
-            '<span style="margin-top: -15px; margin-left:-15px; position: absolute;font-weight:bold;">' . $show_percentage . '</span></div>';
+        $show_percentage = '&nbsp;'.$percentage.'%';
+        $message .= '<div style="width: 80%; text-align: center; -moz-border-radius: 5px 5px 5px 5px; border: 1px solid #aaa; background-image: url(\''.api_get_path(WEB_CODE_PATH).'css/'.api_get_visual_theme().'/images/bg-header4.png\');" class="document-quota-bar">'.
+            '<div style="width:'.$percentage.'%; background-color: #bbb; border-right:3px groove #bbb; -moz-border-radius:5px;">&nbsp;</div>'.
+            '<span style="margin-top: -15px; margin-left:-15px; position: absolute;font-weight:bold;">'.$show_percentage.'</span></div>';
         echo $message;
     }
 
@@ -3129,7 +3129,7 @@ 
         $percentage = $already_consumed_space / $course_quota * 100;
         $percentage = round($percentage, 1);
         $message = get_lang('YouAreCurrentlyUsingXOfYourX');
-        $message = sprintf($message, $already_consumed_space_m, $percentage . '%', $course_quota_m . ' ');
+        $message = sprintf($message, $already_consumed_space_m, $percentage.'%', $course_quota_m.' ');
         echo Display::div($message, array('id' => 'document_quota'));
     }
 
@@ -3161,13 +3161,13 @@ 
      */
     public static function generate_jplayer_jquery($params = array())
     {
-        $js_path = api_get_path(WEB_LIBRARY_PATH) . 'javascript/';
+        $js_path = api_get_path(WEB_LIBRARY_PATH).'javascript/';
 
         $js = '
-            $("#jquery_jplayer_' . $params['count'] . '").jPlayer({
+            $("#jquery_jplayer_' . $params['count'].'").jPlayer({
                 ready: function() {
                     $(this).jPlayer("setMedia", {
-                        ' . $params['extension'] . ' : "' . $params['url'] . '"
+                        ' . $params['extension'].' : "'.$params['url'].'"
                     });
                 },
                 play: function() { // To avoid both jPlayers playing together.
@@ -3175,12 +3175,12 @@ 
                 },
                 //errorAlerts: true,
                 //warningAlerts: true,
-                swfPath: "' . $js_path . 'jquery-jplayer/jplayer/",
+                swfPath: "' . $js_path.'jquery-jplayer/jplayer/",
                 //supplied: "m4a, oga, mp3, ogg, wav",
-                supplied: "' . $params['extension'] . '",
+                supplied: "' . $params['extension'].'",
                 wmode: "window",
                 solution: "flash, html",  // Do not change this setting
-                cssSelectorAncestor: "#jp_container_' . $params['count'] . '",
+                cssSelectorAncestor: "#jp_container_' . $params['count'].'",
             });  	 ' . "\n\n";
 
         return $js;
@@ -3210,16 +3210,16 @@ 
         }
 
         //Shows only the play button
-        $html = '<div id="jquery_jplayer_' . $i . '" class="jp-jplayer"></div>
-                <div id="jp_container_' . $i . '" class="jp-audio">
+        $html = '<div id="jquery_jplayer_'.$i.'" class="jp-jplayer"></div>
+                <div id="jp_container_' . $i.'" class="jp-audio">
                     <div class="jp-type-single">
                         <div class="jp-gui jp-interface">
                             <ul class="jp-controls">
                                 <li><a href="javascript:;" class="jp-play" tabindex="1">play</a></li>
                                 <li><a href="javascript:;" class="jp-pause" tabindex="1">pause</a></li>
-                                ' . $extra_controls . '
+                                ' . $extra_controls.'
                             </ul>
-                            ' . $progress . '
+                            ' . $progress.'
                         </div>
                     </div>
                 </div>';
@@ -3272,8 +3272,8 @@ 
                     </div>
                 </div>
                 <div class="jp-no-solution">
-                    <span>' . get_lang('UpdateRequire') . '</span>
-                    ' . get_lang("ToPlayTheMediaYouWillNeedToUpdateYourBrowserToARecentVersionYouCanAlsoDownloadTheFile") . '
+                    <span>' . get_lang('UpdateRequire').'</span>
+                    ' . get_lang("ToPlayTheMediaYouWillNeedToUpdateYourBrowserToARecentVersionYouCanAlsoDownloadTheFile").'
                 </div>
             </div>
         </div>';
@@ -3354,7 +3354,7 @@ 
 
         $add_folder_filter = null;
         if (!empty($filter_by_folder)) {
-            $add_folder_filter = " AND docs.path LIKE '" . Database::escape_string($filter_by_folder) . "%'";
+            $add_folder_filter = " AND docs.path LIKE '".Database::escape_string($filter_by_folder)."%'";
         }
 
         // If we are in LP display hidden folder https://support.chamilo.org/issues/6679
@@ -3389,7 +3389,7 @@ 
 
                 $notLikeCondition = null;
                 for ($i = 1; $i <= $num; $i++) {
-                    $repeat = str_repeat('/%', $i+1);
+                    $repeat = str_repeat('/%', $i + 1);
                     $notLikeCondition .= " AND docs.path NOT LIKE '".Database::escape_string($cleanedPath.$repeat)."' ";
                 }
 
@@ -3414,7 +3414,7 @@ 
                 ON (docs.id = last.ref AND docs.c_id = last.c_id)
                 WHERE
                     docs.path NOT LIKE '%_DELETED_%' AND
-                    last.tool = '" . TOOL_DOCUMENT . "' $condition_session AND
+                    last.tool = '".TOOL_DOCUMENT."' $condition_session AND
                     (last.visibility = '1' $lp_visibility_condition) AND
                     last.visibility <> 2 AND
                     docs.c_id = {$course_info['real_id']} AND
@@ -3444,7 +3444,7 @@ 
                 Display::url(
                     Display::return_icon('close.png', get_lang('Close'), array(), ICON_SIZE_SMALL),
                     ' javascript:void(0);',
-                    array('id' => 'close_div_' . $course_info['real_id'] . '_' . $session_id, 'class' => 'close_div')
+                    array('id' => 'close_div_'.$course_info['real_id'].'_'.$session_id, 'class' => 'close_div')
                 ),
                 array('style' => 'position:absolute;right:10px')
             );
@@ -3548,7 +3548,7 @@ 
                     $('#'+tempId).hide();
                 } else {
                     image.addClass('open');
-                    image.attr('src', '" . Display::returnIconPath('nolines_minus.gif') . "');
+                    image.attr('src', '" . Display::returnIconPath('nolines_minus.gif')."');
                     $('#'+id).hide();
                     $('#'+tempId).show();
 
@@ -3595,7 +3595,7 @@ 
         $target,
         $overwrite_url
     ) {
-        $img_sys_path = api_get_path(SYS_CODE_PATH) . 'img/';
+        $img_sys_path = api_get_path(SYS_CODE_PATH).'img/';
         $web_code_path = api_get_path(WEB_CODE_PATH);
 
         $documentId = $resource['id'];
@@ -3610,7 +3610,7 @@ 
         // It's a file.
         $icon = choose_image($path);
         $position = strrpos($icon, '.');
-        $icon = substr($icon, 0, $position) . '_small.gif';
+        $icon = substr($icon, 0, $position).'_small.gif';
         $my_file_title = $resource['title'];
         $visibility = $resource['visibility'];
 
@@ -3622,29 +3622,29 @@ 
         // Show the "image name" not the filename of the image.
         if ($lp_id) {
             // LP URL
-            $url = api_get_path(WEB_CODE_PATH) . 'lp/lp_controller.php?'.api_get_cidreq().'&amp;action=add_item&amp;type=' . TOOL_DOCUMENT . '&amp;file=' . $documentId . '&amp;lp_id=' . $lp_id;
+            $url = api_get_path(WEB_CODE_PATH).'lp/lp_controller.php?'.api_get_cidreq().'&amp;action=add_item&amp;type='.TOOL_DOCUMENT.'&amp;file='.$documentId.'&amp;lp_id='.$lp_id;
             if (!empty($overwrite_url)) {
-                $url = $overwrite_url . '&cidReq=' . $course_info['code'] . '&id_session=' . $session_id . '&document_id=' . $documentId.'';
+                $url = $overwrite_url.'&cidReq='.$course_info['code'].'&id_session='.$session_id.'&document_id='.$documentId.'';
             }
         } else {
             // Direct document URL
-            $url = $web_code_path . 'document/document.php?cidReq=' . $course_info['code'] . '&id_session=' . $session_id . '&id=' . $documentId;
+            $url = $web_code_path.'document/document.php?cidReq='.$course_info['code'].'&id_session='.$session_id.'&id='.$documentId;
             if (!empty($overwrite_url)) {
-                $url = $overwrite_url . '&cidReq=' . $course_info['code'] . '&id_session=' . $session_id . '&document_id=' . $documentId;
+                $url = $overwrite_url.'&cidReq='.$course_info['code'].'&id_session='.$session_id.'&document_id='.$documentId;
             }
         }
 
         $img = Display::returnIconPath($icon);
-        if (!file_exists($img_sys_path . $icon)) {
+        if (!file_exists($img_sys_path.$icon)) {
             $img = Display::returnIconPath('default_small.gif');
         }
 
         $link = Display::url(
-            '<img alt="" src="' . $img . '" title="" />&nbsp;' . $my_file_title, $url,
+            '<img alt="" src="'.$img.'" title="" />&nbsp;'.$my_file_title, $url,
             array('target' => $target, 'class' => 'moved')
         );
 
-        $directUrl = $web_code_path . 'document/document.php?cidReq=' . $course_info['code'] . '&id_session=' . $session_id . '&id=' . $documentId;
+        $directUrl = $web_code_path.'document/document.php?cidReq='.$course_info['code'].'&id_session='.$session_id.'&id='.$documentId;
 
         $link .= Display::url(
             Display::return_icon('preview_view.png', get_lang('Preview')),
@@ -3659,12 +3659,12 @@ 
         $return = null;
 
         if ($lp_id == false) {
-            $return .= '<li class="doc_resource '.$visibilityClass.' " data_id="' . $documentId . '" data_type="document" title="' . $my_file_title . '" >';
+            $return .= '<li class="doc_resource '.$visibilityClass.' " data_id="'.$documentId.'" data_type="document" title="'.$my_file_title.'" >';
         } else {
-            $return .= '<li class="doc_resource lp_resource_element '.$visibilityClass.' " data_id="' . $documentId . '" data_type="document" title="' . $my_file_title . '" >';
+            $return .= '<li class="doc_resource lp_resource_element '.$visibilityClass.' " data_id="'.$documentId.'" data_type="document" title="'.$my_file_title.'" >';
         }
 
-        $return .= '<div class="item_data" style="margin-left:' . ($num  * 5 ) . 'px;margin-right:5px;">';
+        $return .= '<div class="item_data" style="margin-left:'.($num * 5).'px;margin-right:5px;">';
 
         if ($add_move_button) {
             $return .= '<a class="moved" href="#">';
@@ -3729,7 +3729,7 @@ 
             if (isset($resource['visible']) && $resource['visible'] == 0) {
                 $folder_class_hidden = "doc_folder_hidden"; // in base.css
             }
-            $onclick = 'onclick="javascript: testResources(\'res_' . $resource['id'] . '\',\'img_' . $resource['id'] . '\')"';
+            $onclick = 'onclick="javascript: testResources(\'res_'.$resource['id'].'\',\'img_'.$resource['id'].'\')"';
         }
         $return = null;
 
@@ -3737,22 +3737,22 @@ 
             $return = '<ul class="lp_resource">';
         }
 
-        $return .= '<li class="doc_folder '.$folder_class_hidden.'" id="doc_id_' . $resource['id'] . '"  style="margin-left:' . ($num * 18) . 'px; ">';
+        $return .= '<li class="doc_folder '.$folder_class_hidden.'" id="doc_id_'.$resource['id'].'"  style="margin-left:'.($num * 18).'px; ">';
 
         $image = Display::returnIconPath('nolines_plus.gif');
         if (empty($path)) {
             $image = Display::returnIconPath('nolines_minus.gif');
         }
-        $return .= '<img style="cursor: pointer;" src="'.$image.'" align="absmiddle" id="img_'.$resource['id'] . '" '.$onclick.'>';
+        $return .= '<img style="cursor: pointer;" src="'.$image.'" align="absmiddle" id="img_'.$resource['id'].'" '.$onclick.'>';
         $return .= Display::return_icon('lp_folder.gif').'&nbsp;';
         $return .= '<span '.$onclick.' style="cursor: pointer;" >'.$title.'</span>';
         $return .= '</li>';
 
         if (empty($path)) {
             if ($folderId == false) {
-                $return .= '<div id="res_' . $resource['id'] . '" >';
+                $return .= '<div id="res_'.$resource['id'].'" >';
             } else {
-                $return .= '<div id="res_' . $resource['id'] . '" style="display: none;" >';
+                $return .= '<div id="res_'.$resource['id'].'" style="display: none;" >';
             }
         }
 
@@ -3914,9 +3914,9 @@ 
             $session_id = api_get_session_id();
         }
         $course_info = api_get_course_info($course_code);
-        $course_dir = $course_info['path'] . '/document';
+        $course_dir = $course_info['path'].'/document';
         $sys_course_path = api_get_path(SYS_COURSE_PATH);
-        $base_work_dir = $sys_course_path . $course_dir;
+        $base_work_dir = $sys_course_path.$course_dir;
 
         $course_id = $course_info['real_id'];
         $table_document = Database::get_course_table(TABLE_DOCUMENT);
@@ -3925,7 +3925,7 @@ 
         $result = Database::query($qry);
         if (Database::num_rows($result) == 1) {
             $row = Database::fetch_array($result);
-            $doc_path = api_get_path(SYS_COURSE_PATH) . $course_dir . $row['path'];
+            $doc_path = api_get_path(SYS_COURSE_PATH).$course_dir.$row['path'];
             //TODO: mime_content_type is deprecated, fileinfo php extension is enabled by default as of PHP 5.3.0
             // now versions of PHP on Debian testing(5.2.6-5) and Ubuntu(5.2.6-2ubuntu) are lower, so wait for a while
             $doc_mime = mime_content_type($doc_path);
@@ -3956,8 +3956,8 @@ 
                 $file_content = self::get_text_content($doc_path, $doc_mime);
                 $course_code = Database::escape_string($course_code);
 
-                require_once api_get_path(LIBRARY_PATH) . 'search/ChamiloIndexer.class.php';
-                require_once api_get_path(LIBRARY_PATH) . 'search/IndexableChunk.class.php';
+                require_once api_get_path(LIBRARY_PATH).'search/ChamiloIndexer.class.php';
+                require_once api_get_path(LIBRARY_PATH).'search/IndexableChunk.class.php';
 
                 $ic_slide = new IndexableChunk();
                 $ic_slide->addValue('title', $file_title);
@@ -3974,7 +3974,7 @@ 
                 $di = new ChamiloIndexer();
                 $return = $di->connectDb(null, null, $lang);
 
-                require_once api_get_path(LIBRARY_PATH) . 'specific_fields_manager.lib.php';
+                require_once api_get_path(LIBRARY_PATH).'specific_fields_manager.lib.php';
                 $specific_fields = get_specific_field_list();
 
                 // process different depending on what to do if file exists
@@ -4011,7 +4011,7 @@ 
                             } else { //if the specific field is not defined, force an empty one
                                 $sterms = '';
                             }
-                            $all_specific_terms .= ' ' . $sterms;
+                            $all_specific_terms .= ' '.$sterms;
                             $sterms = explode(',', $sterms);
                             foreach ($sterms as $sterm) {
                                 $sterm = trim($sterm);
@@ -4025,7 +4025,7 @@ 
                             }
                         }
                         // Add terms also to content to make terms findable by probabilistic search
-                        $file_content = $all_specific_terms . ' ' . $file_content;
+                        $file_content = $all_specific_terms.' '.$file_content;
 
                         if (!$simulation) {
                             $ic_slide->addValue('content', $file_content);
@@ -4051,7 +4051,7 @@ 
                         } else { //if the specific field is not defined, force an empty one
                             $sterms = '';
                         }
-                        $all_specific_terms .= ' ' . $sterms;
+                        $all_specific_terms .= ' '.$sterms;
                         if (!empty($sterms)) {
                             $sterms = explode(',', $sterms);
                             foreach ($sterms as $sterm) {
@@ -4063,7 +4063,7 @@ 
                         }
                     }
                     // Add terms also to content to make terms findable by probabilistic search
-                    $file_content = $all_specific_terms . ' ' . $file_content;
+                    $file_content = $all_specific_terms.' '.$file_content;
                     if (!$simulation) {
                         $ic_slide->addValue('content', $file_content);
                         $di->addChunk($ic_slide);
@@ -4346,7 +4346,7 @@ 
         $defaultVisibility = 'visible';
 
         if (isset($settings['documents'])) {
-            $portalDefaultVisibility =  'invisible';
+            $portalDefaultVisibility = 'invisible';
             if ($settings['documents'] == 'true') {
                 $portalDefaultVisibility = 'visible';
             }
@@ -4585,7 +4585,7 @@ 
         //make htaccess with allow from all, and file index.html into temp/audio
         $htaccess = api_get_path(SYS_ARCHIVE_PATH).'temp/audio/.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/audio/.htaccess', 'w');
             if ($fp) {
                 fwrite($fp, $htaccess_content);
@@ -4594,9 +4594,9 @@ 
         }
 
         //encript temp name file
-        $name_crip = sha1(uniqid());//encript
-        $findext= explode(".", $file);
-        $extension = $findext[count($findext)-1];
+        $name_crip = sha1(uniqid()); //encript
+        $findext = explode(".", $file);
+        $extension = $findext[count($findext) - 1];
         $file_crip = $name_crip.'.'.$extension;
 
         //copy file to temp/audio directory
@@ -4700,7 +4700,7 @@ 
         $comment = null;
 
         $fileName = api_replace_dangerous_char($title);
-        $filePath = api_get_path(SYS_COURSE_PATH) . "{$courseData['path']}/document{$dir}";
+        $filePath = api_get_path(SYS_COURSE_PATH)."{$courseData['path']}/document{$dir}";
         $fileFullPath = "{$filePath}/{$fileName}.html";
         $fileSize = 0;
         $fileType = 'file';
@@ -4752,7 +4752,7 @@ 
             $fileSize,
             $title,
             $comment,
-            0,//$readonly = 0,
+            0, //$readonly = 0,
             true, //$save_visibility = true,
             null, //$group_id = null,
             $sessionId
@@ -5038,8 +5038,8 @@ 
             $sessionId,
             $groupId
         )) {
-            $uniqueName = self::addSuffixToFileName($name, '_' . $counter);
-            $filePath = $path . $uniqueName;
+            $uniqueName = self::addSuffixToFileName($name, '_'.$counter);
+            $filePath = $path.$uniqueName;
             $counter++;
         }
 
@@ -5078,7 +5078,7 @@ 
             $folder_sql = implode("','", $escaped_folders);
 
             $sql = "SELECT * FROM $doc_table
-                WHERE filetype = 'folder' AND c_id = $course_id AND path IN ('" . $folder_sql . "')";
+                WHERE filetype = 'folder' AND c_id = $course_id AND path IN ('".$folder_sql."')";
             $res = Database::query($sql);
             $folder_titles = array();
             while ($obj = Database::fetch_object($res)) {
@@ -5115,9 +5115,9 @@ 
                     $folder_titles[$folder] = cut($folder_titles[$folder], 80);
                     $counter = count($path_parts) - 2;
                     if ($counter > 0) {
-                        $label = str_repeat('&nbsp;&nbsp;&nbsp;', $counter) . ' &mdash; ' . $folder_titles[$folder];
+                        $label = str_repeat('&nbsp;&nbsp;&nbsp;', $counter).' &mdash; '.$folder_titles[$folder];
                     } else {
-                        $label = ' &mdash; ' . $folder_titles[$folder];
+                        $label = ' &mdash; '.$folder_titles[$folder];
                     }
                     $parent_select->addOption($label, $folder_id);
                     if ($selected != '') {
@@ -5135,7 +5135,7 @@ 
                     } 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;
+                        $label = str_repeat('&nbsp;&nbsp;&nbsp;', count($path_parts) - 2).' &mdash; '.$label;
                     }
                     $parent_select->addOption($label, $folder_id);
                     if ($selected != '') {
@@ -5168,7 +5168,7 @@ 
     ) {
         global $dbl_click_id;
         $course_info = api_get_course_info();
-        $www = api_get_path(WEB_COURSE_PATH) . $course_info['path'] . '/document';
+        $www = api_get_path(WEB_COURSE_PATH).$course_info['path'].'/document';
         $webOdflist = DocumentManager::get_web_odf_extension_list();
 
         // Get the title or the basename depending on what we're using
@@ -5192,11 +5192,11 @@ 
 
         if (!$show_as_icon) {
             // Build download link (icon)
-            $forcedownload_link = ($filetype == 'folder') ? api_get_self() . '?' . api_get_cidreq() . '&action=downloadfolder&id=' . $document_data['id'] : api_get_self() . '?' . api_get_cidreq() . '&amp;action=download&amp;id=' . $document_data['id'];
+            $forcedownload_link = ($filetype == 'folder') ? api_get_self().'?'.api_get_cidreq().'&action=downloadfolder&id='.$document_data['id'] : api_get_self().'?'.api_get_cidreq().'&amp;action=download&amp;id='.$document_data['id'];
             // Folder download or file download?
             $forcedownload_icon = ($filetype == 'folder') ? 'save_pack.png' : 'save.png';
             // Prevent multiple clicks on zipped folder download
-            $prevent_multiple_click = ($filetype == 'folder') ? " onclick=\"javascript: if(typeof clic_$dbl_click_id == 'undefined' || !clic_$dbl_click_id) { clic_$dbl_click_id=true; window.setTimeout('clic_" . ($dbl_click_id++) . "=false;',10000); } else { return false; }\"" : '';
+            $prevent_multiple_click = ($filetype == 'folder') ? " onclick=\"javascript: if(typeof clic_$dbl_click_id == 'undefined' || !clic_$dbl_click_id) { clic_$dbl_click_id=true; window.setTimeout('clic_".($dbl_click_id++)."=false;',10000); } else { return false; }\"" : '';
         }
 
         $target = '_self';
@@ -5212,17 +5212,17 @@ 
 
             if ($is_browser_viewable_file) {
                 if ($ext == 'pdf' || in_array($ext, $webOdflist)) {
-                    $url = api_get_self() . '?' . api_get_cidreq() . '&amp;action=download&amp;id=' . $document_data['id'];
+                    $url = api_get_self().'?'.api_get_cidreq().'&amp;action=download&amp;id='.$document_data['id'];
                 } else {
-                    $url = 'showinframes.php?' . api_get_cidreq() . '&id=' . $document_data['id'];
+                    $url = 'showinframes.php?'.api_get_cidreq().'&id='.$document_data['id'];
                 }
             } else {
                 // url-encode for problematic characters (we may not call them dangerous characters...)
-                $path = str_replace('%2F', '/', $url_path) . '?' . api_get_cidreq();
-                $url = $www . $path;
+                $path = str_replace('%2F', '/', $url_path).'?'.api_get_cidreq();
+                $url = $www.$path;
             }
         } else {
-            $url = api_get_self() . '?' . api_get_cidreq() . '&id=' . $document_data['id'];
+            $url = api_get_self().'?'.api_get_cidreq().'&id='.$document_data['id'];
         }
 
         // The little download icon
@@ -5232,10 +5232,10 @@ 
         if ($path == '/shared_folder') {
             $tooltip_title_alt = get_lang('UserFolders');
         } elseif (strstr($path, 'shared_folder_session_')) {
-            $tooltip_title_alt = get_lang('UserFolders') . ' (' . api_get_session_name(api_get_session_id()) . ')';
+            $tooltip_title_alt = get_lang('UserFolders').' ('.api_get_session_name(api_get_session_id()).')';
         } elseif (strstr($tooltip_title, 'sf_user_')) {
             $userinfo = api_get_user_info(substr($tooltip_title, 8));
-            $tooltip_title_alt = get_lang('UserFolder') . ' ' . $userinfo['complete_name'];
+            $tooltip_title_alt = get_lang('UserFolder').' '.$userinfo['complete_name'];
         } elseif ($path == '/chat_files') {
             $tooltip_title_alt = get_lang('ChatFiles');
         } elseif ($path == '/learning_path') {
@@ -5267,24 +5267,24 @@ 
                 ) {
                     //filter when I am into shared folder, I can show for donwload only my shared folder
                     if (DocumentManager::is_shared_folder($curdirpath, $current_session_id)) {
-                        if (preg_match('/shared_folder\/sf_user_' . api_get_user_id() . '$/', urldecode($forcedownload_link)) ||
-                            preg_match('/shared_folder_session_' . $current_session_id . '\/sf_user_' . api_get_user_id() . '$/', urldecode($forcedownload_link)) ||
+                        if (preg_match('/shared_folder\/sf_user_'.api_get_user_id().'$/', urldecode($forcedownload_link)) ||
+                            preg_match('/shared_folder_session_'.$current_session_id.'\/sf_user_'.api_get_user_id().'$/', urldecode($forcedownload_link)) ||
                             api_is_allowed_to_edit() || api_is_platform_admin()
                         ) {
-                            $force_download_html = ($size == 0) ? '' : '<a href="' . $forcedownload_link . '" style="float:right"' . $prevent_multiple_click . '>' .
-                                Display::return_icon($forcedownload_icon, get_lang('Download'), array(), ICON_SIZE_SMALL) . '</a>';
+                            $force_download_html = ($size == 0) ? '' : '<a href="'.$forcedownload_link.'" style="float:right"'.$prevent_multiple_click.'>'.
+                                Display::return_icon($forcedownload_icon, get_lang('Download'), array(), ICON_SIZE_SMALL).'</a>';
                         }
                     } elseif (!preg_match('/shared_folder/', urldecode($forcedownload_link)) ||
                         api_is_allowed_to_edit() ||
                         api_is_platform_admin()
                     ) {
-                        $force_download_html = ($size == 0) ? '' : '<a href="' . $forcedownload_link . '" style="float:right"' . $prevent_multiple_click . '>' .
-                            Display::return_icon($forcedownload_icon, get_lang('Download'), array(), ICON_SIZE_SMALL) . '</a>';
+                        $force_download_html = ($size == 0) ? '' : '<a href="'.$forcedownload_link.'" style="float:right"'.$prevent_multiple_click.'>'.
+                            Display::return_icon($forcedownload_icon, get_lang('Download'), array(), ICON_SIZE_SMALL).'</a>';
                     }
                 }
             } else {
-                $force_download_html = ($size == 0) ? '' : '<a href="' . $forcedownload_link . '" style="float:right"' . $prevent_multiple_click . '>' .
-                    Display::return_icon($forcedownload_icon, get_lang('Download'), array(), ICON_SIZE_SMALL) . '</a>';
+                $force_download_html = ($size == 0) ? '' : '<a href="'.$forcedownload_link.'" style="float:right"'.$prevent_multiple_click.'>'.
+                    Display::return_icon($forcedownload_icon, get_lang('Download'), array(), ICON_SIZE_SMALL).'</a>';
             }
 
             // Copy files to users myfiles
@@ -5292,12 +5292,12 @@ 
                 api_get_setting('users_copy_files') === 'true' &&
                 !api_is_anonymous()
             ) {
-                $copy_myfiles_link = ($filetype == 'file') ? api_get_self() . '?' . api_get_cidreq() . '&action=copytomyfiles&id=' . $document_data['id'] : api_get_self() . '?' . api_get_cidreq();
+                $copy_myfiles_link = ($filetype == 'file') ? api_get_self().'?'.api_get_cidreq().'&action=copytomyfiles&id='.$document_data['id'] : api_get_self().'?'.api_get_cidreq();
 
                 if ($filetype == 'file') {
 
-                    $copy_to_myfiles = '<a href="' . $copy_myfiles_link . '" style="float:right"' . $prevent_multiple_click . '>' .
-                        Display::return_icon('briefcase.png', get_lang('CopyToMyFiles'), array(), ICON_SIZE_SMALL) . '&nbsp;&nbsp;</a>';
+                    $copy_to_myfiles = '<a href="'.$copy_myfiles_link.'" style="float:right"'.$prevent_multiple_click.'>'.
+                        Display::return_icon('briefcase.png', get_lang('CopyToMyFiles'), array(), ICON_SIZE_SMALL).'&nbsp;&nbsp;</a>';
 
                     if (api_get_setting('allow_my_files') === 'false') {
                         $copy_to_myfiles = '';
@@ -5316,13 +5316,13 @@ 
                 $filetype == 'file' &&
                 in_array($extension, array('html', 'htm'))
             ) {
-                $pdf_icon = ' <a style="float:right".' . $prevent_multiple_click . ' href="' . api_get_self() . '?' . api_get_cidreq() . '&action=export_to_pdf&id=' . $document_data['id'] . '">' .
-                    Display::return_icon('pdf.png', get_lang('Export2PDF'), array(), ICON_SIZE_SMALL) . '</a> ';
+                $pdf_icon = ' <a style="float:right".'.$prevent_multiple_click.' href="'.api_get_self().'?'.api_get_cidreq().'&action=export_to_pdf&id='.$document_data['id'].'">'.
+                    Display::return_icon('pdf.png', get_lang('Export2PDF'), array(), ICON_SIZE_SMALL).'</a> ';
             }
 
             if ($is_browser_viewable_file) {
-                $open_in_new_window_link = '<a href="' . $www . str_replace('%2F', '/', $url_path) . '?' . api_get_cidreq() . '" style="float:right"' . $prevent_multiple_click . ' target="_blank">' .
-                    Display::return_icon('open_in_new_window.png', get_lang('OpenInANewWindow'), array(), ICON_SIZE_SMALL) . '&nbsp;&nbsp;</a>';
+                $open_in_new_window_link = '<a href="'.$www.str_replace('%2F', '/', $url_path).'?'.api_get_cidreq().'" style="float:right"'.$prevent_multiple_click.' target="_blank">'.
+                    Display::return_icon('open_in_new_window.png', get_lang('OpenInANewWindow'), array(), ICON_SIZE_SMALL).'&nbsp;&nbsp;</a>';
             }
 
             if ($filetype == 'file') {
@@ -5331,9 +5331,9 @@ 
                     (preg_match('/wav$/i', urldecode($checkExtension))) ||
                     preg_match('/ogg$/i', urldecode($checkExtension))
                 ) {
-                    return '<span style="float:left" ' . $visibility_class . '>' .
-                    $title .
-                    '</span>' . $force_download_html . $send_to . $copy_to_myfiles . $open_in_new_window_link . $pdf_icon;
+                    return '<span style="float:left" '.$visibility_class.'>'.
+                    $title.
+                    '</span>'.$force_download_html.$send_to.$copy_to_myfiles.$open_in_new_window_link.$pdf_icon;
                 } elseif (
 
                     // Show preview
@@ -5346,7 +5346,7 @@ 
                     preg_match('/svg$/i', urldecode($checkExtension))
                 ) {
                     // Simpler version of showinframesmin.php with no headers
-                    $url = 'show_content.php?' . api_get_cidreq() . '&id=' . $document_data['id'];
+                    $url = 'show_content.php?'.api_get_cidreq().'&id='.$document_data['id'];
                     $class = 'ajax';
                     if ($visibility == false) {
                         $class = "ajax invisible";
@@ -5361,34 +5361,34 @@ 
                             'style' => 'float: left;'
                         ]
                     )
-                    . $force_download_html . $send_to . $copy_to_myfiles
-                    . $open_in_new_window_link . $pdf_icon;
+                    . $force_download_html.$send_to.$copy_to_myfiles
+                    . $open_in_new_window_link.$pdf_icon;
                 } else {
                     // For PDF Download the file.
                     $pdfPreview = null;
                     if ($ext != 'pdf' && !in_array($ext, $webOdflist)) {
-                        $url = 'showinframes.php?' . api_get_cidreq() . '&id=' . $document_data['id'];
+                        $url = 'showinframes.php?'.api_get_cidreq().'&id='.$document_data['id'];
                     } else {
                         $pdfPreview = Display::url(
                             Display::return_icon('preview.gif', get_lang('Preview')),
-                            api_get_path(WEB_CODE_PATH).'document/showinframes.php?' . api_get_cidreq() . '&id=' . $document_data['id'],
+                            api_get_path(WEB_CODE_PATH).'document/showinframes.php?'.api_get_cidreq().'&id='.$document_data['id'],
                             array('style' => 'float:right')
                         );
                     }
                     // No plugin just the old and good showinframes.php page
-                    return '<a href="' . $url . '" title="' . $tooltip_title_alt . '" style="float:left" ' . $visibility_class . ' >' . $title . '</a>' .
-                    $pdfPreview.$force_download_html . $send_to . $copy_to_myfiles . $open_in_new_window_link . $pdf_icon;
+                    return '<a href="'.$url.'" title="'.$tooltip_title_alt.'" style="float:left" '.$visibility_class.' >'.$title.'</a>'.
+                    $pdfPreview.$force_download_html.$send_to.$copy_to_myfiles.$open_in_new_window_link.$pdf_icon;
                 }
             } else {
-                return '<a href="' . $url . '" title="' . $tooltip_title_alt . '" ' . $visibility_class . ' style="float:left">' . $title . '</a>' .
-                $force_download_html . $send_to . $copy_to_myfiles . $open_in_new_window_link . $pdf_icon;
+                return '<a href="'.$url.'" title="'.$tooltip_title_alt.'" '.$visibility_class.' style="float:left">'.$title.'</a>'.
+                $force_download_html.$send_to.$copy_to_myfiles.$open_in_new_window_link.$pdf_icon;
             }
             // end copy files to users myfiles
         } else {
             // Icon column
             if (preg_match('/shared_folder/', urldecode($checkExtension)) &&
                 preg_match('/shared_folder$/', urldecode($checkExtension)) == false &&
-                preg_match('/shared_folder_session_' . $current_session_id . '$/', urldecode($url)) == false
+                preg_match('/shared_folder_session_'.$current_session_id.'$/', urldecode($url)) == false
             ) {
                 if ($filetype == 'file') {
                     //Sound preview with jplayer
@@ -5408,19 +5408,19 @@ 
                         preg_match('/bmp$/i', urldecode($checkExtension)) ||
                         preg_match('/svg$/i', urldecode($checkExtension))
                     ) {
-                        $url = 'showinframes.php?' . api_get_cidreq() . '&id=' . $document_data['id'];
-                        return '<a href="' . $url . '" title="' . $tooltip_title_alt . '" ' . $visibility_class . ' style="float:left">' .
-                        DocumentManager::build_document_icon_tag($filetype, $path) .
-                        Display::return_icon('shared.png', get_lang('ResourceShared'), array()) . '</a>';
+                        $url = 'showinframes.php?'.api_get_cidreq().'&id='.$document_data['id'];
+                        return '<a href="'.$url.'" title="'.$tooltip_title_alt.'" '.$visibility_class.' style="float:left">'.
+                        DocumentManager::build_document_icon_tag($filetype, $path).
+                        Display::return_icon('shared.png', get_lang('ResourceShared'), array()).'</a>';
                     } else {
-                        return '<a href="' . $url . '" title="' . $tooltip_title_alt . '" ' . $visibility_class . ' style="float:left">' .
-                        DocumentManager::build_document_icon_tag($filetype, $path) .
-                        Display::return_icon('shared.png', get_lang('ResourceShared'), array()) . '</a>';
+                        return '<a href="'.$url.'" title="'.$tooltip_title_alt.'" '.$visibility_class.' style="float:left">'.
+                        DocumentManager::build_document_icon_tag($filetype, $path).
+                        Display::return_icon('shared.png', get_lang('ResourceShared'), array()).'</a>';
                     }
                 } else {
-                    return '<a href="' . $url . '" title="' . $tooltip_title_alt . '" target="' . $target . '"' . $visibility_class . ' style="float:left">' .
-                    DocumentManager::build_document_icon_tag($filetype, $path) .
-                    Display::return_icon('shared.png', get_lang('ResourceShared'), array()) . '</a>';
+                    return '<a href="'.$url.'" title="'.$tooltip_title_alt.'" target="'.$target.'"'.$visibility_class.' style="float:left">'.
+                    DocumentManager::build_document_icon_tag($filetype, $path).
+                    Display::return_icon('shared.png', get_lang('ResourceShared'), array()).'</a>';
                 }
             } else {
                 if ($filetype == 'file') {
@@ -5443,16 +5443,16 @@ 
                         preg_match('/bmp$/i', urldecode($checkExtension)) ||
                         preg_match('/svg$/i', urldecode($checkExtension))
                     ) {
-                        $url = 'showinframes.php?' . api_get_cidreq() . '&id=' . $document_data['id']; //without preview
-                        return '<a href="' . $url . '" title="' . $tooltip_title_alt . '" ' . $visibility_class . ' style="float:left">' .
-                        DocumentManager::build_document_icon_tag($filetype, $path) . '</a>';
+                        $url = 'showinframes.php?'.api_get_cidreq().'&id='.$document_data['id']; //without preview
+                        return '<a href="'.$url.'" title="'.$tooltip_title_alt.'" '.$visibility_class.' style="float:left">'.
+                        DocumentManager::build_document_icon_tag($filetype, $path).'</a>';
                     } else {
-                        return '<a href="' . $url . '" title="' . $tooltip_title_alt . '" ' . $visibility_class . ' style="float:left">' .
-                        DocumentManager::build_document_icon_tag($filetype, $path) . '</a>';
+                        return '<a href="'.$url.'" title="'.$tooltip_title_alt.'" '.$visibility_class.' style="float:left">'.
+                        DocumentManager::build_document_icon_tag($filetype, $path).'</a>';
                     }
                 } else {
-                    return '<a href="' . $url . '" title="' . $tooltip_title_alt . '" target="' . $target . '"' . $visibility_class . ' style="float:left">' .
-                    DocumentManager::build_document_icon_tag($filetype, $path) . '</a>';
+                    return '<a href="'.$url.'" title="'.$tooltip_title_alt.'" target="'.$target.'"'.$visibility_class.' style="float:left">'.
+                    DocumentManager::build_document_icon_tag($filetype, $path).'</a>';
                 }
             }
         }
@@ -5487,13 +5487,13 @@ 
                 $userinfo = api_get_user_info(substr($basename, 8));
                 $icon = $userinfo['avatar_small'];
 
-                $basename = get_lang('UserFolder') . ' ' . $userinfo['complete_name'];
+                $basename = get_lang('UserFolder').' '.$userinfo['complete_name'];
                 $user_image = true;
             } elseif (strstr($path, 'shared_folder_session_')) {
                 if ($is_allowed_to_edit) {
-                    $basename = '***(' . api_get_session_name($current_session_id) . ')*** ' . get_lang('HelpUsersFolder');
+                    $basename = '***('.api_get_session_name($current_session_id).')*** '.get_lang('HelpUsersFolder');
                 } else {
-                    $basename = get_lang('UserFolders') . ' (' . api_get_session_name($current_session_id) . ')';
+                    $basename = get_lang('UserFolders').' ('.api_get_session_name($current_session_id).')';
                 }
                 $icon = 'folder_users.gif';
             } else {
@@ -5587,16 +5587,16 @@ 
         // Build URL-parameters for table-sorting
         $sort_params = array();
         if (isset($_GET['column'])) {
-            $sort_params[] = 'column=' . Security::remove_XSS($_GET['column']);
+            $sort_params[] = 'column='.Security::remove_XSS($_GET['column']);
         }
         if (isset($_GET['page_nr'])) {
-            $sort_params[] = 'page_nr=' . Security::remove_XSS($_GET['page_nr']);
+            $sort_params[] = 'page_nr='.Security::remove_XSS($_GET['page_nr']);
         }
         if (isset($_GET['per_page'])) {
-            $sort_params[] = 'per_page=' . Security::remove_XSS($_GET['per_page']);
+            $sort_params[] = 'per_page='.Security::remove_XSS($_GET['per_page']);
         }
         if (isset($_GET['direction'])) {
-            $sort_params[] = 'direction=' . Security::remove_XSS($_GET['direction']);
+            $sort_params[] = 'direction='.Security::remove_XSS($_GET['direction']);
         }
         $sort_params = implode('&amp;', $sort_params);
         $visibility_icon = ($visibility == 0) ? 'invisible' : 'visible';
@@ -5609,89 +5609,89 @@ 
         if ($is_read_only /* or ($session_id!=api_get_session_id()) */) {
             if (api_is_course_admin() || api_is_platform_admin()) {
                 if ($extension == 'svg' && api_browser_support('svg') && api_get_setting('enabled_support_svg') == 'true') {
-                    $modify_icons = '<a href="edit_draw.php?' . api_get_cidreq() . '&id=' . $document_id . '">' .
-                        Display::return_icon('edit.png', get_lang('Modify'), '', ICON_SIZE_SMALL) . '</a>';
-                } elseif (in_array($extension, $web_odf_extension_list)  && api_get_setting('enabled_support_odf') === true) {
-                    $modify_icons = '<a href="edit_odf.php?' . api_get_cidreq() . '&id=' . $document_id . '">' .
-                        Display::return_icon('edit.png', get_lang('Modify'), '', ICON_SIZE_SMALL) . '</a>';
+                    $modify_icons = '<a href="edit_draw.php?'.api_get_cidreq().'&id='.$document_id.'">'.
+                        Display::return_icon('edit.png', get_lang('Modify'), '', ICON_SIZE_SMALL).'</a>';
+                } elseif (in_array($extension, $web_odf_extension_list) && api_get_setting('enabled_support_odf') === true) {
+                    $modify_icons = '<a href="edit_odf.php?'.api_get_cidreq().'&id='.$document_id.'">'.
+                        Display::return_icon('edit.png', get_lang('Modify'), '', ICON_SIZE_SMALL).'</a>';
                 } elseif ($extension == 'png' || $extension == 'jpg' || $extension == 'jpeg' || $extension == 'bmp' || $extension == 'gif' || $extension == 'pxd' && api_get_setting('enabled_support_pixlr') == 'true') {
-                    $modify_icons = '<a href="edit_paint.php?' . api_get_cidreq() . '&id=' . $document_id . '">' .
-                        Display::return_icon('edit.png', get_lang('Modify'), '', ICON_SIZE_SMALL) . '</a>';
+                    $modify_icons = '<a href="edit_paint.php?'.api_get_cidreq().'&id='.$document_id.'">'.
+                        Display::return_icon('edit.png', get_lang('Modify'), '', ICON_SIZE_SMALL).'</a>';
                 } else {
-                    $modify_icons = '<a href="edit_document.php?' . api_get_cidreq() . '&id=' . $document_id. '">' .
-                        Display::return_icon('edit.png', get_lang('Modify'), '', ICON_SIZE_SMALL) . '</a>';
+                    $modify_icons = '<a href="edit_document.php?'.api_get_cidreq().'&id='.$document_id.'">'.
+                        Display::return_icon('edit.png', get_lang('Modify'), '', ICON_SIZE_SMALL).'</a>';
                 }
             } else {
                 $modify_icons = Display::return_icon('edit_na.png', get_lang('Modify'), '', ICON_SIZE_SMALL);
             }
-            $modify_icons .= '&nbsp;' . Display::return_icon('move_na.png', get_lang('Move'), array(), ICON_SIZE_SMALL);
+            $modify_icons .= '&nbsp;'.Display::return_icon('move_na.png', get_lang('Move'), array(), ICON_SIZE_SMALL);
             if (api_is_allowed_to_edit() || api_is_platform_admin()) {
-                $modify_icons .= '&nbsp;' . Display::return_icon($visibility_icon . '.png', get_lang('VisibilityCannotBeChanged'), '', ICON_SIZE_SMALL);
+                $modify_icons .= '&nbsp;'.Display::return_icon($visibility_icon.'.png', get_lang('VisibilityCannotBeChanged'), '', ICON_SIZE_SMALL);
             }
-            $modify_icons .= '&nbsp;' . Display::return_icon('delete_na.png', get_lang('Delete'), array(), ICON_SIZE_SMALL);
+            $modify_icons .= '&nbsp;'.Display::return_icon('delete_na.png', get_lang('Delete'), array(), ICON_SIZE_SMALL);
         } else {
             //Edit button
             if (in_array($path, DocumentManager::get_system_folders())) {
                 $modify_icons = Display::return_icon('edit_na.png', get_lang('Modify'), '', ICON_SIZE_SMALL);
-            } elseif ($is_certificate_mode ) {
+            } elseif ($is_certificate_mode) {
                 // gradebook category doesn't seem to be taken into account
-                $modify_icons = '<a href="edit_document.php?' . api_get_cidreq() . '&amp;id=' . $document_id . '&curdirpath=/certificates">' . Display::return_icon('edit.png', get_lang('Modify'), '', ICON_SIZE_SMALL) . '</a>';
+                $modify_icons = '<a href="edit_document.php?'.api_get_cidreq().'&amp;id='.$document_id.'&curdirpath=/certificates">'.Display::return_icon('edit.png', get_lang('Modify'), '', ICON_SIZE_SMALL).'</a>';
             } else {
                 if (api_get_session_id()) {
                     if ($document_data['session_id'] == api_get_session_id()) {
                         if ($extension == 'svg' && api_browser_support('svg') && api_get_setting('enabled_support_svg') == 'true') {
-                            $modify_icons = '<a href="edit_draw.php?' . api_get_cidreq() . '&amp;id=' . $document_id  . '">' .
-                                Display::return_icon('edit.png', get_lang('Modify'), '', ICON_SIZE_SMALL) . '</a>';
-                        } elseif (in_array($extension, $web_odf_extension_list)  && api_get_setting('enabled_support_odf') === true) {
-                            $modify_icons = '<a href="edit_odf.php?' . api_get_cidreq() . '&id=' . $document_id  . '">' .
-                                Display::return_icon('edit.png', get_lang('Modify'), '', ICON_SIZE_SMALL) . '</a>';
+                            $modify_icons = '<a href="edit_draw.php?'.api_get_cidreq().'&amp;id='.$document_id.'">'.
+                                Display::return_icon('edit.png', get_lang('Modify'), '', ICON_SIZE_SMALL).'</a>';
+                        } elseif (in_array($extension, $web_odf_extension_list) && api_get_setting('enabled_support_odf') === true) {
+                            $modify_icons = '<a href="edit_odf.php?'.api_get_cidreq().'&id='.$document_id.'">'.
+                                Display::return_icon('edit.png', get_lang('Modify'), '', ICON_SIZE_SMALL).'</a>';
                         } elseif ($extension == 'png' || $extension == 'jpg' || $extension == 'jpeg' || $extension == 'bmp' || $extension == 'gif' || $extension == 'pxd' && api_get_setting('enabled_support_pixlr') == 'true') {
-                            $modify_icons = '<a href="edit_paint.php?' . api_get_cidreq() . '&id=' . $document_id  . '">' .
-                                Display::return_icon('edit.png', get_lang('Modify'), '', ICON_SIZE_SMALL) . '</a>';
+                            $modify_icons = '<a href="edit_paint.php?'.api_get_cidreq().'&id='.$document_id.'">'.
+                                Display::return_icon('edit.png', get_lang('Modify'), '', ICON_SIZE_SMALL).'</a>';
                         } else {
-                            $modify_icons = '<a href="edit_document.php?' . api_get_cidreq() . '&amp;id=' . $document_id  . '">' .
-                                Display::return_icon('edit.png', get_lang('Modify'), '', ICON_SIZE_SMALL) . '</a>';
+                            $modify_icons = '<a href="edit_document.php?'.api_get_cidreq().'&amp;id='.$document_id.'">'.
+                                Display::return_icon('edit.png', get_lang('Modify'), '', ICON_SIZE_SMALL).'</a>';
                         }
                     } else {
-                        $modify_icons .= '&nbsp;' . Display::return_icon('edit_na.png', get_lang('Edit'), array(), ICON_SIZE_SMALL) . '</a>';
+                        $modify_icons .= '&nbsp;'.Display::return_icon('edit_na.png', get_lang('Edit'), array(), ICON_SIZE_SMALL).'</a>';
                     }
                 } else {
                     if ($extension == 'svg' && api_browser_support('svg') && api_get_setting('enabled_support_svg') == 'true') {
-                        $modify_icons = '<a href="edit_draw.php?' . api_get_cidreq() . '&amp;id=' . $document_id  . '">' .
-                            Display::return_icon('edit.png', get_lang('Modify'), '', ICON_SIZE_SMALL) . '</a>';
-                    } elseif (in_array($extension, $web_odf_extension_list)  && api_get_setting('enabled_support_odf') === true) {
-                        $modify_icons = '<a href="edit_odf.php?' . api_get_cidreq() . '&id=' . $document_id  . '">' .
-                            Display::return_icon('edit.png', get_lang('Modify'), '', ICON_SIZE_SMALL) . '</a>';
+                        $modify_icons = '<a href="edit_draw.php?'.api_get_cidreq().'&amp;id='.$document_id.'">'.
+                            Display::return_icon('edit.png', get_lang('Modify'), '', ICON_SIZE_SMALL).'</a>';
+                    } elseif (in_array($extension, $web_odf_extension_list) && api_get_setting('enabled_support_odf') === true) {
+                        $modify_icons = '<a href="edit_odf.php?'.api_get_cidreq().'&id='.$document_id.'">'.
+                            Display::return_icon('edit.png', get_lang('Modify'), '', ICON_SIZE_SMALL).'</a>';
                     } elseif ($extension == 'png' || $extension == 'jpg' || $extension == 'jpeg' || $extension == 'bmp' || $extension == 'gif' || $extension == 'pxd' && api_get_setting('enabled_support_pixlr') == 'true') {
-                        $modify_icons = '<a href="edit_paint.php?' . api_get_cidreq() . '&amp;id=' . $document_id . '">' .
-                            Display::return_icon('edit.png', get_lang('Modify'), '', ICON_SIZE_SMALL) . '</a>';
+                        $modify_icons = '<a href="edit_paint.php?'.api_get_cidreq().'&amp;id='.$document_id.'">'.
+                            Display::return_icon('edit.png', get_lang('Modify'), '', ICON_SIZE_SMALL).'</a>';
                     } else {
-                        $modify_icons = '<a href="edit_document.php?' . api_get_cidreq() . '&amp;id=' . $document_id  . '">' .
-                            Display::return_icon('edit.png', get_lang('Modify'), '', ICON_SIZE_SMALL) . '</a>';
+                        $modify_icons = '<a href="edit_document.php?'.api_get_cidreq().'&amp;id='.$document_id.'">'.
+                            Display::return_icon('edit.png', get_lang('Modify'), '', ICON_SIZE_SMALL).'</a>';
                     }
                 }
             }
 
             // Move button.
             if ($is_certificate_mode || in_array($path, DocumentManager::get_system_folders())) {
-                $modify_icons .= '&nbsp;' . Display::return_icon('move_na.png', get_lang('Move'), array(), ICON_SIZE_SMALL) . '</a>';
+                $modify_icons .= '&nbsp;'.Display::return_icon('move_na.png', get_lang('Move'), array(), ICON_SIZE_SMALL).'</a>';
             } else {
                 if (api_get_session_id()) {
                     if ($document_data['session_id'] == api_get_session_id()) {
-                        $modify_icons .= '&nbsp;<a href="' . api_get_self() . '?' . api_get_cidreq() . '&amp;id=' . $parent_id . '&amp;move=' . $document_id .  '">' .
-                            Display::return_icon('move.png', get_lang('Move'), array(), ICON_SIZE_SMALL) . '</a>';
+                        $modify_icons .= '&nbsp;<a href="'.api_get_self().'?'.api_get_cidreq().'&amp;id='.$parent_id.'&amp;move='.$document_id.'">'.
+                            Display::return_icon('move.png', get_lang('Move'), array(), ICON_SIZE_SMALL).'</a>';
                     } else {
-                        $modify_icons .= '&nbsp;' . Display::return_icon('move_na.png', get_lang('Move'), array(), ICON_SIZE_SMALL) . '</a>';
+                        $modify_icons .= '&nbsp;'.Display::return_icon('move_na.png', get_lang('Move'), array(), ICON_SIZE_SMALL).'</a>';
                     }
                 } else {
-                    $modify_icons .= '&nbsp;<a href="' . api_get_self() . '?' . api_get_cidreq() . '&amp;id=' . $parent_id . '&amp;move=' . $document_id .  '">' .
-                        Display::return_icon('move.png', get_lang('Move'), array(), ICON_SIZE_SMALL) . '</a>';
+                    $modify_icons .= '&nbsp;<a href="'.api_get_self().'?'.api_get_cidreq().'&amp;id='.$parent_id.'&amp;move='.$document_id.'">'.
+                        Display::return_icon('move.png', get_lang('Move'), array(), ICON_SIZE_SMALL).'</a>';
                 }
             }
 
             //Visibility button
             if ($is_certificate_mode) {
-                $modify_icons .= '&nbsp;' . Display::return_icon($visibility_icon . '.png', get_lang('VisibilityCannotBeChanged'), array(), ICON_SIZE_SMALL) . '</a>';
+                $modify_icons .= '&nbsp;'.Display::return_icon($visibility_icon.'.png', get_lang('VisibilityCannotBeChanged'), array(), ICON_SIZE_SMALL).'</a>';
             } else {
                 if (api_is_allowed_to_edit() || api_is_platform_admin()) {
                     if ($visibility_icon == 'invisible') {
@@ -5699,14 +5699,14 @@ 
                     } else {
                         $tip_visibility = get_lang('Hide');
                     }
-                    $modify_icons .= '&nbsp;<a href="' . api_get_self() . '?' . api_get_cidreq() . '&amp;id=' . $parent_id . '&amp;' . $visibility_command . '=' . $id . '&amp;' . $sort_params . '">' .
-                        Display::return_icon($visibility_icon . '.png', $tip_visibility, '', ICON_SIZE_SMALL) . '</a>';
+                    $modify_icons .= '&nbsp;<a href="'.api_get_self().'?'.api_get_cidreq().'&amp;id='.$parent_id.'&amp;'.$visibility_command.'='.$id.'&amp;'.$sort_params.'">'.
+                        Display::return_icon($visibility_icon.'.png', $tip_visibility, '', ICON_SIZE_SMALL).'</a>';
                 }
             }
 
             // Delete button
             if (in_array($path, DocumentManager::get_system_folders())) {
-                $modify_icons .= '&nbsp;' . Display::return_icon('delete_na.png', get_lang('ThisFolderCannotBeDeleted'), array(), ICON_SIZE_SMALL);
+                $modify_icons .= '&nbsp;'.Display::return_icon('delete_na.png', get_lang('ThisFolderCannotBeDeleted'), array(), ICON_SIZE_SMALL);
             } else {
                 $titleToShow = addslashes(basename($document_data['title']));
 
@@ -5714,23 +5714,23 @@ 
                     $_GET['curdirpath'] == '/certificates' &&
                     DocumentManager::get_default_certificate_id(api_get_course_id()) == $id
                 ) {
-                    $modify_icons .= '&nbsp;<a href="' . api_get_self() . '?' . api_get_cidreq() . '&amp;curdirpath=' . $curdirpath . '&action=delete_item&id='.$parent_id.'&deleteid='.$document_id.'&amp;' . $sort_params . 'delete_certificate_id=' . $id . '" onclick="return confirmation(\'' . $titleToShow . '\');">' .
-                        Display::return_icon('delete.png', get_lang('Delete'), array(), ICON_SIZE_SMALL) . '</a>';
+                    $modify_icons .= '&nbsp;<a href="'.api_get_self().'?'.api_get_cidreq().'&amp;curdirpath='.$curdirpath.'&action=delete_item&id='.$parent_id.'&deleteid='.$document_id.'&amp;'.$sort_params.'delete_certificate_id='.$id.'" onclick="return confirmation(\''.$titleToShow.'\');">'.
+                        Display::return_icon('delete.png', get_lang('Delete'), array(), ICON_SIZE_SMALL).'</a>';
                 } else {
                     if ($is_certificate_mode) {
-                        $modify_icons .= '&nbsp;<a href="' . api_get_self() . '?' . api_get_cidreq() . '&amp;curdirpath=' . $curdirpath . '&action=delete_item&id='.$parent_id.'&deleteid=' . $document_id  . '&amp;' . $sort_params . '" onclick="return confirmation(\'' . $titleToShow . '\');">' .
-                            Display::return_icon('delete.png', get_lang('Delete'), array(), ICON_SIZE_SMALL) . '</a>';
+                        $modify_icons .= '&nbsp;<a href="'.api_get_self().'?'.api_get_cidreq().'&amp;curdirpath='.$curdirpath.'&action=delete_item&id='.$parent_id.'&deleteid='.$document_id.'&amp;'.$sort_params.'" onclick="return confirmation(\''.$titleToShow.'\');">'.
+                            Display::return_icon('delete.png', get_lang('Delete'), array(), ICON_SIZE_SMALL).'</a>';
                     } else {
                         if (api_get_session_id()) {
                             if ($document_data['session_id'] == api_get_session_id()) {
-                                $modify_icons .= '&nbsp;<a href="' . api_get_self() . '?' . api_get_cidreq() . '&amp;curdirpath=' . $curdirpath . '&action=delete_item&id='.$parent_id.'&deleteid='.$document_id  . '&amp;' . $sort_params . '" onclick="return confirmation(\'' . $titleToShow . '\');">'.
-                                    Display::return_icon('delete.png', get_lang('Delete'), array(), ICON_SIZE_SMALL) . '</a>';
+                                $modify_icons .= '&nbsp;<a href="'.api_get_self().'?'.api_get_cidreq().'&amp;curdirpath='.$curdirpath.'&action=delete_item&id='.$parent_id.'&deleteid='.$document_id.'&amp;'.$sort_params.'" onclick="return confirmation(\''.$titleToShow.'\');">'.
+                                    Display::return_icon('delete.png', get_lang('Delete'), array(), ICON_SIZE_SMALL).'</a>';
                             } else {
-                                $modify_icons .= '&nbsp;' . Display::return_icon('delete_na.png', get_lang('ThisFolderCannotBeDeleted'), array(), ICON_SIZE_SMALL);
+                                $modify_icons .= '&nbsp;'.Display::return_icon('delete_na.png', get_lang('ThisFolderCannotBeDeleted'), array(), ICON_SIZE_SMALL);
                             }
                         } else {
-                            $modify_icons .= '&nbsp;<a href="' . api_get_self() . '?' . api_get_cidreq() . '&amp;curdirpath=' . $curdirpath . '&action=delete_item&id='.$parent_id.'&deleteid='.$document_id . '&amp;' . $sort_params . '" onclick="return confirmation(\'' . $titleToShow. '\');">' .
-                                Display::return_icon('delete.png', get_lang('Delete'), array(), ICON_SIZE_SMALL) . '</a>';
+                            $modify_icons .= '&nbsp;<a href="'.api_get_self().'?'.api_get_cidreq().'&amp;curdirpath='.$curdirpath.'&action=delete_item&id='.$parent_id.'&deleteid='.$document_id.'&amp;'.$sort_params.'" onclick="return confirmation(\''.$titleToShow.'\');">'.
+                                Display::return_icon('delete.png', get_lang('Delete'), array(), ICON_SIZE_SMALL).'</a>';
                         }
                     }
                 }
@@ -5742,15 +5742,15 @@ 
                 // nothing to do
             } else {
                 if ($usePpt2lp && $formatType) {
-                    $modify_icons .= '&nbsp;<a class="convertAction" href="#" ' .
-                        'data-documentId = ' . $document_id .
-                        ' data-formatType = ' . $formatType . '>' .
+                    $modify_icons .= '&nbsp;<a class="convertAction" href="#" '.
+                        'data-documentId = '.$document_id.
+                        ' data-formatType = '.$formatType.'>'.
                         Display::return_icon(
                             'convert.png',
                             get_lang('Convert'),
                             array(),
                             ICON_SIZE_SMALL
-                        ) . '</a>';
+                        ).'</a>';
                 }
             }
         }
@@ -5758,8 +5758,8 @@ 
         if ($type == 'file' && ($extension == 'html' || $extension == 'htm')) {
             if ($is_template == 0) {
                 if ((isset($_GET['curdirpath']) && $_GET['curdirpath'] != '/certificates') || !isset($_GET['curdirpath'])) {
-                    $modify_icons .= '&nbsp;<a href="' . api_get_self() . '?' . api_get_cidreq() . '&amp;curdirpath=' . $curdirpath . '&amp;add_as_template=' . $id .  '&amp;' . $sort_params . '">' .
-                        Display::return_icon('wizard.png', get_lang('AddAsTemplate'), array(), ICON_SIZE_SMALL) . '</a>';
+                    $modify_icons .= '&nbsp;<a href="'.api_get_self().'?'.api_get_cidreq().'&amp;curdirpath='.$curdirpath.'&amp;add_as_template='.$id.'&amp;'.$sort_params.'">'.
+                        Display::return_icon('wizard.png', get_lang('AddAsTemplate'), array(), ICON_SIZE_SMALL).'</a>';
                 }
                 if (isset($_GET['curdirpath']) && $_GET['curdirpath'] == '/certificates') {//allow attach certificate to course
                     $visibility_icon_certificate = 'nocertificate';
@@ -5773,21 +5773,21 @@ 
                         $certificate = get_lang('NoDefaultCertificate');
                     }
                     if (isset($_GET['selectcat'])) {
-                        $modify_icons .= '&nbsp;<a href="' . api_get_self() . '?' . api_get_cidreq() . '&amp;curdirpath=' . $curdirpath . '&amp;selectcat=' . intval($_GET['selectcat']) . '&amp;set_certificate=' . $id . '&amp;' . $sort_params . '">';
+                        $modify_icons .= '&nbsp;<a href="'.api_get_self().'?'.api_get_cidreq().'&amp;curdirpath='.$curdirpath.'&amp;selectcat='.intval($_GET['selectcat']).'&amp;set_certificate='.$id.'&amp;'.$sort_params.'">';
                         $modify_icons .= Display::return_icon($visibility_icon_certificate.'.png', $certificate);
                         $modify_icons .= '</a>';
                         if ($is_preview) {
-                            $modify_icons .= '&nbsp;<a target="_blank"  href="' . api_get_self() . '?' . api_get_cidreq() . '&amp;curdirpath=' . $curdirpath . '&amp;set_preview=' . $id . '&amp;' . $sort_params . '" >' .
-                                Display::return_icon('preview_view.png', $preview, '', ICON_SIZE_SMALL) . '</a>';
+                            $modify_icons .= '&nbsp;<a target="_blank"  href="'.api_get_self().'?'.api_get_cidreq().'&amp;curdirpath='.$curdirpath.'&amp;set_preview='.$id.'&amp;'.$sort_params.'" >'.
+                                Display::return_icon('preview_view.png', $preview, '', ICON_SIZE_SMALL).'</a>';
                         }
                     }
                 }
             } else {
-                $modify_icons .= '&nbsp;<a href="' . api_get_self() . '?' . api_get_cidreq() . '&curdirpath=' . $curdirpath . '&amp;remove_as_template=' . $id. '&amp;' . $sort_params . '">' .
-                    Display::return_icon('wizard_na.png', get_lang('RemoveAsTemplate'), '', ICON_SIZE_SMALL) . '</a>';
+                $modify_icons .= '&nbsp;<a href="'.api_get_self().'?'.api_get_cidreq().'&curdirpath='.$curdirpath.'&amp;remove_as_template='.$id.'&amp;'.$sort_params.'">'.
+                    Display::return_icon('wizard_na.png', get_lang('RemoveAsTemplate'), '', ICON_SIZE_SMALL).'</a>';
             }
-            $modify_icons .= '&nbsp;<a href="' . api_get_self() . '?' . api_get_cidreq() . '&action=export_to_pdf&id=' . $id . '">' .
-                Display::return_icon('pdf.png', get_lang('Export2PDF'), array(), ICON_SIZE_SMALL) . '</a>';
+            $modify_icons .= '&nbsp;<a href="'.api_get_self().'?'.api_get_cidreq().'&action=export_to_pdf&id='.$id.'">'.
+                Display::return_icon('pdf.png', get_lang('Export2PDF'), array(), ICON_SIZE_SMALL).'</a>';
         }
 
         return $modify_icons;
@@ -5859,7 +5859,7 @@ 
                     // 3. inside a subfolder of the folder you want to move
                     if (($curdirpath != $folder) &&
                         ($folder != $move_file) &&
-                        (substr($folder, 0, strlen($move_file) + 1) != $move_file . '/')
+                        (substr($folder, 0, strlen($move_file) + 1) != $move_file.'/')
                     ) {
                         $path_displayed = $folder;
                         // If document title is used, we have to display titles instead of real paths...
@@ -5876,7 +5876,7 @@ 
             foreach ($folders as $folder) {
                 if (($curdirpath != $folder) &&
                     ($folder != $move_file) &&
-                    (substr($folder, 0, strlen($move_file) + 1) != $move_file . '/')
+                    (substr($folder, 0, strlen($move_file) + 1) != $move_file.'/')
                 ) {
                     // Cannot copy dir into his own subdir
                     $path_displayed = DocumentManager::get_titles_of_path($folder);
@@ -5919,10 +5919,10 @@ 
                 // If this path has soon been stored here we don't need a new query
                 $path_displayed .= $tmp_folders_titles[$tmp_path];
             } else {
-                $sql = 'SELECT title FROM ' . Database::get_course_table(TABLE_DOCUMENT) . '
-                    WHERE c_id = ' . $course_id . ' AND path LIKE BINARY "' . $tmp_path . '"';
+                $sql = 'SELECT title FROM '.Database::get_course_table(TABLE_DOCUMENT).'
+                    WHERE c_id = ' . $course_id.' AND path LIKE BINARY "'.$tmp_path.'"';
                 $rs = Database::query($sql);
-                $tmp_title = '/' . Database::result($rs, 0, 0);
+                $tmp_title = '/'.Database::result($rs, 0, 0);
                 $path_displayed .= $tmp_title;
                 $tmp_folders_titles[$tmp_path] = $tmp_title;
             }
@@ -5959,7 +5959,7 @@ 
         $clean_curdirpath = Security::remove_XSS($curdirpath);
         if ($clean_curdirpath == '/shared_folder') {
             return true;
-        } elseif ($clean_curdirpath == '/shared_folder_session_' . $current_session_id) {
+        } elseif ($clean_curdirpath == '/shared_folder_session_'.$current_session_id) {
             return true;
         } else {
             return false;
@@ -5975,7 +5975,7 @@ 
         $clean_path = Security::remove_XSS($path);
         if (strpos($clean_path, 'shared_folder/sf_user_')) {
             return true;
-        } elseif (strpos($clean_path, 'shared_folder_session_' . $current_session_id . '/sf_user_')) {
+        } elseif (strpos($clean_path, 'shared_folder_session_'.$current_session_id.'/sf_user_')) {
             return true;
         } else {
             return false;
@@ -5988,11 +5988,11 @@ 
      */
     public static function is_my_shared_folder($user_id, $path, $current_session_id)
     {
-        $clean_path = Security::remove_XSS($path) . '/';
+        $clean_path = Security::remove_XSS($path).'/';
         //for security does not remove the last slash
-        $main_user_shared_folder = '/shared_folder\/sf_user_' . $user_id . '\//';
+        $main_user_shared_folder = '/shared_folder\/sf_user_'.$user_id.'\//';
         //for security does not remove the last slash
-        $main_user_shared_folder_session = '/shared_folder_session_' . $current_session_id . '\/sf_user_' . $user_id . '\//';
+        $main_user_shared_folder_session = '/shared_folder_session_'.$current_session_id.'\/sf_user_'.$user_id.'\//';
 
         if (preg_match($main_user_shared_folder, $clean_path)) {
             return true;
@@ -6265,7 +6265,7 @@ 
                 ON (i.c_id = d.c_id)
                 WHERE
                     d.id = i.ref AND
-                    i.tool = '" . TOOL_DOCUMENT . "'
+                    i.tool = '".TOOL_DOCUMENT."'
                     $conditionSession AND
                     i.c_id = $courseId AND
                     d.c_id = $courseId ";
@@ -6273,9 +6273,9 @@ 
         $result = Database::query($sql);
         $documents = Database::store_result($result, 'ASSOC');
         if ($documents) {
-            $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;
+            $base_work_dir = $sys_course_path.$course_dir;
 
             foreach ($documents as $document) {
                 $documentId = $document['id'];

Doc Comments +23 added lines, -18 removed lines

@@ -277,7 +277,7 @@ 
     /**
      *  @param string
      *  @param string
-     * 	@return true if the user is allowed to see the document, false otherwise
+     * 	@return boolean if the user is allowed to see the document, false otherwise
      * 	@author Sergio A Kessler, first version
      * 	@author Roan Embrechts, bugfix
      *  @todo not only check if a file is visible, but also check if the user is allowed to see the file??
@@ -1529,7 +1529,7 @@ 
      * Return true if the documentpath have visibility=1 as
      * item_property (you should use the is_visible_by_id)
      *
-     * @param string $document_path the relative complete path of the document
+     * @param string $doc_path the relative complete path of the document
      * @param array  $course the _course array info of the document's course
      * @param int
      * @param string
@@ -1615,6 +1615,8 @@ 
      * @param   int
      * @param   int
      * @param bool
+     * @param integer $session_id
+     * @param integer $user_id
      * @return  bool
      */
     public static function is_visible_by_id(
@@ -1966,7 +1968,7 @@ 
      * Remove default certificate
      * @param string $course_id The course code
      * @param int $default_certificate_id The document id of the default certificate
-     * @return void
+     * @return false|null
      */
     public static function remove_attach_certificate($course_id, $default_certificate_id)
     {
@@ -2101,6 +2103,7 @@ 
      * @param	bool  	is file or string html
      * @param	string	type (one of the app tools) - optional (otherwise takes the current item's type)
      * @param	int		level of recursivity we're in
+     * @param string $source_html
      * @return	array	List of file paths. An additional field containing 'local' or 'remote' helps determine
      * if the file should be copied into the zip or just linked
      */
@@ -2940,6 +2943,7 @@ 
 
     /**
      * Obtains the text inside the file with the right parser
+     * @param string $doc_path
      */
     public static function get_text_content($doc_path, $doc_mime)
     {
@@ -3191,6 +3195,7 @@ 
      * Shows a play icon next to the document title in the document list
      * @param int
      * @param string
+     * @param integer|null $i
      * @return string	html content
      */
     public static function generate_media_preview($i, $type = 'simple')
@@ -4089,7 +4094,7 @@ 
     }
 
     /**
-     * @return array
+     * @return string[]
      */
     public static function get_web_odf_extension_list()
     {
@@ -4098,10 +4103,10 @@ 
 
     /**
      * Set of extension allowed to use Jodconverter
-     * @param $mode 'from'
+     * @param string $mode 'from'
      *              'to'
      *              'all'
-     * @param $format   'text'
+     * @param string $format   'text'
      *                  'spreadsheet'
      *                  'presentation'
      *                  'drawing'
@@ -4305,7 +4310,7 @@ 
     }
 
     /**
-     * @return array
+     * @return string[]
      */
     public static function get_system_folders()
     {
@@ -4323,7 +4328,7 @@ 
     }
 
     /**
-     * @return array
+     * @return string[]
      */
     public static function getProtectedFolderFromStudent()
     {
@@ -4479,7 +4484,7 @@ 
      * Requires the ffmpeg lib. In ubuntu: sudo apt-get install ffmpeg
      * @param string $wavFile
      * @param bool $removeWavFileIfSuccess
-     * @return bool
+     * @return string|false
      */
     public static function convertWavToMp3($wavFile, $removeWavFileIfSuccess = false)
     {
@@ -5055,6 +5060,8 @@ 
      * @param string	The current folder (path inside of the "document" directory, including the prefix "/")
      * @param string	Group directory, if empty, prevents documents to be uploaded (because group documents cannot be uploaded in root)
      * @param	boolean	Whether to change the renderer (this will add a template <span> to the QuickForm object displaying the form)
+     * @param string $document_id
+     * @param FormValidator $form
 
      * @return string html form
      */
@@ -5560,9 +5567,6 @@ 
     /**
      * Creates the row of edit icons for a file/folder
      *
-     * @param string $curdirpath current path (cfr open folder)
-     * @param string $type (file/folder)
-     * @param string $path dbase path of file/folder
      * @param int $visibility (1/0)
      * @param int $id dbase id of the document
      * @return string html img tags with hyperlinks
@@ -5896,7 +5900,7 @@ 
     /**
      * Gets the path translated with title of docs and folders
      * @param string $path the real path
-     * @return the path which should be displayed
+     * @return string path which should be displayed
      */
     public static function get_titles_of_path($path)
     {
@@ -5952,7 +5956,8 @@ 
 
     /**
      * Checks whether the user is in shared folder
-     * @return return bool Return true when user is into shared folder
+     * @param integer $current_session_id
+     * @return boolean bool Return true when user is into shared folder
      */
     public static function is_shared_folder($curdirpath, $current_session_id)
     {
@@ -5968,7 +5973,7 @@ 
 
     /**
      * Checks whether the user is into any user shared folder
-     * @return return bool Return true when user is in any user shared folder
+     * @return boolean bool Return true when user is in any user shared folder
      */
     public static function is_any_user_shared_folder($path, $current_session_id)
     {
@@ -6182,7 +6187,7 @@ 
      * @param int $id
      * @param array $courseInfo
      * @param int $sessionId
-     * @return bool
+     * @return boolean|null
      */
     public static function downloadDeletedDocument($id, $courseInfo, $sessionId)
     {
@@ -6201,7 +6206,7 @@ 
      * @param array $courseInfo
      * @param int $sessionId
      *
-     * @return bool
+     * @return false|null
      */
     public static function downloadAllDeletedDocument($courseInfo, $sessionId)
     {
@@ -6240,7 +6245,7 @@ 
      * @param array $courseInfo
      * @param int $sessionId
      *
-     * @return bool
+     * @return false|null
      */
     public static function deleteDocumentsFromSession($courseInfo, $sessionId)
     {