chamilo / chamilo-lms

main/dropbox/dropbox_functions.inc.php

Spacing +30 added lines, -30 removed lines

@@ -41,7 +41,7 @@ 
 
     // STEP 2: at least one file has to be selected. If not we return an error message
     $ids = isset($_GET['id']) ? $_GET['id'] : array();
-    if (count($ids)>0) {
+    if (count($ids) > 0) {
         $checked_file_ids = $_POST['id'];
     } else {
         foreach ($_POST as $key => $value) {
@@ -133,7 +133,7 @@ 
     }
 
     $cat = get_dropbox_category($id);
-    if (count($cat)==0) {
+    if (count($cat) == 0) {
         return false;
     }
 
@@ -166,7 +166,7 @@ 
             WHERE c_id = $course_id AND cat_id='".intval($id)."'";
     $result = Database::query($sql);
 
-    while($row = Database::fetch_array($result)) {
+    while ($row = Database::fetch_array($result)) {
         $dropboxfile = new Dropbox_Person($user_id, $is_courseAdmin, $is_courseTutor);
         if ($action == 'deletereceivedcategory') {
             $dropboxfile->deleteReceivedWork($row[$id_field]);
@@ -657,7 +657,7 @@ 
 
                 $full_name = $userInfo['complete_name'].$groupNameListToString;
                 $current_user_id = $current_user['user_id'];
-                $options['user_' . $current_user_id] = $full_name;
+                $options['user_'.$current_user_id] = $full_name;
             }
         }
     }
@@ -706,11 +706,11 @@ 
 
     $mailingId = $id - dropbox_cnf('mailingIdBase');
     if ($mailingId > 0) {
-        return get_lang('MailingAsUsername', '') . $mailingId;
+        return get_lang('MailingAsUsername', '').$mailingId;
     }
     $id = intval($id);
     $sql = "SELECT ".(api_is_western_name_order() ? "CONCAT(firstname,' ', lastname)" : "CONCAT(lastname,' ', firstname)")." AS name
-            FROM " . $dropbox_cnf['tbl_user'] . "
+            FROM " . $dropbox_cnf['tbl_user']."
             WHERE user_id='$id'";
     $result = Database::query($sql);
     $res = Database::fetch_array($result);
@@ -730,7 +730,7 @@ 
 {
     $id = intval($id);
     $sql = "SELECT username
-            FROM " . dropbox_cnf('tbl_user') . "
+            FROM " . dropbox_cnf('tbl_user')."
             WHERE user_id='$id'";
     $result = Database::query($sql);
     $res = Database::fetch_array($result);
@@ -762,8 +762,8 @@ 
 
     // select all files that aren't referenced anymore
     $sql = "SELECT DISTINCT f.id, f.filename
-            FROM " . dropbox_cnf('tbl_file') . " f
-            LEFT JOIN " . dropbox_cnf('tbl_person') . " p
+            FROM " . dropbox_cnf('tbl_file')." f
+            LEFT JOIN " . dropbox_cnf('tbl_person')." p
             ON (f.id = p.file_id)
             WHERE p.user_id IS NULL AND
                   f.c_id = $course_id
@@ -771,14 +771,14 @@ 
     $result = Database::query($sql);
     while ($res = Database::fetch_array($result)) {
         //delete the selected files from the post and file tables
-        $sql = "DELETE FROM " . dropbox_cnf('tbl_post') . "
-                WHERE c_id = $course_id AND file_id = '" . $res['id'] . "'";
+        $sql = "DELETE FROM ".dropbox_cnf('tbl_post')."
+                WHERE c_id = $course_id AND file_id = '".$res['id']."'";
         Database::query($sql);
-        $sql = "DELETE FROM " . dropbox_cnf('tbl_file') . "
-                WHERE c_id = $course_id AND id ='" . $res['id'] . "'";
+        $sql = "DELETE FROM ".dropbox_cnf('tbl_file')."
+                WHERE c_id = $course_id AND id ='".$res['id']."'";
         Database::query($sql);
         //delete file from server
-        @unlink( dropbox_cnf('sysPath') . '/' . $res['filename']);
+        @unlink(dropbox_cnf('sysPath').'/'.$res['filename']);
     }
 }
 
@@ -801,11 +801,11 @@ 
 
     $mailingPseudoId = intval($mailingPseudoId);
     $sql = "SELECT f.uploader_id
-            FROM " . $dropbox_cnf['tbl_file'] . " f
-            LEFT JOIN " . $dropbox_cnf['tbl_post'] . " p
+            FROM " . $dropbox_cnf['tbl_file']." f
+            LEFT JOIN " . $dropbox_cnf['tbl_post']." p
             ON (f.id = p.file_id AND f.c_id = $course_id AND p.c_id = $course_id)
             WHERE
-                p.dest_user_id = '" . $mailingPseudoId . "' AND
+                p.dest_user_id = '".$mailingPseudoId."' AND
                 p.c_id = $course_id
             ";
     $result = Database::query($sql);
@@ -832,20 +832,20 @@ 
     //    for all content files, replace mailingPseudoId by owner as uploader
     $file_id = intval($file_id);
     $sql = "SELECT p.dest_user_id
-            FROM " . $dropbox_cnf['tbl_post'] . " p
-            WHERE c_id = $course_id AND p.file_id = '" . $file_id . "'";
+            FROM " . $dropbox_cnf['tbl_post']." p
+            WHERE c_id = $course_id AND p.file_id = '".$file_id."'";
     $result = Database::query($sql);
 
     if ($res = Database::fetch_array($result)) {
         $mailingPseudoId = $res['dest_user_id'];
         if ($mailingPseudoId > dropbox_cnf('mailingIdBase')) {
-            $sql = "DELETE FROM " . dropbox_cnf('tbl_person') . "
-                    WHERE c_id = $course_id AND user_id='" . $mailingPseudoId . "'";
+            $sql = "DELETE FROM ".dropbox_cnf('tbl_person')."
+                    WHERE c_id = $course_id AND user_id='".$mailingPseudoId."'";
             Database::query($sql);
 
-            $sql = "UPDATE " . dropbox_cnf('tbl_file') ."
-                    SET uploader_id='" . api_get_user_id() . "'
-                    WHERE c_id = $course_id AND uploader_id='" . $mailingPseudoId . "'";
+            $sql = "UPDATE ".dropbox_cnf('tbl_file')."
+                    SET uploader_id='" . api_get_user_id()."'
+                    WHERE c_id = $course_id AND uploader_id='".$mailingPseudoId."'";
             Database::query($sql);
         }
     }
@@ -984,7 +984,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('');
     }
 
     // creating the array that contains all the users who will receive the file
@@ -1002,7 +1002,7 @@ 
         }
     }
 
-    @move_uploaded_file($dropbox_filetmpname, dropbox_cnf('sysPath') . '/' . $dropbox_filename);
+    @move_uploaded_file($dropbox_filetmpname, dropbox_cnf('sysPath').'/'.$dropbox_filename);
 
     $b_send_mail = api_get_course_setting('email_alert_on_new_doc_dropbox');
 
@@ -1023,14 +1023,14 @@ 
                 ),
                 $recipent_temp['email'],
                 get_lang('NewDropboxFileUploaded'),
-                get_lang('NewDropboxFileUploadedContent').' <a href="'.api_get_path(WEB_CODE_PATH).'dropbox/index.php?' . api_get_cidreq() . '">'.get_lang('SeeFile').'</a>'.
+                get_lang('NewDropboxFileUploadedContent').' <a href="'.api_get_path(WEB_CODE_PATH).'dropbox/index.php?'.api_get_cidreq().'">'.get_lang('SeeFile').'</a>'.
                 "\n\n".
                 api_get_person_name(
                     $_user['firstName'],
                     $_user['lastName'],
                     null,
                     PERSON_NAME_EMAIL_ADDRESS
-                )."\n".  get_lang('Email') ." : ".$_user['mail'],
+                )."\n".get_lang('Email')." : ".$_user['mail'],
                 api_get_person_name(
                     $_user['firstName'],
                     $_user['lastName'],
@@ -1308,7 +1308,7 @@ 
         // Adding the content.
         $return .= "\n<tr>";
         foreach ($column as $column_key => $column_value) {
-            if (!in_array($column_value,$dont_show_columns)) {
+            if (!in_array($column_value, $dont_show_columns)) {
                 $return .= "\n\t<td>";
                 if (in_array($column_value, $make_link)) {
                     $return .= '<a href="'.$value[$column_value].'">'.$value[$column_value].'</a>';
@@ -1341,7 +1341,7 @@ 
             WHERE c_id = $course_id GROUP BY file_id";
     $result = Database::query($sql);
     $return = array();
-    while ($row=Database::fetch_array($result)) {
+    while ($row = Database::fetch_array($result)) {
         $return[$row['file_id']] = $row['total'];
     }
     return $return;

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/forum/forumqualify.php

Spacing +24 added lines, -24 removed lines

@@ -59,12 +59,12 @@ 
 /*
     Header and Breadcrumbs
 */
-if (isset($_SESSION['gradebook'])){
-    $gradebook=	$_SESSION['gradebook'];
+if (isset($_SESSION['gradebook'])) {
+    $gradebook = $_SESSION['gradebook'];
 }
 
-if (!empty($gradebook) && $gradebook=='view') {
-    $interbreadcrumb[]= array (
+if (!empty($gradebook) && $gradebook == 'view') {
+    $interbreadcrumb[] = array(
         'url' => '../gradebook/'.$_SESSION['gradebook_dest'],
         'name' => get_lang('ToolGradebook')
     );
@@ -88,7 +88,7 @@ 
             "name" => prepare4display($currentForum['forum_title'])
         );
         if ($message <> 'PostDeletedSpecial') {
-            $interbreadcrumb[]= array(
+            $interbreadcrumb[] = array(
                 "url" => "viewthread.php?forum=".intval($_GET['forum'])."&gradebook=".$gradebook."&thread=".intval($_GET['thread']),
                 "name" => prepare4display($currentThread['thread_title'])
             );
@@ -119,8 +119,8 @@ 
         );
 
         if ($message <> 'PostDeletedSpecial') {
-            if (isset($_GET['gradebook']) and $_GET['gradebook']=='view') {
-                $info_thread=get_thread_information($_GET['thread']);
+            if (isset($_GET['gradebook']) and $_GET['gradebook'] == 'view') {
+                $info_thread = get_thread_information($_GET['thread']);
                 $interbreadcrumb[] = array(
                     "url" => "viewthread.php?".api_get_cidreq()."&forum=".$info_thread['forum_id']."&thread=".intval($_GET['thread']),
                     "name" => prepare4display($currentThread['thread_title'])
@@ -133,7 +133,7 @@ 
             }
         }
         // the last element of the breadcrumb navigation is already set in interbreadcrumb, so give empty string
-        $interbreadcrumb[]=array("url" => "#","name" => get_lang('QualifyThread'));
+        $interbreadcrumb[] = array("url" => "#", "name" => get_lang('QualifyThread'));
         Display :: display_header('');
     }
 }
@@ -143,7 +143,7 @@ 
 */
 $action = isset($_GET['action']) ? $_GET['action'] : '';
 
-if ($action =='delete' &&
+if ($action == 'delete' &&
     isset($_GET['content']) &&
     isset($_GET['id']) && api_is_allowed_to_edit(false, true)
 ) {
@@ -240,8 +240,8 @@ 
     if (isset($rows)) {
         $counter = 1;
         foreach ($rows as $row) {
-            if ($row['status']=='0') {
-                $style =" id = 'post".$post_en."' class=\"hide-me\" style=\"border:1px solid red; display:none; background-color:#F7F7F7; width:95%; margin: 0px 0px 4px 40px; \" ";
+            if ($row['status'] == '0') {
+                $style = " id = 'post".$post_en."' class=\"hide-me\" style=\"border:1px solid red; display:none; background-color:#F7F7F7; width:95%; margin: 0px 0px 4px 40px; \" ";
             } else {
                 $style = "";
                 $post_en = $row['post_parent_id'];
@@ -258,20 +258,20 @@ 
 
             echo "<div ".$style."><table class=\"data_table\">";
 
-            if ($row['visible']=='0') {
-                $titleclass='forum_message_post_title_2_be_approved';
-                $messageclass='forum_message_post_text_2_be_approved';
-                $leftclass='forum_message_left_2_be_approved';
+            if ($row['visible'] == '0') {
+                $titleclass = 'forum_message_post_title_2_be_approved';
+                $messageclass = 'forum_message_post_text_2_be_approved';
+                $leftclass = 'forum_message_left_2_be_approved';
             } else {
-                $titleclass='forum_message_post_title';
-                $messageclass='forum_message_post_text';
-                $leftclass='forum_message_left';
+                $titleclass = 'forum_message_post_title';
+                $messageclass = 'forum_message_post_text';
+                $leftclass = 'forum_message_left';
             }
 
             echo "<tr>";
             echo "<td rowspan=\"3\" class=\"$leftclass\">";
 
-            echo '<br /><b>'.  api_convert_and_format_date($row['post_date'], DATE_TIME_FORMAT_LONG).'</b><br />';
+            echo '<br /><b>'.api_convert_and_format_date($row['post_date'], DATE_TIME_FORMAT_LONG).'</b><br />';
 
             echo "</td>";
 
@@ -292,7 +292,7 @@ 
                 $realname = $attachment_list['path'];
                 $user_filename = $attachment_list['filename'];
 
-                echo Display::return_icon('attachment.gif',get_lang('Attachment'));
+                echo Display::return_icon('attachment.gif', get_lang('Attachment'));
                 echo '<a href="download.php?file=';
                 echo $realname;
                 echo ' "> '.$user_filename.' </a>';
@@ -311,8 +311,8 @@ 
 
     // Show past data
     if (api_is_allowed_to_edit() && $counter > 0) {
-        if (isset($_GET['gradebook'])){
-            $view_gradebook='&gradebook=view';
+        if (isset($_GET['gradebook'])) {
+            $view_gradebook = '&gradebook=view';
         }
         echo '<h4>'.get_lang('QualificationChangesHistory').'</h4>';
         if (isset($_GET['type']) && $_GET['type'] == 'false') {
@@ -342,12 +342,12 @@ 
             );
             $table_list .= '</td></tr>';
         }
-        $table_list.= '</table>';
+        $table_list .= '</table>';
 
         echo $table_list;
     }
 }
 
-if ($origin!='learnpath') {
+if ($origin != 'learnpath') {
     Display :: display_footer();
 }

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/tracking/courseLog.php

Spacing +14 added lines, -14 removed lines

@@ -112,7 +112,7 @@ 
                             get_lang('HideColumn'),
                             array('align' => 'absmiddle', 'hspace' => '3px'),
                             ICON_SIZE_SMALL
-                         ) . "</div>'
+                         )."</div>'
                     );
                 }
             );
@@ -147,7 +147,7 @@ 
 $TABLETRACK_LINKS       = Database::get_main_table(TABLE_STATISTIC_TRACK_E_LINKS);
 $TABLETRACK_DOWNLOADS   = Database::get_main_table(TABLE_STATISTIC_TRACK_E_DOWNLOADS);
 $TABLETRACK_ACCESS_2    = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ACCESS);
-$TABLETRACK_EXERCISES 	= Database::get_main_table(TABLE_STATISTIC_TRACK_E_EXERCISES);
+$TABLETRACK_EXERCISES = Database::get_main_table(TABLE_STATISTIC_TRACK_E_EXERCISES);
 $TABLECOURSUSER = Database::get_main_table(TABLE_MAIN_COURSE_USER);
 $TABLECOURSE = Database::get_main_table(TABLE_MAIN_COURSE);
 $table_user = Database::get_main_table(TABLE_MAIN_USER);
@@ -157,8 +157,8 @@ 
 
 // Breadcrumbs.
 if (isset($_GET['origin']) && $_GET['origin'] == 'resume_session') {
-    $interbreadcrumb[] = array('url' => '../admin/index.php','name' => get_lang('PlatformAdmin'));
-    $interbreadcrumb[] = array('url' => '../session/session_list.php','name' => get_lang('SessionList'));
+    $interbreadcrumb[] = array('url' => '../admin/index.php', 'name' => get_lang('PlatformAdmin'));
+    $interbreadcrumb[] = array('url' => '../session/session_list.php', 'name' => get_lang('SessionList'));
     $interbreadcrumb[] = array('url' => '../session/resume_session.php?id_session='.$sessionId, 'name' => get_lang('SessionOverview'));
 }
 
@@ -229,21 +229,21 @@ 
 if (!empty($sessionId)) {
     $actionsLeft .= Display::url(
         Display::return_icon('attendance_list.png', get_lang('Logins'), '', ICON_SIZE_MEDIUM),
-        api_get_path(WEB_CODE_PATH) . 'attendance/index.php?' . api_get_cidreq() . '&action=calendar_logins'
+        api_get_path(WEB_CODE_PATH).'attendance/index.php?'.api_get_cidreq().'&action=calendar_logins'
     );
 }
 
 $actionsRight = '<div class="pull-right">';
 $actionsRight .= '<a href="javascript: void(0);" onclick="javascript: window.print();">'.
-    Display::return_icon('printer.png', get_lang('Print'),'',ICON_SIZE_MEDIUM).'</a>';
+    Display::return_icon('printer.png', get_lang('Print'), '', ICON_SIZE_MEDIUM).'</a>';
 
 $addional_param = '';
 if (isset($_GET['additional_profile_field'])) {
-    $addional_param ='additional_profile_field='.intval($_GET['additional_profile_field']);
+    $addional_param = 'additional_profile_field='.intval($_GET['additional_profile_field']);
 }
 $users_tracking_per_page = '';
 if (isset($_GET['users_tracking_per_page'])) {
-    $users_tracking_per_page= '&users_tracking_per_page='.intval($_GET['users_tracking_per_page']);
+    $users_tracking_per_page = '&users_tracking_per_page='.intval($_GET['users_tracking_per_page']);
 }
 $actionsRight .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&export=csv&'.$addional_param.$users_tracking_per_page.'">
      '.Display::return_icon('export_csv.png', get_lang('ExportAsCSV'), '', ICON_SIZE_MEDIUM).'</a>';
@@ -264,13 +264,13 @@ 
 $form_search->addButtonSearch(get_lang('SearchUsers'));
 
 
-echo Display::toolbarAction('toolbar-courselog', array( 0 => $actionsLeft, 1 => $form_search->returnForm(), 2 => $actionsRight ), 3);
+echo Display::toolbarAction('toolbar-courselog', array(0 => $actionsLeft, 1 => $form_search->returnForm(), 2 => $actionsRight), 3);
 
 $course_name = get_lang('Course').' '.$courseInfo['name'];
 
 if ($session_id) {
     $titleSession = Display::return_icon('session.png', get_lang('Session'), array(), ICON_SIZE_SMALL).' '.api_get_session_name($session_id);
-    $titleCourse =  Display::return_icon('course.png', get_lang('Course'), array(), ICON_SIZE_SMALL).' '.$course_name;
+    $titleCourse = Display::return_icon('course.png', get_lang('Course'), array(), ICON_SIZE_SMALL).' '.$course_name;
 
 } else {
     $titleSession = Display::return_icon('course.png', get_lang('Course'), array(), ICON_SIZE_SMALL).' '.$courseInfo['name'];
@@ -312,7 +312,7 @@ 
     $html .= '<ul class="session-list">';
     foreach ($sessionList as $session) {
         $url = api_get_path(WEB_CODE_PATH).'mySpace/course.php?session_id='.$session['id'].'&cidReq='.$courseInfo['code'];
-        $html .= Display::tag('li', $iconCourse . ' ' . Display::url($session['name'], $url));
+        $html .= Display::tag('li', $iconCourse.' '.Display::url($session['name'], $url));
     }
     $html .= '</ul>';
 }
@@ -327,12 +327,12 @@ 
     $form = new FormValidator(
         'reminder_form',
         'get',
-        api_get_path(WEB_CODE_PATH).'announcements/announcements.php?' . api_get_cidreq(),
+        api_get_path(WEB_CODE_PATH).'announcements/announcements.php?'.api_get_cidreq(),
         null,
         ['style' => 'margin-bottom: 10px'],
         FormValidator::LAYOUT_INLINE
     );
-    $options = array (
+    $options = array(
         2 => sprintf($getLangXDays, 2),
         3 => sprintf($getLangXDays, 3),
         4 => sprintf($getLangXDays, 4),
@@ -345,7 +345,7 @@ 
     );
     $el = $form->addSelect(
         'since',
-        Display::returnFontAwesomeIcon('warning') . get_lang('RemindInactivesLearnersSince'),
+        Display::returnFontAwesomeIcon('warning').get_lang('RemindInactivesLearnersSince'),
         $options,
         ['class' => 'col-sm-3']
     );