diff --git a/main/link/link.php b/main/link/link.php
index 00a2d95cbe..0cc7e321c5 100755
--- a/main/link/link.php
+++ b/main/link/link.php
@@ -1,36 +1,35 @@
-<?php // $Id: link.php 22251 2009-07-20 16:56:54Z iflorespaz $
+<?php
 /* For licensing terms, see /license.txt */
 
 /**
-* Main script for the links tool.
-*
-* Features:
-* - Organize links into categories;
-* - favorites/bookmarks-like interface;
-* - move links up/down within a category;
-* - move categories up/down;
-* - expand/collapse all categories (except the main "non"-category);
-* - add link to 'root' category => category-less link is always visible.
-*
-* @author Patrick Cool, main author, completely rewritten
-* @author René Haentjens, added CSV file import (October 2004)
-* @package chamilo.link
-* @todo improve organisation, tables should come from database library
-*/
-
-/*
-		INIT SECTION
-*/
-// name of the language file that needs to be included
-$language_file = array('link','admin');
-
-// including libraries
-require_once "../inc/global.inc.php";
-require_once "linkfunctions.php";
-
-
-$this_section=SECTION_COURSES;
+ * Main script for the links tool.
+ *
+ * Features:
+ * - Organize links into categories;
+ * - favorites/bookmarks-like interface;
+ * - move links up/down within a category;
+ * - move categories up/down;
+ * - expand/collapse all categories (except the main "non"-category);
+ * - add link to 'root' category => category-less link is always visible.
+ *
+ * @author Patrick Cool, main author, completely rewritten
+ * @author René Haentjens, added CSV file import (October 2004)
+ * @package chamilo.link
+ * @todo improve organisation, tables should come from database library
+ */
+
+/*	INIT SECTION */
+
+// Language files that need to be included
+$language_file = array('link', 'admin');
+
+// Including libraries
+require_once '../inc/global.inc.php';
+require_once 'linkfunctions.php';
+
+$this_section = SECTION_COURSES;
 api_protect_course_script();
+
 $htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery.js" type="text/javascript" language="javascript"></script>'; //jQuery
 $htmlHeadXtra[] = '<script type="text/javascript">
 $(document).ready( function() {
@@ -63,60 +62,59 @@ $(document).ready( function() {
 
  </script>';
 
-
-//   div_target
 // @todo change the $_REQUEST into $_POST or $_GET
 // @todo remove this code
-$link_submitted = (isset($_POST['submitLink'])?true:false);
-$category_submitted = (isset($_POST['submitCategory'])?true:false);
-$urlview = (!empty($_GET['urlview'])?$_GET['urlview']:'');
-$submitImport = (!empty($_POST['submitImport'])?$_POST['submitImport']:'');
-$down = (!empty($_GET['down'])?$_GET['down']:'');
-$up = (!empty($_GET['up'])?$_GET['up']:'');
-$catmove = (!empty($_GET['catmove'])?$_GET['catmove']:'');
-$editlink = (!empty($_REQUEST['editlink'])?$_REQUEST['editlink']:'');
-$id = (!empty($_REQUEST['id'])?$_REQUEST['id']:'');
-$urllink = (!empty($_REQUEST['urllink'])?$_REQUEST['urllink']:'');
-$title = (!empty($_REQUEST['title'])?$_REQUEST['title']:'');
-$description = (!empty($_REQUEST['description'])?$_REQUEST['description']:'');
-$selectcategory = (!empty($_REQUEST['selectcategory'])?$_REQUEST['selectcategory']:'');
-$submitLink = (isset($_REQUEST['submitLink'])?true : false);
-$action = (!empty($_REQUEST['action'])?$_REQUEST['action']:'');
-$category_title = (!empty($_REQUEST['category_title'])?$_REQUEST['category_title']:'');
-$submitCategory = isset($_POST['submitCategory'])?true:false;
+$link_submitted = isset($_POST['submitLink']);
+$category_submitted = isset($_POST['submitCategory']);
+$urlview = !empty($_GET['urlview']) ? $_GET['urlview'] : '';
+$submit_import = !empty($_POST['submitImport']) ? $_POST['submitImport'] : '';
+$down = !empty($_GET['down']) ? $_GET['down'] : '';
+$up = !empty($_GET['up']) ? $_GET['up'] : '';
+$catmove = !empty($_GET['catmove']) ? $_GET['catmove'] : '';
+$editlink = !empty($_REQUEST['editlink']) ? $_REQUEST['editlink'] : '';
+$id = !empty($_REQUEST['id']) ? $_REQUEST['id'] : '';
+$urllink = !empty($_REQUEST['urllink']) ? $_REQUEST['urllink'] : '';
+$title = !empty($_REQUEST['title']) ? $_REQUEST['title'] : '';
+$description = !empty($_REQUEST['description']) ? $_REQUEST['description'] : '';
+$selectcategory = !empty($_REQUEST['selectcategory']) ? $_REQUEST['selectcategory'] : '';
+$submit_link = isset($_REQUEST['submitLink']);
+$action = !empty($_REQUEST['action']) ? $_REQUEST['action'] : '';
+$category_title = !empty($_REQUEST['category_title']) ? $_REQUEST['category_title'] : '';
+$submit_category = isset($_POST['submitCategory']);
+
 $nameTools = get_lang('Links');
 
-//condition for the session
+// Condition for the session
 $session_id = api_get_session_id();
 $condition_session = api_get_session_condition($session_id, false);
 
-if (isset($_GET['action']) && $_GET['action']=='addlink') {
+if (isset($_GET['action']) && $_GET['action'] == 'addlink') {
 	$nameTools = '';
-	$interbreadcrumb[] = array ('url' => 'link.php', 'name' => get_lang('Links'));
-	$interbreadcrumb[] = array ('url' => 'link.php?action=addlink', 'name' => get_lang('AddLink'));
+	$interbreadcrumb[] = array('url' => 'link.php', 'name' => get_lang('Links'));
+	$interbreadcrumb[] = array('url' => 'link.php?action=addlink', 'name' => get_lang('AddLink'));
 }
 
-if (isset($_GET['action']) && $_GET['action']=='addcategory') {
+if (isset($_GET['action']) && $_GET['action'] == 'addcategory') {
 	$nameTools = '';
-	$interbreadcrumb[] = array ('url' => 'link.php', 'name' => get_lang('Links'));
-	$interbreadcrumb[] = array ('url' => 'link.php?action=addcategory', 'name' => get_lang('AddCategory'));
+	$interbreadcrumb[] = array('url' => 'link.php', 'name' => get_lang('Links'));
+	$interbreadcrumb[] = array('url' => 'link.php?action=addcategory', 'name' => get_lang('AddCategory'));
 }
 
-if (isset($_GET['action']) && $_GET['action']=='editlink') {
+if (isset($_GET['action']) && $_GET['action'] == 'editlink') {
 	$nameTools = '';
-	$interbreadcrumb[] = array ('url' => 'link.php', 'name' => get_lang('Links'));
-	$interbreadcrumb[] = array ('url' => '#', 'name' => get_lang('EditLink'));
+	$interbreadcrumb[] = array('url' => 'link.php', 'name' => get_lang('Links'));
+	$interbreadcrumb[] = array('url' => '#', 'name' => get_lang('EditLink'));
 }
 
-
 // Database Table definitions
 $tbl_link = Database::get_course_table(TABLE_LINK);
 $tbl_categories = Database::get_course_table(TABLE_LINK_CATEGORY);
 
-//statistics
+// Statistics
 event_access_tool(TOOL_LINK);
 
 Display::display_header($nameTools, 'Links');
+
 ?>
 <script type="text/javascript">
 /* <![CDATA[ */
@@ -128,95 +126,83 @@ function MM_popupMsg(msg) { //v1.0
 
 <?php
 
+/*	Action Handling */
 
+$nameTools = get_lang('Links');
 
-/*
-	Action Handling
-*/
-$nameTools = get_lang("Links");
-
-if(isset($_GET['action'])) {
-	switch($_GET['action']) {
-		case "addlink":
-			if($link_submitted)
-			{
-				if(!addlinkcategory("link"))	// here we add a link
-				{
-					unset($submitLink);
+if (isset($_GET['action'])) {
+	switch ($_GET['action']) {
+		case 'addlink':
+			if ($link_submitted) {
+				if(!addlinkcategory("link")) {	// Here we add a link
+					unset($submit_link);
 				}
 			}
 			break;
-		case "addcategory":
-			if($category_submitted)
-			{
-				if(!addlinkcategory("category"))	// here we add a category
-				{
-					unset($submitCategory);
+		case 'addcategory':
+			if ($category_submitted) {
+				if (!addlinkcategory('category')) {	// Here we add a category
+					unset($submit_category);
 				}
 			}
 			break;
-		case "importcsv":
-			if($_POST["submitImport"])
-			{
+		case 'importcsv':
+			if ($_POST['submitImport']) {
 				import_csvfile();
 			}
 			break;
-		case "deletelink":
-			deletelinkcategory("link"); // here we delete a link
+		case 'deletelink':
+			deletelinkcategory('link'); // Here we delete a link
 			break;
 
-		case "deletecategory":
-			deletelinkcategory("category"); // here we delete a category
+		case 'deletecategory':
+			deletelinkcategory('category'); // Here we delete a category
 			break;
-		case "editlink":
-			editlinkcategory("link"); // here we edit a link
+		case 'editlink':
+			editlinkcategory('link'); // Here we edit a link
 			break;
-		case "editcategory":
-			editlinkcategory("category"); // here we edit a category
+		case 'editcategory':
+			editlinkcategory('category'); // Here we edit a category
 			break;
-		case "visible":
-			change_visibility($_GET['id'],$_GET['scope']); // here we edit a category
+		case 'visible':
+			change_visibility($_GET['id'], $_GET['scope']); // Here we edit a category
 			break;
-		case "invisible":
-			change_visibility($_GET['id'],$_GET['scope']); // here we edit a category
+		case 'invisible':
+			change_visibility($_GET['id'], $_GET['scope']); // Here we edit a category
 			break;
 	}
 }
 
-/*
------------------------------------------------------------
-	Introduction section
------------------------------------------------------------
-*/
-Display::display_introduction_section(TOOL_LINK);
+/*	Introduction section */
 
+Display::display_introduction_section(TOOL_LINK);
 
-if (api_is_allowed_to_edit(null, true) and isset($_GET['action'])) {
+if (api_is_allowed_to_edit(null, true) && isset($_GET['action'])) {
 	echo '<div class="actions">';
-	//echo '<a href="link.php?cidReq='.Security::remove_XSS($_GET['cidReq']).'&amp;urlview='.Security::remove_XSS($_GET['urlview']).'">'.Display::return_icon('back.png',get_lang('BackToLinksOverview')).get_lang('BackToLinksOverview').'</a>';
+	//echo '<a href="link.php?cidReq='.Security::remove_XSS($_GET['cidReq']).'&amp;urlview='.Security::remove_XSS($_GET['urlview']).'">'.Display::return_icon('back.png', get_lang('BackToLinksOverview')).get_lang('BackToLinksOverview').'</a>';
 	echo '</div>';
-if(api_get_setting('search_enabled')=='true') {
-	if (!extension_loaded('xapian')) {
-		Display::display_error_message(get_lang('SearchXapianModuleNotInstaled'));
+	if (api_get_setting('search_enabled') == 'true') {
+		if (!extension_loaded('xapian')) {
+			Display::display_error_message(get_lang('SearchXapianModuleNotInstaled'));
+		}
 	}
-}
 	// Displaying the correct title and the form for adding a category or link. This is only shown when nothing
-	// has been submitted yet, hence !isset($submitLink)
-	if (($_GET['action']=="addlink" or $_GET['action']=="editlink") and empty($_POST['submitLink'])) {
+	// has been submitted yet, hence !isset($submit_link)
+	if (($_GET['action'] == 'addlink' || $_GET['action'] == 'editlink') && empty($_POST['submitLink'])) {
 		echo '<div class="row">';
-		if ($_GET['action']=="addlink")
-			{echo '<div class="form_header">'.get_lang("LinkAdd").'</div>';}
-		else
-			{echo '<div class="form_header">'.get_lang("LinkMod").'</div>';}
+		if ($_GET['action'] == 'addlink') {
+			echo '<div class="form_header">'.get_lang('LinkAdd').'</div>';
+		} else {
+			echo '<div class="form_header">'.get_lang('LinkMod').'</div>';
+		}
 		echo '</div>';
-		if ($category=="") {
-			$category=0;
+		if ($category == '') {
+			$category = 0;
 		}
-		echo "<form method=\"post\" action=\"".api_get_self()."?action=".Security::remove_XSS($_GET['action'])."&amp;urlview=".Security::remove_XSS($urlview)."\">";
-		if ($_GET['action']=="editlink")
-		{
-			echo "<input type=\"hidden\" name=\"id\" value=\"".Security::remove_XSS($_GET['id'])."\" />";
-			$clean_link_id=trim(Security::remove_XSS($_GET['id']));
+		echo '<form method="post" action="'.api_get_self().'?action='.Security::remove_XSS($_GET['action']).'&amp;urlview='.Security::remove_XSS($urlview).'">';
+		if ($_GET['action'] == 'editlink') {
+			echo '<input type="hidden" name="id" value="'.Security::remove_XSS($_GET['id']).'" />';
+			$clean_link_id = trim(Security::remove_XSS($_GET['id']));
 		}
 
 		echo '	<div class="row">
@@ -224,7 +210,7 @@ if(api_get_setting('search_enabled')=='true') {
 						<span class="form_required">*</span> '.get_lang('Url').'
 					</div>
 					<div class="formw">
-						<input type="text" name="urllink" size="50" value="' . (empty($urllink)?'http://':api_htmlentities($urllink, ENT_COMPAT, $charset)) . '" />
+						<input type="text" name="urllink" size="50" value="' . (empty($urllink) ? 'http://' : Security::remove_XSS($urllink)) . '" />
 					</div>
 				</div>';
 
@@ -233,7 +219,7 @@ if(api_get_setting('search_enabled')=='true') {
 						'.get_lang('LinkName').'
 					</div>
 					<div class="formw">
-						<input type="text" name="title" size="50" value="' . api_htmlentities($title,ENT_QUOTES,$charset) . '" />
+						<input type="text" name="title" size="50" value="' . Security::remove_XSS($title) . '" />
 					</div>
 				</div>';
 		echo '	<div class="row">
@@ -249,13 +235,10 @@ if(api_get_setting('search_enabled')=='true') {
 						'.get_lang('Description').'
 					</div>
 					<div class="formw">
-						<textarea rows="3" cols="50" name="description">' .	api_htmlentities($description,ENT_QUOTES,$charset) . '</textarea>
+						<textarea rows="3" cols="50" name="description">' .	Security::remove_XSS($description) . '</textarea>
 					</div>
 				</div>';
 
-
-
-
 		$sqlcategories = "SELECT * FROM ".$tbl_categories." $condition_session ORDER BY display_order DESC";
 		$resultcategories = Database::query($sqlcategories);
 
@@ -267,17 +250,16 @@ if(api_get_setting('search_enabled')=='true') {
 						<div class="formw">';
 			echo '			<select name="selectcategory">';
 			echo '			<option value="0">--</option>';
-			while ($myrow = Database::fetch_array($resultcategories))
-			{
-				echo "		<option value=\"".$myrow["id"]."\"";
-				if ($myrow["id"]==$category)
-					{echo " selected";}
-				echo ">".$myrow["category_title"]."</option>";
+			while ($myrow = Database::fetch_array($resultcategories)) {
+				echo '		<option value="'.$myrow['id'].'"';
+				if ($myrow['id'] == $category) {
+					echo ' selected';
+				}
+				echo '>'.$myrow['category_title'].'</option>';
 			}
 			echo '			</select>';
 			echo '		</div>
 					</div>';
-
 		}
 
 		echo '	<div class="row">
@@ -302,9 +284,8 @@ if(api_get_setting('search_enabled')=='true') {
 					</div>
 				</div>';
 
-		if(api_get_setting('search_enabled')=='true')
-		{
-			require_once(api_get_path(LIBRARY_PATH) . 'specific_fields_manager.lib.php');
+		if (api_get_setting('search_enabled') == 'true') {
+			require_once api_get_path(LIBRARY_PATH).'specific_fields_manager.lib.php';
 			$specific_fields = get_specific_field_list();
 
 			echo '	<div class="row">
@@ -316,14 +297,13 @@ if(api_get_setting('search_enabled')=='true') {
 						</div>';
 
 			foreach ($specific_fields as $specific_field) {
-				//Author : <input name="A" type="text" />
+				// Author : <input name="A" type="text" />
 
 				$default_values = '';
-                if ($_GET['action']=="editlink")
-				{
+                if ($_GET['action'] == 'editlink') {
 					$filter = array('course_code'=> "'". api_get_course_id() ."'", 'field_id' => $specific_field['id'], 'ref_id' => Security::remove_XSS($_GET['id']), 'tool_id' => '\''. TOOL_LINK .'\'');
 					$values = get_specific_field_values_list($filter, array('value'));
-					if ( !empty($values) ) {
+					if (!empty($values)) {
 						$arr_str_values = array();
 						foreach ($values as $value) {
 							$arr_str_values[] = $value['value'];
@@ -353,20 +333,19 @@ if(api_get_setting('search_enabled')=='true') {
 				</div>';
 
 		echo '</form>';
-	} elseif(($_GET['action']=="addcategory" or $_GET['action']=="editcategory") and !$submitCategory) {
+	} elseif(($_GET['action'] == 'addcategory' || $_GET['action'] == 'editcategory') && !$submit_category) {
 		echo '<div class="row">';
-		if ($_GET['action']=="addcategory") {
+		if ($_GET['action'] == 'addcategory') {
 			echo '<div class="form_header">'.get_lang('CategoryAdd').'</div>';
-			$my_cat_title=get_lang('CategoryAdd');
-			} else {
+			$my_cat_title = get_lang('CategoryAdd');
+		} else {
 			echo '<div class="form_header">'.get_lang('CategoryMod').'</div>';
-			$my_cat_title=get_lang('CategoryMod');
+			$my_cat_title = get_lang('CategoryMod');
 		}
 		echo "</div>\n\n";
-		echo "<form method=\"post\" action=\"".api_get_self()."?action=".Security::remove_XSS($_GET['action'])."&amp;urlview=".Security::remove_XSS($urlview)."\">";
-		if ($_GET['action']=="editcategory")
-		{
-			echo "<input type=\"hidden\" name=\"id\" value=\"".$id."\" />";
+		echo '<form method="post" action="'.api_get_self().'?action='.Security::remove_XSS($_GET['action']).'&amp;urlview='.Security::remove_XSS($urlview).'">';
+		if ($_GET['action'] == 'editcategory') {
+			echo '<input type="hidden" name="id" value="'.$id.'" />';
 		}
 
 		echo '	<div class="row">
@@ -374,7 +353,7 @@ if(api_get_setting('search_enabled')=='true') {
 						<span class="form_required">*</span> '.get_lang('CategoryName').'
 					</div>
 					<div class="formw">
-						<input type="text" name="category_title" size="50" value="'.api_htmlentities($category_title,ENT_QUOTES,$charset).'" />
+						<input type="text" name="category_title" size="50" value="'.Security::remove_XSS($category_title).'" />
 					</div>
 				</div>';
 
@@ -383,7 +362,7 @@ if(api_get_setting('search_enabled')=='true') {
 						'.get_lang('Description').'
 					</div>
 					<div class="formw">
-						<textarea rows="3" cols="50" name="description">'.api_htmlentities($description,ENT_QUOTES,$charset).'</textarea>
+						<textarea rows="3" cols="50" name="description">'.Security::remove_XSS($description).'</textarea>
 					</div>
 				</div>';
 
@@ -397,8 +376,7 @@ if(api_get_setting('search_enabled')=='true') {
 
 		echo "</form>";
 	}
-	/*elseif(($_GET['action']=="importcsv") and !$submitImport)  // RH start
-	{
+	/*elseif(($_GET['action'] == 'importcsv') and !$submit_import) {
 		echo "<h4>", get_lang('CsvImport'), "</h4>\n\n",
 		     "<form method=\"post\" action=\"".api_get_self()."?action=".$_GET['action']."&amp;urlview=".$urlview."\" enctype=\"multipart/form-data\">",
                 // uncomment if you want to set a limit: '<input type="hidden" name="MAX_FILE_SIZE" value="32768">', "\n",
@@ -409,7 +387,6 @@ if(api_get_setting('search_enabled')=='true') {
 	}*/
 }
 
-
 if (!empty($down)) {
 	movecatlink($down);
 }
@@ -417,132 +394,119 @@ if (!empty($up)) {
 	movecatlink($up);
 }
 
-if (empty($_GET['action']) || ($_GET['action']!='editlink' && $_GET['action']!='addcategory' && $_GET['action']!='addlink') || $link_submitted || $category_submitted) {
-	/*
-	-----------------------------------------------------------
-		Action Links
-	-----------------------------------------------------------
-	*/
-	if ((isset($_GET['action'] ) &&  $_GET['action']=='editcategory' && isset($_GET['id'])) || (isset($_GET['action']) && $_GET['action']=='addcategory')) {
-			echo '<br/><br/><br/>';
+if (empty($_GET['action']) || ($_GET['action'] != 'editlink' && $_GET['action'] != 'addcategory' && $_GET['action'] != 'addlink') || $link_submitted || $category_submitted) {
+
+	/*	Action Links */
+
+	if ((isset($_GET['action']) &&  $_GET['action'] == 'editcategory' && isset($_GET['id'])) || (isset($_GET['action']) && $_GET['action'] == 'addcategory')) {
+			echo '<br /><br /><br />';
 	}
 	echo '<div class="actions">';
-	if(api_is_allowed_to_edit(null, true)) {
+	if (api_is_allowed_to_edit(null, true)) {
 		$urlview = Security::remove_XSS($urlview);
-		echo Display::return_icon('linksnew.gif',get_lang('LinkAdd'))." <a href=\"".api_get_self()."?".api_get_cidreq()."&action=addlink&amp;category=".(!empty($category)?$category:'')."&amp;urlview=$urlview\">".get_lang("LinkAdd")."</a>\n";
-		echo Display::return_icon('folder_new.gif', get_lang("CategoryAdd"))." <a href=\"".api_get_self()."?".api_get_cidreq()."&action=addcategory&amp;urlview=".$urlview."\">".get_lang("CategoryAdd")."</a>\n";
+		echo Display::return_icon('linksnew.gif', get_lang('LinkAdd')).' <a href="'.api_get_self().'?'.api_get_cidreq().'&amp;action=addlink&amp;category='.(!empty($category) ? $category : '').'&amp;urlview='.$urlview.'">'.get_lang('LinkAdd')."</a>\n";
+		echo Display::return_icon('folder_new.gif', get_lang('CategoryAdd')).' <a href="'.api_get_self().'?'.api_get_cidreq().'&amp;action=addcategory&amp;urlview='.$urlview.'">'.get_lang('CategoryAdd')."</a>\n";
 		   /* "<a href=\"".api_get_self()."?".api_get_cidreq()."&action=importcsv&amp;urlview=".$urlview."\">".get_lang('CsvImport')."</a>\n", // RH*/
 	}
-	//making the show none / show all links. Show none means urlview=0000 (number of zeros depending on the
-	//number of categories). Show all means urlview=1111 (number of 1 depending on teh number of categories).
+	// Making the show none / show all links. Show none means urlview=0000 (number of zeros depending on the
+	// number of categories). Show all means urlview=1111 (number of 1 depending on teh number of categories).
 	$sqlcategories = "SELECT * FROM ".$tbl_categories." $condition_session ORDER BY display_order DESC";
 	$resultcategories = Database::query($sqlcategories);
 	$aantalcategories = Database::num_rows($resultcategories);
 	if ($aantalcategories > 0) {
-		echo Display::return_icon('remove.gif', $shownone)." <a href=\"".api_get_self()."?".api_get_cidreq()."&urlview=";
-		for($j = 1; $j <= $aantalcategories; $j++) {
-			echo "0";
+		echo Display::return_icon('remove.gif', $shownone).' <a href="'.api_get_self().'?'.api_get_cidreq().'&urlview=';
+		for ($j = 1; $j <= $aantalcategories; $j++) {
+			echo '0';
 		}
-		echo "\">".get_lang('shownone')."</a>";
-		echo Display::return_icon('add.gif', $showall)." <a href=\"".api_get_self()."?".api_get_cidreq()."&urlview=";
-		for($j = 1; $j <= $aantalcategories; $j++)
-		{
-		echo "1";
+		echo '">'.get_lang('shownone').'</a>';
+		echo Display::return_icon('add.gif', $showall).' <a href="'.api_get_self().'?'.api_get_cidreq().'&urlview=';
+		for ($j = 1; $j <= $aantalcategories; $j++) {
+			echo '1';
 		}
-		echo "\">".get_lang('showall')."</a>";
+		echo '">'.get_lang('showall').'</a>';
 	}
 	echo '</div>';
 
-	//Starting the table which contains the categories
+	// Starting the table which contains the categories
 	$sqlcategories = "SELECT * FROM ".$tbl_categories." $condition_session ORDER BY display_order DESC";
 	$resultcategories = Database::query($sqlcategories);
 
 	echo '<table class="data_table">';
-	// displaying the links which have no category (thus category = 0 or NULL), if none present this will not be displayed
-	$sqlLinks = "SELECT * FROM ".$tbl_link." WHERE category_id=0 or category_id IS NULL";
+	// Displaying the links which have no category (thus category = 0 or NULL), if none present this will not be displayed
+	$sqlLinks = "SELECT * FROM ".$tbl_link." WHERE category_id=0 OR category_id IS NULL";
 	$result = Database::query($sqlLinks);
-	$numberofzerocategory=Database::num_rows($result);
-	if ($numberofzerocategory!==0) {
-		echo "<tr><th style=\"font-weight: bold; text-align:left;padding-left: 10px;\"><i>".get_lang('General')."</i></th></tr>";
+	$numberofzerocategory = Database::num_rows($result);
+	if ($numberofzerocategory !== 0) {
+		echo '<tr><th style="font-weight: bold; text-align:left;padding-left: 10px;"><i>'.get_lang('General').'</i></th></tr>';
 		echo '</table>';
 		showlinksofcategory(0);
 	}
 
-	$i=0;
-	$catcounter=1;
-	$view="0";
+	$i = 0;
+	$catcounter = 1;
+	$view = '0';
 
 	while ($myrow = Database::fetch_array($resultcategories)) {
-		//validacion when belongs to a session
+		// Validacion when belongs to a session
 		$session_img = api_get_session_image($myrow['session_id'], $_user['status']);
 
-		//if (!isset($urlview))
-		if ($urlview == '')
-		{
+		//if (!isset($urlview)) {
+		if ($urlview == '') {
 			// No $view set in the url, thus for each category link it should be all zeros except it's own
 			makedefaultviewcode($i);
+		} else {
+			$view = $urlview;
+			$view[$i] = '1';
 		}
-		else
-		{
-			$view=$urlview;
-			$view[$i]="1";
-		}
-		// if the $urlview has a 1 for this categorie, this means it is expanded and should be desplayed as a
+		// If the $urlview has a 1 for this categorie, this means it is expanded and should be desplayed as a
 		// - instead of a +, the category is no longer clickable and all the links of this category are displayed
-		$myrow["description"]=text_filter($myrow["description"]);
+		$myrow['description'] = text_filter($myrow['description']);
 
-		if ($urlview[$i]=="1")
-		{
-			$newurlview=$urlview;
-			$newurlview[$i]="0";
+		if ($urlview[$i] == '1') {
+			$newurlview = $urlview;
+			$newurlview[$i] = '0';
 
 			echo '<tr>';
 				echo '<table class="data_table">';
 				echo '<tr>';
-					echo '<th width="81%"  style="font-weight: bold; text-align:left;padding-left: 5px;">';
-					echo '<a href="'.api_get_self()."?".api_get_cidreq()."&urlview=".Security::remove_XSS($newurlview)."\">";
-					echo "<img src=../img/remove.gif>&nbsp;&nbsp;".api_htmlentities($myrow["category_title"],ENT_QUOTES,$charset)."</a><br/>&nbsp;&nbsp;&nbsp;".$myrow["description"];
-
-					if (api_is_allowed_to_edit(null,true))
-						{
-							echo '<th>';
-							showcategoryadmintools($myrow["id"]);
-							echo '</th>';
-						}
+					echo '<th width="81%" style="font-weight: bold; text-align:left;padding-left: 5px;">';
+					echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&amp;urlview='.Security::remove_XSS($newurlview).'">';
+					echo '<img src="../img/remove.gif" />&nbsp;&nbsp;'.Security::remove_XSS($myrow['category_title']).'</a><br />&nbsp;&nbsp;&nbsp;'.$myrow['description'];
+
+					if (api_is_allowed_to_edit(null, true)) {
+						echo '<th>';
+						showcategoryadmintools($myrow['id']);
+						echo '</th>';
+					}
 					echo '</th>';
 				echo '</tr>';
 				echo '</table>';
-				echo showlinksofcategory($myrow["id"]);
+				echo showlinksofcategory($myrow['id']);
 			echo '</tr>';
-		}
-		else
-		{
+		} else {
 			echo '<tr>';
 				echo '<table class="data_table">';
 				echo '<tr>';
-					echo '<th width="81%" style="font-weight: bold; text-align:left;padding-left: 5px;"><a href="'.api_get_self()."?".api_get_cidreq()."&urlview=";
-					echo is_array($view)?implode('',$view):$view;
-					echo "\"><img src=../img/add.gif>&nbsp;&nbsp;".  api_htmlentities($myrow["category_title"],ENT_QUOTES,$charset). $session_img;
+					echo '<th width="81%" style="font-weight: bold; text-align:left;padding-left: 5px;"><a href="'.api_get_self().'?'.api_get_cidreq().'&amp;urlview=';
+					echo is_array($view) ? implode('', $view) : $view;
+					echo '"><img src="../img/add.gif" />&nbsp;&nbsp;'.Security::remove_XSS($myrow['category_title']).$session_img;
 					echo'</a><br />&nbsp;&nbsp;&nbsp;';
-					echo $myrow["description"];
-						if (api_is_allowed_to_edit(null, true))
-						{
-							echo '<th style="text-align:center;">';
-							showcategoryadmintools($myrow["id"]);
-							echo '</th>';
-						}
+					echo $myrow['description'];
+					if (api_is_allowed_to_edit(null, true)) {
+						echo '<th style="text-align:center;">';
+						showcategoryadmintools($myrow['id']);
+						echo '</th>';
+					}
 					echo '</th>';
 				echo '</tr>';
 
-
 				echo '</table>';
 			echo '</tr>';
 		}
-		// displaying the link of the category
+		// Displaying the link of the category
 		$i++;
 	}
-	echo '</table>';	
+	echo '</table>';
 }
 
 Display::display_footer();
-?>
\ No newline at end of file
diff --git a/main/link/link_goto.php b/main/link/link_goto.php
index 7f695eb25c..51fbfd7db6 100755
--- a/main/link/link_goto.php
+++ b/main/link/link_goto.php
@@ -1,31 +1,30 @@
-<?php // $Id: link_goto.php 22201 2009-07-17 19:57:03Z cfasanando $
+<?php
 /* For licensing terms, see /license.txt */
+
 /**
 * This page is used to launch an event when a user clicks
 * on a page linked in a course.
 * - It gets name of URL
 * - It calls the event function
 * - It redirects the user to the linked page
-*                                                               
+*
 * Need the liens.id, user.user_id et cours.code when called
-* ?link_id=$myrow[0]&link_url=$myrow[1]                           
+* ?link_id=$myrow[0]&link_url=$myrow[1]
 * url is given to avoid a new select
 *
 * @author Thomas Depraetere, Hugues Peeters, Christophe Gesch� - original versions
 * @package chamilo.link
 */
 
-/*
-		INIT SECTION
-*/
+/*	INIT SECTION */
 
 require_once '../inc/global.inc.php';
-$this_section=SECTION_COURSES;
+$this_section = SECTION_COURSES;
 
 $link_url = Security::remove_XSS($_GET['link_url']);
 $link_id = intval($_GET['link_id']);
 
-// launch event
+// Launch event
 event_link($link_id);
 
 header("Cache-Control: no-store, no-cache, must-revalidate");   // HTTP/1.1
@@ -33,6 +32,5 @@ header("Cache-Control: post-check=0, pre-check=0", false);
 header("Pragma: no-cache");                                     // HTTP/1.0
 header("Location: $link_url");
 
-//to be sure that the script stops running after the redirection
+// To be sure that the script stops running after the redirection
 exit;
-?>
\ No newline at end of file
diff --git a/main/link/linkfunctions.php b/main/link/linkfunctions.php
index 677406ec2d..d93a2ff69d 100755
--- a/main/link/linkfunctions.php
+++ b/main/link/linkfunctions.php
@@ -1,26 +1,24 @@
 <?php
 /* For licensing terms, see /license.txt */
-/**
-* Function library for the links tool.
-*
-* This is a complete remake of the original link tool.
-* New features:
-* - Organize links into categories;
-* - favorites/bookmarks interface;
-* - move links up/down within a category;
-* - move categories up/down;
-* - expand/collapse all categories;
-* - add link to 'root' category => category-less link is always visible.
-*
-*	@author Patrick Cool, complete remake (December 2003 - January 2004)
-*	@author René Haentjens, CSV file import (October 2004)
-*	@package chamilo.link
-*/
 
-/*
+/**
+ * Function library for the links tool.
+ *
+ * This is a complete remake of the original link tool.
+ * New features:
+ * - Organize links into categories;
+ * - favorites/bookmarks interface;
+ * - move links up/down within a category;
+ * - move categories up/down;
+ * - expand/collapse all categories;
+ * - add link to 'root' category => category-less link is always visible.
+ *
+ *	@author Patrick Cool, complete remake (December 2003 - January 2004)
+ *	@author René Haentjens, CSV file import (October 2004)
+ *	@package chamilo.link
+ */
 
-		FUNCTIONS
-*/
+/*	FUNCTIONS */
 
 /**
 * Used to add a link or a category
@@ -28,15 +26,13 @@
 * @todo replace strings by constants
 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
 */
-function addlinkcategory($type)
-{
+function addlinkcategory($type) {
 	global $catlinkstatus;
 	global $msgErr;
 
 	$ok = true;
 
-	if ($type == "link")
-	{
+	if ($type == 'link') {
 		$tbl_link = Database :: get_course_table(TABLE_LINK);
 
 		$title = Security::remove_XSS($_POST['title']);
@@ -46,7 +42,7 @@ function addlinkcategory($type)
 
 		if ($_POST['onhomepage'] == '') {
 			$onhomepage = 0;
-			$target='_self';//default target
+			$target = '_self'; // Default target
 		} else {
 			$onhomepage = Security::remove_XSS($_POST['onhomepage']);
 			$target = Security::remove_XSS($_POST['target_link']);
@@ -56,35 +52,27 @@ function addlinkcategory($type)
 		$title = trim($title);
 		$description = trim($description);
 
-		// if title is empty, an error occurs
-		if (empty ($urllink) OR $urllink == 'http://')
-		{
+		// If title is empty, an error occurs
+		if (empty($urllink) || $urllink == 'http://') {
 			$msgErr = get_lang('GiveURL');
-
 			Display::display_error_message(get_lang('GiveURL'));
-
 			$ok = false;
 		}
-		// if the title is empty, we use the url as the title
-		else
-		{
-			if (empty ($title))
-			{
+		// If the title is empty, we use the url as the title
+		else {
+			if (empty($title)) {
 				$title = $urllink;
 			}
 
-			// we check weither the $url starts with http://, if not we add this
-			if (!strstr($urllink, '://'))
-			{
-				$urllink = "http://".$urllink;
+			// We check weither the $url starts with http://, if not we add this
+			if (strpos($urllink, '://') === false) {
+				$urllink = 'http://'.$urllink;
 			}
 
-			// looking for the largest order number for this category
+			// Looking for the largest order number for this category
 			$result = Database::query("SELECT MAX(display_order) FROM  ".$tbl_link." WHERE category_id='".Database::escape_string($_POST['selectcategory'])."'");
-
-			list ($orderMax) = Database::fetch_row($result);
-
-			$order = $orderMax +1;
+			list($orderMax) = Database::fetch_row($result);
+			$order = $orderMax + 1;
 
 			$session_id = api_get_session_id();
 
@@ -93,17 +81,16 @@ function addlinkcategory($type)
 			Database::query($sql);
 			$link_id = Database::insert_id();
 
-
-			if ( (api_get_setting('search_enabled')=='true') && $link_id && extension_loaded('xapian')) {
-				require_once(api_get_path(LIBRARY_PATH) .'search/DokeosIndexer.class.php');
-				require_once(api_get_path(LIBRARY_PATH) .'search/IndexableChunk.class.php');
-				require_once(api_get_path(LIBRARY_PATH) .'specific_fields_manager.lib.php');
+			if ((api_get_setting('search_enabled') == 'true') && $link_id && extension_loaded('xapian')) {
+				require_once api_get_path(LIBRARY_PATH).'search/DokeosIndexer.class.php';
+				require_once api_get_path(LIBRARY_PATH).'search/IndexableChunk.class.php';
+				require_once api_get_path(LIBRARY_PATH).'specific_fields_manager.lib.php';
 
 				$courseid = api_get_course_id();
 				$specific_fields = get_specific_field_list();
 				$ic_slide = new IndexableChunk();
 
-				// add all terms to db
+				// Add all terms to db
 				$all_specific_terms = '';
 				foreach ($specific_fields as $specific_field) {
 					if (isset($_REQUEST[$specific_field['code']])) {
@@ -119,8 +106,8 @@ function addlinkcategory($type)
 					}
 				}
 
-				// build the chunk to index
-				$ic_slide->addValue("title", $title);
+				// Build the chunk to index
+				$ic_slide->addValue('title', $title);
 				$ic_slide->addCourseId($courseid);
 				$ic_slide->addToolId(TOOL_LINK);
 				$xapian_data = array(
@@ -130,62 +117,57 @@ function addlinkcategory($type)
 					SE_USER => (int)api_get_user_id(),
 				);
 				$ic_slide->xapian_data = serialize($xapian_data);
-				$description = $all_specific_terms .' '. $description;
-				$ic_slide->addValue("content", $description);
+				$description = $all_specific_terms .' '.$description;
+				$ic_slide->addValue('content', $description);
 
-				// add category name if set
-				if (isset($_POST['selectcategory']) && $selectcategory>0) {
+				// Add category name if set
+				if (isset($_POST['selectcategory']) && $selectcategory > 0) {
 					$table_link_category = Database::get_course_table(TABLE_LINK_CATEGORY);
 					$sql_cat = 'SELECT * FROM %s WHERE id=%d LIMIT 1';
 					$sql_cat = sprintf($sql_cat, $table_link_category, (int)$selectcategory);
 					$result = Database::query($sql_cat);
 					if (Database::num_rows($result) == 1) {
 						$row = Database::fetch_array($result);
-						$ic_slide->addValue("category", $row['category_title']);
+						$ic_slide->addValue('category', $row['category_title']);
 					}
 				}
 
 				$di = new DokeosIndexer();
-				isset($_POST['language'])? $lang=Database::escape_string($_POST['language']): $lang = 'english';
+				isset($_POST['language'])? $lang = Database::escape_string($_POST['language']): $lang = 'english';
 				$di->connectDb(NULL, NULL, $lang);
 				$di->addChunk($ic_slide);
 
-				//index and return search engine document id
+				// Index and return search engine document id
 				$did = $di->index();
 				if ($did) {
-					// save it to db
+					// Save it to db
 					$tbl_se_ref = Database::get_main_table(TABLE_MAIN_SEARCH_ENGINE_REF);
 					$sql = 'INSERT INTO %s (id, course_code, tool_id, ref_id_high_level, search_did)
 						VALUES (NULL , \'%s\', \'%s\', %s, %s)';
 					$sql = sprintf($sql, $tbl_se_ref, $courseid, TOOL_LINK, $link_id, $did);
 					Database::query($sql);
 				}
-
 			}
 
-			unset ($urllink, $title, $description, $selectcategory);
+			unset($urllink, $title, $description, $selectcategory);
 
 			Display::display_confirmation_message(get_lang('LinkAdded'));
 		}
-	} elseif ($type == "category") {
+	} elseif ($type == 'category') {
 		$tbl_categories = Database :: get_course_table(TABLE_LINK_CATEGORY);
 
 		$category_title = trim($_POST['category_title']);
 		$description = trim($_POST['description']);
 
-		if (empty ($category_title)) {
+		if (empty($category_title)) {
 			$msgErr = get_lang('GiveCategoryName');
-
 			Display::display_error_message(get_lang('GiveCategoryName'));
-
 			$ok = false;
 		} else {
-			// looking for the largest order number for this category
+			// Looking for the largest order number for this category
 			$result = Database::query("SELECT MAX(display_order) FROM  ".$tbl_categories."");
-
-			list ($orderMax) = Database::fetch_row($result);
-
-			$order = $orderMax +1;
+			list($orderMax) = Database::fetch_row($result);
+			$order = $orderMax + 1;
 
 			$session_id = api_get_session_id();
 
@@ -193,33 +175,29 @@ function addlinkcategory($type)
 			Database::query($sql);
 
 			$catlinkstatus = get_lang('CategoryAdded');
-
-			unset ($category_title, $description);
-
+			unset($category_title, $description);
 			Display::display_confirmation_message(get_lang('CategoryAdded'));
 		}
 	}
 
 	// "WHAT'S NEW" notification : update last tool Edit
-	if ($type == "link")
-	{
+	if ($type == 'link') {
 		global $_user;
 		global $_course;
 		global $nameTools;
 
-		api_item_property_update($_course, TOOL_LINK, $link_id, "LinkAdded", $_user['user_id']);
+		api_item_property_update($_course, TOOL_LINK, $link_id, 'LinkAdded', $_user['user_id']);
 	}
 
 	return $ok;
 }
-// End of the function addlinkcategory
 
 /**
-* Used to delete a link or a category
-* @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
-*/
-function deletelinkcategory($type)
-{
+ * Used to delete a link or a category
+ * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
+ */
+function deletelinkcategory($type) {
+
 	global $catlinkstatus;
 	global $_course;
 	global $_user;
@@ -227,28 +205,29 @@ function deletelinkcategory($type)
 	$tbl_categories = Database :: get_course_table(TABLE_LINK_CATEGORY);
 	$TABLE_ITEM_PROPERTY = Database :: get_course_table(TABLE_ITEM_PROPERTY);
 
-	if ($type == "link")
-	{
+	if ($type == 'link') {
+
 		global $id;
 		// -> items are no longer fysically deleted, but the visibility is set to 2 (in item_property). This will
 		// make a restore function possible for the platform administrator
-		if (isset($_GET['id']) && $_GET['id']==strval(intval($_GET['id']))) {
-			$sql="UPDATE $tbl_link SET on_homepage='0' WHERE id='".Database::escape_string($_GET['id'])."'";
+		if (isset($_GET['id']) && $_GET['id'] == strval(intval($_GET['id']))) {
+			$sql = "UPDATE $tbl_link SET on_homepage='0' WHERE id='".Database::escape_string($_GET['id'])."'";
 			Database::query($sql);
 		}
 
-		api_item_property_update($_course, TOOL_LINK, $id, "delete", $_user['user_id']);
+		api_item_property_update($_course, TOOL_LINK, $id, 'delete', $_user['user_id']);
 		delete_link_from_search_engine(api_get_course_id(), $id);
-		$catlinkstatus = get_lang("LinkDeleted");
+		$catlinkstatus = get_lang('LinkDeleted');
 		unset ($id);
 
 		Display::display_confirmation_message(get_lang('LinkDeleted'));
 	}
-	if ($type == "category")
-	{
+
+	if ($type == 'category') {
+
 		global $id;
 
-		// first we delete the category itself and afterwards all the links of this category.
+		// First we delete the category itself and afterwards all the links of this category.
 		$sql = "DELETE FROM ".$tbl_categories." WHERE id='".Database::escape_string(Security::remove_XSS($_GET['id']))."'";
 		Database::query($sql);
 		$sql = "DELETE FROM ".$tbl_link." WHERE category_id='".Database::escape_string(Security::remove_XSS($_GET['id']))."'";
@@ -267,7 +246,7 @@ function deletelinkcategory($type)
  * @param int $document_id Document id to delete
  */
 function delete_link_from_search_engine($course_id, $link_id) {
-	// remove from search engine if enabled
+	// Remove from search engine if enabled
 	if (api_get_setting('search_enabled') == 'true') {
 		$tbl_se_ref = Database::get_main_table(TABLE_MAIN_SEARCH_ENGINE_REF);
 		$sql = 'SELECT * FROM %s WHERE course_code=\'%s\' AND tool_id=\'%s\' AND ref_id_high_level=%s LIMIT 1';
@@ -275,7 +254,7 @@ function delete_link_from_search_engine($course_id, $link_id) {
 		$res = Database::query($sql);
 		if (Database::num_rows($res) > 0) {
 			$row = Database::fetch_array($res);
-			require_once(api_get_path(LIBRARY_PATH) .'search/DokeosIndexer.class.php');
+			require_once api_get_path(LIBRARY_PATH).'search/DokeosIndexer.class.php';
 			$di = new DokeosIndexer();
 			$di->remove_document((int)$row['search_did']);
 		}
@@ -283,27 +262,26 @@ function delete_link_from_search_engine($course_id, $link_id) {
 		$sql = sprintf($sql, $tbl_se_ref, $course_id, TOOL_LINK, $link_id);
 		Database::query($sql);
 
-		// remove terms from db
+		// Remove terms from db
 		require_once(api_get_path(LIBRARY_PATH) .'specific_fields_manager.lib.php');
 		delete_all_values_for_item($course_id, TOOL_DOCUMENT, $link_id);
 	}
 }
 
-
 /**
-* Used to edit a link or a category
-* @todo rewrite the whole links tool because it is becoming completely cluttered,
-* 		code does not follow the coding conventions, does not use html_quickform, ...
-* 		some features were patched in
-* @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
-* @todo replace the globals with the appropriate $_POST or $_GET values
-*/
-function editlinkcategory($type)
-{
+ * Used to edit a link or a category
+ * @todo rewrite the whole links tool because it is becoming completely cluttered,
+ * 		code does not follow the coding conventions, does not use html_quickform, ...
+ * 		some features were patched in
+ * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
+ * @todo replace the globals with the appropriate $_POST or $_GET values
+ */
+function editlinkcategory($type) {
+
 	global $catlinkstatus;
 	global $id;
-	global $submitLink;
-	global $submitCategory;
+	global $submit_link;
+	global $submit_category;
 	global $_user;
 	global $_course;
 	global $nameTools;
@@ -319,41 +297,40 @@ function editlinkcategory($type)
 	$tbl_link 		= Database :: get_course_table(TABLE_LINK);
 	$tbl_categories = Database :: get_course_table(TABLE_LINK_CATEGORY);
 
-	if ($type == "link")
-	{
-		// this is used to populate the link-form with the info found in the database
+	if ($type == 'link') {
+
+		// This is used to populate the link-form with the info found in the database
 		$sql = "SELECT * FROM ".$tbl_link." WHERE id='".$_GET['id']."'";
 		$result = Database::query($sql);
-		if ($myrow = Database::fetch_array($result))
-		{
-			$urllink = $myrow["url"];
-			$title = $myrow["title"];
-			$description = $myrow["description"];
-			$category = $myrow["category_id"];
-			if ($myrow["on_homepage"] <> 0)
-			{
-				$onhomepage = "checked";
+		if ($myrow = Database::fetch_array($result)) {
+			$urllink = $myrow['url'];
+			$title = $myrow['title'];
+			$description = $myrow['description'];
+			$category = $myrow['category_id'];
+			if ($myrow['on_homepage'] != 0) {
+				$onhomepage = 'checked';
 			}
 		}
-		// this is used to put the modified info of the link-form into the database
-		if ($_POST['submitLink'])
-		{
+
+		// This is used to put the modified info of the link-form into the database
+		if ($_POST['submitLink']) {
+
 			if ($_POST['onhomepage'] == '') {
 				$onhomepage = 0;
-				$mytarget='';
+				$mytarget = '';
 			} else {
 				$onhomepage = Security::remove_XSS($_POST['onhomepage']);
 				$target = Security::remove_XSS($_POST['target_link']);
-				$mytarget=",target='".$target."'";
+				$mytarget = ",target='".$target."'";
 			}
 
-			// finding the old category_id
+			// Finding the old category_id
 			$sql = "SELECT * FROM ".$tbl_link." WHERE id='".Database::escape_string(Security::remove_XSS($_POST['id']))."'";
 			$result = Database::query($sql);
 			$row = Database::fetch_array($result);
 			$category_id = $row['category_id'];
 
-			if ($category_id <> $_POST['selectcategory']) {
+			if ($category_id != $_POST['selectcategory']) {
 				$sql = "SELECT MAX(display_order) FROM ".$tbl_link." WHERE category_id='".$_POST['selectcategory']."'";
 				$result = Database::query($sql);
 				list ($max_display_order) = Database::fetch_row($result);
@@ -365,15 +342,15 @@ function editlinkcategory($type)
 			$sql = "UPDATE ".$tbl_link." set url='".Database::escape_string(Security::remove_XSS($_POST['urllink']))."', title='".Database::escape_string(Security::remove_XSS($_POST['title']))."', description='".Database::escape_string(Security::remove_XSS($_POST['description']))."', category_id='".Database::escape_string(Security::remove_XSS($_POST['selectcategory']))."', display_order='".$max_display_order."', on_homepage='".Database::escape_string(Security::remove_XSS($onhomepage))." ' $mytarget WHERE id='".Database::escape_string(Security::remove_XSS($_POST['id']))."'";
 			Database::query($sql);
 
-            // update search enchine and its values table if enabled
-            if (api_get_setting('search_enabled')=='true') {
+            // Update search enchine and its values table if enabled
+            if (api_get_setting('search_enabled') == 'true') {
                 $link_id = $_POST['id'];
                 $course_id = api_get_course_id();
                 $link_url = $_POST['urllink'];
                 $link_title = $_POST['title'];
                 $link_description = $_POST['description'];
 
-                // actually, it consists on delete terms from db, insert new ones, create a new search engine document, and remove the old one
+                // Actually, it consists on delete terms from db, insert new ones, create a new search engine document, and remove the old one
 	            // get search_did
 	            $tbl_se_ref = Database::get_main_table(TABLE_MAIN_SEARCH_ENGINE_REF);
 	            $sql = 'SELECT * FROM %s WHERE course_code=\'%s\' AND tool_id=\'%s\' AND ref_id_high_level=%s LIMIT 1';
@@ -381,9 +358,9 @@ function editlinkcategory($type)
 	            $res = Database::query($sql);
 
 	            if (Database::num_rows($res) > 0) {
-                    require_once(api_get_path(LIBRARY_PATH) . 'search/DokeosIndexer.class.php');
-                    require_once(api_get_path(LIBRARY_PATH) . 'search/IndexableChunk.class.php');
-                    require_once(api_get_path(LIBRARY_PATH) . 'specific_fields_manager.lib.php');
+                    require_once api_get_path(LIBRARY_PATH).'search/DokeosIndexer.class.php';
+                    require_once api_get_path(LIBRARY_PATH).'search/IndexableChunk.class.php';
+                    require_once api_get_path(LIBRARY_PATH).'specific_fields_manager.lib.php';
 
                     $se_ref = Database::fetch_array($res);
                     $specific_fields = get_specific_field_list();
@@ -405,7 +382,7 @@ function editlinkcategory($type)
 	                    }
                     }
 
-                    // build the chunk to index
+                    // Build the chunk to index
                     $ic_slide->addValue("title", $link_title);
                     $ic_slide->addCourseId($course_id);
                     $ic_slide->addToolId(TOOL_LINK);
@@ -417,293 +394,243 @@ function editlinkcategory($type)
                     );
                     $ic_slide->xapian_data = serialize($xapian_data);
                     $link_description = $all_specific_terms .' '. $link_description;
-                    $ic_slide->addValue("content", $link_description);
+                    $ic_slide->addValue('content', $link_description);
 
                     // add category name if set
-                    if (isset($_POST['selectcategory']) && $selectcategory>0) {
+                    if (isset($_POST['selectcategory']) && $selectcategory > 0) {
 	                    $table_link_category = Database::get_course_table(TABLE_LINK_CATEGORY);
 	                    $sql_cat = 'SELECT * FROM %s WHERE id=%d LIMIT 1';
 	                    $sql_cat = sprintf($sql_cat, $table_link_category, (int)$selectcategory);
 	                    $result = Database::query($sql_cat);
 	                    if (Database::num_rows($result) == 1) {
 		                    $row = Database::fetch_array($result);
-		                    $ic_slide->addValue("category", $row['category_title']);
+		                    $ic_slide->addValue('category', $row['category_title']);
 	                    }
                     }
 
                     $di = new DokeosIndexer();
-                    isset($_POST['language'])? $lang=Database::escape_string($_POST['language']): $lang = 'english';
+                    isset($_POST['language'])? $lang = Database::escape_string($_POST['language']): $lang = 'english';
                     $di->connectDb(NULL, NULL, $lang);
                     $di->remove_document((int)$se_ref['search_did']);
                     $di->addChunk($ic_slide);
 
-                    //index and return search engine document id
+                    // Index and return search engine document id
                     $did = $di->index();
                     if ($did) {
-	                    // save it to db
+	                    // Save it to db
                         $sql = 'DELETE FROM %s WHERE course_code=\'%s\' AND tool_id=\'%s\' AND ref_id_high_level=\'%s\'';
                         $sql = sprintf($sql, $tbl_se_ref, $course_id, TOOL_LINK, $link_id);
                         Database::query($sql);
-                        //var_dump($sql);
 	                    $sql = 'INSERT INTO %s (id, course_code, tool_id, ref_id_high_level, search_did)
 		                    VALUES (NULL , \'%s\', \'%s\', %s, %s)';
 	                    $sql = sprintf($sql, $tbl_se_ref, $course_id, TOOL_LINK, $link_id, $did);
 	                    Database::query($sql);
                     }
-
                 }
             }
 
 			// "WHAT'S NEW" notification: update table last_toolEdit
-			api_item_property_update($_course, TOOL_LINK, $_POST['id'], "LinkUpdated", $_user['user_id']);
+			api_item_property_update($_course, TOOL_LINK, $_POST['id'], 'LinkUpdated', $_user['user_id']);
 
 			Display::display_confirmation_message(get_lang('LinkModded'));
 		}
 	}
-	if ($type == "category")
-	{
-		// this is used to populate the category-form with the info found in the database
-		if (!$submitCategory)
-		{
+
+	if ($type == 'category') {
+
+		// This is used to populate the category-form with the info found in the database
+		if (!$submit_category) {
 			$sql = "SELECT * FROM ".$tbl_categories." WHERE id='".$_GET['id']."'";
 			$result = Database::query($sql);
-			if ($myrow = Database::fetch_array($result))
-			{
+			if ($myrow = Database::fetch_array($result)) {
 				$category_title = $myrow["category_title"];
 				$description = $myrow["description"];
 			}
 		}
-		// this is used to put the modified info of the category-form into the database
-		if ($submitCategory)
-		{
+
+		// This is used to put the modified info of the category-form into the database
+		if ($submit_category) {
 			$sql = "UPDATE ".$tbl_categories." set category_title='".Database::escape_string(Security::remove_XSS($_POST['category_title']))."', description='".Database::escape_string(Security::remove_XSS($_POST['description']))."' WHERE id='".Database::escape_string(Security::remove_XSS($_POST['id']))."'";
 			Database::query($sql);
 			Display::display_confirmation_message(get_lang('CategoryModded'));
 		}
 
-
 	}
 }
-// END of function editlinkcat
 
 /**
-* creates a correct $view for in the URL
-* @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
-*/
-function makedefaultviewcode($locatie)
-{
-	global $aantalcategories;
-	global $view;
-
-	for ($j = 0; $j <= $aantalcategories -1; $j ++)
-	{
+ * Creates a correct $view for in the URL
+ * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
+ */
+function makedefaultviewcode($locatie) {
+	global $aantalcategories, $view;
+	for ($j = 0; $j <= $aantalcategories -1; $j ++) {
 		$view[$j] = 0;
 	}
-	$view[intval($locatie)] = "1";
+	$view[intval($locatie)] = '1';
 }
-// END of function makedefaultviewcode
 
 /**
-* changes the visibility of a link
-* @todo add the changing of the visibility of a course
-* @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
-*/
-function change_visibility($id, $scope)
-{
-	global $_course;
-	global $_user;
-	$TABLE_ITEM_PROPERTY = Database :: get_course_table(TABLE_ITEM_PROPERTY);
-
-	if ($scope == "link")
-	{
-		$sqlselect = "SELECT * FROM $TABLE_ITEM_PROPERTY WHERE tool='".TOOL_LINK."' and ref='".Database::escape_string($id)."'";
-		$result = Database::query($sqlselect);
-		$row = Database::fetch_array($result);
+ * Changes the visibility of a link
+ * @todo add the changing of the visibility of a course
+ * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
+ */
+function change_visibility($id, $scope) {
+	global $_course, $_user;
+	if ($scope == 'link') {
 		api_item_property_update($_course, TOOL_LINK, $id, $_GET['action'], $_user['user_id']);
+		Display::display_confirmation_message(get_lang('VisibilityChanged'));
 	}
-
-	Display::display_confirmation_message(get_lang('VisibilityChanged'));
 }
 
 /**
-* displays all the links of a given category.
-* @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
-*/
-function showlinksofcategory($catid)
-{
+ * Displays all the links of a given category.
+ * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
+ */
+function showlinksofcategory($catid) {
 	global $is_allowed, $charset, $urlview, $up, $down, $_user;
-	$tbl_link = Database :: get_course_table(TABLE_LINK);
 
+	$tbl_link = Database :: get_course_table(TABLE_LINK);
 	$TABLE_ITEM_PROPERTY = Database :: get_course_table(TABLE_ITEM_PROPERTY);
 
-	//condition for the session
+	// Condition for the session
 	$session_id = api_get_session_id();
 	$condition_session = api_get_session_condition($session_id);
 
-	$sqlLinks = "SELECT * FROM ".$tbl_link." link, ".$TABLE_ITEM_PROPERTY." itemproperties WHERE itemproperties.tool='".TOOL_LINK."' AND link.id=itemproperties.ref AND  link.category_id='".$catid."' AND (itemproperties.visibility='0' OR itemproperties.visibility='1') $condition_session ORDER BY link.display_order DESC";
+	$sqlLinks = "SELECT * FROM ".$tbl_link." link, ".$TABLE_ITEM_PROPERTY." itemproperties WHERE itemproperties.tool='".TOOL_LINK."' AND link.id=itemproperties.ref AND link.category_id='".$catid."' AND (itemproperties.visibility='0' OR itemproperties.visibility='1') $condition_session ORDER BY link.display_order DESC";
 	$result = Database::query($sqlLinks);
 	$numberoflinks = Database::num_rows($result);
 
 	echo '<table class="data_table" width="100%">';
 	$i = 1;
 	while ($myrow = Database::fetch_array($result)) {
-		//validacion when belongs to a session
+
+		// Validacion when belongs to a session
 		$session_img = api_get_session_image($myrow['session_id'], $_user['status']);
 
-		if($i%2==0) $css_class = 'row_odd';
-		else $css_class = 'row_even';
+		$css_class = $i%2 == 0 ? $css_class = 'row_odd' : $css_class = 'row_even';
 
 		$myrow[3] = text_filter($myrow[3]);
-		if ($myrow['visibility'] == '1')
-		{
-			echo "<tr class='".$css_class."'>", "<td align=\"center\" valign=\"middle\" width=\"15\">", "<a href=\"link_goto.php?".api_get_cidreq()."&link_id=", $myrow[0], "&amp;link_url=", urlencode($myrow[1]), "\" target=\"_blank\">", "<img src=\"../../main/img/file_html.gif\" border=\"0\" alt=\"".get_lang('Link')."\"/>", "</a></td>", "<td width=\"80%\" valign=\"top\">", "<a href=\"link_goto.php?".api_get_cidreq()."&link_id=", $myrow[0], "&amp;link_url=", urlencode($myrow[1]), "\" target=\"_blank\">", api_htmlentities($myrow[2],ENT_QUOTES,$charset), "</a>", $session_img , "<br/>", $myrow[3], "";
-		}
-		else
-		{
-			if (api_is_allowed_to_edit(null,true))
-			{
-				echo "<tr class='".$css_class."'>", "<td align=\"center\" valign=\"middle\" width=\"15\">", "<a href=\"link_goto.php?".api_get_cidreq()."&link_id=", $myrow[0], "&amp;link_url=", urlencode($myrow[1]), "\" target=\"_blank\" class=\"invisible\">", Display::return_icon('file_html_na.gif', get_lang('Link')),"</a></td>", "<td width=\"80%\" valign=\"top\">", "<a href=\"link_goto.php?".api_get_cidreq()."&link_id=", $myrow[0], "&amp;link_url=", urlencode($myrow[1]), "\" target=\"_blank\"  class=\"invisible\">", api_htmlentities($myrow[2],ENT_QUOTES,$charset), "</a>\n", $session_img , "<br />", $myrow[3], "";
+		if ($myrow['visibility'] == '1') {
+			echo '<tr class="', $css_class, '"><td align="center" valign="middle" width="15"><a href="link_goto.php?', api_get_cidreq(), '&amp;link_id=', $myrow[0], '&amp;link_url=', urlencode($myrow[1]), '" target="_blank"><img src="../../main/img/file_html.gif" border="0" alt="', get_lang('Link'), '"/></a></td><td width="80%" valign="top"><a href="link_goto.php?', api_get_cidreq(), '&amp;link_id=', $myrow[0], '&amp;link_url=', urlencode($myrow[1]), '" target="_blank">', Security::remove_XSS($myrow[2]), '</a>', $session_img, '<br />', $myrow[3];
+		} else {
+			if (api_is_allowed_to_edit(null, true)) {
+				echo '<tr class="', $css_class, '"><td align="center" valign="middle" width="15"><a href="link_goto.php?', api_get_cidreq(), '&amp;link_id=', $myrow[0], "&amp;link_url=", urlencode($myrow[1]), '" target="_blank" class="invisible">', Display::return_icon('file_html_na.gif', get_lang('Link')), '</a></td><td width="80%" valign="top"><a href="link_goto.php?', api_get_cidreq(), '&amp;link_id=', $myrow[0], '&amp;link_url=', urlencode($myrow[1]), '" target="_blank"  class="invisible">', Security::remove_XSS($myrow[2]), "</a>\n", $session_img, '<br />', $myrow[3];
 			}
 		}
 
 		echo '<td style="text-align:center;">';
-		if (api_is_allowed_to_edit(null,true))
-		{
-			echo "<a href=\"".api_get_self()."?".api_get_cidreq()."&action=editlink&amp;category=".(!empty($category)?$category:'')."&amp;id=".$myrow[0]." &amp;urlview=$urlview \"  title=\"".get_lang('Modify')."\"  >", "<img src=\"../img/edit.gif\" border=\"0\" alt=\"", get_lang('Modify'), "\" />", "</a>";
-			echo "<a href=\"".api_get_self()."?".api_get_cidreq()."&action=deletelink&amp;id=", $myrow[0], "&amp;urlview=", $urlview, "\" onclick=\"javascript:if(!confirm('".get_lang('LinkDelconfirm')."')) return false;\"  title=\"".get_lang('Delete')."\" >", "<img src=\"../img/delete.gif\" border=\"0\" alt=\"", get_lang('Delete'), "\" />", "</a>";
+		if (api_is_allowed_to_edit(null, true)) {
+
+			echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&amp;action=editlink&amp;category='.(!empty($category) ? $category : '').'&amp;id='.$myrow[0].'&amp;urlview='.$urlview.'" title="'.get_lang('Modify').'"><img src="../img/edit.gif" border="0" alt="', get_lang('Modify'), '" /></a>';
+			echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&amp;action=deletelink&amp;id=', $myrow[0], '&amp;urlview=', $urlview, "\" onclick=\"javascript: if(!confirm('".get_lang('LinkDelconfirm')."')) return false;\" title=\"".get_lang('Delete').'"><img src="../img/delete.gif" border="0" alt="', get_lang('Delete'), '" /></a>';
 			// DISPLAY MOVE UP COMMAND only if it is not the top link
-			if ($i != 1)
-			{
-				echo "<a href=\"".api_get_self()."?".api_get_cidreq()."&urlview=".$urlview."&amp;up=", $myrow[0], "\"  title=\"".get_lang('Up')."\"   >", "<img src=../img/up.gif border=0 alt=\"".get_lang('Up')."\"/>", "</a>\n";
-			}
-			else
-			{
-				echo '<img src="'.api_get_path(WEB_IMG_PATH).'up_na.gif" border=0 alt="'.get_lang('Up').'"/>';
+			if ($i != 1) {
+				echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&amp;urlview='.$urlview.'&amp;up=', $myrow[0], '" title="'.get_lang('Up').'"><img src="../img/up.gif" border="0" alt="'.get_lang('Up').'"/>', "</a>\n";
+			} else {
+				echo '<img src="'.api_get_path(WEB_IMG_PATH).'up_na.gif" border="0" alt="'.get_lang('Up').'"/>';
 			}
 
 			// DISPLAY MOVE DOWN COMMAND only if it is not the bottom link
-			if ($i < $numberoflinks)
-			{
-				echo "<a href=\"".api_get_self()."?".api_get_cidreq()."&urlview=".$urlview."&amp;down=".$myrow[0]."\"  title=\"".get_lang('Down')."\" >", "<img src=\"../img/down.gif\" border=\"0\" alt=\"".get_lang('Down')."\"/>", "</a>\n";
-			}
-			else
-			{
-				echo '<img src="'.api_get_path(WEB_IMG_PATH).'down_na.gif" border=0 alt="'.get_lang('Down').'"/>';
+			if ($i < $numberoflinks) {
+				echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&amp;urlview='.$urlview.'&amp;down='.$myrow[0].'" title="'.get_lang('Down').'"><img src="../img/down.gif" border="0" alt="'.get_lang('Down').'"/>', "</a>\n";
+			} else {
+				echo '<img src="'.api_get_path(WEB_IMG_PATH).'down_na.gif" border="0" alt="'.get_lang('Down').'"/>';
 			}
 
-			if ($myrow['visibility'] == "1")
-			{
-				echo '<a href="link.php?'.api_get_cidreq().'&action=invisible&amp;id='.$myrow[0].'&amp;scope=link&amp;urlview='.$urlview.'" title="'.get_lang('Hide').'"><img src="../img/visible.gif" border="0" /></a>';
+			if ($myrow['visibility'] == '1') {
+				echo '<a href="link.php?'.api_get_cidreq().'&amp;action=invisible&amp;id='.$myrow[0].'&amp;scope=link&amp;urlview='.$urlview.'" title="'.get_lang('Hide').'"><img src="../img/visible.gif" border="0" /></a>';
 			}
-			if ($myrow['visibility'] == "0")
-			{
- 				echo '<a href="link.php?'.api_get_cidreq().'&action=visible&amp;id='.$myrow[0].'&amp;scope=link&amp;urlview='.$urlview.'" title="'.get_lang('Show').'"><img src="../img/invisible.gif" border="0" /></a>';
+			if ($myrow['visibility'] == '0') {
+ 				echo '<a href="link.php?'.api_get_cidreq().'&amp;action=visible&amp;id='.$myrow[0].'&amp;scope=link&amp;urlview='.$urlview.'" title="'.get_lang('Show').'"><img src="../img/invisible.gif" border="0" /></a>';
 			}
 		}
-		echo '</td>';
-		echo '</tr>';
-		$i ++;
+		echo '</td></tr>';
+		$i++;
 	}
 	echo '</table>';
 }
 
 /**
-* displays the edit, delete and move icons
-* @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
-*/
-function showcategoryadmintools($categoryid)
-{
+ * Displays the edit, delete and move icons
+ * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
+ */
+function showcategoryadmintools($categoryid) {
+
 	global $urlview;
 	global $aantalcategories;
 	global $catcounter;
-	echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&action=editcategory&amp;id='.$categoryid.'&amp;urlview='.$urlview.'"  title='.get_lang('Modify').' "><img src="../img/edit.gif" border="0" alt="'.get_lang('Modify').' "/></a>';
-	echo "<a href=\"".api_get_self()."?".api_get_cidreq()."&action=deletecategory&amp;id=", $categoryid, "&amp;urlview=$urlview\" onclick=\"javascript:if(!confirm('".get_lang('CategoryDelconfirm')."')) return false;\">", "<img src=\"../img/delete.gif\" border=\"0\" alt=\"", get_lang('Delete'), "\"/>", "</a>";
+	echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&amp;action=editcategory&amp;id='.$categoryid.'&amp;urlview='.$urlview.'" title='.get_lang('Modify').'"><img src="../img/edit.gif" border="0" alt="'.get_lang('Modify').'"/></a>';
+	echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&amp;action=deletecategory&amp;id=', $categoryid, "&amp;urlview=$urlview\" onclick=\"javascript: if(!confirm('".get_lang('CategoryDelconfirm')."')) return false;\">", '<img src="../img/delete.gif" border="0" alt="', get_lang('Delete'), '"/></a>';
 
 	// DISPLAY MOVE UP COMMAND only if it is not the top link
-	if ($catcounter != 1)
-	{
-		echo "<a href=\"".api_get_self()."?".api_get_cidreq()."&catmove=true&amp;up=", $categoryid, "&amp;urlview=$urlview\"  title=\"".get_lang('Up')."\" >", "<img src=../img/up.gif border=0 alt=\"".get_lang('Up')."\"/>", "</a>\n";
-	}
-	else
-	{
-		echo '<img src="'.api_get_path(WEB_IMG_PATH).'up_na.gif" border=0 alt="'.get_lang('Up').'"/>';
+	if ($catcounter != 1) {
+		echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&amp;catmove=true&amp;up=', $categoryid, '&amp;urlview='.$urlview.'" title="'.get_lang('Up').'"><img src="../img/up.gif" border="0" alt="'.get_lang('Up').'"/>', "</a>\n";
+	} else {
+		echo '<img src="'.api_get_path(WEB_IMG_PATH).'up_na.gif" border="0" alt="'.get_lang('Up').'"/>';
 	}
+
 	// DISPLAY MOVE DOWN COMMAND only if it is not the bottom link
-	if ($catcounter < $aantalcategories)
-	{
-		echo "<a href=\"".api_get_self()."?".api_get_cidreq()."&catmove=true&amp;down=".$categoryid."&amp;urlview=$urlview\">", "<img src=\"../img/down.gif\" border=\"0\" alt=\"".get_lang('Down')."\"/>", "</a>\n";
-	}
-	else
-	{
-		echo '<img src="'.api_get_path(WEB_IMG_PATH).'down_na.gif" border=0 alt="'.get_lang('Down').'"/>';
+	if ($catcounter < $aantalcategories) {
+		echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&amp;catmove=true&amp;down='.$categoryid.'&amp;urlview='.$urlview.'"><img src="../img/down.gif" border="0" alt="'.get_lang('Down').'"/>', "</a>\n";
+	} else {
+		echo '<img src="'.api_get_path(WEB_IMG_PATH).'down_na.gif" border="0" alt="'.get_lang('Down').'"/>';
 	}
 	$catcounter ++;
 }
 
 /**
-* move a link or a linkcategory up or down
-* @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
-*/
-function movecatlink($catlinkid)
-{
+ * move a link or a linkcategory up or down
+ * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
+ */
+function movecatlink($catlinkid) {
+
 	global $catmove;
 	global $up;
 	global $down;
 	$tbl_link = Database :: get_course_table(TABLE_LINK);
 	$tbl_categories = Database :: get_course_table(TABLE_LINK_CATEGORY);
 
-	if (!empty($_GET['down']))
-	{
-		$thiscatlinkId = $_GET['down'];
-		$sortDirection = "DESC";
+	if (!empty($down)) {
+		$thiscatlinkId = intval($down);
+		$sortDirection = 'DESC';
 	}
-	if (!empty($_GET['up']))
-	{
-		$thiscatlinkId = Security::remove_XSS($_GET['up']);
-		$sortDirection = "ASC";
+	if (!empty($up)) {
+		$thiscatlinkId = intval($up);
+		$sortDirection = 'ASC';
 	}
 
 	// We check if it is a category we are moving or a link. If it is a category, a querystring catmove = true is present in the url
-	if ($catmove == "true")
-	{
+	if ($catmove == 'true') {
 		$movetable = $tbl_categories;
 		$catid = $catlinkid;
-	}
-	else
-	{
+	} else {
 		$movetable = $tbl_link;
-		//getting the category of the link
-		if(!empty($thiscatlinkId))
-		{
+		// Getting the category of the link
+		if (!empty($thiscatlinkId)) {
 			$sql = "SELECT category_id from ".$movetable." WHERE id='$thiscatlinkId'";
 			$result = Database::query($sql);
 			$catid = Database::fetch_array($result);
 		}
 	}
 
-	// this code is copied and modified from announcements.php
-	if (!empty($sortDirection))
-	{
+	// This code is copied and modified from announcements.php
+	if (!empty($sortDirection)) {
 		if (!in_array(trim(strtoupper($sortDirection)), array ('ASC', 'DESC')))
-			die("Bad sort direction used."); //sanity check of sortDirection var
-		if ($catmove == "true")
-		{
+			die('Bad sort direction used.'); // Sanity check of sortDirection var
+		if ($catmove == 'true') {
 			$sqlcatlinks = "SELECT id, display_order FROM ".$movetable." ORDER BY display_order $sortDirection";
-		}
-		else
-		{
+		} else {
 			$sqlcatlinks = "SELECT id, display_order FROM ".$movetable." WHERE category_id='".$catid[0]."' ORDER BY display_order $sortDirection";
 		}
 		$linkresult = Database::query($sqlcatlinks);
-		while ($sortrow = Database::fetch_array($linkresult))
-		{
+		while ($sortrow = Database::fetch_array($linkresult)) {
 			// STEP 2 : FOUND THE NEXT ANNOUNCEMENT ID AND ORDER, COMMIT SWAP
 			// This part seems unlogic, but it isn't . We first look for the current link with the querystring ID
 			// and we know the next iteration of the while loop is the next one. These should be swapped.
-			if (isset ($thislinkFound) && $thislinkFound == true)
-			{
-				$nextlinkId = $sortrow["id"];
-				$nextlinkOrdre = $sortrow["display_order"];
+			if (isset ($thislinkFound) && $thislinkFound) {
+				$nextlinkId = $sortrow['id'];
+				$nextlinkOrdre = $sortrow['display_order'];
 
 				Database::query("UPDATE ".$movetable."
 							             SET display_order = '$nextlinkOrdre'
@@ -716,9 +643,8 @@ function movecatlink($catlinkid)
 				break;
 			}
 
-			if ($sortrow["id"] == $thiscatlinkId)
-			{
-				$thislinkOrdre = $sortrow["display_order"];
+			if ($sortrow['id'] == $thiscatlinkId) {
+				$thislinkOrdre = $sortrow['display_order'];
 				$thislinkFound = true;
 			}
 		}
@@ -728,31 +654,28 @@ function movecatlink($catlinkid)
 }
 
 /**
-* CSV file import functions
-* @author René Haentjens , Ghent University
-*/
-function get_cat($catname) // get category id (existing or make new)
-{
+ * CSV file import functions
+ * @author René Haentjens , Ghent University
+ */
+function get_cat($catname) {
+	// Get category id (existing or make new)
 	$tbl_categories = Database :: get_course_table(TABLE_LINK_CATEGORY);
-
 	$result = Database::query("SELECT `id` FROM ".$tbl_categories." WHERE `category_title`='".addslashes($catname)."'");
-
-	if (Database::num_rows($result) >= 1 && ($row = Database::fetch_array($result)))
-		return $row['id']; // several categories with same name: take first
+	if (Database::num_rows($result) >= 1 && ($row = Database::fetch_array($result))) {
+		return $row['id']; // Several categories with same name: take first
+	}
 
 	$result = Database::query("SELECT MAX(display_order) FROM ".$tbl_categories."");
 	list ($max_order) = Database::fetch_row($result);
-
 	Database::query("INSERT INTO ".$tbl_categories." (category_title, description, display_order) VALUES ('".addslashes($catname)."','','". ($max_order +1)."')");
-
 	return Database::insert_id();
 }
+
 /**
-* CSV file import functions
-* @author René Haentjens , Ghent University
-*/
-function put_link($url, $cat, $title, $description, $on_homepage, $hidden)
-{
+ * CSV file import functions
+ * @author René Haentjens , Ghent University
+ */
+function put_link($url, $cat, $title, $description, $on_homepage, $hidden) {
 	$tbl_link = Database :: get_course_table(TABLE_LINK);
 
 	$urleq = "url='".addslashes($url)."'";
@@ -760,16 +683,14 @@ function put_link($url, $cat, $title, $description, $on_homepage, $hidden)
 
 	$result = Database::query("SELECT id FROM $tbl_link WHERE ".$urleq.' AND '.$cateq);
 
-	if (Database::num_rows($result) >= 1 && ($row = Database::fetch_array($result)))
-	{
+	if (Database::num_rows($result) >= 1 && ($row = Database::fetch_array($result))) {
 		Database::query("UPDATE $tbl_link set title='".addslashes($title)."', description='".addslashes($description)."' WHERE id='".addslashes($id = $row['id'])."'");
 
 		$lang_link = get_lang('update_link');
-		$ipu = "LinkUpdated";
-		$rv = 1; // 1= upd
-	}
-	else // add new link
-		{
+		$ipu = 'LinkUpdated';
+		$rv = 1; // 1 = upd
+	} else {
+		// Add new link
 		$result = Database::query("SELECT MAX(display_order) FROM  $tbl_link WHERE category_id='".addslashes($cat)."'");
 		list ($max_order) = Database::fetch_row($result);
 
@@ -777,38 +698,41 @@ function put_link($url, $cat, $title, $description, $on_homepage, $hidden)
 
 		$id = Database::insert_id();
 		$lang_link = get_lang('new_link');
-		$ipu = "LinkAdded";
-		$rv = 2; // 2= new
+		$ipu = 'LinkAdded';
+		$rv = 2; // 2 = new
 	}
 
 	global $_course, $nameTools, $_user;
 	api_item_property_update($_course, TOOL_LINK, $id, $ipu, $_user['user_id']);
 
-	if ($hidden && $ipu == "LinkAdded")
-		api_item_property_update($_course, TOOL_LINK, $id, "invisible", $_user['user_id']);
-
+	if ($hidden && $ipu == 'LinkAdded') {
+		api_item_property_update($_course, TOOL_LINK, $id, 'invisible', $_user['user_id']);
+	}
 	return $rv;
 }
+
 /**
-* CSV file import functions
-* @author René Haentjens , Ghent University
-*/
-function import_link($linkdata) // url, category_id, title, description, ...
-{
-	// field names used in the uploaded file
-	$known_fields = array ('url', 'category', 'title', 'description', 'on_homepage', 'hidden');
-	$hide_fields = array ('kw', 'kwd', 'kwds', 'keyword', 'keywords');
+ * CSV file import functions
+ * @author René Haentjens , Ghent University
+ */
+function import_link($linkdata) {
+	// url, category_id, title, description, ...
+
+	// Field names used in the uploaded file
+	$known_fields = array('url', 'category', 'title', 'description', 'on_homepage', 'hidden');
+	$hide_fields = array('kw', 'kwd', 'kwds', 'keyword', 'keywords');
 
-	// all other fields are added to description, as "name:value"
+	// All other fields are added to description, as "name:value"
 
-	// only one hide_field is assumed to be present, <> is removed from value
+	// Only one hide_field is assumed to be present, <> is removed from value
 
-	if (!($url = trim($linkdata['url'])) || !($title = trim($linkdata['title'])))
-		return 0; // 0= fail
+	if (!($url = trim($linkdata['url'])) || !($title = trim($linkdata['title']))) {
+		return 0; // 0 = fail
+	}
 
 	$cat = ($catname = trim($linkdata['category'])) ? get_cat($catname) : 0;
 
-	$regs = array(); // will be passed to ereg()
+	$regs = array(); // Will be passed to ereg()
 	foreach ($linkdata as $key => $value)
 		if (!in_array($key, $known_fields))
 			if (in_array($key, $hide_fields) && ereg('^<?([^>]*)>?$', $value, $regs)) // possibly in <...>
@@ -818,63 +742,66 @@ function import_link($linkdata) // url, category_id, title, description, ...
 					$kw = '';
 	// i.e. assume only one of the $hide_fields will be present
 	// and if found, hide the value as expando property of an <i> tag
-	elseif (trim($value)) $d .= ', '.$key.':'.$value;
-	if ($d)
+	elseif (trim($value)) {
+		$d .= ', '.$key.':'.$value;
+	}
+	if ($d) {
 		$d = substr($d, 2).' - ';
+	}
 
 	return put_link($url, $cat, $title, $kw.ereg_replace('\[((/?(b|big|i|small|sub|sup|u))|br/)\]', '<\\1>', htmlspecialchars($d.$linkdata['description'])). ($kw ? '</i>' : ''), $linkdata['on_homepage'] ? '1' : '0', $linkdata['hidden'] ? '1' : '0');
 	// i.e. allow some BBcode tags, e.g. [b]...[/b]
 }
+
 /**
-* CSV file import functions
-* @author René Haentjens , Ghent University
-*/
-function import_csvfile()
-{
+ * CSV file import functions
+ * @author René Haentjens , Ghent University
+ */
+function import_csvfile() {
+
 	global $catlinkstatus; // feedback message to user
 
-	if (is_uploaded_file($filespec = $_FILES['import_file']['tmp_name']) && filesize($filespec) && ($myFile = @ fopen($filespec, 'r')))
-	{
+	if (is_uploaded_file($filespec = $_FILES['import_file']['tmp_name']) && filesize($filespec) && ($myFile = @ fopen($filespec, 'r'))) {
 		// read first line of file (column names) and find ',' or ';'
-		$listsep = strpos($colnames = trim(fgets($myFile)), ',') !== FALSE ? ',' : (strpos($colnames, ';') !== FALSE ? ';' : '');
+		$listsep = strpos($colnames = trim(fgets($myFile)), ',') !== false ? ',' : (strpos($colnames, ';') !== false ? ';' : '');
 
-		if ($listsep)
-		{
+		if ($listsep) {
 			$columns = array_map('strtolower', explode($listsep, $colnames));
 
-			if (in_array('url', $columns) && in_array('title', $columns))
-			{
+			if (in_array('url', $columns) && in_array('title', $columns)) {
 				$stats = array (0, 0, 0); // fails, updates, inserts
 
 				// Modified by Ivan Tcholakov, 01-FEB-2010.
-				//while (($data = fgetcsv($myFile, 32768, $listsep)))
-				while (($data = api_fgetcsv($myFile, null, $listsep)))
+				//while (($data = fgetcsv($myFile, 32768, $listsep))) {
+				while (($data = api_fgetcsv($myFile, null, $listsep))) {
 				//
-				{
-					foreach ($data as $i => $text)
+					foreach ($data as $i => & $text) {
 						$linkdata[$columns[$i]] = $text;
-					//  $linkdata['url', 'title', ...]
+					}
 
 					$stats[import_link($linkdata)]++;
-					unset ($linkdata);
+					unset($linkdata);
 				}
 
 				$catlinkstatus = '';
 
-				if ($stats[0])
+				if ($stats[0]) {
 					$catlinkstatus .= $stats[0].' '.get_lang('CsvLinesFailed');
-				if ($stats[1])
+				}
+				if ($stats[1]) {
 					$catlinkstatus .= $stats[1].' '.get_lang('CsvLinesOld');
-				if ($stats[2])
+				}
+				if ($stats[2]) {
 					$catlinkstatus .= $stats[2].' '.get_lang('CsvLinesNew');
-			}
-			else
+				}
+			} else {
 				$catlinkstatus = get_lang('CsvFileNoURL'). ($colnames ? get_lang('CsvFileLine1').htmlspecialchars(substr($colnames, 0, 200)).'...' : '');
-		}
-		else
+			}
+		} else {
 			$catlinkstatus = get_lang('CsvFileNoSeps'). ($colnames ? get_lang('CsvFileLine1').htmlspecialchars(substr($colnames, 0, 200)).'...' : '');
+		}
 		fclose($myFile);
-	}
-	else
+	} else {
 		$catlinkstatus = get_lang('CsvFileNotFound');
+	}
 }