chamilo / chamilo-lms

main/inc/lib/api.lib.php

Indentation +2 added lines, -4 removed lines

@@ -625,7 +625,6 @@ 
  * The other configuration parameters have not been changed.
  *
  * This is how we can get most used paths, for common purpose:
-
  * api_get_path(REL_PATH)                       /chamilo/
  * api_get_path(REL_COURSE_PATH)                /chamilo/courses/
  * api_get_path(REL_CODE_PATH)                  /chamilo/main/
@@ -1803,7 +1802,6 @@ 
 
 /**
  * Returns the current course info array.
-
  * Now if the course_code is given, the returned array gives info about that
  * particular course, not specially the current one.
  * @param int $id Numeric ID of the course
@@ -2734,7 +2732,7 @@ 
         switch ($session_user_status) {
             case 0:
                 $session_status['status'] = 'student';
-               break;
+                break;
             case 2:
                 $session_status['status'] = 'coach';
             break;
@@ -6492,7 +6490,7 @@ 
 function api_get_jquery_ui_js($include_jqgrid = false) {
     $libraries = array();
     if ($include_jqgrid) {
-       $libraries[]='jqgrid';
+        $libraries[]='jqgrid';
     }
     return api_get_jquery_libraries_js($libraries);
 }

main/install/install.lib.php

Indentation +2 added lines, -2 removed lines

@@ -1682,7 +1682,7 @@ 
         $html .= '<label class="checkbox-inline">
                         <input type="radio" name="allowSelfReg" value="0" id="allowSelfReg0" '. ($allowSelfReg == 'false' ? '' : 'checked="checked" ') .' /> '. get_lang('No') .'
                     </label>';
-         $html .= '<label class="checkbox-inline">
+            $html .= '<label class="checkbox-inline">
                     <input type="radio" name="allowSelfReg" value="0" id="allowSelfReg0" '. ($allowSelfReg == 'approval' ? '' : 'checked="checked" ') .' /> '. get_lang('AfterApproval') .'
                 </label>';
         $html .= '</div>';
@@ -1716,7 +1716,7 @@ 
     </div>';
 
     echo panel($html, get_lang('Platform'), 'platform');
- ?>
+    ?>
     <div class='form-group'>
         <div class="col-sm-6">
             <button type="submit" class="btn btn-default pull-right" name="step3" value="&lt; <?php echo get_lang('Previous'); ?>" ><em class="fa fa-backward"> </em> <?php echo get_lang('Previous'); ?></button>

main/course_home/course_home.php

Indentation +7 added lines, -7 removed lines

@@ -213,7 +213,7 @@ 
             if (Database::num_rows($result) ==  0) {
                 $condition = '';
             } else {
-            	//great, there is an specific auto launch for this session we leave the $condition
+                //great, there is an specific auto launch for this session we leave the $condition
             }
         }
 
@@ -225,7 +225,7 @@ 
             $lp_data = Database::fetch_array($result,'ASSOC');
             if (!empty($lp_data['id'])) {
                 if (api_is_platform_admin() || api_is_allowed_to_edit()) {
-                	$show_autolaunch_lp_warning = true;
+                    $show_autolaunch_lp_warning = true;
                 } else {
                     $session_key = 'lp_autolaunch_'.$session_id.'_'.api_get_course_int_id().'_'.api_get_user_id();
                     if (!isset($_SESSION[$session_key])) {
@@ -254,7 +254,7 @@ 
         //if (!isset($_SESSION[$forumKey])) {
             //redirecting to the LP
             $url = api_get_path(WEB_CODE_PATH).'forum/index.php?'.api_get_cidreq().'&id_session='.$session_id;
-          //  $_SESSION[$forumKey] = true;
+            //  $_SESSION[$forumKey] = true;
             header("Location: $url");
             exit;
         //}
@@ -280,13 +280,13 @@ 
 if (api_get_setting('course.homepage_view') == 'activity' ||
     api_get_setting('course.homepage_view') == 'activity_big'
 ) {
-	require 'activity.php';
+    require 'activity.php';
 } elseif (api_get_setting('course.homepage_view') == '2column') {
-	require '2column.php';
+    require '2column.php';
 } elseif (api_get_setting('course.homepage_view') == '3column') {
-	require '3column.php';
+    require '3column.php';
 } elseif (api_get_setting('course.homepage_view') == 'vertical_activity') {
-	require 'vertical_activity.php';
+    require 'vertical_activity.php';
 }
 
 $content = '<div id="course_tools">'.$content.'</div>';

main/dropbox/index.php

Indentation +428 added lines, -428 removed lines

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

main/inc/lib/login.lib.php

Indentation +6 added lines, -6 removed lines

@@ -852,14 +852,14 @@ 
             $email = false;
         }
 
-		if ($email) {
-			$condition = "LOWER(email) = '".Database::escape_string($username)."' ";
-		} else {
+        if ($email) {
+            $condition = "LOWER(email) = '".Database::escape_string($username)."' ";
+        } else {
             $condition = "LOWER(username) = '".Database::escape_string($username)."'";
         }
 
-		$tbl_user = Database :: get_main_table(TABLE_MAIN_USER);
-		$query = "SELECT 
+        $tbl_user = Database :: get_main_table(TABLE_MAIN_USER);
+        $query = "SELECT 
 		            user_id AS uid, 
 		            lastname AS lastName, 
 		            firstname AS firstName, 
@@ -874,7 +874,7 @@ 
                     auth_source
 				 FROM $tbl_user
 				 WHERE ( $condition AND active = 1) ";
-		$result = Database::query($query);
+        $result = Database::query($query);
         $num_rows = Database::num_rows($result);
         if ($result && $num_rows > 0) {
             return Database::fetch_assoc($result);

main/inc/lib/formvalidator/Element/SelectLanguage.php

Indentation +18 added lines, -18 removed lines

@@ -7,22 +7,22 @@
  */
 class SelectLanguage extends HTML_QuickForm_select
 {
-	/**
-	 * Class constructor
-	 */
-	public function __construct($elementName = null, $elementLabel = null, $options = null, $attributes = null)
-	{
-		parent::__construct($elementName, $elementLabel, $options, $attributes);
-		// Get all languages
-		$languages = api_get_languages();
-		$this->_options = array();
-		$this->_values = array();
-		foreach ($languages['name'] as $index => $name) {
-			if ($languages['folder'][$index] == api_get_setting('platformLanguage')) {
-				$this->addOption($name, $languages['folder'][$index], array('selected'=>'selected'));
-			} else {
-				$this->addOption($name, $languages['folder'][$index]);
-			}
-		}
-	}
+    /**
+     * Class constructor
+     */
+    public function __construct($elementName = null, $elementLabel = null, $options = null, $attributes = null)
+    {
+        parent::__construct($elementName, $elementLabel, $options, $attributes);
+        // Get all languages
+        $languages = api_get_languages();
+        $this->_options = array();
+        $this->_values = array();
+        foreach ($languages['name'] as $index => $name) {
+            if ($languages['folder'][$index] == api_get_setting('platformLanguage')) {
+                $this->addOption($name, $languages['folder'][$index], array('selected'=>'selected'));
+            } else {
+                $this->addOption($name, $languages['folder'][$index]);
+            }
+        }
+    }
 }

main/document/show_content.php

Indentation +4 added lines, -4 removed lines

@@ -91,11 +91,11 @@
 $pathinfo = pathinfo($header_file);
 
 if ($pathinfo['extension']=='swf') {
-	$width='83%';
-	$height='83%';
+    $width='83%';
+    $height='83%';
 } else {
-	$width='100%';
-	$height='100%';
+    $width='100%';
+    $height='100%';
 }
 
 echo '<iframe border="0" frameborder="0" scrolling="no" style="width:'.$width.'; height:'.$height.';background-color:#ffffff;" id="mainFrame" name="mainFrame" src="'.$file_url_web.'?'.api_get_cidreq().'&amp;rand='.mt_rand(1, 1000).'"></iframe>';

main/admin/configure_homepage.php

Indentation +849 added lines, -849 removed lines

@@ -17,35 +17,35 @@ 
  */
 function home_tabs($file_logged_in)
 {
-	$post = strpos($file_logged_in, "_logged_in");
-	if ($post !== false) {
-		$file_logged_out = str_replace('_logged_in','', $file_logged_in);
-		//variables initialization
-		$data_logged_out = array();
-		$data_logged_in  = array();
-
-		//we read the file with all links
-		$file = file($file_logged_in);
-		foreach ($file as $line) {
-			$line = str_replace("\n", '',$line);
-			//not logged user only sees public links
-			if (!preg_match('/::private/',$line)) {
-				$data_logged_out[] = $line;
-			}
-			//logged user only sees all links
-			$data_logged_in[] = $line;
-		}
-		//tabs file for logged out users
-		if (file_exists($file_logged_out)) {
-			$fp = fopen($file_logged_out, 'w');
-			fputs($fp, implode("\n", $data_logged_out));
-			fclose($fp);
-		}
-		//tabs file for logged in users
-		$fp = fopen($file_logged_in, 'w');
-		fputs($fp, implode("\n", $data_logged_in));
-		fclose($fp);
-	}
+    $post = strpos($file_logged_in, "_logged_in");
+    if ($post !== false) {
+        $file_logged_out = str_replace('_logged_in','', $file_logged_in);
+        //variables initialization
+        $data_logged_out = array();
+        $data_logged_in  = array();
+
+        //we read the file with all links
+        $file = file($file_logged_in);
+        foreach ($file as $line) {
+            $line = str_replace("\n", '',$line);
+            //not logged user only sees public links
+            if (!preg_match('/::private/',$line)) {
+                $data_logged_out[] = $line;
+            }
+            //logged user only sees all links
+            $data_logged_in[] = $line;
+        }
+        //tabs file for logged out users
+        if (file_exists($file_logged_out)) {
+            $fp = fopen($file_logged_out, 'w');
+            fputs($fp, implode("\n", $data_logged_out));
+            fclose($fp);
+        }
+        //tabs file for logged in users
+        $fp = fopen($file_logged_in, 'w');
+        fputs($fp, implode("\n", $data_logged_in));
+        fclose($fp);
+    }
 }
 
 $cidReset = true;
@@ -76,39 +76,39 @@ 
 $_languages = api_get_languages();
 $selfUrl =  api_get_self();
 $interbreadcrumb[] = array(
-	'url' => 'index.php',
-	'name' => get_lang('PlatformAdmin')
+    'url' => 'index.php',
+    'name' => get_lang('PlatformAdmin')
 );
 
 if (!empty($action)) {
-	$interbreadcrumb[] = array(
-		'url' => 'configure_homepage.php',
-		'name' => get_lang('ConfigureHomePage')
-	);
-
-	switch ($action) {
-		case 'edit_top':
-			$tool_name = get_lang('EditHomePage');
-			break;
-		case 'edit_news':
-			$tool_name = get_lang('EditNews');
-			break;
-		case 'edit_notice':
-			$tool_name = get_lang('EditNotice');
-			break;
-		case 'insert_link':
-			$tool_name = get_lang('InsertLink');
-			break;
-		case 'edit_link':
-			$tool_name = get_lang('EditLink');
-			break;
-		case 'insert_tabs':
-			$tool_name = get_lang('InsertTabs');
-			break;
-		case 'edit_tabs':
-			$tool_name = get_lang('EditTabs');
-			break;
-	}
+    $interbreadcrumb[] = array(
+        'url' => 'configure_homepage.php',
+        'name' => get_lang('ConfigureHomePage')
+    );
+
+    switch ($action) {
+        case 'edit_top':
+            $tool_name = get_lang('EditHomePage');
+            break;
+        case 'edit_news':
+            $tool_name = get_lang('EditNews');
+            break;
+        case 'edit_notice':
+            $tool_name = get_lang('EditNotice');
+            break;
+        case 'insert_link':
+            $tool_name = get_lang('InsertLink');
+            break;
+        case 'edit_link':
+            $tool_name = get_lang('EditLink');
+            break;
+        case 'insert_tabs':
+            $tool_name = get_lang('InsertTabs');
+            break;
+        case 'edit_tabs':
+            $tool_name = get_lang('EditTabs');
+            break;
+    }
 }
 
 // The global logic for language priorities should be:
@@ -131,11 +131,11 @@ 
 
 $lang = ''; //el for "Edit Language"
 if (!empty($_SESSION['user_language_choice'])) {
-	$lang = $_SESSION['user_language_choice'];
+    $lang = $_SESSION['user_language_choice'];
 } elseif (!empty($_SESSION['_user']['language'])) {
-	$lang = $_SESSION['_user']['language'];
+    $lang = $_SESSION['_user']['language'];
 } else {
-	$lang = api_get_setting('platformLanguage');
+    $lang = api_get_setting('platformLanguage');
 }
 
 $languageGet = isset($_GET['language']) ? Security::remove_XSS($_GET['language']) : $lang;
@@ -144,25 +144,25 @@ 
 $homePath = api_get_path(SYS_HOME_PATH);
 
 if (api_is_multiple_url_enabled()) {
-	$access_url_id = api_get_current_access_url_id();
-	if ($access_url_id != -1) {
-		$url_info = api_get_access_url($access_url_id);
-		$url = api_remove_trailing_slash(preg_replace('/https?:\/\//i', '', $url_info['url']));
-		$clean_url = api_replace_dangerous_char($url);
-		$clean_url = str_replace('/', '-', $clean_url);
-		$clean_url .= '/';
-
-		$homep = $homePath; //homep for Home Path
-		$homep_new = $homePath.$clean_url; //homep for Home Path added the url
-		$new_url_dir = $homePath.$clean_url;
-		//we create the new dir for the new sites
-		if (!is_dir($new_url_dir)) {
-			mkdir($new_url_dir, api_get_permissions_for_new_directories());
-		}
-	}
+    $access_url_id = api_get_current_access_url_id();
+    if ($access_url_id != -1) {
+        $url_info = api_get_access_url($access_url_id);
+        $url = api_remove_trailing_slash(preg_replace('/https?:\/\//i', '', $url_info['url']));
+        $clean_url = api_replace_dangerous_char($url);
+        $clean_url = str_replace('/', '-', $clean_url);
+        $clean_url .= '/';
+
+        $homep = $homePath; //homep for Home Path
+        $homep_new = $homePath.$clean_url; //homep for Home Path added the url
+        $new_url_dir = $homePath.$clean_url;
+        //we create the new dir for the new sites
+        if (!is_dir($new_url_dir)) {
+            mkdir($new_url_dir, api_get_permissions_for_new_directories());
+        }
+    }
 } else {
-	$homep_new = '';
-	$homep = $homePath; //homep for Home Path
+    $homep_new = '';
+    $homep = $homePath; //homep for Home Path
 }
 
 $menuf = 'home_menu'; //menuf for Menu File
@@ -177,25 +177,25 @@ 
 
 // If language-specific file does not exist, create it by copying default file
 foreach ($homef as $my_file) {
-	if (api_is_multiple_url_enabled()) {
-		if (!file_exists($homep_new.$my_file.'_'.$lang.$ext)) {
-			if (!file_exists($homep.$my_file.$ext)) {
-				touch($homep.$my_file.$ext);
-			}
-			@copy($homep.$my_file.$ext, $homep_new.$my_file.'_'.$lang.$ext);
-		}
-	} else {
-		if (!file_exists($homep.$my_file.'_'.$lang.$ext)) {
-			if (!file_exists($homep.$my_file.$ext)) {
-				touch($homep.$my_file.$ext);
-			}
-			@copy($homep.$my_file.$ext, $homep.$my_file.'_'.$lang.$ext);
-		}
-	}
+    if (api_is_multiple_url_enabled()) {
+        if (!file_exists($homep_new.$my_file.'_'.$lang.$ext)) {
+            if (!file_exists($homep.$my_file.$ext)) {
+                touch($homep.$my_file.$ext);
+            }
+            @copy($homep.$my_file.$ext, $homep_new.$my_file.'_'.$lang.$ext);
+        }
+    } else {
+        if (!file_exists($homep.$my_file.'_'.$lang.$ext)) {
+            if (!file_exists($homep.$my_file.$ext)) {
+                touch($homep.$my_file.$ext);
+            }
+            @copy($homep.$my_file.$ext, $homep.$my_file.'_'.$lang.$ext);
+        }
+    }
 }
 
 if (api_is_multiple_url_enabled()) {
-	$homep = $homep_new;
+    $homep = $homep_new;
 }
 
 // Check WCAG settings and prepare edition using WCAG
@@ -204,578 +204,578 @@ 
 // Filter link param
 $link = '';
 if (!empty($_GET['link'])) {
-	$link = $_GET['link'];
-	// If the link parameter is suspicious, empty it
-	if (strstr($link, '/') || !strstr($link, '.html') || strstr($link, '\\')) {
-		$link = '';
-		$action = '';
-	}
+    $link = $_GET['link'];
+    // If the link parameter is suspicious, empty it
+    if (strstr($link, '/') || !strstr($link, '.html') || strstr($link, '\\')) {
+        $link = '';
+        $action = '';
+    }
 }
 
 // Start analysing requested actions
 if (!empty($action)) {
-	if (!empty($_POST['formSent'])) {
-		// Variables used are $homep for home path, $menuf for menu file, $newsf
-		// for news file, $topf for top file, $noticef for noticefile,
-		// $ext for '.html'
-		switch ($action) {
-			case 'edit_top':
-				// Filter
-				$home_top = trim(stripslashes($_POST['home_top']));
-
-
-				// Write
-				if (is_writable($homep)) {
-					// Default
-					if (is_writable($homep.$topf.'_'.$lang.$ext)) {
-						$fp = fopen($homep.$topf.'_'.$lang.$ext, 'w');
-						fputs($fp, $home_top);
-						fclose($fp);
-
-						// Language
-						foreach ($_languages['name'] as $key => $value) {
-							$lang_name = $_languages['folder'][$key];
-							if (isset($_POST[$lang_name])) {
-								$fp = fopen($homep.$topf.'_'.$lang_name.$ext, 'w');
-								fputs($fp, $home_top);
-								fclose($fp);
-							}
-						}
-					} else {
-						$errorMsg = get_lang('HomePageFilesNotWritable');
-					}
-				} else {
-					//File does not exist
-					$fp = fopen($homep.$topf.'_'.$lang.$ext, 'w');
-					fputs($fp, $home_top);
-					fclose($fp);
-
-					foreach ($_languages['name'] as $key => $value) {
-						$lang_name = $_languages['folder'][$key];
-						if (isset($_POST[$lang_name])) {
-							if (file_exists($homep.$topf.'_'.$lang_name.$ext)) {
-								$fp = fopen($homep.$topf.'_'.$lang_name.$ext, 'w');
-								fputs($fp, $home_top);
-								fclose($fp);
-							}
-						}
-					}
-				}
-
-				if (EventsMail::check_if_using_class('portal_homepage_edited')) {
-					EventsDispatcher::events('portal_homepage_edited',array('about_user' => api_get_user_id()));
-				}
-				Event::addEvent(
-					LOG_HOMEPAGE_CHANGED,
-					'edit_top',
-					cut(strip_tags($home_top), 254),
-					api_get_utc_datetime(),
-					api_get_user_id()
-				);
-				break;
-			case 'edit_notice':
-				// Filter
-				$notice_title = trim(strip_tags(stripslashes($_POST['notice_title'])));
-				$notice_text = trim(str_replace(array("\r", "\n"), array('', '<br />'), strip_tags(stripslashes($_POST['notice_text']), '<a>')));
-				if (empty($notice_title) || empty($notice_text)) {
-					$errorMsg = get_lang('NoticeWillBeNotDisplayed');
-				}
-				// Write
-				if (file_exists($homep.$noticef.'_'.$lang.$ext)) {
-					if (is_writable($homep.$noticef.'_'.$lang.$ext)) {
-						$fp = fopen($homep.$noticef.'_'.$lang.$ext, 'w');
-						if ($errorMsg == '') {
-							fputs($fp, "<h5>$notice_title</h5><p>\n$notice_text");
-
-							foreach ($_languages['name'] as $key => $value) {
-								$lang_name = $_languages['folder'][$key];
-								if (isset($_POST[$lang_name])) {
-									if (file_exists($homep.$noticef.'_'.$lang_name.$ext)) {
-										if (is_writable($homep.$noticef.'_'.$lang_name.$ext)) {
-											$fp = fopen($homep.$noticef.'_'.$lang_name.$ext, 'w');
-											fputs($fp, "<h5>$notice_title</h5><p>\n$notice_text");
-											fclose($fp);
-										}
-									}
-								}
-							}
-						} else {
-							fputs($fp, '');
-
-							foreach ($_languages['name'] as $key => $value) {
-								$lang_name = $_languages['folder'][$key];
-								if (isset($_POST[$lang_name])) {
-									if (file_exists($homep.$noticef.'_'.$lang_name.$ext)) {
-										$fp1 = fopen($homep.$noticef.'_'.$lang_name.$ext, 'w');
-										fputs($fp1, '');
-										fclose($fp1);
-									}
-								}
-							}
-						}
-						fclose($fp);
-					} else {
-						$errorMsg .= "<br/>\n".get_lang('HomePageFilesNotWritable');
-					}
-				} else {
-					//File does not exist
-					$fp = fopen($homep.$noticef.'_'.$lang.$ext, 'w');
-					fputs($fp, "<h5>$notice_title</h5><p>\n$notice_text");
-					fclose($fp);
-				}
-				Event::addEvent(
+    if (!empty($_POST['formSent'])) {
+        // Variables used are $homep for home path, $menuf for menu file, $newsf
+        // for news file, $topf for top file, $noticef for noticefile,
+        // $ext for '.html'
+        switch ($action) {
+            case 'edit_top':
+                // Filter
+                $home_top = trim(stripslashes($_POST['home_top']));
+
+
+                // Write
+                if (is_writable($homep)) {
+                    // Default
+                    if (is_writable($homep.$topf.'_'.$lang.$ext)) {
+                        $fp = fopen($homep.$topf.'_'.$lang.$ext, 'w');
+                        fputs($fp, $home_top);
+                        fclose($fp);
+
+                        // Language
+                        foreach ($_languages['name'] as $key => $value) {
+                            $lang_name = $_languages['folder'][$key];
+                            if (isset($_POST[$lang_name])) {
+                                $fp = fopen($homep.$topf.'_'.$lang_name.$ext, 'w');
+                                fputs($fp, $home_top);
+                                fclose($fp);
+                            }
+                        }
+                    } else {
+                        $errorMsg = get_lang('HomePageFilesNotWritable');
+                    }
+                } else {
+                    //File does not exist
+                    $fp = fopen($homep.$topf.'_'.$lang.$ext, 'w');
+                    fputs($fp, $home_top);
+                    fclose($fp);
+
+                    foreach ($_languages['name'] as $key => $value) {
+                        $lang_name = $_languages['folder'][$key];
+                        if (isset($_POST[$lang_name])) {
+                            if (file_exists($homep.$topf.'_'.$lang_name.$ext)) {
+                                $fp = fopen($homep.$topf.'_'.$lang_name.$ext, 'w');
+                                fputs($fp, $home_top);
+                                fclose($fp);
+                            }
+                        }
+                    }
+                }
+
+                if (EventsMail::check_if_using_class('portal_homepage_edited')) {
+                    EventsDispatcher::events('portal_homepage_edited',array('about_user' => api_get_user_id()));
+                }
+                Event::addEvent(
+                    LOG_HOMEPAGE_CHANGED,
+                    'edit_top',
+                    cut(strip_tags($home_top), 254),
+                    api_get_utc_datetime(),
+                    api_get_user_id()
+                );
+                break;
+            case 'edit_notice':
+                // Filter
+                $notice_title = trim(strip_tags(stripslashes($_POST['notice_title'])));
+                $notice_text = trim(str_replace(array("\r", "\n"), array('', '<br />'), strip_tags(stripslashes($_POST['notice_text']), '<a>')));
+                if (empty($notice_title) || empty($notice_text)) {
+                    $errorMsg = get_lang('NoticeWillBeNotDisplayed');
+                }
+                // Write
+                if (file_exists($homep.$noticef.'_'.$lang.$ext)) {
+                    if (is_writable($homep.$noticef.'_'.$lang.$ext)) {
+                        $fp = fopen($homep.$noticef.'_'.$lang.$ext, 'w');
+                        if ($errorMsg == '') {
+                            fputs($fp, "<h5>$notice_title</h5><p>\n$notice_text");
+
+                            foreach ($_languages['name'] as $key => $value) {
+                                $lang_name = $_languages['folder'][$key];
+                                if (isset($_POST[$lang_name])) {
+                                    if (file_exists($homep.$noticef.'_'.$lang_name.$ext)) {
+                                        if (is_writable($homep.$noticef.'_'.$lang_name.$ext)) {
+                                            $fp = fopen($homep.$noticef.'_'.$lang_name.$ext, 'w');
+                                            fputs($fp, "<h5>$notice_title</h5><p>\n$notice_text");
+                                            fclose($fp);
+                                        }
+                                    }
+                                }
+                            }
+                        } else {
+                            fputs($fp, '');
+
+                            foreach ($_languages['name'] as $key => $value) {
+                                $lang_name = $_languages['folder'][$key];
+                                if (isset($_POST[$lang_name])) {
+                                    if (file_exists($homep.$noticef.'_'.$lang_name.$ext)) {
+                                        $fp1 = fopen($homep.$noticef.'_'.$lang_name.$ext, 'w');
+                                        fputs($fp1, '');
+                                        fclose($fp1);
+                                    }
+                                }
+                            }
+                        }
+                        fclose($fp);
+                    } else {
+                        $errorMsg .= "<br/>\n".get_lang('HomePageFilesNotWritable');
+                    }
+                } else {
+                    //File does not exist
+                    $fp = fopen($homep.$noticef.'_'.$lang.$ext, 'w');
+                    fputs($fp, "<h5>$notice_title</h5><p>\n$notice_text");
+                    fclose($fp);
+                }
+                Event::addEvent(
                     LOG_HOMEPAGE_CHANGED,
                     'edit_notice',
                     cut(strip_tags($notice_title), 254),
                     api_get_utc_datetime(),
                     api_get_user_id()
                 );
-				break;
-			case 'edit_news':
-				//Filter
-				$home_news = trim(stripslashes($_POST['home_news']));
-
-				//Write
-				if ($s_languages_news != 'all') {
-					if (file_exists($homep.$newsf.'_'.$s_languages_news.$ext)) {
-						if (is_writable($homep.$newsf.'_'.$s_languages_news.$ext)) {
-							$fp = fopen($homep.$newsf.'_'.$s_languages_news.$ext, 'w');
-							fputs($fp, $home_news);
-							fclose($fp);
-						} else {
-							$errorMsg = get_lang('HomePageFilesNotWritable');
-						}
-					} else {
-						// File does not exist
-						$fp = fopen($homep.$newsf.'_'.$s_languages_news.$ext, 'w');
-						fputs($fp, $home_news);
-						fclose($fp);
-					}
-				} else {
-					// We update all the news file
-					foreach ($_languages['name'] as $key => $value) {
-						$english_name = $_languages['folder'][$key];
-						if (file_exists($homep.$newsf.'_'.$english_name.$ext)) {
-							if (is_writable($homep.$newsf.'_'.$english_name.$ext)) {
-								$fp = fopen($homep.$newsf.'_'.$english_name.$ext, 'w');
-								fputs($fp, $home_news);
-								fclose($fp);
-							} else {
-								$errorMsg = get_lang('HomePageFilesNotWritable');
-							}
-						} else {
-							// File does not exist
-							$fp = fopen($homep.$newsf.'_'.$english_name.$ext, 'w');
-							fputs($fp, $home_news);
-							fclose($fp);
-						}
-					}
-				}
-				Event::addEvent(
+                break;
+            case 'edit_news':
+                //Filter
+                $home_news = trim(stripslashes($_POST['home_news']));
+
+                //Write
+                if ($s_languages_news != 'all') {
+                    if (file_exists($homep.$newsf.'_'.$s_languages_news.$ext)) {
+                        if (is_writable($homep.$newsf.'_'.$s_languages_news.$ext)) {
+                            $fp = fopen($homep.$newsf.'_'.$s_languages_news.$ext, 'w');
+                            fputs($fp, $home_news);
+                            fclose($fp);
+                        } else {
+                            $errorMsg = get_lang('HomePageFilesNotWritable');
+                        }
+                    } else {
+                        // File does not exist
+                        $fp = fopen($homep.$newsf.'_'.$s_languages_news.$ext, 'w');
+                        fputs($fp, $home_news);
+                        fclose($fp);
+                    }
+                } else {
+                    // We update all the news file
+                    foreach ($_languages['name'] as $key => $value) {
+                        $english_name = $_languages['folder'][$key];
+                        if (file_exists($homep.$newsf.'_'.$english_name.$ext)) {
+                            if (is_writable($homep.$newsf.'_'.$english_name.$ext)) {
+                                $fp = fopen($homep.$newsf.'_'.$english_name.$ext, 'w');
+                                fputs($fp, $home_news);
+                                fclose($fp);
+                            } else {
+                                $errorMsg = get_lang('HomePageFilesNotWritable');
+                            }
+                        } else {
+                            // File does not exist
+                            $fp = fopen($homep.$newsf.'_'.$english_name.$ext, 'w');
+                            fputs($fp, $home_news);
+                            fclose($fp);
+                        }
+                    }
+                }
+                Event::addEvent(
                     LOG_HOMEPAGE_CHANGED,
                     'edit_news',
                     strip_tags(cut($home_news, 254)),
                     api_get_utc_datetime(),
                     api_get_user_id()
                 );
-				break;
-			case 'insert_tabs':
-			case 'edit_tabs':
-			case 'insert_link':
-			case 'edit_link':
-				$link_index     = intval($_POST['link_index']);
-				$insert_where   = intval($_POST['insert_where']);
-				$link_name      = trim(stripslashes($_POST['link_name']));
-				$link_url       = trim(stripslashes($_POST['link_url']));
-				$add_in_tab     = intval($_POST['add_in_tab']);
-				$link_html = trim(stripslashes($_POST['link_html']));
-				$filename = trim(stripslashes($_POST['filename']));
-				$target_blank = $_POST['target_blank'] ? true : false;
-
-				if ($link_url == 'http://' || $link_url == 'https://') {
-					$link_url = '';
-				} elseif (!empty($link_url) && !strstr($link_url, '://')) {
-					$link_url='http://'.$link_url;
-				}
-				$menuf = ($action == 'insert_tabs' || $action == 'edit_tabs')? $mtloggedin : $menuf;
-
-				if (!is_writable($homep.$menuf.'_'.$lang.$ext)) {
-					$errorMsg = get_lang('HomePageFilesNotWritable');
-				} elseif (empty($link_name)) {
-					$errorMsg = get_lang('PleaseEnterLinkName');
-				} else {
-					// New links are added as new files in the home/ directory
-					if ($action == 'insert_link' || $action == 'insert_tabs' || empty($filename) || strstr($filename, '/') || !strstr($filename, '.html')) {
-						$filename = api_replace_dangerous_char($link_name).'.html';
-					}
-
-					// "home_" prefix for links are renamed to "user_" prefix (to avoid name clash with existing home page files)
-					if (!empty($filename)) {
-						$filename = str_replace('home_', 'user_', $filename);
-					}
-					// If the typical language suffix is not found in the file name,
-					// replace the ".html" suffix by "_en.html" or the active menu language
-					if (!strstr($filename,'_'.$lang.$ext)) {
-						$filename = str_replace($ext, '_'.$lang.$ext, $filename);
-					}
-					// Get the contents of home_menu_en.html (or active menu language
-					// version) into $home_menu as an array of one entry per line
-					$home_menu = file($homep.$menuf.'_'.$lang.$ext);
-					$home_menu = implode("\n", $home_menu);
-					$home_menu = api_to_system_encoding($home_menu, api_detect_encoding(strip_tags($home_menu)));
-					$home_menu = explode("\n", $home_menu);
-					$home_menu = array_values(array_filter(array_map('trim', $home_menu), 'strlen'));
-					// Prepare place to insert the new link into (default is end of file)
-					if ($insert_where < -1 || $insert_where > (sizeof($home_menu) - 1)) {
-						$insert_where = sizeof($home_menu) - 1;
-					}
-					//
-					// For each line of the file, remove trailing spaces and special chars
-					//foreach ($home_menu as $key => $enreg) {
-					//	$home_menu[$key] = trim($enreg);
-					//}
-					//
-					// If the given link url is empty, then replace the link url by a link to the link file created
-
-					if (empty($link_url) || $link_url == 'http://' ||  $link_url == 'https://') {
-						$link_url = api_get_path(WEB_PATH).'index.php?include='.urlencode($filename);
-						// If the file doesn't exist, then create it and
-						// fill it with default text
-
-						$fp = @fopen($homep.$filename, 'w');
-						if ($fp) {
-							if (empty($link_html)) {
-								fputs($fp, get_lang('MyTextHere'));
-								home_tabs($homep.$filename);
-							} else {
-								fputs($fp, $link_html);
-								home_tabs($homep.$filename);
-							}
-							fclose($fp);
-						}
-					}
-					// If the requested action is to edit a link, open the file and
-					// write to it (if the file doesn't exist, create it)
-					if (in_array($action, array('edit_link'))  && !empty($link_html)) {
-						$fp = @fopen($homep.$filename, 'w');
-						if ($fp) {
-							fputs($fp, $link_html);
-							home_tabs($homep.$filename);
-							fclose($fp);
-						}
-					}
+                break;
+            case 'insert_tabs':
+            case 'edit_tabs':
+            case 'insert_link':
+            case 'edit_link':
+                $link_index     = intval($_POST['link_index']);
+                $insert_where   = intval($_POST['insert_where']);
+                $link_name      = trim(stripslashes($_POST['link_name']));
+                $link_url       = trim(stripslashes($_POST['link_url']));
+                $add_in_tab     = intval($_POST['add_in_tab']);
+                $link_html = trim(stripslashes($_POST['link_html']));
+                $filename = trim(stripslashes($_POST['filename']));
+                $target_blank = $_POST['target_blank'] ? true : false;
+
+                if ($link_url == 'http://' || $link_url == 'https://') {
+                    $link_url = '';
+                } elseif (!empty($link_url) && !strstr($link_url, '://')) {
+                    $link_url='http://'.$link_url;
+                }
+                $menuf = ($action == 'insert_tabs' || $action == 'edit_tabs')? $mtloggedin : $menuf;
+
+                if (!is_writable($homep.$menuf.'_'.$lang.$ext)) {
+                    $errorMsg = get_lang('HomePageFilesNotWritable');
+                } elseif (empty($link_name)) {
+                    $errorMsg = get_lang('PleaseEnterLinkName');
+                } else {
+                    // New links are added as new files in the home/ directory
+                    if ($action == 'insert_link' || $action == 'insert_tabs' || empty($filename) || strstr($filename, '/') || !strstr($filename, '.html')) {
+                        $filename = api_replace_dangerous_char($link_name).'.html';
+                    }
+
+                    // "home_" prefix for links are renamed to "user_" prefix (to avoid name clash with existing home page files)
+                    if (!empty($filename)) {
+                        $filename = str_replace('home_', 'user_', $filename);
+                    }
+                    // If the typical language suffix is not found in the file name,
+                    // replace the ".html" suffix by "_en.html" or the active menu language
+                    if (!strstr($filename,'_'.$lang.$ext)) {
+                        $filename = str_replace($ext, '_'.$lang.$ext, $filename);
+                    }
+                    // Get the contents of home_menu_en.html (or active menu language
+                    // version) into $home_menu as an array of one entry per line
+                    $home_menu = file($homep.$menuf.'_'.$lang.$ext);
+                    $home_menu = implode("\n", $home_menu);
+                    $home_menu = api_to_system_encoding($home_menu, api_detect_encoding(strip_tags($home_menu)));
+                    $home_menu = explode("\n", $home_menu);
+                    $home_menu = array_values(array_filter(array_map('trim', $home_menu), 'strlen'));
+                    // Prepare place to insert the new link into (default is end of file)
+                    if ($insert_where < -1 || $insert_where > (sizeof($home_menu) - 1)) {
+                        $insert_where = sizeof($home_menu) - 1;
+                    }
+                    //
+                    // For each line of the file, remove trailing spaces and special chars
+                    //foreach ($home_menu as $key => $enreg) {
+                    //	$home_menu[$key] = trim($enreg);
+                    //}
+                    //
+                    // If the given link url is empty, then replace the link url by a link to the link file created
+
+                    if (empty($link_url) || $link_url == 'http://' ||  $link_url == 'https://') {
+                        $link_url = api_get_path(WEB_PATH).'index.php?include='.urlencode($filename);
+                        // If the file doesn't exist, then create it and
+                        // fill it with default text
+
+                        $fp = @fopen($homep.$filename, 'w');
+                        if ($fp) {
+                            if (empty($link_html)) {
+                                fputs($fp, get_lang('MyTextHere'));
+                                home_tabs($homep.$filename);
+                            } else {
+                                fputs($fp, $link_html);
+                                home_tabs($homep.$filename);
+                            }
+                            fclose($fp);
+                        }
+                    }
+                    // If the requested action is to edit a link, open the file and
+                    // write to it (if the file doesn't exist, create it)
+                    if (in_array($action, array('edit_link'))  && !empty($link_html)) {
+                        $fp = @fopen($homep.$filename, 'w');
+                        if ($fp) {
+                            fputs($fp, $link_html);
+                            home_tabs($homep.$filename);
+                            fclose($fp);
+                        }
+                    }
 
                     $class_add_in_tab = 'class="show_menu"';
 
-					if (!$add_in_tab) {
-						$class_add_in_tab = 'class="hide_menu"';
-					}
-
-					// If the requested action is to create a link, make some room
-					// for the new link in the home_menu array at the requested place
-					// and insert the new link there
-
-					if ($action == 'insert_link' || $action == 'insert_tabs') {
-						for ($i = sizeof($home_menu); $i; $i--) {
-							if ($i > $insert_where) {
-								$home_menu[$i] = $home_menu[$i - 1];
-							} else {
-								break;
-							}
-						}
-						$home_menu[$insert_where + 1] = '<li ' . $class_add_in_tab . '><a href="'.$link_url.'" target="'.($target_blank ? '_blank' : '_self').'">'. $link_name .'</a></li>';
-					} else {
-						// If the request is about a link edition, change the link
-						$home_menu[$link_index]='<li ' . $class_add_in_tab . '><a href="'.$link_url.'" target="'.($target_blank?'_blank':'_self').'">'. $link_name .'</a></li>';
-					}
-					// Re-build the file from the home_menu array
-					$home_menu = implode("\n", $home_menu);
-					// Write
-					if (file_exists($homep.$menuf.'_'.$lang.$ext)) {
-						if (is_writable($homep.$menuf.'_'.$lang.$ext)) {
-							$fp = fopen($homep.$menuf.'_'.$lang.$ext, 'w');
-							fputs($fp, $home_menu);
-							home_tabs($homep.$menuf.'_'.$lang.$ext);
-							fclose($fp);
-
-							foreach ($_languages['name'] as $key => $value) {
-								$lang_name = $_languages['folder'][$key];
-								if (isset($_POST[$lang_name])) {
-									$fp = fopen($homep.$menuf.'_'.$lang_name.$ext, 'w');
-									fputs($fp, $home_menu);
-									home_tabs($homep.$menuf.'_'.$lang_name.$ext);
-									fclose($fp);
-								}
-							}
-
-							if (file_exists($homep.$menuf.$ext)) {
-								if (is_writable($homep.$menuf.$ext)) {
-									$fpo = fopen($homep.$menuf.$ext, 'w');
-									fputs($fpo, $home_menu);
-									home_tabs($homep.$menuf.$ext);
-									fclose($fpo);
-								}
-							}
-						} else {
-							$errorMsg = get_lang('HomePageFilesNotWritable');
-						}
-					} else {
-						//File does not exist
-						$fp = fopen($homep.$menuf.'_'.$lang.$ext, 'w');
-						fputs($fp, $home_menu);
-						home_tabs($homep.$menuf.'_'.$lang.$ext);
-						fclose($fp);
-
-						foreach ($_languages['name'] as $key => $value) {
-							$lang_name = $_languages['folder'][$key];
-							if (isset($_POST[$lang_name])) {
-								$fp = fopen($homep.$menuf.'_'.$lang_name.$ext, 'w');
-								fputs($fp, $home_menu);
-								home_tabs($homep.$menuf.'_'.$lang_name.$ext);
-								fclose($fp);
-							}
-						}
-					}
-				}
-				Event::addEvent(
-					LOG_HOMEPAGE_CHANGED,
-					$action,
-					cut($link_name . ':' . $link_url, 254),
-					api_get_utc_datetime(),
-					api_get_user_id()
-				);
-				break;
-		} //end of switch($action)
-
-		if (empty($errorMsg)) {
-			header('Location: '.$selfUrl.'?language='.$languageGet);
-			exit();
-		}
-	} else {
-		//if POST[formSent] is not set
-		switch ($action) {
-			case 'open_link':
-				// Previously, filtering of GET['link'] was done here but it left
-				// a security threat. Filtering has now been moved outside conditions
-				break;
-			case 'delete_tabs':
-			case 'delete_link':
-				// A link is deleted by getting the file into an array, removing the
-				// link and re-writing the array to the file
-				$link_index = intval($_GET['link_index']);
-				$menuf = ($action == 'delete_tabs')? $mtloggedin : $menuf;
-				$home_menu = @file($homep.$menuf.'_'.$lang.$ext);
-				if (empty($home_menu)) {
-					$home_menu = array();
-				}
-				foreach ($home_menu as $key => $enreg) {
-					if ($key == $link_index) {
-						unset($home_menu[$key]);
-					} else {
-						$home_menu[$key] = trim($enreg);
-					}
-				}
-				$home_menu = implode("\n", $home_menu);
-				$home_menu = api_to_system_encoding($home_menu, api_detect_encoding(strip_tags($home_menu)));
-
-				$fp = fopen($homep.$menuf.'_'.$lang.$ext, 'w');
-				fputs($fp, $home_menu);
-				home_tabs($homep.$menuf.'_'.$lang.$ext);
-				fclose($fp);
-				if (file_exists($homep.$menuf.$ext)) {
-					if (is_writable($homep.$menuf.$ext)) {
-						$fpo = fopen($homep.$menuf.$ext,'w');
-						fputs($fpo, $home_menu);
-						home_tabs($homep.$menuf.$ext);
-						fclose($fpo);
-					}
-				}
-				header('Location: '.$selfUrl);
-				exit();
-				break;
-			case 'edit_top':
-				// This request is only the preparation for the update of the home_top
-				$home_top = '';
-				if (is_file($homep.$topf.'_'.$lang.$ext) && is_readable($homep.$topf.'_'.$lang.$ext)) {
-					$home_top = @(string)file_get_contents($homep.$topf.'_'.$lang.$ext);
-				} elseif (is_file($homep.$topf.$lang.$ext) && is_readable($homep.$topf.$lang.$ext)) {
-					$home_top = @(string)file_get_contents($homep.$topf.$lang.$ext);
-				} else {
-					$errorMsg = get_lang('HomePageFilesNotReadable');
-				}
-				$home_top = api_to_system_encoding($home_top, api_detect_encoding(strip_tags($home_top)));
-				break;
-			case 'edit_notice':
-				// This request is only the preparation for the update of the home_notice
-				$home_notice = '';
-				if (is_file($homep.$noticef.'_'.$lang.$ext) && is_readable($homep.$noticef.'_'.$lang.$ext)) {
-					$home_notice = @file($homep.$noticef.'_'.$lang.$ext);
-				} elseif (is_file($homep.$noticef.$lang.$ext) && is_readable($homep.$noticef.$lang.$ext)) {
-					$home_notice = @file($homep.$noticef.$lang.$ext);
-				} else {
-					$errorMsg = get_lang('HomePageFilesNotReadable');
-				}
-				if (empty($home_notice)) {
-					$home_notice = array();
-				}
-				$notice_title = strip_tags($home_notice[0]);
-				$notice_title = api_to_system_encoding($notice_title, api_detect_encoding($notice_title));
-				$notice_text = strip_tags(str_replace('<br />', "\n", $home_notice[1]), '<a>');
-				$notice_text = api_to_system_encoding($notice_text, api_detect_encoding(strip_tags($notice_text)));
-				break;
-			case 'edit_news':
-				// This request is the preparation for the update of the home_news page
-				$home_news = '';
-				if (is_file($homep.$newsf.'_'.$lang.$ext) && is_readable($homep.$newsf.'_'.$lang.$ext)) {
-					$home_news = @(string)file_get_contents($homep.$newsf.'_'.$lang.$ext);
-				} elseif (is_file($homep.$newsf.$lang.$ext) && is_readable($homep.$newsf.$lang.$ext)) {
-					$home_news = @(string)file_get_contents($homep.$newsf.$lang.$ext);
-				} else {
-					$errorMsg = get_lang('HomePageFilesNotReadable');
-				}
-				$home_news = api_to_system_encoding($home_news, api_detect_encoding(strip_tags($home_news)));
-				break;
-			case 'insert_link':
-				// This request is the preparation for the addition of an item in home_menu
-				$home_menu = '';
-				$menuf = ($action == 'edit_tabs')? $mtloggedin : $menuf;
-				if (is_file($homep.$menuf.'_'.$lang.$ext) && is_readable($homep.$menuf.'_'.$lang.$ext)) {
-					$home_menu = @file($homep.$menuf.'_'.$lang.$ext);
-				} elseif(is_file($homep.$menuf.$lang.$ext) && is_readable($homep.$menuf.$lang.$ext)) {
-					$home_menu = @file($homep.$menuf.$lang.$ext);
-				} else {
-					$errorMsg = get_lang('HomePageFilesNotReadable');
-				}
-				if (empty($home_menu)) {
-					$home_menu = array();
-				}
-				if (!empty($home_menu)) {
-					$home_menu = implode("\n", $home_menu);
-					$home_menu = api_to_system_encoding($home_menu, api_detect_encoding(strip_tags($home_menu)));
-					$home_menu = explode("\n", $home_menu);
-				}
-				$home_menu = array_values(array_filter(array_map('trim', $home_menu), 'strlen'));
-				break;
-			case 'insert_tabs':
-				// This request is the preparation for the addition of an item in home_menu
-				$home_menu = '';
-				if (is_file($homep.$mtloggedin.'_'.$lang.$ext) && is_readable($homep.$mtloggedin.'_'.$lang.$ext)) {
-					$home_menu = @file($homep.$mtloggedin.'_'.$lang.$ext);
-				} elseif (is_file($homep.$mtloggedin.$lang.$ext) && is_readable($homep.$mtloggedin.$lang.$ext)) {
-					$home_menu = @file($homep.$mtloggedin.$lang.$ext);
-				} elseif (touch($homep.$mtloggedin.'_'.$lang.$ext)) {
-					$home_menu = @file($homep.$mtloggedin.'_'.$lang.$ext);
-				} else {
-					$errorMsg = get_lang('HomePageFilesNotReadable');
-				}
-				if (empty($home_menu)) {
-					$home_menu = array();
-				}
-				if (!empty($home_menu)) {
-					$home_menu = implode("\n", $home_menu);
-					$home_menu = api_to_system_encoding($home_menu, api_detect_encoding(strip_tags($home_menu)));
-					$home_menu = explode("\n", $home_menu);
-				}
-				$home_menu = array_values(array_filter(array_map('trim', $home_menu), 'strlen'));
-				break;
-			case 'edit_tabs':
-			case 'edit_link':
-				// This request is the preparation for the edition of the links array
-				$home_menu = '';
-				$menuf = ($action == 'edit_tabs')? $mtloggedin : $menuf;
-				if (is_file($homep.$menuf.'_'.$lang.$ext) && is_readable($homep.$menuf.'_'.$lang.$ext)) {
-					$home_menu = @file($homep.$menuf.'_'.$lang.$ext);
-				} elseif(is_file($homep.$menuf.$lang.$ext) && is_readable($homep.$menuf.$lang.$ext)) {
-					$home_menu = @file($homep.$menuf.$lang.$ext);
-				} else {
-					$errorMsg = get_lang('HomePageFilesNotReadable');
-				}
-
-				if (empty($home_menu)) {
-					if (file_exists($homep.$menutabs.'_'.$lang.$ext)) {
-						$home_menu = @file($homep.$menutabs.'_'.$lang.$ext);
-					}
-				}
-
-				if (empty($home_menu)) {
-					$home_menu = array();
-				}
-				if (!empty($home_menu)) {
-					$home_menu = implode("\n", $home_menu);
-					$home_menu = api_to_system_encoding($home_menu, api_detect_encoding(strip_tags($home_menu)));
-					$home_menu = explode("\n", $home_menu);
-				}
-
-				$link_index = intval($_GET['link_index']);
-
-				$target_blank = false;
-				$link_name = '';
-				$link_url = '';
-
-				//$home_menu_new = array();
-				//
-				//Cleaning array
-				//foreach ($home_menu as $item) {
-				//	if(!empty($item)) {
-				//		$home_menu_new[] = $item;
-				//	}
-				//}
-				//$home_menu = $home_menu_new;
-
-				// Cleaning the array
-				$home_menu = array_values(array_filter(array_map('trim', $home_menu), 'strlen'));
-
-				// For each line of the home_menu file
-				foreach ($home_menu as $key => $enreg) {
-
-					// Check if the current item is the one we want to update
-					if ($key == $link_index) {
-						// This is the link we want to update
-						// Check if the target should be "_blank"
-						if (strstr($enreg, 'target="_blank"')) {
-							$target_blank = true;
-						}
-
-						if (strstr($enreg, 'hide_menu')) {
-							$add_in_tab = false;
-						} else {
-							$add_in_tab = true;
-						}
-
-						// Remove dangerous HTML tags from the link itself (this is an
-						// additional measure in case a link previously contained
-						// unsecure tags)
-						$link_name = strip_tags($enreg);
-
-						// Get the contents of "href" attribute in $link_url
-						$enreg = explode('href="',$enreg);
-						list($link_url) = explode('"', $enreg[sizeof($enreg) - 1]);
-
-						// If the link contains the web root of this portal, then strip
-						// it off and keep only the name of the file that needs edition
-						if (strstr($link_url, '?include=')) {
-							$link_url = explode('?include=', $link_url);
-
-							$filename = $link_url[sizeof($link_url) - 1];
-
-							if (!strstr($filename, '/') && strstr($filename, '.html')) {
-								// Get oonly the contents of the link file
-								$link_html = @file($homep.$filename);
-								$link_html = implode('', $link_html);
-								$link_url = '';
-							} else {
-								$filename = '';
-							}
-						}
-						break;
-					}
-				}
-				break;
-		}//end of second switch($action) (when POST['formSent'] was not set, yet)
-	}// end of "else" in if($_POST['formSent']) condition
+                    if (!$add_in_tab) {
+                        $class_add_in_tab = 'class="hide_menu"';
+                    }
+
+                    // If the requested action is to create a link, make some room
+                    // for the new link in the home_menu array at the requested place
+                    // and insert the new link there
+
+                    if ($action == 'insert_link' || $action == 'insert_tabs') {
+                        for ($i = sizeof($home_menu); $i; $i--) {
+                            if ($i > $insert_where) {
+                                $home_menu[$i] = $home_menu[$i - 1];
+                            } else {
+                                break;
+                            }
+                        }
+                        $home_menu[$insert_where + 1] = '<li ' . $class_add_in_tab . '><a href="'.$link_url.'" target="'.($target_blank ? '_blank' : '_self').'">'. $link_name .'</a></li>';
+                    } else {
+                        // If the request is about a link edition, change the link
+                        $home_menu[$link_index]='<li ' . $class_add_in_tab . '><a href="'.$link_url.'" target="'.($target_blank?'_blank':'_self').'">'. $link_name .'</a></li>';
+                    }
+                    // Re-build the file from the home_menu array
+                    $home_menu = implode("\n", $home_menu);
+                    // Write
+                    if (file_exists($homep.$menuf.'_'.$lang.$ext)) {
+                        if (is_writable($homep.$menuf.'_'.$lang.$ext)) {
+                            $fp = fopen($homep.$menuf.'_'.$lang.$ext, 'w');
+                            fputs($fp, $home_menu);
+                            home_tabs($homep.$menuf.'_'.$lang.$ext);
+                            fclose($fp);
+
+                            foreach ($_languages['name'] as $key => $value) {
+                                $lang_name = $_languages['folder'][$key];
+                                if (isset($_POST[$lang_name])) {
+                                    $fp = fopen($homep.$menuf.'_'.$lang_name.$ext, 'w');
+                                    fputs($fp, $home_menu);
+                                    home_tabs($homep.$menuf.'_'.$lang_name.$ext);
+                                    fclose($fp);
+                                }
+                            }
+
+                            if (file_exists($homep.$menuf.$ext)) {
+                                if (is_writable($homep.$menuf.$ext)) {
+                                    $fpo = fopen($homep.$menuf.$ext, 'w');
+                                    fputs($fpo, $home_menu);
+                                    home_tabs($homep.$menuf.$ext);
+                                    fclose($fpo);
+                                }
+                            }
+                        } else {
+                            $errorMsg = get_lang('HomePageFilesNotWritable');
+                        }
+                    } else {
+                        //File does not exist
+                        $fp = fopen($homep.$menuf.'_'.$lang.$ext, 'w');
+                        fputs($fp, $home_menu);
+                        home_tabs($homep.$menuf.'_'.$lang.$ext);
+                        fclose($fp);
+
+                        foreach ($_languages['name'] as $key => $value) {
+                            $lang_name = $_languages['folder'][$key];
+                            if (isset($_POST[$lang_name])) {
+                                $fp = fopen($homep.$menuf.'_'.$lang_name.$ext, 'w');
+                                fputs($fp, $home_menu);
+                                home_tabs($homep.$menuf.'_'.$lang_name.$ext);
+                                fclose($fp);
+                            }
+                        }
+                    }
+                }
+                Event::addEvent(
+                    LOG_HOMEPAGE_CHANGED,
+                    $action,
+                    cut($link_name . ':' . $link_url, 254),
+                    api_get_utc_datetime(),
+                    api_get_user_id()
+                );
+                break;
+        } //end of switch($action)
+
+        if (empty($errorMsg)) {
+            header('Location: '.$selfUrl.'?language='.$languageGet);
+            exit();
+        }
+    } else {
+        //if POST[formSent] is not set
+        switch ($action) {
+            case 'open_link':
+                // Previously, filtering of GET['link'] was done here but it left
+                // a security threat. Filtering has now been moved outside conditions
+                break;
+            case 'delete_tabs':
+            case 'delete_link':
+                // A link is deleted by getting the file into an array, removing the
+                // link and re-writing the array to the file
+                $link_index = intval($_GET['link_index']);
+                $menuf = ($action == 'delete_tabs')? $mtloggedin : $menuf;
+                $home_menu = @file($homep.$menuf.'_'.$lang.$ext);
+                if (empty($home_menu)) {
+                    $home_menu = array();
+                }
+                foreach ($home_menu as $key => $enreg) {
+                    if ($key == $link_index) {
+                        unset($home_menu[$key]);
+                    } else {
+                        $home_menu[$key] = trim($enreg);
+                    }
+                }
+                $home_menu = implode("\n", $home_menu);
+                $home_menu = api_to_system_encoding($home_menu, api_detect_encoding(strip_tags($home_menu)));
+
+                $fp = fopen($homep.$menuf.'_'.$lang.$ext, 'w');
+                fputs($fp, $home_menu);
+                home_tabs($homep.$menuf.'_'.$lang.$ext);
+                fclose($fp);
+                if (file_exists($homep.$menuf.$ext)) {
+                    if (is_writable($homep.$menuf.$ext)) {
+                        $fpo = fopen($homep.$menuf.$ext,'w');
+                        fputs($fpo, $home_menu);
+                        home_tabs($homep.$menuf.$ext);
+                        fclose($fpo);
+                    }
+                }
+                header('Location: '.$selfUrl);
+                exit();
+                break;
+            case 'edit_top':
+                // This request is only the preparation for the update of the home_top
+                $home_top = '';
+                if (is_file($homep.$topf.'_'.$lang.$ext) && is_readable($homep.$topf.'_'.$lang.$ext)) {
+                    $home_top = @(string)file_get_contents($homep.$topf.'_'.$lang.$ext);
+                } elseif (is_file($homep.$topf.$lang.$ext) && is_readable($homep.$topf.$lang.$ext)) {
+                    $home_top = @(string)file_get_contents($homep.$topf.$lang.$ext);
+                } else {
+                    $errorMsg = get_lang('HomePageFilesNotReadable');
+                }
+                $home_top = api_to_system_encoding($home_top, api_detect_encoding(strip_tags($home_top)));
+                break;
+            case 'edit_notice':
+                // This request is only the preparation for the update of the home_notice
+                $home_notice = '';
+                if (is_file($homep.$noticef.'_'.$lang.$ext) && is_readable($homep.$noticef.'_'.$lang.$ext)) {
+                    $home_notice = @file($homep.$noticef.'_'.$lang.$ext);
+                } elseif (is_file($homep.$noticef.$lang.$ext) && is_readable($homep.$noticef.$lang.$ext)) {
+                    $home_notice = @file($homep.$noticef.$lang.$ext);
+                } else {
+                    $errorMsg = get_lang('HomePageFilesNotReadable');
+                }
+                if (empty($home_notice)) {
+                    $home_notice = array();
+                }
+                $notice_title = strip_tags($home_notice[0]);
+                $notice_title = api_to_system_encoding($notice_title, api_detect_encoding($notice_title));
+                $notice_text = strip_tags(str_replace('<br />', "\n", $home_notice[1]), '<a>');
+                $notice_text = api_to_system_encoding($notice_text, api_detect_encoding(strip_tags($notice_text)));
+                break;
+            case 'edit_news':
+                // This request is the preparation for the update of the home_news page
+                $home_news = '';
+                if (is_file($homep.$newsf.'_'.$lang.$ext) && is_readable($homep.$newsf.'_'.$lang.$ext)) {
+                    $home_news = @(string)file_get_contents($homep.$newsf.'_'.$lang.$ext);
+                } elseif (is_file($homep.$newsf.$lang.$ext) && is_readable($homep.$newsf.$lang.$ext)) {
+                    $home_news = @(string)file_get_contents($homep.$newsf.$lang.$ext);
+                } else {
+                    $errorMsg = get_lang('HomePageFilesNotReadable');
+                }
+                $home_news = api_to_system_encoding($home_news, api_detect_encoding(strip_tags($home_news)));
+                break;
+            case 'insert_link':
+                // This request is the preparation for the addition of an item in home_menu
+                $home_menu = '';
+                $menuf = ($action == 'edit_tabs')? $mtloggedin : $menuf;
+                if (is_file($homep.$menuf.'_'.$lang.$ext) && is_readable($homep.$menuf.'_'.$lang.$ext)) {
+                    $home_menu = @file($homep.$menuf.'_'.$lang.$ext);
+                } elseif(is_file($homep.$menuf.$lang.$ext) && is_readable($homep.$menuf.$lang.$ext)) {
+                    $home_menu = @file($homep.$menuf.$lang.$ext);
+                } else {
+                    $errorMsg = get_lang('HomePageFilesNotReadable');
+                }
+                if (empty($home_menu)) {
+                    $home_menu = array();
+                }
+                if (!empty($home_menu)) {
+                    $home_menu = implode("\n", $home_menu);
+                    $home_menu = api_to_system_encoding($home_menu, api_detect_encoding(strip_tags($home_menu)));
+                    $home_menu = explode("\n", $home_menu);
+                }
+                $home_menu = array_values(array_filter(array_map('trim', $home_menu), 'strlen'));
+                break;
+            case 'insert_tabs':
+                // This request is the preparation for the addition of an item in home_menu
+                $home_menu = '';
+                if (is_file($homep.$mtloggedin.'_'.$lang.$ext) && is_readable($homep.$mtloggedin.'_'.$lang.$ext)) {
+                    $home_menu = @file($homep.$mtloggedin.'_'.$lang.$ext);
+                } elseif (is_file($homep.$mtloggedin.$lang.$ext) && is_readable($homep.$mtloggedin.$lang.$ext)) {
+                    $home_menu = @file($homep.$mtloggedin.$lang.$ext);
+                } elseif (touch($homep.$mtloggedin.'_'.$lang.$ext)) {
+                    $home_menu = @file($homep.$mtloggedin.'_'.$lang.$ext);
+                } else {
+                    $errorMsg = get_lang('HomePageFilesNotReadable');
+                }
+                if (empty($home_menu)) {
+                    $home_menu = array();
+                }
+                if (!empty($home_menu)) {
+                    $home_menu = implode("\n", $home_menu);
+                    $home_menu = api_to_system_encoding($home_menu, api_detect_encoding(strip_tags($home_menu)));
+                    $home_menu = explode("\n", $home_menu);
+                }
+                $home_menu = array_values(array_filter(array_map('trim', $home_menu), 'strlen'));
+                break;
+            case 'edit_tabs':
+            case 'edit_link':
+                // This request is the preparation for the edition of the links array
+                $home_menu = '';
+                $menuf = ($action == 'edit_tabs')? $mtloggedin : $menuf;
+                if (is_file($homep.$menuf.'_'.$lang.$ext) && is_readable($homep.$menuf.'_'.$lang.$ext)) {
+                    $home_menu = @file($homep.$menuf.'_'.$lang.$ext);
+                } elseif(is_file($homep.$menuf.$lang.$ext) && is_readable($homep.$menuf.$lang.$ext)) {
+                    $home_menu = @file($homep.$menuf.$lang.$ext);
+                } else {
+                    $errorMsg = get_lang('HomePageFilesNotReadable');
+                }
+
+                if (empty($home_menu)) {
+                    if (file_exists($homep.$menutabs.'_'.$lang.$ext)) {
+                        $home_menu = @file($homep.$menutabs.'_'.$lang.$ext);
+                    }
+                }
+
+                if (empty($home_menu)) {
+                    $home_menu = array();
+                }
+                if (!empty($home_menu)) {
+                    $home_menu = implode("\n", $home_menu);
+                    $home_menu = api_to_system_encoding($home_menu, api_detect_encoding(strip_tags($home_menu)));
+                    $home_menu = explode("\n", $home_menu);
+                }
+
+                $link_index = intval($_GET['link_index']);
+
+                $target_blank = false;
+                $link_name = '';
+                $link_url = '';
+
+                //$home_menu_new = array();
+                //
+                //Cleaning array
+                //foreach ($home_menu as $item) {
+                //	if(!empty($item)) {
+                //		$home_menu_new[] = $item;
+                //	}
+                //}
+                //$home_menu = $home_menu_new;
+
+                // Cleaning the array
+                $home_menu = array_values(array_filter(array_map('trim', $home_menu), 'strlen'));
+
+                // For each line of the home_menu file
+                foreach ($home_menu as $key => $enreg) {
+
+                    // Check if the current item is the one we want to update
+                    if ($key == $link_index) {
+                        // This is the link we want to update
+                        // Check if the target should be "_blank"
+                        if (strstr($enreg, 'target="_blank"')) {
+                            $target_blank = true;
+                        }
+
+                        if (strstr($enreg, 'hide_menu')) {
+                            $add_in_tab = false;
+                        } else {
+                            $add_in_tab = true;
+                        }
+
+                        // Remove dangerous HTML tags from the link itself (this is an
+                        // additional measure in case a link previously contained
+                        // unsecure tags)
+                        $link_name = strip_tags($enreg);
+
+                        // Get the contents of "href" attribute in $link_url
+                        $enreg = explode('href="',$enreg);
+                        list($link_url) = explode('"', $enreg[sizeof($enreg) - 1]);
+
+                        // If the link contains the web root of this portal, then strip
+                        // it off and keep only the name of the file that needs edition
+                        if (strstr($link_url, '?include=')) {
+                            $link_url = explode('?include=', $link_url);
+
+                            $filename = $link_url[sizeof($link_url) - 1];
+
+                            if (!strstr($filename, '/') && strstr($filename, '.html')) {
+                                // Get oonly the contents of the link file
+                                $link_html = @file($homep.$filename);
+                                $link_html = implode('', $link_html);
+                                $link_url = '';
+                            } else {
+                                $filename = '';
+                            }
+                        }
+                        break;
+                    }
+                }
+                break;
+        }//end of second switch($action) (when POST['formSent'] was not set, yet)
+    }// end of "else" in if($_POST['formSent']) condition
 } else {
-	//if $action is empty, then prepare a list of the course categories to display (?)
-	$Categories = CourseCategory::getCategoriesToDisplayInHomePage();
+    //if $action is empty, then prepare a list of the course categories to display (?)
+    $Categories = CourseCategory::getCategoriesToDisplayInHomePage();
 }
 
 // Display section
@@ -783,25 +783,25 @@ 
 Display::display_header($tool_name);
 
 switch ($action) {
-	case 'open_link':
-		if (!empty($link)) {
-			// $link is only set in case of action=open_link and is filtered
-			$open = @(string)file_get_contents($homep.$link);
-			$open = api_to_system_encoding($open, api_detect_encoding(strip_tags($open)));
-			echo $open;
-		}
-		break;
-	case 'edit_notice':
-		// Display for edit_notice case
-		?>
+    case 'open_link':
+        if (!empty($link)) {
+            // $link is only set in case of action=open_link and is filtered
+            $open = @(string)file_get_contents($homep.$link);
+            $open = api_to_system_encoding($open, api_detect_encoding(strip_tags($open)));
+            echo $open;
+        }
+        break;
+    case 'edit_notice':
+        // Display for edit_notice case
+        ?>
 		<form action="<?php echo $selfUrl; ?>?action=<?php echo $action; ?>" method="post" class="form-horizontal">
 			<legend><?php echo $tool_name; ?></legend>
 			<input type="hidden" name="formSent" value="1"/>
 			<?php
-			if (!empty($errorMsg)) {
-				Display::display_normal_message($errorMsg);
-			}
-			?>
+            if (!empty($errorMsg)) {
+                Display::display_normal_message($errorMsg);
+            }
+            ?>
                         <div class="row">
                             <div class="col-md-12">
                                 <p><?php echo get_lang('LetThoseFieldsEmptyToHideTheNotice'); ?></p>
@@ -839,170 +839,170 @@ 
                         </div>
 		</form>
 		<?php
-		break;
-	case 'insert_tabs':
-	case 'edit_tabs':
-	case 'insert_link':
-	case 'edit_link':
-		$menuf = ($action == 'insert_tabs' || $action == 'edit_tabs') ? $mtloggedin : $menuf;
-		if (!empty($errorMsg)) {
-			Display::display_normal_message($errorMsg);
-		}
-		$default = array();
-		$form = new FormValidator('configure_homepage_'.$action, 'post', $selfUrl.'?action='.$action, '', array('style' => 'margin: 0px;'));
-		$renderer =& $form->defaultRenderer();
-
-		$form->addElement('header', '', $tool_name);
-		$form->addElement('hidden', 'formSent', '1');
-		$form->addElement('hidden', 'link_index', ($action == 'edit_link' || $action == 'edit_tabs') ? $link_index : '0');
-		$form->addElement('hidden', 'filename', ($action == 'edit_link' || $action == 'edit_tabs') ? (!empty($filename) ? $filename : '') : '');
-
-		$form->addElement('text', 'link_name', get_lang('LinkName'), array('size' => '30', 'maxlength' => '50'));
-		if (!empty($link_name)) {
-			$default['link_name'] = $link_name;
-		}
-		$default['link_url'] = empty($link_url) ? 'http://' : api_htmlentities($link_url, ENT_QUOTES);
-		$linkUrlComment = ($action == 'insert_tabs') ? get_lang('Optional').'<br />'.get_lang('GlobalLinkUseDoubleColumnPrivateToShowPrivately') : '';
-		$form->addElement('text', 'link_url', array(get_lang('LinkURL'), $linkUrlComment), array('size' => '30', 'maxlength' => '100', 'style' => 'width: 350px;'));
-
-		$options = array('-1' => get_lang('FirstPlace'));
-
-		$selected = '';
-
-		if ($action == 'insert_link' || $action == 'insert_tabs') {
-			$add_in_tab = 1;
-			if (is_array($home_menu)){
-				foreach ($home_menu as $key => $enreg) {
-					if (strlen($enreg = trim(strip_tags($enreg))) > 0) {
-						$options[$key] = get_lang('After').' &quot;'.$enreg.'&quot;';
-						$formSentCheck = (!empty($_POST['formSent']) ? true : false);
-						$selected = $formSentCheck && $insert_where == $key ? $key : '';
-					}
-				}
-			}
-			$default['insert_link'] = $selected;
-			$form->addElement('select', 'insert_where', get_lang('InsertThisLink') , $options);
-		}
-
-		$target_blank_checkbox = $form->addElement('checkbox', 'target_blank', null, get_lang('OpenInNewWindow'), 1);
-
-		if ($action == 'insert_tabs' || $action == 'edit_tabs') {
-			$form->addElement('checkbox', 'add_in_tab', null, get_lang('AddInMenu'), 1);
-			$default['add_in_tab'] = $add_in_tab;
-		}
-
-		if (!empty($target_blank)) { $target_blank_checkbox->setChecked(true); }
-
-		if ($action == 'edit_link' && (empty($link_url) || $link_url == 'http://' || $link_url == 'https://')) {
-			$default['link_html'] = isset($_POST['link_html']) ? $_POST['link_html'] : $link_html;
-			$form->addHtmlEditor('link_html', get_lang('Content'), false, false, array('ToolbarSet' => 'PortalHomePage', 'Width' => '100%', 'Height' => '400'));
+        break;
+    case 'insert_tabs':
+    case 'edit_tabs':
+    case 'insert_link':
+    case 'edit_link':
+        $menuf = ($action == 'insert_tabs' || $action == 'edit_tabs') ? $mtloggedin : $menuf;
+        if (!empty($errorMsg)) {
+            Display::display_normal_message($errorMsg);
+        }
+        $default = array();
+        $form = new FormValidator('configure_homepage_'.$action, 'post', $selfUrl.'?action='.$action, '', array('style' => 'margin: 0px;'));
+        $renderer =& $form->defaultRenderer();
+
+        $form->addElement('header', '', $tool_name);
+        $form->addElement('hidden', 'formSent', '1');
+        $form->addElement('hidden', 'link_index', ($action == 'edit_link' || $action == 'edit_tabs') ? $link_index : '0');
+        $form->addElement('hidden', 'filename', ($action == 'edit_link' || $action == 'edit_tabs') ? (!empty($filename) ? $filename : '') : '');
+
+        $form->addElement('text', 'link_name', get_lang('LinkName'), array('size' => '30', 'maxlength' => '50'));
+        if (!empty($link_name)) {
+            $default['link_name'] = $link_name;
+        }
+        $default['link_url'] = empty($link_url) ? 'http://' : api_htmlentities($link_url, ENT_QUOTES);
+        $linkUrlComment = ($action == 'insert_tabs') ? get_lang('Optional').'<br />'.get_lang('GlobalLinkUseDoubleColumnPrivateToShowPrivately') : '';
+        $form->addElement('text', 'link_url', array(get_lang('LinkURL'), $linkUrlComment), array('size' => '30', 'maxlength' => '100', 'style' => 'width: 350px;'));
+
+        $options = array('-1' => get_lang('FirstPlace'));
+
+        $selected = '';
+
+        if ($action == 'insert_link' || $action == 'insert_tabs') {
+            $add_in_tab = 1;
+            if (is_array($home_menu)){
+                foreach ($home_menu as $key => $enreg) {
+                    if (strlen($enreg = trim(strip_tags($enreg))) > 0) {
+                        $options[$key] = get_lang('After').' &quot;'.$enreg.'&quot;';
+                        $formSentCheck = (!empty($_POST['formSent']) ? true : false);
+                        $selected = $formSentCheck && $insert_where == $key ? $key : '';
+                    }
+                }
+            }
+            $default['insert_link'] = $selected;
+            $form->addElement('select', 'insert_where', get_lang('InsertThisLink') , $options);
+        }
+
+        $target_blank_checkbox = $form->addElement('checkbox', 'target_blank', null, get_lang('OpenInNewWindow'), 1);
+
+        if ($action == 'insert_tabs' || $action == 'edit_tabs') {
+            $form->addElement('checkbox', 'add_in_tab', null, get_lang('AddInMenu'), 1);
+            $default['add_in_tab'] = $add_in_tab;
+        }
+
+        if (!empty($target_blank)) { $target_blank_checkbox->setChecked(true); }
+
+        if ($action == 'edit_link' && (empty($link_url) || $link_url == 'http://' || $link_url == 'https://')) {
+            $default['link_html'] = isset($_POST['link_html']) ? $_POST['link_html'] : $link_html;
+            $form->addHtmlEditor('link_html', get_lang('Content'), false, false, array('ToolbarSet' => 'PortalHomePage', 'Width' => '100%', 'Height' => '400'));
             $form->addButtonSave(get_lang('Save'),'submit');
 
-		} else {
-			if (in_array($action, array('edit_tabs','insert_tabs'))) {
-				$default['link_html'] = isset($_POST['link_html']) ? $_POST['link_html'] : (!empty($link_html) ? $link_html : '');
-				$form->addHtmlEditor('link_html', get_lang('Content'), false, false, array('ToolbarSet' => 'PortalHomePage', 'Width' => '100%', 'Height' => '400'));
-			}
-			$form->addElement('checkbox', 'all_langs', null, get_lang('ApplyAllLanguages'), array('id' => 'all_langs'));
-			$form->addElement('html','<table id="table_langs" style="margin-left:159px;"><tr>');
-			$i = 0;
-			foreach ($_languages['name'] as $key => $value) {
-				$i++;
-				$lang_name = $_languages['folder'][$key];
-				$html_langs = '<td width="300">';
-				$html_langs .= '<label><input type="checkbox" id="lang" name="'.$lang_name.'" />&nbsp;'.$lang_name.'<label/>';
-				$html_langs .= '</td>';
-				if ($i % 5 == 0) {
-					$html_langs .= '</tr><tr>';
-				}
-				$form->addElement('html', $html_langs);
-			}
-			$form->addElement('html','</tr></table><br/>');
+        } else {
+            if (in_array($action, array('edit_tabs','insert_tabs'))) {
+                $default['link_html'] = isset($_POST['link_html']) ? $_POST['link_html'] : (!empty($link_html) ? $link_html : '');
+                $form->addHtmlEditor('link_html', get_lang('Content'), false, false, array('ToolbarSet' => 'PortalHomePage', 'Width' => '100%', 'Height' => '400'));
+            }
+            $form->addElement('checkbox', 'all_langs', null, get_lang('ApplyAllLanguages'), array('id' => 'all_langs'));
+            $form->addElement('html','<table id="table_langs" style="margin-left:159px;"><tr>');
+            $i = 0;
+            foreach ($_languages['name'] as $key => $value) {
+                $i++;
+                $lang_name = $_languages['folder'][$key];
+                $html_langs = '<td width="300">';
+                $html_langs .= '<label><input type="checkbox" id="lang" name="'.$lang_name.'" />&nbsp;'.$lang_name.'<label/>';
+                $html_langs .= '</td>';
+                if ($i % 5 == 0) {
+                    $html_langs .= '</tr><tr>';
+                }
+                $form->addElement('html', $html_langs);
+            }
+            $form->addElement('html','</tr></table><br/>');
             $form->addButtonSave(get_lang('Save'),'submit');
-		}
-
-		$form->setDefaults($default);
-		$form->display();
-
-		break;
-	case 'edit_top':
-	case 'edit_news':
-		if ($action == 'edit_top') {
-			$name = $topf;
-			$open = $home_top;
-		} else {
-			$name = $newsf;
-			$open = @(string)file_get_contents($homep.$newsf.'_'.$lang.$ext);
-		}
-		$open = api_to_system_encoding($open, api_detect_encoding(strip_tags($open)));
-
-		if (!empty($errorMsg)) {
-			Display::display_normal_message($errorMsg); //main API
-		}
-
-		$default = array();
-		$form = new FormValidator(
-			'configure_homepage_'.$action,
-			'post',
-			$selfUrl.'?action='.$action,
-			'',
-			array('style' => 'margin: 0px;')
-		);
-		$renderer =& $form->defaultRenderer();
-		$renderer->setHeaderTemplate('');
-		$renderer->setFormTemplate('<form{attributes}><table border="0" cellpadding="5" cellspacing="0" width="100%">{content}</table></form>');
-		$renderer->setCustomElementTemplate('<tr><td>{element}</td></tr>');
-		$renderer->setRequiredNoteTemplate('');
-		$form->addElement('hidden', 'formSent', '1');
-
-		if ($action == 'edit_news') {
-			$_languages = api_get_languages();
-			$html = '<tr><td>'.get_lang('ChooseNewsLanguage').' : ';
-			$html .= '<select name="news_languages">';
-			$html .= '<option value="all">'.get_lang('ApplyAllLanguages').'</option>';
-			foreach ($_languages['name'] as $key => $value) {
-				$english_name = $_languages['folder'][$key];
-				if ($language == $english_name) {
-					$html .= '<option value="'.$english_name.'" selected="selected">'.$value.'</option>';
-				} else {
-					$html .= '<option value="'.$english_name.'">'.$value.'</option>';
-				}
-			}
-			$html .= '</select></td></tr>';
-			$form->addElement('html', $html);
-		}
-
-		$default[$name] = str_replace('{rel_path}', api_get_path(REL_PATH), $open);
-		$form->addHtmlEditor($name, '', true, false, array('ToolbarSet' => 'PortalHomePage', 'Width' => '100%', 'Height' => '400'));
-		$form->addElement('checkbox', 'all_langs', null, get_lang('ApplyAllLanguages'),array('id' => 'all_langs'));
-		$form->addElement('html','<table id="table_langs" style="margin-left:5px;"><tr>');
-
-		$currentLanguage = api_get_interface_language();
-		$i = 0;
-		foreach ($_languages['name'] as $key => $value) {
-			$lang_name = $_languages['folder'][$key];
-			$i++;
-
-			$checked = null;
-			if ($languageGet == $lang_name)  {
-				$checked = "checked";
-			}
-			$html_langs = '<td width="300">';
-			$html_langs .= '<label><input type="checkbox" '.$checked.' id="lang" name="'.$lang_name.'" />&nbsp;'.$value.'<label/>';
-			$html_langs .= '</td>';
-			if ($i % 5 == 0) {
-				$html_langs .= '</tr><tr>';
-			}
-			$form->addElement('html', $html_langs);
-		}
-		$form->addElement('html','</tr></table><br/>');
-		$form->addButtonSave(get_lang('Save'));
-		$form->setDefaults($default);
-		$form->display();
-
-		break;
-	default: // When no action applies, default page to update campus homepage
-		?>
+        }
+
+        $form->setDefaults($default);
+        $form->display();
+
+        break;
+    case 'edit_top':
+    case 'edit_news':
+        if ($action == 'edit_top') {
+            $name = $topf;
+            $open = $home_top;
+        } else {
+            $name = $newsf;
+            $open = @(string)file_get_contents($homep.$newsf.'_'.$lang.$ext);
+        }
+        $open = api_to_system_encoding($open, api_detect_encoding(strip_tags($open)));
+
+        if (!empty($errorMsg)) {
+            Display::display_normal_message($errorMsg); //main API
+        }
+
+        $default = array();
+        $form = new FormValidator(
+            'configure_homepage_'.$action,
+            'post',
+            $selfUrl.'?action='.$action,
+            '',
+            array('style' => 'margin: 0px;')
+        );
+        $renderer =& $form->defaultRenderer();
+        $renderer->setHeaderTemplate('');
+        $renderer->setFormTemplate('<form{attributes}><table border="0" cellpadding="5" cellspacing="0" width="100%">{content}</table></form>');
+        $renderer->setCustomElementTemplate('<tr><td>{element}</td></tr>');
+        $renderer->setRequiredNoteTemplate('');
+        $form->addElement('hidden', 'formSent', '1');
+
+        if ($action == 'edit_news') {
+            $_languages = api_get_languages();
+            $html = '<tr><td>'.get_lang('ChooseNewsLanguage').' : ';
+            $html .= '<select name="news_languages">';
+            $html .= '<option value="all">'.get_lang('ApplyAllLanguages').'</option>';
+            foreach ($_languages['name'] as $key => $value) {
+                $english_name = $_languages['folder'][$key];
+                if ($language == $english_name) {
+                    $html .= '<option value="'.$english_name.'" selected="selected">'.$value.'</option>';
+                } else {
+                    $html .= '<option value="'.$english_name.'">'.$value.'</option>';
+                }
+            }
+            $html .= '</select></td></tr>';
+            $form->addElement('html', $html);
+        }
+
+        $default[$name] = str_replace('{rel_path}', api_get_path(REL_PATH), $open);
+        $form->addHtmlEditor($name, '', true, false, array('ToolbarSet' => 'PortalHomePage', 'Width' => '100%', 'Height' => '400'));
+        $form->addElement('checkbox', 'all_langs', null, get_lang('ApplyAllLanguages'),array('id' => 'all_langs'));
+        $form->addElement('html','<table id="table_langs" style="margin-left:5px;"><tr>');
+
+        $currentLanguage = api_get_interface_language();
+        $i = 0;
+        foreach ($_languages['name'] as $key => $value) {
+            $lang_name = $_languages['folder'][$key];
+            $i++;
+
+            $checked = null;
+            if ($languageGet == $lang_name)  {
+                $checked = "checked";
+            }
+            $html_langs = '<td width="300">';
+            $html_langs .= '<label><input type="checkbox" '.$checked.' id="lang" name="'.$lang_name.'" />&nbsp;'.$value.'<label/>';
+            $html_langs .= '</td>';
+            if ($i % 5 == 0) {
+                $html_langs .= '</tr><tr>';
+            }
+            $form->addElement('html', $html_langs);
+        }
+        $form->addElement('html','</tr></table><br/>');
+        $form->addButtonSave(get_lang('Save'));
+        $form->setDefaults($default);
+        $form->display();
+
+        break;
+    default: // When no action applies, default page to update campus homepage
+        ?>
 
 <section id="page-home">
     <div class="row">
@@ -1158,53 +1158,53 @@ 
             ?>
 
             <?php
-		if (file_exists($homep.$newsf.'_'.$lang.$ext)) {
+        if (file_exists($homep.$newsf.'_'.$lang.$ext)) {
                     $open = @(string)file_get_contents($homep.$newsf.'_'.$lang.$ext);
                     $open = api_to_system_encoding($open, api_detect_encoding(strip_tags($open)));
                     echo $open;
-		} else {
+        } else {
                     $open = @(string)file_get_contents($homep.$newsf.$ext);
                     $open = api_to_system_encoding($open, api_detect_encoding(strip_tags($open)));
                     echo $open;
-		}
+        }
             ?>
 
             <?php
                 // Add new page
-		$home_menu = '';
-		if (file_exists($homep.$mtloggedin.'_'.$lang.$ext)) {
+        $home_menu = '';
+        if (file_exists($homep.$mtloggedin.'_'.$lang.$ext)) {
                     $home_menu = @file($homep.$mtloggedin.'_'.$lang.$ext);
-		} else {
+        } else {
                     $home_menu = @file($homep.$mtloggedin.$ext);
-		}
-		if (empty($home_menu)) {
+        }
+        if (empty($home_menu)) {
                     if (file_exists($homep.$menutabs.'_'.$lang.$ext)) {
-			$home_menu = @file($homep.$menutabs.'_'.$lang.$ext);
+            $home_menu = @file($homep.$menutabs.'_'.$lang.$ext);
                     }
-		}
-		if (empty($home_menu)) {
+        }
+        if (empty($home_menu)) {
                     $home_menu = array();
-		}
-		if (!empty($home_menu)) {
+        }
+        if (!empty($home_menu)) {
                     $home_menu = implode("\n", $home_menu);
                     $home_menu = api_to_system_encoding($home_menu, api_detect_encoding(strip_tags($home_menu)));
                     $home_menu = explode("\n", $home_menu);
-		}
-		$link_list = '';
-		$tab_counter = 0;
+        }
+        $link_list = '';
+        $tab_counter = 0;
                     foreach ($home_menu as $enreg) {
                     $enreg = trim($enreg);
-			if (!empty($enreg)) {
+            if (!empty($enreg)) {
                             $edit_link   = ' <a href="'.$selfUrl.'?action=edit_tabs&amp;link_index='.$tab_counter.'" ><span>'.Display::return_icon('edit.png', get_lang('Edit')).'</span></a>';
                             $delete_link = ' <a href="'.$selfUrl.'?action=delete_tabs&amp;link_index='.$tab_counter.'"  onclick="javascript: if(!confirm(\''.addslashes(api_htmlentities(get_lang('ConfirmYourChoice'), ENT_QUOTES)).'\')) return false;"><span>'.Display::return_icon('delete.png', get_lang('Delete')).'</span></a>';
                             $tab_string = str_replace(array('href="'.api_get_path(WEB_PATH).'index.php?include=', '</li>'),
                                 array('href="'.api_get_path(WEB_CODE_PATH).'admin/'.basename($selfUrl).'?action=open_link&link=', $edit_link.$delete_link.'</li>'),
-				$enreg);
+                $enreg);
                             $tab_string = str_replace(array('<li>', '</li>','class="hide_menu"', 'hide_menu'), '', $tab_string);
-				$link_list .= Display::tag('li', $tab_string, array('class' => 'list-group-item'));
-				$tab_counter++;
-			}
-		}
+                $link_list .= Display::tag('li', $tab_string, array('class' => 'list-group-item'));
+                $tab_counter++;
+            }
+        }
             ?>
             <div class="actions">
 		<a href="<?php echo $selfUrl; ?>?action=insert_tabs">
@@ -1212,9 +1212,9 @@ 
                 </a>
             </div>
             <?php
-		echo '<ul id="list-hiperlink" class="list-group">';
-		echo $link_list;
-		echo '</ul>';
+        echo '<ul id="list-hiperlink" class="list-group">';
+        echo $link_list;
+        echo '</ul>';
             ?>
         </div>
     </div>

main/admin/ldap_synchro.php

Indentation +102 added lines, -102 removed lines

@@ -44,121 +44,121 @@
 $users=Database::store_result($result);
 
 foreach($Sessions as $session){
-	$id_session = $session['id'];
-	$name_session = $session['name'];
-	$UserList=array();
-	$UserUpdate=array();
-	$UserAdd=array();
+    $id_session = $session['id'];
+    $name_session = $session['name'];
+    $UserList=array();
+    $UserUpdate=array();
+    $UserAdd=array();
 
-	// Parse des code etape de la session
-	/*
+    // Parse des code etape de la session
+    /*
 	$sql = "SELECT  id_session, code_etape, etape_description, code_ufr, annee
 		FROM $tbl_session_rel_etape
 		WHERE id_session='$id_session'
 		ORDER BY code_ufr, code_etape";
 	$result = Database::query($sql);
 	*/
-	$ds = ldap_connect($ldap_host, $ldap_port) or die(get_lang('LDAPConnectionError'));
-	ldap_set_version($ds);
-	// Import des utilisateurs des etapes dans la session
-	if ($ds)
-	{
-		$r = false;
-		$res = ldap_handle_bind($ds, $r);
-		$UserList=array();
-		if($result !== false)
-		{
-			//while($row = Database::fetch_array($result))
-			//{
-				/*
+    $ds = ldap_connect($ldap_host, $ldap_port) or die(get_lang('LDAPConnectionError'));
+    ldap_set_version($ds);
+    // Import des utilisateurs des etapes dans la session
+    if ($ds)
+    {
+        $r = false;
+        $res = ldap_handle_bind($ds, $r);
+        $UserList=array();
+        if($result !== false)
+        {
+            //while($row = Database::fetch_array($result))
+            //{
+                /*
 				$annee = $row['annee'];
 				$code_ufr = $row['code_ufr'];
 				$etape = $row['code_etape'];
 				*/
-				// LDAP Query
-				// edupersonorgunitdn=ou=12CI1,ou=2006,ou=diploma,o=Paris1,dc=univ-paris1,dc=fr
-				//etapescommented
-				//$sr = @ ldap_search($ds, "ou=people,$LDAPbasedn", "edupersonorgunitdn=ou=$etape,ou=$annee,ou=diploma,$LDAPbasedn");
-				$sr = @ ldap_search($ds, $ldap_basedn, '(uid=*)');
-				$info = ldap_get_entries($ds, $sr);
-				for ($key = 0; $key < $info["count"]; $key ++)
-				{
-					echo "<pre>";
-					print_r($info[$key]);
-					echo "</pre>";
-					$lastname = api_utf8_decode($info[$key]["sn"][0]);
-					$firstname = api_utf8_decode($info[$key]["givenname"][0]);
-					$email = $info[$key]["mail"][0];
-					// Get uid from dn
-					$dn_array=ldap_explode_dn($info[$key]["dn"],1);
-					$username = $dn_array[0]; // uid is first key
-					$outab[] = $info[$key]["edupersonprimaryaffiliation"][0]; // Ici "student"
-					$val = ldap_get_values_len($ds, $sr, "userPassword");
-					$password = $val[0];
-					// Pour faciliter la gestion on ajoute le code "etape-annee"
-					$official_code=$etape."-".$annee;
-					$auth_source="ldap";
-					// Pas de date d'expiration d'etudiant (a recuperer par rapport au shadow expire LDAP)
-					$expiration_date='';
-					$active=1;
-					// Ajout de l'utilisateur
-					if (UserManager::is_username_available($username)) {
-						$user_id = UserManager::create_user($firstname,$lastname,$status,$email,$username,$password,$official_code,api_get_setting('platformLanguage'),$phone,$picture_uri,$auth_source,$expiration_date,$active);
-						$UserAdd[]=$user_id;
-					} else {
-						$user = api_get_user_info_from_username($username);
-						$user_id=$user['user_id'];
-						UserManager::update_user($user_id, $firstname, $lastname, $username, null, null, $email, $status, $official_code, $phone, $picture_uri, $expiration_date, $active);
-						$UserUpdate[]=$user_id;
-					}
-					$UserList[]=$user_id;
-				}
-			//}
-		}
-		if (isset($included) && ($included))
-		{
-			$message .= "> $name_session: ".count($UserAdd)." ".get_lang('Added').' '.get_lang('And').' '.count($UserUpdate).' '.get_lang('Modified').'<br/>';
-		}
-		else
-		{
-			print "> $name_session: ".count($UserAdd).get_lang('Added').' '.get_lang('And').' '.count($UserUpdate).' '.get_lang('Modified')."\n";
-		}
+                // LDAP Query
+                // edupersonorgunitdn=ou=12CI1,ou=2006,ou=diploma,o=Paris1,dc=univ-paris1,dc=fr
+                //etapescommented
+                //$sr = @ ldap_search($ds, "ou=people,$LDAPbasedn", "edupersonorgunitdn=ou=$etape,ou=$annee,ou=diploma,$LDAPbasedn");
+                $sr = @ ldap_search($ds, $ldap_basedn, '(uid=*)');
+                $info = ldap_get_entries($ds, $sr);
+                for ($key = 0; $key < $info["count"]; $key ++)
+                {
+                    echo "<pre>";
+                    print_r($info[$key]);
+                    echo "</pre>";
+                    $lastname = api_utf8_decode($info[$key]["sn"][0]);
+                    $firstname = api_utf8_decode($info[$key]["givenname"][0]);
+                    $email = $info[$key]["mail"][0];
+                    // Get uid from dn
+                    $dn_array=ldap_explode_dn($info[$key]["dn"],1);
+                    $username = $dn_array[0]; // uid is first key
+                    $outab[] = $info[$key]["edupersonprimaryaffiliation"][0]; // Ici "student"
+                    $val = ldap_get_values_len($ds, $sr, "userPassword");
+                    $password = $val[0];
+                    // Pour faciliter la gestion on ajoute le code "etape-annee"
+                    $official_code=$etape."-".$annee;
+                    $auth_source="ldap";
+                    // Pas de date d'expiration d'etudiant (a recuperer par rapport au shadow expire LDAP)
+                    $expiration_date='';
+                    $active=1;
+                    // Ajout de l'utilisateur
+                    if (UserManager::is_username_available($username)) {
+                        $user_id = UserManager::create_user($firstname,$lastname,$status,$email,$username,$password,$official_code,api_get_setting('platformLanguage'),$phone,$picture_uri,$auth_source,$expiration_date,$active);
+                        $UserAdd[]=$user_id;
+                    } else {
+                        $user = api_get_user_info_from_username($username);
+                        $user_id=$user['user_id'];
+                        UserManager::update_user($user_id, $firstname, $lastname, $username, null, null, $email, $status, $official_code, $phone, $picture_uri, $expiration_date, $active);
+                        $UserUpdate[]=$user_id;
+                    }
+                    $UserList[]=$user_id;
+                }
+            //}
+        }
+        if (isset($included) && ($included))
+        {
+            $message .= "> $name_session: ".count($UserAdd)." ".get_lang('Added').' '.get_lang('And').' '.count($UserUpdate).' '.get_lang('Modified').'<br/>';
+        }
+        else
+        {
+            print "> $name_session: ".count($UserAdd).get_lang('Added').' '.get_lang('And').' '.count($UserUpdate).' '.get_lang('Modified')."\n";
+        }
 
-		// Une fois les utilisateurs importer dans la base des utilisateurs, on peux les affecter la session
-		$result=Database::query("SELECT c_id FROM $tbl_session_rel_course WHERE session_id='$id_session'");
-		$CourseList=array();
-		while($row=Database::fetch_array($result)) {
-			$CourseList[]= $row['c_id'];
-		}
+        // Une fois les utilisateurs importer dans la base des utilisateurs, on peux les affecter la session
+        $result=Database::query("SELECT c_id FROM $tbl_session_rel_course WHERE session_id='$id_session'");
+        $CourseList=array();
+        while($row=Database::fetch_array($result)) {
+            $CourseList[]= $row['c_id'];
+        }
 
-		foreach ($CourseList as $enreg_course) {
-			// On ajoute la relation entre l'utilisateur et le cours
-			foreach ($UserList as $enreg_user) {
-				$sql = "INSERT IGNORE INTO $tbl_session_rel_course_rel_user(session_id,c_id,user_id)
+        foreach ($CourseList as $enreg_course) {
+            // On ajoute la relation entre l'utilisateur et le cours
+            foreach ($UserList as $enreg_user) {
+                $sql = "INSERT IGNORE INTO $tbl_session_rel_course_rel_user(session_id,c_id,user_id)
 						VALUES('$id_session','$enreg_course','$enreg_user')";
-				Database::query($sql);
-			}
-			$sql = "SELECT COUNT(user_id) as nbUsers " .
-					"FROM $tbl_session_rel_course_rel_user " .
-					"WHERE session_id='$id_session' AND c_id='$enreg_course'";
-			$rs = Database::query($sql);
-			list($nbr_users) = Database::fetch_array($rs);
-			$sql = "UPDATE $tbl_session_rel_course SET nbr_users=$nbr_users
+                Database::query($sql);
+            }
+            $sql = "SELECT COUNT(user_id) as nbUsers " .
+                    "FROM $tbl_session_rel_course_rel_user " .
+                    "WHERE session_id='$id_session' AND c_id='$enreg_course'";
+            $rs = Database::query($sql);
+            list($nbr_users) = Database::fetch_array($rs);
+            $sql = "UPDATE $tbl_session_rel_course SET nbr_users=$nbr_users
 					WHERE session_id='$id_session' AND c_id = '$enreg_course'";
-			Database::query($sql);
-		}
-		// On ajoute la relation entre l'utilisateur et la session
-		foreach($UserList as $enreg_user){
-			$sql = "INSERT IGNORE INTO $tbl_session_rel_user(session_id, user_id, registered_at) " .
-					"VALUES('$id_session','$enreg_user', '" . api_get_utc_datetime() . "')";
-			Database::query($sql);
-		}
-		$sql = "SELECT COUNT(user_id) as nbUsers " .
-				"FROM $tbl_session_rel_user " .
-				"WHERE session_id='$id_session' AND relation_type<>".SESSION_RELATION_TYPE_RRHH."";
-		$rs = Database::query($sql);
-		list($nbr_users) = Database::fetch_array($rs);
-		$sql = "UPDATE $tbl_session SET nbr_users=$nbr_users WHERE id='$id_session'";
-		Database::query($sql);
-	}
+            Database::query($sql);
+        }
+        // On ajoute la relation entre l'utilisateur et la session
+        foreach($UserList as $enreg_user){
+            $sql = "INSERT IGNORE INTO $tbl_session_rel_user(session_id, user_id, registered_at) " .
+                    "VALUES('$id_session','$enreg_user', '" . api_get_utc_datetime() . "')";
+            Database::query($sql);
+        }
+        $sql = "SELECT COUNT(user_id) as nbUsers " .
+                "FROM $tbl_session_rel_user " .
+                "WHERE session_id='$id_session' AND relation_type<>".SESSION_RELATION_TYPE_RRHH."";
+        $rs = Database::query($sql);
+        list($nbr_users) = Database::fetch_array($rs);
+        $sql = "UPDATE $tbl_session SET nbr_users=$nbr_users WHERE id='$id_session'";
+        Database::query($sql);
+    }
 }