chamilo / chamilo-lms

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

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

main/dropbox/dropbox_submit.php

Spacing +9 added lines, -9 removed lines

@@ -23,10 +23,10 @@ 
      */
 
     // the author or description field is empty
-    if (!isset($_POST['authors']) || !isset( $_POST['description'])) {
+    if (!isset($_POST['authors']) || !isset($_POST['description'])) {
         $error = true;
         $errormsg = get_lang('BadFormData');
-    } elseif (!isset( $_POST['recipients']) || count( $_POST['recipients']) <= 0) {
+    } elseif (!isset($_POST['recipients']) || count($_POST['recipients']) <= 0) {
         $error = true;
         $errormsg = get_lang('NoUserSelected');
     } else {
@@ -48,12 +48,12 @@ 
         }
 
 		// we are doing a mailing but an additional recipient is selected
-        if ($thisIsAMailing && ( count($_POST['recipients']) != 1)) {
+        if ($thisIsAMailing && (count($_POST['recipients']) != 1)) {
             $error = true;
             $errormsg = get_lang('MailingSelectNoOther');
         }
         // we are doing a just upload but an additional recipient is selected.
-        elseif ( $thisIsJustUpload && ( count($_POST['recipients']) != 1)) {
+        elseif ($thisIsJustUpload && (count($_POST['recipients']) != 1)) {
             $error = true;
             $errormsg = get_lang('MailingJustUploadSelectNoOther');
         } elseif (empty($_FILES['file']['name'])) {
@@ -125,7 +125,7 @@ 
                     }
                 } else {
                     // rename file to login_filename_uniqueId format
-                    $dropbox_filename = getLoginFromId( $_user['user_id']) . '_' . $dropbox_filename . '_'.uniqid('');
+                    $dropbox_filename = getLoginFromId($_user['user_id']).'_'.$dropbox_filename.'_'.uniqid('');
                 }
 
                 if (!is_dir(dropbox_cnf('sysPath'))) {
@@ -147,7 +147,7 @@ 
                         $newWorkRecipients = dropbox_cnf('mailingIdBase');
                     } else {
                         $error = true;
-                        $errormsg = $dropbox_title . ': ' . get_lang('MailingWrongZipfile');
+                        $errormsg = $dropbox_title.': '.get_lang('MailingWrongZipfile');
                     }
                 } elseif ($thisIsJustUpload) {
                     $newWorkRecipients = array();
@@ -171,7 +171,7 @@ 
 				// After uploading the file, create the db entries
 
 	        	if (!$error) {
-		            @move_uploaded_file($dropbox_filetmpname, dropbox_cnf('sysPath') . '/' . $dropbox_filename)
+		            @move_uploaded_file($dropbox_filetmpname, dropbox_cnf('sysPath').'/'.$dropbox_filename)
 		            	or die(get_lang('UploadError').' (code 407)');
 		            new Dropbox_SentWork($_user['user_id'], $dropbox_title, $_POST['description'], strip_tags($_POST['authors']), $dropbox_filename, $dropbox_filesize, $newWorkRecipients);
 	        	}
@@ -198,7 +198,7 @@ 
  * - EDIT FEEDBACK
  */
 if (isset($_GET['deleteReceived']) || isset($_GET['deleteSent'])
-         || isset( $_GET['showFeedback']) || isset( $_GET['editFeedback'])) {
+         || isset($_GET['showFeedback']) || isset($_GET['editFeedback'])) {
 	if ($_GET['mailing']) {
 		getUserOwningThisMailing($_GET['mailing'], $_user['user_id'], '408');
 		$dropbox_person = new Dropbox_Person($_GET['mailing'], $is_courseAdmin, $is_courseTutor);
@@ -223,7 +223,7 @@ 
         if ($_GET['deleteReceived'] == 'all') {
             $dropbox_person->deleteAllReceivedWork();
         } elseif (is_numeric($_GET['deleteReceived'])) {
-            $dropbox_person->deleteReceivedWork( $_GET['deleteReceived']);
+            $dropbox_person->deleteReceivedWork($_GET['deleteReceived']);
         } else {
             die(get_lang('GeneralError').' (code 409)');
         }

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);
 }
 
 /**

main/forum/viewthread_threaded.inc.php

Spacing +94 added lines, -94 removed lines

@@ -21,7 +21,7 @@ 
  * @package chamilo.forum
  */
 
-$forumUrl = api_get_path(WEB_CODE_PATH) . 'forum/';
+$forumUrl = api_get_path(WEB_CODE_PATH).'forum/';
 $_user = api_get_user_info();
 $sortDirection = isset($_GET['posts_order']) && $_GET['posts_order'] === 'desc' ? 'DESC' : 'ASC';
 $rows = getPosts($current_forum, $_GET['thread'], $sortDirection, true);
@@ -42,13 +42,13 @@ 
 // Are we in a lp ?
 $origin = '';
 if (isset($_GET['origin'])) {
-    $origin =  Security::remove_XSS($_GET['origin']);
+    $origin = Security::remove_XSS($_GET['origin']);
 }
 
 // Delete attachment file.
 if (
     isset($_GET['action']) &&
-    $_GET['action']=='delete_attach' &&
+    $_GET['action'] == 'delete_attach' &&
     isset($_GET['id_attach'])
 ) {
     delete_attachment(0, $_GET['id_attach']);
@@ -59,7 +59,7 @@ 
 
 // Displaying the thread (structure)
 
-$thread_structure = "<div class=\"structure\">" .get_lang('Structure')."</div>";
+$thread_structure = "<div class=\"structure\">".get_lang('Structure')."</div>";
 $counter = 0;
 $count = 0;
 $prev_next_array = array();
@@ -71,7 +71,7 @@ 
 foreach ($rows as $post) {
     $counter++;
     $indent = $post['indent_cnt'] * '20';
-    $thread_structure .= "<div style=\"margin-left: " . $indent . "px;\">";
+    $thread_structure .= "<div style=\"margin-left: ".$indent."px;\">";
 
     if (
         !empty($whatsnew_post_info[$forumId][$post['thread_id']]) &&
@@ -89,7 +89,7 @@ 
             $counter == 1 AND !isset($_GET['post'])
         )
     ) {
-        $thread_structure .= '<strong>' .prepare4display($post['post_title']) . '</strong></div>';
+        $thread_structure .= '<strong>'.prepare4display($post['post_title']).'</strong></div>';
         $prev_next_array[] = $post['post_id'];
     } else {
         if ($post['visible'] == '0') {
@@ -98,10 +98,10 @@ 
             $class = '';
         }
         $count_loop = ($count == 0) ? '&id=1' : '';
-        $thread_structure .= "<a href=\"viewthread.php?" . api_get_cidreq() .
-            "&forum=" . $forumId . "&thread=" . $threadId .
-            "&post=" . $post['post_id'] . "&origin=$origin$count_loop\"" .
-            "$class>" . prepare4display($post['post_title']) . "</a></div>";
+        $thread_structure .= "<a href=\"viewthread.php?".api_get_cidreq().
+            "&forum=".$forumId."&thread=".$threadId.
+            "&post=".$post['post_id']."&origin=$origin$count_loop\"".
+            "$class>".prepare4display($post['post_title'])."</a></div>";
         $prev_next_array[] = $post['post_id'];
     }
     $count++;
@@ -148,43 +148,43 @@ 
 $class_next = '';
 
 // Links
-$first_href = $forumUrl . 'viewthread.php?' . api_get_cidreq() .
-    '&forum=' . $forumId . '&thread=' . $threadId .
-    '&gradebook=' . $gradebook . '&id=1&post=' . $prev_next_array[0];
-$last_href 	= $forumUrl . 'viewthread.php?' . api_get_cidreq() .
-    '&forum=' . $forumId . '&thread=' . $threadId .
-    '&gradebook=' . $gradebook . '&post=' . $prev_next_array[$max-1];
-$prev_href	= $forumUrl . 'viewthread.php?' . api_get_cidreq() .
-    '&forum=' . $forumId . '&thread=' . $threadId .
-    '&gradebook=' . $gradebook . '&post=' . $prev_next_array[$prev_id];
-$next_href	= $forumUrl . 'viewthread.php?' . api_get_cidreq() .
-    '&forum=' . $forumId . '&thread=' . $threadId .
-    '&post=' . $prev_next_array[$next_id];
+$first_href = $forumUrl.'viewthread.php?'.api_get_cidreq().
+    '&forum='.$forumId.'&thread='.$threadId.
+    '&gradebook='.$gradebook.'&id=1&post='.$prev_next_array[0];
+$last_href 	= $forumUrl.'viewthread.php?'.api_get_cidreq().
+    '&forum='.$forumId.'&thread='.$threadId.
+    '&gradebook='.$gradebook.'&post='.$prev_next_array[$max - 1];
+$prev_href	= $forumUrl.'viewthread.php?'.api_get_cidreq().
+    '&forum='.$forumId.'&thread='.$threadId.
+    '&gradebook='.$gradebook.'&post='.$prev_next_array[$prev_id];
+$next_href	= $forumUrl.'viewthread.php?'.api_get_cidreq().
+    '&forum='.$forumId.'&thread='.$threadId.
+    '&post='.$prev_next_array[$next_id];
 
 echo '<center style="margin-top: 10px; margin-bottom: 10px;">';
 // Go to: first and previous
 if (((int) $current_id) > 0) {
-    echo '<a href="' . $first_href . '" ' . $class . ' title=' .
-        $first_message . '>' . $first_img . ' ' . $first_message .'</a>';
-    echo '<a href="' . $prev_href . '" ' . $class_prev . ' title=' .
-        $prev_message . '>' . $prev_img . ' ' . $prev_message . '</a>';
+    echo '<a href="'.$first_href.'" '.$class.' title='.
+        $first_message.'>'.$first_img.' '.$first_message.'</a>';
+    echo '<a href="'.$prev_href.'" '.$class_prev.' title='.
+        $prev_message.'>'.$prev_img.' '.$prev_message.'</a>';
 } else {
-    echo '<b><span class="invisible">' .
-        $first_img . ' ' . $first_message . '</b></span>';
-    echo '<b><span class="invisible">' .
-        $prev_img . ' ' . $prev_message . '</b></span>';
+    echo '<b><span class="invisible">'.
+        $first_img.' '.$first_message.'</b></span>';
+    echo '<b><span class="invisible">'.
+        $prev_img.' '.$prev_message.'</b></span>';
 }
 
 // Current counter
-echo ' [ ' . ($current_id + 1) . ' / ' . $max . ' ] ';
+echo ' [ '.($current_id + 1).' / '.$max.' ] ';
 
 // Go to: next and last
 if (($current_id + 1) < $max) {
-    echo '<a href="' . $next_href . '" ' . $class_next . ' title=' . $next_message . '>' . $next_message . ' ' . $next_img . '</a>';
-    echo '<a href="' . $last_href . '" ' . $class . ' title=' . $last_message . '>' . $last_message . ' ' . $last_img . '</a>';
+    echo '<a href="'.$next_href.'" '.$class_next.' title='.$next_message.'>'.$next_message.' '.$next_img.'</a>';
+    echo '<a href="'.$last_href.'" '.$class.' title='.$last_message.'>'.$last_message.' '.$last_img.'</a>';
 } else {
-    echo '<b><span class="invisible">' . $next_message . ' ' . $next_img . '</b></span>';
-    echo '<b><span class="invisible">' . $last_message . ' ' . $last_img . '</b></span>';
+    echo '<b><span class="invisible">'.$next_message.' '.$next_img.'</b></span>';
+    echo '<b><span class="invisible">'.$last_message.' '.$last_img.'</b></span>';
 }
 echo '</center>';
 
@@ -218,18 +218,18 @@ 
 }
 
 if (api_get_course_setting('allow_user_image_forum')) {
-    echo '<br />' . display_user_image($rows[$display_post_id]['user_id'], $name, $origin) . '<br />';
+    echo '<br />'.display_user_image($rows[$display_post_id]['user_id'], $name, $origin).'<br />';
 }
 echo display_user_link(
     $rows[$display_post_id]['user_id'],
     $name,
     $origin,
     $username
-) . "<br />";
+)."<br />";
 
 echo api_convert_and_format_date(
     $rows[$display_post_id]['post_date']
-) . '<br /><br />';
+).'<br /><br />';
 // Get attach id
 $attachment_list = get_attachment($display_post_id);
 $id_attach = !empty($attachment_list) ? $attachment_list['id'] : '';
@@ -248,16 +248,16 @@ 
     )
 ) {
     if ($locked == false) {
-        echo "<a href=\"editpost.php?" . api_get_cidreq() .
-            "&forum=" . $forumId . "&thread=" . $threadId .
-            "&post=" . $rows[$display_post_id]['post_id'] .
-            "&id_attach=" . $id_attach . "\">" .
+        echo "<a href=\"editpost.php?".api_get_cidreq().
+            "&forum=".$forumId."&thread=".$threadId.
+            "&post=".$rows[$display_post_id]['post_id'].
+            "&id_attach=".$id_attach."\">".
             Display::return_icon(
                 'edit.png',
                 get_lang('Edit'),
                 array(),
                 ICON_SIZE_SMALL
-            ) . '</a>';
+            ).'</a>';
     }
 }
 
@@ -273,7 +273,7 @@ 
     sort($id_posts, SORT_NUMERIC);
     reset($id_posts);
     // The post minor
-    $post_minor = (int)$id_posts[0];
+    $post_minor = (int) $id_posts[0];
 }
 
 if (
@@ -282,13 +282,13 @@ 
     !(api_is_course_coach() && $current_forum['session_id'] != $sessionId)
 ) {
     if ($locked == false) {
-        echo "<a href=\"" . api_get_self() . "?" . api_get_cidreq() .
-            "&forum=" . $forumId . "&thread=" . $threadId .
-            "&action=delete&content=post&id=" .
-            $rows[$display_post_id]['post_id'] .
-            "\" onclick=\"javascript:if(!confirm('" .
-            addslashes(api_htmlentities(get_lang('DeletePost'), ENT_QUOTES)) .
-            "')) return false;\">" . Display::return_icon(
+        echo "<a href=\"".api_get_self()."?".api_get_cidreq().
+            "&forum=".$forumId."&thread=".$threadId.
+            "&action=delete&content=post&id=".
+            $rows[$display_post_id]['post_id'].
+            "\" onclick=\"javascript:if(!confirm('".
+            addslashes(api_htmlentities(get_lang('DeletePost'), ENT_QUOTES)).
+            "')) return false;\">".Display::return_icon(
                 'delete.png',
                 get_lang('Delete'),
                 array(),
@@ -307,16 +307,16 @@ 
     );
 
     if (!isset($_GET['id']) && $post_id > $post_minor) {
-        echo "<a href=\"viewthread.php?" . api_get_cidreq() .
-            "&forum=" . $forumId . "&thread=" . $threadId .
-            "&origin=" . $origin . "&action=move&post=" .
-            $rows[$display_post_id]['post_id'] . "\">" .
+        echo "<a href=\"viewthread.php?".api_get_cidreq().
+            "&forum=".$forumId."&thread=".$threadId.
+            "&origin=".$origin."&action=move&post=".
+            $rows[$display_post_id]['post_id']."\">".
             Display::return_icon(
                 'move.png',
                 get_lang('MovePost'),
                 array(),
                 ICON_SIZE_SMALL
-            ) . "</a>";
+            )."</a>";
 
     }
 }
@@ -339,16 +339,16 @@ 
         );
 
         if ($locked == false) {
-            echo "<a href=\"forumqualify.php?" . api_get_cidreq() .
-                "&forum=" . $forumId . "&thread=" . $threadId .
-                "&action=list&post=" . $rows[$display_post_id]['post_id'] .
-                "&user=" . $rows[$display_post_id]['user_id'] . "&user_id=" .
-                $rows[$display_post_id]['user_id'] . "&origin=" . $origin .
-                "&idtextqualify=" . $current_qualify_thread .
-                "\" >" . Display::return_icon(
+            echo "<a href=\"forumqualify.php?".api_get_cidreq().
+                "&forum=".$forumId."&thread=".$threadId.
+                "&action=list&post=".$rows[$display_post_id]['post_id'].
+                "&user=".$rows[$display_post_id]['user_id']."&user_id=".
+                $rows[$display_post_id]['user_id']."&origin=".$origin.
+                "&idtextqualify=".$current_qualify_thread.
+                "\" >".Display::return_icon(
                     'quiz.gif',
                     get_lang('Qualify')
-                ) . "</a>";
+                )."</a>";
         }
     }
 }
@@ -360,33 +360,33 @@ 
         ($current_forum['allow_anonymous'] == 1 && !$_user['user_id'])
     ) {
         if (!api_is_anonymous() && api_is_allowed_to_session_edit(false, true)) {
-            echo '<a href="reply.php?' . api_get_cidreq() .
-                '&forum=' . $forumId . '&thread=' . $threadId .
-                '&post=' . $rows[$display_post_id]['post_id'] .
-                '&action=replymessage&origin=' . $origin . '">' .
+            echo '<a href="reply.php?'.api_get_cidreq().
+                '&forum='.$forumId.'&thread='.$threadId.
+                '&post='.$rows[$display_post_id]['post_id'].
+                '&action=replymessage&origin='.$origin.'">'.
                 Display::return_icon(
                     'message_reply_forum.png',
                     get_lang('ReplyToMessage')
-                ) . "</a>";
-            echo '<a href="reply.php?' . api_get_cidreq() .
-                '&forum=' . $forumId . '&thread=' . $threadId .
-                '&post=' . $rows[$display_post_id]['post_id'] .
-                '&action=quote&origin=' . $origin . '">' .
+                )."</a>";
+            echo '<a href="reply.php?'.api_get_cidreq().
+                '&forum='.$forumId.'&thread='.$threadId.
+                '&post='.$rows[$display_post_id]['post_id'].
+                '&action=quote&origin='.$origin.'">'.
                 Display::return_icon(
                     'quote.gif',
                     get_lang('QuoteMessage')
-                ) . "</a>";
+                )."</a>";
         }
     }
 } else {
     if ($current_forum_category && $current_forum_category['locked'] == 1) {
-        echo get_lang('ForumcategoryLocked') . '<br />';
+        echo get_lang('ForumcategoryLocked').'<br />';
     }
     if ($current_forum['locked'] == 1) {
-        echo get_lang('ForumLocked') . '<br />';
+        echo get_lang('ForumLocked').'<br />';
     }
     if ($current_thread['locked'] == 1) {
-        echo get_lang('ThreadLocked') . '<br />';
+        echo get_lang('ThreadLocked').'<br />';
     }
 }
 
@@ -405,17 +405,17 @@ 
     $rows[$display_post_id]['post_notification'] == '1' AND
     $rows[$display_post_id]['poster_id'] == $_user['user_id']
 ) {
-    $post_image .= Display::return_icon('forumnotification.gif',get_lang('YouWillBeNotified'));
+    $post_image .= Display::return_icon('forumnotification.gif', get_lang('YouWillBeNotified'));
 }
 // The post title
-echo "<td class=\"$titleclass\">" .
-    prepare4display($rows[$display_post_id]['post_title']) . "</td>";
+echo "<td class=\"$titleclass\">".
+    prepare4display($rows[$display_post_id]['post_title'])."</td>";
 echo "</tr>";
 
 // The post message
 echo "<tr>";
-echo "<td class=\"$messageclass\">" .
-    prepare4display($rows[$display_post_id]['post_text']) . "</td>";
+echo "<td class=\"$messageclass\">".
+    prepare4display($rows[$display_post_id]['post_text'])."</td>";
 echo "</tr>";
 
 // The check if there is an attachment
@@ -428,24 +428,24 @@ 
         echo Display::return_icon('attachment.gif', get_lang('Attachment'));
         echo '<a href="download.php?file=';
         echo $realname;
-        echo ' "> ' . $user_filename . ' </a>';
-        echo '<span class="forum_attach_comment">' .
-            Security::remove_XSS($attachment['comment'], STUDENT) . '</span>';
+        echo ' "> '.$user_filename.' </a>';
+        echo '<span class="forum_attach_comment">'.
+            Security::remove_XSS($attachment['comment'], STUDENT).'</span>';
 
         if (
-            ($current_forum['allow_edit'] == 1 &&$rows[$display_post_id]['user_id'] == $_user['user_id']) ||
+            ($current_forum['allow_edit'] == 1 && $rows[$display_post_id]['user_id'] == $_user['user_id']) ||
             (api_is_allowed_to_edit(false, true) && !(api_is_course_coach() && $current_forum['session_id'] != $sessionId))
         ) {
-            echo '&nbsp;&nbsp;<a href="' . api_get_self() . '?' .
-                api_get_cidreq() . '&origin=' .
-                Security::remove_XSS($_GET['origin']) .
-                '&action=delete_attach&id_attach=' .
-                $attachment['id'] . '&forum=' . $forumId .
-                '&thread=' . $threadId .
-                '" onclick="javascript:if(!confirm(\'' .
+            echo '&nbsp;&nbsp;<a href="'.api_get_self().'?'.
+                api_get_cidreq().'&origin='.
+                Security::remove_XSS($_GET['origin']).
+                '&action=delete_attach&id_attach='.
+                $attachment['id'].'&forum='.$forumId.
+                '&thread='.$threadId.
+                '" onclick="javascript:if(!confirm(\''.
                 addslashes(api_htmlentities(
                     get_lang('ConfirmYourChoice'), ENT_QUOTES)
-                ) . '\')) return false;">' . Display::return_icon(
+                ).'\')) return false;">'.Display::return_icon(
                     'delete.gif',
                     get_lang('Delete')
                 ).'</a><br />';

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/admin/access_urls.php

Spacing +17 added lines, -17 removed lines

@@ -19,7 +19,7 @@ 
     exit;
 }
 
-$interbreadcrumb[] = array ("url" => 'index.php', 'name' => get_lang('PlatformAdmin'));
+$interbreadcrumb[] = array("url" => 'index.php', 'name' => get_lang('PlatformAdmin'));
 $tool_name = get_lang('MultipleAccessURLs');
 Display :: display_header($tool_name);
 
@@ -55,12 +55,12 @@ 
         case 'register':
             // we are going to register the admin
             if (api_is_platform_admin()) {
-                if ($current_access_url_id!=-1) {
+                if ($current_access_url_id != -1) {
                     $url_str = '';
                     foreach ($url_list as $my_url) {
                         if (!in_array($my_url['id'], $my_user_url_list)) {
                             UrlManager::add_user_to_url(api_get_user_id(), $my_url['id']);
-                            $url_str.=$my_url['url'].' <br />';
+                            $url_str .= $my_url['url'].' <br />';
                         }
                     }
                     Display:: display_normal_message(
@@ -84,16 +84,16 @@ 
         $url_string .= $my_url['url'].' <br />';
     }
 }
-if(!empty($url_string)) {
-	Display :: display_warning_message(get_lang('AdminShouldBeRegisterInSite').'<br />'.$url_string,false);
+if (!empty($url_string)) {
+	Display :: display_warning_message(get_lang('AdminShouldBeRegisterInSite').'<br />'.$url_string, false);
 }
 
 // checking the current installation
-if ($current_access_url_id==-1) {
+if ($current_access_url_id == -1) {
 	Display::display_warning_message(get_lang('URLNotConfiguredPleaseChangedTo').': '.api_get_path(WEB_PATH));
-} elseif(api_is_platform_admin()) {
-    $quant= UrlManager::relation_url_user_exist(api_get_user_id(),$current_access_url_id);
-    if ($quant==0) {
+} elseif (api_is_platform_admin()) {
+    $quant = UrlManager::relation_url_user_exist(api_get_user_id(), $current_access_url_id);
+    if ($quant == 0) {
         Display:: display_warning_message(
             '<a href="'.api_get_self().'?action=register&sec_token='.$parameters['sec_token'].'">'.get_lang('ClickToRegisterAdmin').'</a>',
             false
@@ -142,16 +142,16 @@ 
 
     //Status
     $active = $row['active'];
-    if ($active=='1') {
-        $action='lock';
-        $image='right';
+    if ($active == '1') {
+        $action = 'lock';
+        $image = 'right';
     }
-    if ($active=='0') {
-        $action='unlock';
-        $image='wrong';
+    if ($active == '0') {
+        $action = 'unlock';
+        $image = 'wrong';
     }
     // you cannot lock the default
-    if ($row['id']=='1') {
+    if ($row['id'] == '1') {
         $status = Display::return_icon($image.'.gif', get_lang(ucfirst($action)));
     } else {
         $status = '<a href="access_urls.php?action='.$action.'&amp;url_id='.$row['id'].'">'.
@@ -161,7 +161,7 @@ 
     $url_id = $row['id'];
     $actions = Display::url(Display::return_icon('edit.png', get_lang('Edit'), array(), ICON_SIZE_SMALL), "access_url_edit.php?url_id=$url_id");
     if ($url_id != '1') {
-        $actions .= '<a href="access_urls.php?action=delete_url&amp;url_id='.$url_id.'" onclick="javascript:if(!confirm('."'".addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES,$charset))."'".')) return false;">'.
+        $actions .= '<a href="access_urls.php?action=delete_url&amp;url_id='.$url_id.'" onclick="javascript:if(!confirm('."'".addslashes(api_htmlentities(get_lang("ConfirmYourChoice"), ENT_QUOTES, $charset))."'".')) return false;">'.
             Display::return_icon('delete.png', get_lang('Delete'), array(), ICON_SIZE_SMALL).'</a>';
     }
     $urls[] = array($url, $description, $status, $actions);