diff --git a/main/inc/lib/legal.lib.php b/main/inc/lib/legal.lib.php
index 7cde19f59b..a506d838cc 100755
--- a/main/inc/lib/legal.lib.php
+++ b/main/inc/lib/legal.lib.php
@@ -64,37 +64,37 @@ class LegalManager
     /**
      * @param int $id
      */
-	public static function delete($id)
+    public static function delete($id)
     {
-		/*
-		$legal_table = Database::get_main_table(TABLE_MAIN_LEGAL);
-		$id = intval($id);
-		$sql = "DELETE FROM $legal_table WHERE id = '".$id."'";
-		*/
-	}
+        /*
+        $legal_table = Database::get_main_table(TABLE_MAIN_LEGAL);
+        $id = intval($id);
+        $sql = "DELETE FROM $legal_table WHERE id = '".$id."'";
+        */
+    }
 
-	/**
-	 * Gets the last version of a Term and condition by language
-	 * @param int $language language id
-	 * @return array all the info of a Term and condition
-	 */
-	public static function get_last_condition_version($language)
+    /**
+     * Gets the last version of a Term and condition by language
+     * @param int $language language id
+     * @return array all the info of a Term and condition
+     */
+    public static function get_last_condition_version($language)
     {
-		$legal_conditions_table = Database::get_main_table(TABLE_MAIN_LEGAL);
-		$language= Database::escape_string($language);
-		$sql = "SELECT version FROM $legal_conditions_table
-		        WHERE language_id = '".$language."'
-		        ORDER BY id DESC LIMIT 1 ";
-		$result = Database::query($sql);
-		$row = Database::fetch_array($result);
+        $legal_conditions_table = Database::get_main_table(TABLE_MAIN_LEGAL);
+        $language= Database::escape_string($language);
+        $sql = "SELECT version FROM $legal_conditions_table
+                WHERE language_id = '".$language."'
+                ORDER BY id DESC LIMIT 1 ";
+        $result = Database::query($sql);
+        $row = Database::fetch_array($result);
         if (Database::num_rows($result) > 0) {
 
-			return $row['version'];
-		} else {
+            return $row['version'];
+        } else {
 
-			return 0;
-		}
-	}
+            return 0;
+        }
+    }
 
 	/**
 	 * Gets the data of a Term and condition by language
@@ -126,7 +126,6 @@ class LegalManager
     {
         if (strpos($content, '{{sessions}}')) {
             $sessionListToString = '';
-
             $sessionList = SessionManager::get_sessions_by_user(api_get_user_id());
             if ($sessionList) {
                 $sessionListToString = get_lang('SessionList').'<ul>';
diff --git a/main/inc/lib/link.lib.php b/main/inc/lib/link.lib.php
index 0984acdd51..49a365a140 100755
--- a/main/inc/lib/link.lib.php
+++ b/main/inc/lib/link.lib.php
@@ -558,7 +558,7 @@ class Link extends Model
             'display_order' => $max_display_order,
             'on_homepage' => $values['on_homepage'],
             'target' => $values['target'],
-            'category_id' => $values['category_id'],
+            'category_id' => $values['category_id']
         ];
         Database::update($tbl_link, $params, ['c_id = ? AND id = ?' => [$course_id, $id] ]);
 
@@ -887,23 +887,23 @@ class Link extends Model
                 $toolbar = '';
                 $link_validator = '';
                 if (api_is_allowed_to_edit(null, true)) {
-                    $toolbar .= Display::toolbarButton('',
-                            '#',
-                            'retweet',
-                            'default btn-sm',
-                            array(
-                                'onclick' => "check_url('" . $myrow['id'] . "', '" . addslashes($myrow['url']) . "');",
-                                'title' => get_lang('CheckURL')
-                                )
-                            );
+                    $toolbar .= Display::toolbarButton(
+                        '',
+                        '#',
+                        'retweet',
+                        'default btn-sm',
+                        array(
+                            'onclick' => "check_url('" . $myrow['id'] . "', '" . addslashes($myrow['url']) . "');",
+                            'title' => get_lang('CheckURL')
+                        )
+                    );
                     $link_validator .= Display::span(
                         '',
                         array(
-                            'id' => 'url_id_' . $myrow['id'],
-                            'class' => 'check-link'
-                            )
+                        'id' => 'url_id_' . $myrow['id'],
+                        'class' => 'check-link'
+                        )
                     );
-
                 }
 
                 if (api_is_allowed_to_edit(null, true)) {
@@ -954,8 +954,8 @@ class Link extends Model
                                     'title' => $title
                                 )
                             );
-
                         }
+
                         if ($myrow['visibility'] == '0') {
                             $url .= 'link.php?' . api_get_cidreq() .'&sec_token=' . $token .'&action=visible&id=' . $myrow['id'] .'&scope=link&category_id=' . $myrow['category_id'];
                             $title = get_lang('MakeVisible');
@@ -975,37 +975,34 @@ class Link extends Model
                         $title = get_lang('Delete');
 
                         $toolbar .= Display::toolbarButton(
-                                '',
-                                $url,
-                                'trash',
-                                'default btn-sm',
-                                array(
-                                    'onclick' => $event,
-                                    'title' => $title
-                                    )
-                                );
-
-
+                            '',
+                            $url,
+                            'trash',
+                            'default btn-sm',
+                            array(
+                                'onclick' => $event,
+                                'title' => $title
+                            )
+                        );
                     } else {
                         $title = get_lang('EditionNotAvailableFromSession');
                         $toolbar .= Display::toolbarButton(
-                                '',
-                                '#',
-                                'trash-o',
-                                'default btn-sm',
-                                array(
-                                    'title' => $title
-                                    )
-                                );
+                            '',
+                            '#',
+                            'trash-o',
+                            'default btn-sm',
+                            array(
+                                'title' => $title
+                            )
+                        );
                     }
-
                 }
                 $iconLink = Display::return_icon(
-                        'url.png',
-                        get_lang('Link'),
-                        null,
-                        ICON_SIZE_SMALL
-                        );
+                    'url.png',
+                    get_lang('Link'),
+                    null,
+                    ICON_SIZE_SMALL
+                );
 
                 if ($myrow['visibility'] == '1') {
                     $content .= '<div class="list-group-item">';
@@ -1014,13 +1011,13 @@ class Link extends Model
                     $content .= $iconLink;
                     $url =  'link_goto.php?' . api_get_cidreq() .'&link_id=' . $myrow['id'] .'&link_url=' . urlencode($myrow['url']);
                     $content .= Display::tag(
-                            'a',
-                            Security:: remove_XSS($myrow['title']),
-                            array(
-                                'href' => $url,
-                                'target' => $myrow['target']
-                                    )
-                            );
+                        'a',
+                        Security:: remove_XSS($myrow['title']),
+                        array(
+                            'href' => $url,
+                            'target' => $myrow['target']
+                        )
+                    );
                     $content .= $link_validator;
                     $content .= $session_img;
                     $content .= '</h4>';
@@ -1035,14 +1032,14 @@ class Link extends Model
                         $content .= $iconLink;
                         $url = 'link_goto.php?' . api_get_cidreq() .'&link_id=' . $myrow['id'] . "&link_url=" . urlencode($myrow['url']);
                         $content .= Display::tag(
-                                'a',
-                                Security:: remove_XSS($myrow['title']),
-                                array(
-                                    'href' => $url,
-                                    'target' => '_blank',
-                                    'class' => 'invisible'
-                                    )
-                                );
+                            'a',
+                            Security:: remove_XSS($myrow['title']),
+                            array(
+                                'href' => $url,
+                                'target' => '_blank',
+                                'class' => 'invisible'
+                            )
+                        );
                         $content .= $link_validator;
                         $content .= $session_img;
                         $content .= '</h4>';
@@ -1285,16 +1282,11 @@ class Link extends Model
                 $result
             ))
         ) {
-            Database:: query(
-                "UPDATE $tbl_link set title='" . Database:: escape_string(
-                    $title
-                ) . "', description='" . Database:: escape_string(
-                    $description
-                ) . "'
-                WHERE c_id = $course_id AND  id='" . Database:: escape_string(
-                    $row['id']
-                ) . "'"
-            );
+            $sql = "UPDATE $tbl_link SET 
+                        title = '" . Database:: escape_string($title) . "', 
+                        description = '" . Database:: escape_string($description) . "'
+                    WHERE c_id = $course_id AND  id='" . Database:: escape_string($row['id']) . "'";
+            Database:: query($sql);
 
             $ipu = 'LinkUpdated';
             $rv = 1; // 1 = upd
@@ -1321,6 +1313,7 @@ class Link extends Model
             $ipu = 'LinkAdded';
             $rv = 2; // 2 = new
         }
+
         api_item_property_update(
             $_course,
             TOOL_LINK,
@@ -1338,6 +1331,7 @@ class Link extends Model
                 $_user['user_id']
             );
         }
+
         return $rv;
     }
 
@@ -1421,7 +1415,6 @@ class Link extends Model
         // i.e. allow some BBcode tags, e.g. [b]...[/b]
     }
 
-
     /**
      * This function checks if the url is a vimeo link
      * @author Julio Montoya
@@ -1430,6 +1423,7 @@ class Link extends Model
     public static function isVimeoLink($url)
     {
         $isLink = strrpos($url, "vimeo.com");
+
         return $isLink;
     }
 
@@ -1463,9 +1457,9 @@ class Link extends Model
     public static function is_youtube_link($url)
     {
         $is_youtube_link = strrpos($url, "youtube") || strrpos(
-                $url,
-                "youtu.be"
-            );
+            $url,
+            "youtu.be"
+        );
         return $is_youtube_link;
     }
 
@@ -1622,8 +1616,8 @@ class Link extends Model
     /**
      * @param int $linkId
      * @param $action
-     * @param null $urlview
      * @param null $token
+     *
      * @return FormValidator
      */
     public static function getLinkForm($linkId, $action, $token = null)
diff --git a/main/inc/lib/lp_item.lib.php b/main/inc/lib/lp_item.lib.php
index 0747939963..cc31e931a3 100755
--- a/main/inc/lib/lp_item.lib.php
+++ b/main/inc/lib/lp_item.lib.php
@@ -14,11 +14,11 @@ class LpItem
     public $c_id = 0;
     public $id = 0;
     public $lp_id = 0;
-    public $item_type = "";
-    public $ref = "";
-    public $title = "";
-    public $description = "";
-    public $path = "";
+    public $item_type = '';
+    public $ref = '';
+    public $title = '';
+    public $description = '';
+    public $path = '';
     public $min_score = 0;
     public $max_score = 0;
     public $mastery_score = 0;
@@ -26,15 +26,15 @@ class LpItem
     public $previous_item_id = 0;
     public $next_item_id = 0;
     public $display_order = 0;
-    public $prerequisite = "";
-    public $parameters = "";
-    public $launch_data = "";
-    public $max_time_allowed = "";
-    public $terms = "";
+    public $prerequisite = '';
+    public $parameters = '';
+    public $launch_data = '';
+    public $max_time_allowed = '';
+    public $terms = '';
     public $search_did = 0;
-    public $audio = "";
+    public $audio = '';
 
-    public function __construct($in_c_id=0, $in_id=0)
+    public function __construct($in_c_id = 0, $in_id = 0)
     {
         if ($in_c_id > 0 && $in_id >0) {
             $item_view_table = Database::get_course_table(TABLE_LP_ITEM);
diff --git a/main/inc/lib/message.lib.php b/main/inc/lib/message.lib.php
index 67c723a48c..97ff8d856a 100755
--- a/main/inc/lib/message.lib.php
+++ b/main/inc/lib/message.lib.php
@@ -227,8 +227,7 @@ class MessageManager
         $topic_id = 0,
         $sender_id = null,
         $directMessage = false
-    )
-    {
+    ) {
         $table_message = Database::get_main_table(TABLE_MESSAGE);
         $group_id = intval($group_id);
         $receiver_user_id = intval($receiver_user_id);
@@ -435,8 +434,7 @@ class MessageManager
         $sender_id = null,
         $sendCopyToDrhUsers = false,
         $directMessage = false
-    )
-    {
+    ) {
         $result = MessageManager::send_message(
             $receiver_user_id,
             $subject,
@@ -521,8 +519,9 @@ class MessageManager
     public static function delete_message_by_user_receiver($user_receiver_id, $id)
     {
         $table_message = Database::get_main_table(TABLE_MESSAGE);
-        if ($id != strval(intval($id)))
+        if ($id != strval(intval($id))) {
             return false;
+        }
         $user_receiver_id = intval($user_receiver_id);
         $id = intval($id);
         $sql = "SELECT * FROM $table_message
@@ -536,6 +535,7 @@ class MessageManager
             $query = "UPDATE $table_message SET msg_status=3
                       WHERE user_receiver_id=" . $user_receiver_id . " AND id=" . $id;
             $result = Database::query($query);
+
             return $result;
         } else {
             return false;
@@ -594,8 +594,7 @@ class MessageManager
         $receiver_user_id = 0,
         $sender_user_id = 0,
         $group_id = 0
-    )
-    {
+    ) {
         $tbl_message_attach = Database::get_main_table(TABLE_MESSAGE_ATTACHMENT);
 
         // Try to add an extension to the file if it hasn't one
@@ -745,6 +744,7 @@ class MessageManager
         $query = "SELECT * FROM $table_message
                   WHERE user_receiver_id=" . intval($user_id) . " AND id='" . intval($message_id) . "'";
         $result = Database::query($query);
+
         return $row = Database::fetch_array($result);
     }
 
@@ -755,8 +755,9 @@ class MessageManager
      */
     public static function get_messages_by_group($group_id)
     {
-        if ($group_id != strval(intval($group_id)))
+        if ($group_id != strval(intval($group_id))) {
             return false;
+        }
 
         $table_message = Database::get_main_table(TABLE_MESSAGE);
         $group_id = intval($group_id);
@@ -783,8 +784,9 @@ class MessageManager
      */
     public static function get_messages_by_group_by_message($group_id, $message_id)
     {
-        if ($group_id != strval(intval($group_id)))
+        if ($group_id != strval(intval($group_id))) {
             return false;
+        }
         $table_message = Database::get_main_table(TABLE_MESSAGE);
         $group_id = intval($group_id);
         $sql = "SELECT * FROM $table_message
diff --git a/main/inc/lib/plugin.class.php b/main/inc/lib/plugin.class.php
index 813b76fd73..6c21851732 100755
--- a/main/inc/lib/plugin.class.php
+++ b/main/inc/lib/plugin.class.php
@@ -534,7 +534,7 @@ class Plugin
 
     /**
      * Install the course fields and tool link of this plugin in all courses
-     * @param boolean Whether we want to add a plugin link on the course homepage
+     * @param boolean $add_tool_link Whether we want to add a plugin link on the course homepage
      *
      * @return void
      */
diff --git a/main/inc/lib/rights.lib.php b/main/inc/lib/rights.lib.php
index 5fbca40af0..701adc4e03 100755
--- a/main/inc/lib/rights.lib.php
+++ b/main/inc/lib/rights.lib.php
@@ -1,6 +1,7 @@
 <?php
 
 /**
+ * @deprecated
  * Class Rights
  * @deprecated Don't use this class
  */
diff --git a/main/inc/lib/security.lib.php b/main/inc/lib/security.lib.php
index fef5726b9d..c8a019a706 100755
--- a/main/inc/lib/security.lib.php
+++ b/main/inc/lib/security.lib.php
@@ -44,7 +44,8 @@ class Security
      * Checks if the absolute path (directory) given is really under the
      * checker path (directory)
      * @param	string	Absolute path to be checked (with trailing slash)
-     * @param	string	Checker path under which the path should be (absolute path, with trailing slash, get it from api_get_path(SYS_COURSE_PATH))
+     * @param	string	Checker path under which the path
+     * should be (absolute path, with trailing slash, get it from api_get_path(SYS_COURSE_PATH))
      * @return	bool	True if the path is under the checker, false otherwise
      */
     public static function check_abs_path($abs_path, $checker_path)
@@ -77,7 +78,8 @@ class Security
      * Checks if the relative path (directory) given is really under the
      * checker path (directory)
      * @param	string	Relative path to be checked (relative to the current directory) (with trailing slash)
-     * @param	string	Checker path under which the path should be (absolute path, with trailing slash, get it from api_get_path(SYS_COURSE_PATH))
+     * @param	string	Checker path under which the path
+     * should be (absolute path, with trailing slash, get it from api_get_path(SYS_COURSE_PATH))
      * @return	bool	True if the path is under the checker, false otherwise
      */
     public static function check_rel_path($rel_path, $checker_path)
@@ -156,7 +158,7 @@ class Security
      */
     public static function check_ua()
     {
-        if (isset($_SESSION['sec_ua']) and $_SESSION['sec_ua'] === $_SERVER['HTTP_USER_AGENT'].$_SESSION['sec_ua_seed']) {
+        if (isset($_SESSION['sec_ua']) && $_SESSION['sec_ua'] === $_SERVER['HTTP_USER_AGENT'].$_SESSION['sec_ua_seed']) {
             return true;
         }
 
@@ -428,7 +430,7 @@ class Security
     		$new_text = str_ireplace($bad_terms, $replace, $text, $count);
     		$text = $new_text;
     	}
-        
+
 		return $text;
     }
 
diff --git a/main/inc/lib/sortable_table.class.php b/main/inc/lib/sortable_table.class.php
index b5ff7a855a..3f52150d1e 100755
--- a/main/inc/lib/sortable_table.class.php
+++ b/main/inc/lib/sortable_table.class.php
@@ -1,6 +1,8 @@
 <?php
 /* For licensing terms, see /license.txt */
 
+use ChamiloSession as Session;
+
 /**
  * This class allows you to display a sortable data-table. It is possible to
  * split the data in several pages.
@@ -131,13 +133,12 @@ class SortableTable extends HTML_Table
         $this->additional_parameters = array();
         $this->param_prefix = $table_name.'_';
 
-        $this->page_nr = isset($_SESSION[$this->param_prefix.'page_nr']) ? intval($_SESSION[$this->param_prefix.'page_nr']) : 1;
+        $this->page_nr = Session::read($this->param_prefix.'page_nr', 1);
         $this->page_nr = isset($_GET[$this->param_prefix.'page_nr']) ? intval($_GET[$this->param_prefix.'page_nr']) : $this->page_nr;
-        $this->column  = isset($_SESSION[$this->param_prefix.'column']) ? intval($_SESSION[$this->param_prefix.'column']) : $default_column;
-        $this->column  = isset($_GET[$this->param_prefix.'column']) ? intval($_GET[$this->param_prefix.'column']) : $this->column;
+        $this->column = Session::read($this->param_prefix.'column', $default_column);
+        $this->column = isset($_GET[$this->param_prefix.'column']) ? intval($_GET[$this->param_prefix.'column']) : $this->column;
 
         // Default direction.
-
         if (in_array(strtoupper($default_order_direction), array('ASC', 'DESC'))) {
             $this->direction = $default_order_direction;
         }
@@ -169,15 +170,16 @@ class SortableTable extends HTML_Table
         }
 
         // Allow to change paginate in multiples tabs
-        unset($_SESSION[$this->param_prefix.'per_page']);
+        Session::erase($this->param_prefix.'per_page');
 
-        $this->per_page = isset($_SESSION[$this->param_prefix.'per_page']) ? intval($_SESSION[$this->param_prefix.'per_page']) : $default_items_per_page;
+        $this->per_page = Session::read($this->param_prefix.'per_page', $default_items_per_page);
         $this->per_page = isset($_GET[$this->param_prefix.'per_page']) ? intval($_GET[$this->param_prefix.'per_page']) : $this->per_page;
 
-        $_SESSION[$this->param_prefix.'per_page'] = $this->per_page;
-        $_SESSION[$this->param_prefix.'direction'] = $this->direction;
-        $_SESSION[$this->param_prefix.'page_nr'] = $this->page_nr;
-        $_SESSION[$this->param_prefix.'column'] = $this->column;
+        Session::write($this->param_prefix.'per_page', $this->per_page);
+        Session::write($this->param_prefix.'direction', $this->direction);
+        Session::write($this->param_prefix.'page_nr', $this->page_nr);
+        Session::write($this->param_prefix.'column', $this->column);
+
         $this->pager = null;
         $this->default_items_per_page = $default_items_per_page;
         $this->total_number_of_items = -1;
diff --git a/main/inc/lib/system_announcements.lib.php b/main/inc/lib/system_announcements.lib.php
index 2df6e799b7..0339dabdcb 100755
--- a/main/inc/lib/system_announcements.lib.php
+++ b/main/inc/lib/system_announcements.lib.php
@@ -17,10 +17,10 @@ class SystemAnnouncementManager
 	 */
 	public static function display_announcements($visible, $id = -1)
     {
-		$user_selected_language = api_get_interface_language();
-		$db_table = Database :: get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS);
+        $user_selected_language = api_get_interface_language();
+        $db_table = Database :: get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS);
         $tbl_announcement_group = Database :: get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS_GROUPS);
-		$userGroup = new UserGroup();
+        $userGroup = new UserGroup();
 
         $temp_user_groups = $userGroup->get_groups_by_user(api_get_user_id(),0);
         $groups = array();
@@ -32,10 +32,10 @@ class SystemAnnouncementManager
         $groups_string = '('.implode($groups,',').')';
         $now = api_get_utc_datetime();
         $sql = "SELECT *, DATE_FORMAT(date_start,'%d-%m-%Y %h:%i:%s') AS display_date
-				FROM  $db_table
-				WHERE
-				 	(lang='$user_selected_language' OR lang IS NULL) AND
-				 	(('$now' BETWEEN date_start AND date_end) OR date_end='0000-00-00') ";
+                FROM  $db_table
+                WHERE
+                    (lang='$user_selected_language' OR lang IS NULL) AND
+                    (('$now' BETWEEN date_start AND date_end) OR date_end='0000-00-00') ";
 
         switch ($visible) {
             case self::VISIBLE_GUEST :
@@ -55,47 +55,47 @@ class SystemAnnouncementManager
                         WHERE group_id in $groups_string
                     ) ";
         }
-		$current_access_url_id = 1;
-		if (api_is_multiple_url_enabled()) {
-			$current_access_url_id = api_get_current_access_url_id();
-		}
-		$sql .= " AND access_url_id = '$current_access_url_id' ";
-		$sql .= " ORDER BY date_start DESC LIMIT 0,7";
-
-		$announcements = Database::query($sql);
-		if (Database::num_rows($announcements) > 0) {
-			$query_string = ereg_replace('announcement=[1-9]+', '', $_SERVER['QUERY_STRING']);
-			$query_string = ereg_replace('&$', '', $query_string);
-			$url = api_get_self();
-			echo '<div class="system_announcements">';
-			echo '<h3>'.get_lang('SystemAnnouncements').'</h3>';
-			echo '<div style="margin:10px;text-align:right;"><a href="news_list.php">'.get_lang('More').'</a></div>';
-
-			while ($announcement = Database::fetch_object($announcements)) {
-				if ($id != $announcement->id) {
-					if (strlen($query_string) > 0) {
-						$show_url = 'news_list.php#'.$announcement->id;
-					} else {
-						$show_url = 'news_list.php#'.$announcement->id;
-					}
-			        $display_date = api_convert_and_format_date($announcement->display_date, DATE_FORMAT_LONG);
-					echo '<a name="'.$announcement->id.'"></a>
-						<div class="system_announcement">
-							<div class="system_announcement_title"><a name="ann'.$announcement->id.'" href="'.$show_url.'">'.$announcement->title.'</a></div><div class="system_announcement_date">'.$display_date.'</div>
-					  	</div>';
-				} else {
-					echo '<div class="system_announcement">
-							<div class="system_announcement_title">'
-								.$announcement->display_date.'
-								<a name="ann'.$announcement->id.'" href="'.$url.'?'.$query_string.'#ann'.$announcement->id.'">'.$announcement->title.'</a>
-							</div>';
-				}
-				echo '<br />';
-			}
-			echo '</div>';
-		}
-		return;
-	}
+        $current_access_url_id = 1;
+        if (api_is_multiple_url_enabled()) {
+            $current_access_url_id = api_get_current_access_url_id();
+        }
+        $sql .= " AND access_url_id = '$current_access_url_id' ";
+        $sql .= " ORDER BY date_start DESC LIMIT 0,7";
+
+        $announcements = Database::query($sql);
+        if (Database::num_rows($announcements) > 0) {
+            $query_string = ereg_replace('announcement=[1-9]+', '', $_SERVER['QUERY_STRING']);
+            $query_string = ereg_replace('&$', '', $query_string);
+            $url = api_get_self();
+            echo '<div class="system_announcements">';
+            echo '<h3>'.get_lang('SystemAnnouncements').'</h3>';
+            echo '<div style="margin:10px;text-align:right;"><a href="news_list.php">'.get_lang('More').'</a></div>';
+
+            while ($announcement = Database::fetch_object($announcements)) {
+                if ($id != $announcement->id) {
+                    if (strlen($query_string) > 0) {
+                        $show_url = 'news_list.php#'.$announcement->id;
+                    } else {
+                        $show_url = 'news_list.php#'.$announcement->id;
+                    }
+                    $display_date = api_convert_and_format_date($announcement->display_date, DATE_FORMAT_LONG);
+                    echo '<a name="'.$announcement->id.'"></a>
+                        <div class="system_announcement">
+                            <div class="system_announcement_title"><a name="ann'.$announcement->id.'" href="'.$show_url.'">'.$announcement->title.'</a></div><div class="system_announcement_date">'.$display_date.'</div>
+                        </div>';
+                } else {
+                    echo '<div class="system_announcement">
+                            <div class="system_announcement_title">'
+                                .$announcement->display_date.'
+                                <a name="ann'.$announcement->id.'" href="'.$url.'?'.$query_string.'#ann'.$announcement->id.'">'.$announcement->title.'</a>
+                            </div>';
+                }
+                echo '<br />';
+            }
+            echo '</div>';
+        }
+        return;
+    }
 
     /**
      * @param $visible
@@ -106,100 +106,100 @@ class SystemAnnouncementManager
      */
     public static function display_all_announcements($visible, $id = -1, $start = 0,$user_id='')
     {
-		$user_selected_language = api_get_interface_language();
-		$start	= intval($start);
+        $user_selected_language = api_get_interface_language();
+        $start	= intval($start);
         $userGroup = new UserGroup();
-	    $tbl_announcement_group = Database :: get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS_GROUPS);
-	    $temp_user_groups = $userGroup->get_groups_by_user(api_get_user_id(),0);
+        $tbl_announcement_group = Database :: get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS_GROUPS);
+        $temp_user_groups = $userGroup->get_groups_by_user(api_get_user_id(),0);
         $groups = array();
-	    foreach ($temp_user_groups as $user_group) {
-	        $groups = array_merge($groups, array($user_group['id']));
-	        $groups = array_merge($groups, $userGroup->get_parent_groups($user_group['id']));
-	    }
+        foreach ($temp_user_groups as $user_group) {
+            $groups = array_merge($groups, array($user_group['id']));
+            $groups = array_merge($groups, $userGroup->get_parent_groups($user_group['id']));
+        }
 
-	    // Checks if tables exists to not break platform not updated
-	    $groups_string = '('.implode($groups,',').')';
+        // Checks if tables exists to not break platform not updated
+        $groups_string = '('.implode($groups,',').')';
 
-		$db_table = Database :: get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS);
-		$now  = api_get_utc_datetime();
+        $db_table = Database :: get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS);
+        $now  = api_get_utc_datetime();
 
-		$sql = "SELECT * FROM ".$db_table."
-				WHERE
-				    (lang = '$user_selected_language' OR lang IS NULL) AND
-				    ( '$now' >= date_start AND '$now' <= date_end) ";
-
-		switch ($visible) {
-			case self::VISIBLE_GUEST :
-				$sql .= " AND visible_guest = 1 ";
-				break;
-			case self::VISIBLE_STUDENT :
-				$sql .= " AND visible_student = 1 ";
-				break;
-			case self::VISIBLE_TEACHER :
-				$sql .= " AND visible_teacher = 1 ";
-				break;
-		}
+        $sql = "SELECT * FROM ".$db_table."
+                WHERE
+                    (lang = '$user_selected_language' OR lang IS NULL) AND
+                    ( '$now' >= date_start AND '$now' <= date_end) ";
 
-	    if (count($groups) > 0) {
+        switch ($visible) {
+            case self::VISIBLE_GUEST:
+                $sql .= " AND visible_guest = 1 ";
+                break;
+            case self::VISIBLE_STUDENT:
+                $sql .= " AND visible_student = 1 ";
+                break;
+            case self::VISIBLE_TEACHER:
+                $sql .= " AND visible_teacher = 1 ";
+                break;
+        }
+
+        if (count($groups) > 0) {
             $sql .= " OR id IN (
                     SELECT announcement_id FROM $tbl_announcement_group
                     WHERE group_id in $groups_string
                     ) ";
-	    }
+        }
 
-		if (api_is_multiple_url_enabled()) {
-			$current_access_url_id = api_get_current_access_url_id();
+        if (api_is_multiple_url_enabled()) {
+            $current_access_url_id = api_get_current_access_url_id();
             $sql .= " AND access_url_id IN ('1', '$current_access_url_id')";
-		}
+        }
 
-		if(!isset($_GET['start']) || $_GET['start'] == 0) {
-			$sql .= " ORDER BY date_start DESC LIMIT ".$start.",20";
-		} else {
-			$sql .= " ORDER BY date_start DESC LIMIT ".($start+1).",20";
-		}
-		$announcements = Database::query($sql);
-		$content = '';
-		if (Database::num_rows($announcements) > 0) {
-			$query_string = ereg_replace('announcement=[1-9]+', '', $_SERVER['QUERY_STRING']);
-			$query_string = ereg_replace('&$', '', $query_string);
-			$url = api_get_self();
-			$content .= '<div class="system_announcements">';
-			$content .= '<h3>'.get_lang('SystemAnnouncements').'</h3>';
-			$content .= '<table align="center">';
-				$content .= '<tr>';
-					$content .= '<td>';
-						$content .= SystemAnnouncementManager :: display_arrow($user_id);
-					$content .= '</td>';
-				$content .= '</tr>';
-			$content .= '</table>';
-			$content .= '<table align="center" border="0" width="900px">';
-			while ($announcement = Database::fetch_object($announcements)) {
-				$display_date = api_convert_and_format_date($announcement->display_date, DATE_FORMAT_LONG);
-				$content .= '<tr><td>';
-				$content .= '<a name="'.$announcement->id.'"></a>
-						<div class="system_announcement">
-						<h2>'.$announcement->title.'</h2><div class="system_announcement_date">'.$display_date.'</div>
-						<br />
-					  	<div class="system_announcement_content">'
-					  			.$announcement->content.'
-						</div>
-					  </div><br />';
-				$content .= '</tr></td>';
-			}
-			$content .= '</table>';
-
-			$content .= '<table align="center">';
-				$content .= '<tr>';
-					$content .= '<td>';
-						$content .= SystemAnnouncementManager :: display_arrow($user_id);
-					$content .= '</td>';
-				$content .= '</tr>';
-			$content .= '</table>';
-			$content .= '</div>';
-		}
+        if(!isset($_GET['start']) || $_GET['start'] == 0) {
+            $sql .= " ORDER BY date_start DESC LIMIT ".$start.",20";
+        } else {
+            $sql .= " ORDER BY date_start DESC LIMIT ".($start+1).",20";
+        }
+        $announcements = Database::query($sql);
+        $content = '';
+        if (Database::num_rows($announcements) > 0) {
+            $query_string = ereg_replace('announcement=[1-9]+', '', $_SERVER['QUERY_STRING']);
+            $query_string = ereg_replace('&$', '', $query_string);
+            $url = api_get_self();
+            $content .= '<div class="system_announcements">';
+            $content .= '<h3>'.get_lang('SystemAnnouncements').'</h3>';
+            $content .= '<table align="center">';
+                $content .= '<tr>';
+                    $content .= '<td>';
+                        $content .= SystemAnnouncementManager :: display_arrow($user_id);
+                    $content .= '</td>';
+                $content .= '</tr>';
+            $content .= '</table>';
+            $content .= '<table align="center" border="0" width="900px">';
+            while ($announcement = Database::fetch_object($announcements)) {
+                $display_date = api_convert_and_format_date($announcement->display_date, DATE_FORMAT_LONG);
+                $content .= '<tr><td>';
+                $content .= '<a name="'.$announcement->id.'"></a>
+                        <div class="system_announcement">
+                        <h2>'.$announcement->title.'</h2><div class="system_announcement_date">'.$display_date.'</div>
+                        <br />
+                        <div class="system_announcement_content">'
+                                .$announcement->content.'
+                        </div>
+                      </div><br />';
+                $content .= '</tr></td>';
+            }
+            $content .= '</table>';
+
+            $content .= '<table align="center">';
+                $content .= '<tr>';
+                    $content .= '<td>';
+                        $content .= SystemAnnouncementManager :: display_arrow($user_id);
+                    $content .= '</td>';
+                $content .= '</tr>';
+            $content .= '</table>';
+            $content .= '</div>';
+        }
 
-		return $content;
-	}
+        return $content;
+    }
 
     /**
      * @param int $user_id
@@ -207,23 +207,23 @@ class SystemAnnouncementManager
      */
     public static function display_arrow($user_id)
     {
-		$start = (int)$_GET['start'];
-		$nb_announcement = SystemAnnouncementManager :: count_nb_announcement($start,$user_id);
-		$next = ((int)$_GET['start']+19);
-		$prev = ((int)$_GET['start']-19);
-		$content = '';
-		if(!isset($_GET['start']) || $_GET['start'] == 0) {
-			if($nb_announcement > 20) {
-				$content .= '<a href="news_list.php?start='.$next.'">'.get_lang('NextBis').' >> </a>';
-			}
-		} else {
-			echo '<a href="news_list.php?start='.$prev.'"> << '.get_lang('Prev').'</a>';
-			if ($nb_announcement > 20) {
-				$content .= '<a href="news_list.php?start='.$next.'">'.get_lang('NextBis').' >> </a>';
-			}
-		}
-		return $content;
-	}
+        $start = (int)$_GET['start'];
+        $nb_announcement = SystemAnnouncementManager :: count_nb_announcement($start,$user_id);
+        $next = ((int)$_GET['start']+19);
+        $prev = ((int)$_GET['start']-19);
+        $content = '';
+        if(!isset($_GET['start']) || $_GET['start'] == 0) {
+            if($nb_announcement > 20) {
+                $content .= '<a href="news_list.php?start='.$next.'">'.get_lang('NextBis').' >> </a>';
+            }
+        } else {
+            echo '<a href="news_list.php?start='.$prev.'"> << '.get_lang('Prev').'</a>';
+            if ($nb_announcement > 20) {
+                $content .= '<a href="news_list.php?start='.$next.'">'.get_lang('NextBis').' >> </a>';
+            }
+        }
+        return $content;
+    }
 
     /**
      * @param int $start
@@ -232,82 +232,82 @@ class SystemAnnouncementManager
      */
     public static function count_nb_announcement($start = 0, $user_id = '')
     {
-		$start = intval($start);
-		$visibility = api_is_allowed_to_create_course() ? self::VISIBLE_TEACHER : self::VISIBLE_STUDENT;
-		$user_selected_language = api_get_interface_language();
-		$db_table = Database :: get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS);
-		$sql = 'SELECT id FROM '.$db_table.'
-		        WHERE (lang="'.$user_selected_language.'" OR lang IS NULL) ';
-		if (isset($user_id)) {
-			switch ($visibility) {
-				case self::VISIBLE_GUEST :
-					$sql .= " AND visible_guest = 1 ";
-					break;
-				case self::VISIBLE_STUDENT :
-					$sql .= " AND visible_student = 1 ";
-					break;
-				case self::VISIBLE_TEACHER :
-					$sql .= " AND visible_teacher = 1 ";
-					break;
-			}
- 		}
-
-		$current_access_url_id = 1;
-		if (api_is_multiple_url_enabled()) {
-			$current_access_url_id = api_get_current_access_url_id();
-		}
-		$sql .= " AND access_url_id = '$current_access_url_id' ";
+        $start = intval($start);
+        $visibility = api_is_allowed_to_create_course() ? self::VISIBLE_TEACHER : self::VISIBLE_STUDENT;
+        $user_selected_language = api_get_interface_language();
+        $db_table = Database :: get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS);
+        $sql = 'SELECT id FROM '.$db_table.'
+                WHERE (lang="'.$user_selected_language.'" OR lang IS NULL) ';
+        if (isset($user_id)) {
+            switch ($visibility) {
+                case self::VISIBLE_GUEST:
+                    $sql .= " AND visible_guest = 1 ";
+                    break;
+                case self::VISIBLE_STUDENT:
+                    $sql .= " AND visible_student = 1 ";
+                    break;
+                case self::VISIBLE_TEACHER:
+                    $sql .= " AND visible_teacher = 1 ";
+                    break;
+            }
+        }
 
+        $current_access_url_id = 1;
+        if (api_is_multiple_url_enabled()) {
+            $current_access_url_id = api_get_current_access_url_id();
+        }
+        $sql .= " AND access_url_id = '$current_access_url_id' ";
 
-		$sql .= 'LIMIT '.$start.', 21';
-		$announcements = Database::query($sql);
-		$i = 0;
-		while ($rows = Database::fetch_array($announcements)) {
-			$i++;
-		}
-		return $i;
-	}
 
-	/**
-	 * Get all announcements
-	 * @return array An array with all available system announcements (as php
-	 * objects)
-	 */
-	public static function get_all_announcements()
+        $sql .= 'LIMIT '.$start.', 21';
+        $announcements = Database::query($sql);
+        $i = 0;
+        while ($rows = Database::fetch_array($announcements)) {
+            $i++;
+        }
+        return $i;
+    }
+
+    /**
+     * Get all announcements
+     * @return array An array with all available system announcements (as php
+     * objects)
+     */
+    public static function get_all_announcements()
     {
-		$table = Database :: get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS);
-		$now = api_get_utc_datetime();
-		$sql = "SELECT *, IF ( '$now'  >= date_start AND '$now' <= date_end, '1', '0') AS visible
-				FROM $table";
+        $table = Database :: get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS);
+        $now = api_get_utc_datetime();
+        $sql = "SELECT *, IF ( '$now'  >= date_start AND '$now' <= date_end, '1', '0') AS visible
+                FROM $table";
 
-		$current_access_url_id = 1;
-		if (api_is_multiple_url_enabled()) {
-			$current_access_url_id = api_get_current_access_url_id();
-		}
-		$sql .= " WHERE access_url_id = '$current_access_url_id' ";
-		$sql .= " ORDER BY date_start ASC";
+        $current_access_url_id = 1;
+        if (api_is_multiple_url_enabled()) {
+            $current_access_url_id = api_get_current_access_url_id();
+        }
+        $sql .= " WHERE access_url_id = '$current_access_url_id' ";
+        $sql .= " ORDER BY date_start ASC";
 
-		$announcements = Database::query($sql);
-		$all_announcements = array();
-		while ($announcement = Database::fetch_object($announcements)) {
-			$all_announcements[] = $announcement;
-		}
-		return $all_announcements;
-	}
+        $announcements = Database::query($sql);
+        $all_announcements = array();
+        while ($announcement = Database::fetch_object($announcements)) {
+            $all_announcements[] = $announcement;
+        }
+        return $all_announcements;
+    }
 
-	/**
-	 * Adds an announcement to the database
-	 * @param string Title of the announcement
-	 * @param string Content of the announcement
-	 * @param string Start date (YYYY-MM-DD HH:II: SS)
-	 * @param string End date (YYYY-MM-DD HH:II: SS)
-	 * @param int    Whether the announcement should be visible to teachers (1) or not (0)
-	 * @param int    Whether the announcement should be visible to students (1) or not (0)
-	 * @param int    Whether the announcement should be visible to anonymous users (1) or not (0)
-	 * @param string The language for which the announvement should be shown. Leave null for all langages
-	 * @param int    Whether to send an e-mail to all users (1) or not (0)
-	 * @return mixed  insert_id on success, false on failure
-	 */
+    /**
+     * Adds an announcement to the database
+     * @param string Title of the announcement
+     * @param string Content of the announcement
+     * @param string Start date (YYYY-MM-DD HH:II: SS)
+     * @param string End date (YYYY-MM-DD HH:II: SS)
+     * @param int    Whether the announcement should be visible to teachers (1) or not (0)
+     * @param int    Whether the announcement should be visible to students (1) or not (0)
+     * @param int    Whether the announcement should be visible to anonymous users (1) or not (0)
+     * @param string The language for which the announvement should be shown. Leave null for all langages
+     * @param int    Whether to send an e-mail to all users (1) or not (0)
+     * @return mixed  insert_id on success, false on failure
+     */
     public static function add_announcement(
         $title,
         $content,
@@ -321,114 +321,112 @@ class SystemAnnouncementManager
         $add_to_calendar = false,
         $sendEmailTest = false
     ) {
-		$original_content = $content;
-		$a_dateS = explode(' ',$date_start);
-		$a_arraySD = explode('-',$a_dateS[0]);
-		$a_arraySH = explode(':',$a_dateS[1]);
-		$date_start_to_compare = array_merge($a_arraySD,$a_arraySH);
+        $original_content = $content;
+        $a_dateS = explode(' ', $date_start);
+        $a_arraySD = explode('-', $a_dateS[0]);
+        $a_arraySH = explode(':', $a_dateS[1]);
+        $date_start_to_compare = array_merge($a_arraySD, $a_arraySH);
 
-		$a_dateE = explode(' ',$date_end);
-		$a_arrayED = explode('-',$a_dateE[0]);
-		$a_arrayEH = explode(':',$a_dateE[1]);
-		$date_end_to_compare = array_merge($a_arrayED,$a_arrayEH);
+        $a_dateE = explode(' ', $date_end);
+        $a_arrayED = explode('-', $a_dateE[0]);
+        $a_arrayEH = explode(':', $a_dateE[1]);
+        $date_end_to_compare = array_merge($a_arrayED, $a_arrayEH);
 
-		$db_table = Database :: get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS);
+        $db_table = Database :: get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS);
 
-		if (!checkdate($date_start_to_compare[1], $date_start_to_compare[2], $date_start_to_compare[0])) {
-			Display :: display_normal_message(get_lang('InvalidStartDate'));
-			return false;
-		}
+        if (!checkdate($date_start_to_compare[1], $date_start_to_compare[2], $date_start_to_compare[0])) {
+            Display :: display_normal_message(get_lang('InvalidStartDate'));
+            return false;
+        }
 
-		if (($date_end_to_compare[1] ||
+        if (($date_end_to_compare[1] ||
             $date_end_to_compare[2] ||
             $date_end_to_compare[0]) &&
             !checkdate($date_end_to_compare[1], $date_end_to_compare[2], $date_end_to_compare[0])
         ) {
-			Display :: display_normal_message(get_lang('InvalidEndDate'));
-			return false;
-		}
-		if (strlen(trim($title)) == 0) {
-			Display::display_normal_message(get_lang('InvalidTitle'));
-			return false;
-		}
+            Display :: display_normal_message(get_lang('InvalidEndDate'));
+            return false;
+        }
+        if (strlen(trim($title)) == 0) {
+            Display::display_normal_message(get_lang('InvalidTitle'));
+            return false;
+        }
 
-		$start = api_get_utc_datetime($date_start);
+        $start = api_get_utc_datetime($date_start);
         $end = api_get_utc_datetime($date_end);
 
-		//Fixing urls that are sent by email
-		//$content = str_replace('src=\"/home/', 'src=\"'.api_get_path(WEB_PATH).'home/', $content);
-		//$content = str_replace('file=/home/', 'file='.api_get_path(WEB_PATH).'home/', $content);
-		$content = str_replace('src=\"'.api_get_path(REL_HOME_PATH), 'src=\"'.api_get_path(WEB_PATH).api_get_path(REL_HOME_PATH), $content);
-		$content = str_replace('file='.api_get_path(REL_HOME_PATH), 'file='.api_get_path(WEB_PATH).api_get_path(REL_HOME_PATH), $content);
+        //Fixing urls that are sent by email
+        //$content = str_replace('src=\"/home/', 'src=\"'.api_get_path(WEB_PATH).'home/', $content);
+        //$content = str_replace('file=/home/', 'file='.api_get_path(WEB_PATH).'home/', $content);
+        $content = str_replace('src=\"'.api_get_path(REL_HOME_PATH), 'src=\"'.api_get_path(WEB_PATH).api_get_path(REL_HOME_PATH), $content);
+        $content = str_replace('file='.api_get_path(REL_HOME_PATH), 'file='.api_get_path(WEB_PATH).api_get_path(REL_HOME_PATH), $content);
+        $lang = is_null($lang) ? '' : $lang;
+
+        $current_access_url_id = 1;
+        if (api_is_multiple_url_enabled()) {
+            $current_access_url_id = api_get_current_access_url_id();
+        }
 
+        $params = [
+            'title' => $title,
+            'content' => $content,
+            'date_start' => $start,
+            'date_end' => $end,
+            'visible_teacher' => $visible_teacher,
+            'visible_student' => $visible_student,
+            'visible_guest' => $visible_guest,
+            'lang' => $lang,
+            'access_url_id' => $current_access_url_id,
+        ];
 
-		$lang = is_null($lang) ? '' : $lang;
+        $resultId = Database::insert($db_table, $params);
 
-		$current_access_url_id = 1;
-		if (api_is_multiple_url_enabled()) {
-			$current_access_url_id = api_get_current_access_url_id();
-		}
+        if ($resultId) {
 
-		$params = [
-			'title' => $title,
-			'content' => $content,
-			'date_start' => $start,
-			'date_end' => $end,
-			'visible_teacher' => $visible_teacher,
-			'visible_student' => $visible_student,
-			'visible_guest' => $visible_guest,
-			'lang' => $lang,
-			'access_url_id' => $current_access_url_id,
-		];
-
-		$resultId = Database::insert($db_table, $params);
-
-		if ($resultId) {
-
-			if ($sendEmailTest) {
-				SystemAnnouncementManager::send_system_announcement_by_email(
-					$title,
-					$content,
-					$visible_teacher,
-					$visible_student,
-					$lang,
-					true
-				);
-			} else {
-				if ($send_mail == 1) {
-					SystemAnnouncementManager::send_system_announcement_by_email(
-						$title,
-						$content,
-						$visible_teacher,
-						$visible_student,
-						$lang
-					);
-				}
-			}
-
-			if ($add_to_calendar) {
-				$agenda = new Agenda();
-				$agenda->setType('admin');
-				$agenda->addEvent(
-					$date_start,
-					$date_end,
-					false,
-					$title,
-					$original_content
-				);
-			}
-
-			return $resultId;
+            if ($sendEmailTest) {
+                SystemAnnouncementManager::send_system_announcement_by_email(
+                    $title,
+                    $content,
+                    $visible_teacher,
+                    $visible_student,
+                    $lang,
+                    true
+                );
+            } else {
+                if ($send_mail == 1) {
+                    SystemAnnouncementManager::send_system_announcement_by_email(
+                        $title,
+                        $content,
+                        $visible_teacher,
+                        $visible_student,
+                        $lang
+                    );
+                }
+            }
 
-		}
+            if ($add_to_calendar) {
+                $agenda = new Agenda();
+                $agenda->setType('admin');
+                $agenda->addEvent(
+                    $date_start,
+                    $date_end,
+                    false,
+                    $title,
+                    $original_content
+                );
+            }
 
-		return false;
-	}
+            return $resultId;
+
+        }
+
+        return false;
+    }
 
     /**
     * Makes the announcement id visible only for groups in groups_array
-    * @param int announcement id
-    * @param array array of group id
+    * @param int $announcement_id
+    * @param array $group_array array of group id
     **/
     public static function announcement_for_groups($announcement_id, $group_array)
     {
@@ -437,9 +435,8 @@ class SystemAnnouncementManager
         );
         //first delete all group associations for this announcement
         $res = Database::query(
-            "DELETE FROM $tbl_announcement_group WHERE announcement_id=".intval(
-                $announcement_id
-            )
+            "DELETE FROM $tbl_announcement_group 
+             WHERE announcement_id=".intval($announcement_id)
         );
 
         if ($res === false) {
@@ -482,6 +479,7 @@ class SystemAnnouncementManager
                     ag.group_id = g.id";
         $res = Database::query($sql);
         $groups = Database::fetch_array($res);
+
         return $groups;
     }
 
@@ -509,22 +507,23 @@ class SystemAnnouncementManager
     ) {
         $em = Database::getManager();
 
-		$a_dateS = explode(' ',$date_start);
-		$a_arraySD = explode('-',$a_dateS[0]);
-		$a_arraySH = explode(':',$a_dateS[1]);
-		$date_start_to_compare = array_merge($a_arraySD,$a_arraySH);
+        $a_dateS = explode(' ', $date_start);
+        $a_arraySD = explode('-', $a_dateS[0]);
+        $a_arraySH = explode(':', $a_dateS[1]);
+        $date_start_to_compare = array_merge($a_arraySD, $a_arraySH);
 
-		$a_dateE = explode(' ',$date_end);
-		$a_arrayED = explode('-',$a_dateE[0]);
-		$a_arrayEH = explode(':',$a_dateE[1]);
-		$date_end_to_compare = array_merge($a_arrayED,$a_arrayEH);
+        $a_dateE = explode(' ', $date_end);
+        $a_arrayED = explode('-', $a_dateE[0]);
+        $a_arrayEH = explode(':', $a_dateE[1]);
+        $date_end_to_compare = array_merge($a_arrayED, $a_arrayEH);
 
         $lang = is_null($lang) ? '' : $lang;
 
-		if (!checkdate($date_start_to_compare[1], $date_start_to_compare[2], $date_start_to_compare[0])) {
-			Display :: display_normal_message(get_lang('InvalidStartDate'));
-			return false;
-		}
+        if (!checkdate($date_start_to_compare[1], $date_start_to_compare[2], $date_start_to_compare[0])) {
+            Display:: display_normal_message(get_lang('InvalidStartDate'));
+
+            return false;
+        }
 
 		if (($date_end_to_compare[1] ||
             $date_end_to_compare[2] ||
@@ -670,8 +669,14 @@ class SystemAnnouncementManager
 	 * @param	string	Language (optional, considered for all languages if left empty)
      * @return  bool    True if the message was sent or there was no destination matching. False on database or e-mail sending error.
 	 */
-	public static function send_system_announcement_by_email($title, $content, $teacher, $student, $language = null, $sendEmailTest = false)
-    {
+    public static function send_system_announcement_by_email(
+        $title,
+        $content,
+        $teacher,
+        $student,
+        $language = null,
+        $sendEmailTest = false
+    ) {
 		global $charset;
 
         $title = api_html_entity_decode(stripslashes($title), ENT_QUOTES, $charset);
@@ -753,13 +758,13 @@ class SystemAnnouncementManager
 				    ('$now' >= date_start AND '$now' <= date_end) ";
 
         switch ($visible) {
-            case self::VISIBLE_GUEST :
+            case self::VISIBLE_GUEST:
                 $sql .= " AND visible_guest = 1 ";
                 break;
-            case self::VISIBLE_STUDENT :
+            case self::VISIBLE_STUDENT:
                 $sql .= " AND visible_student = 1 ";
                 break;
-            case self::VISIBLE_TEACHER :
+            case self::VISIBLE_TEACHER:
                 $sql .= " AND visible_teacher = 1 ";
                 break;
         }
diff --git a/main/inc/lib/thematic.lib.php b/main/inc/lib/thematic.lib.php
index f6f72f6b79..88d2e917ea 100755
--- a/main/inc/lib/thematic.lib.php
+++ b/main/inc/lib/thematic.lib.php
@@ -408,6 +408,7 @@ class Thematic
                 );
             }
         }
+
         return $affected_rows;
     }
 
@@ -654,6 +655,7 @@ class Thematic
             $return  .= '</div>';
             $final_return[$thematic_id] = $return;
         }
+
         return $final_return;
     }
 
@@ -668,9 +670,7 @@ class Thematic
     ) {
         $course_info = api_get_course_info($course_code);
         $tbl_thematic_advance = Database::get_course_table(TABLE_THEMATIC_ADVANCE);
-
         $data = array();
-
         $condition = '';
         if (isset($thematic_advance_id)) {
             $thematic_advance_id = intval($thematic_advance_id);
@@ -691,7 +691,7 @@ class Thematic
                 api_get_session_id()
             );
             foreach ($list as $value) {
-                $elements[$value['ref']]= $value;
+                $elements[$value['ref']] = $value;
             }
         }
 
@@ -1157,9 +1157,7 @@ class Thematic
                         );
 
                         if ($item_info['session_id'] == $sessionId) {
-
                             $a_thematic_advance_ids[] = $thematic_advance['id'];
-
                             // update done thematic for previous advances ((done_advance = 1))
                             $upd = "UPDATE $tbl_thematic_advance SET
                                     done_advance = 1
@@ -1321,7 +1319,10 @@ class Thematic
         if (!empty($thematic_data)) {
             foreach ($thematic_data as $thematic) {
                 $thematic_id = $thematic['id'];
-                $a_average_of_advances_by_thematic[$thematic_id] = $this->get_average_of_advances_by_thematic($thematic_id, $course_code);
+                $a_average_of_advances_by_thematic[$thematic_id] = $this->get_average_of_advances_by_thematic(
+                    $thematic_id,
+                    $course_code
+                );
             }
         }
 
@@ -1331,6 +1332,7 @@ class Thematic
             $score = array_sum($a_average_of_advances_by_thematic);
             $total_average = round(($score * 100) / ($count_tematics * 100));
         }
+        
         return $total_average;
     }
 
diff --git a/main/inc/lib/urlmanager.lib.php b/main/inc/lib/urlmanager.lib.php
index 10f5931244..0750aa1b0f 100755
--- a/main/inc/lib/urlmanager.lib.php
+++ b/main/inc/lib/urlmanager.lib.php
@@ -80,22 +80,22 @@ class UrlManager
         $tableGroup = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USERGROUP);
 
         $sql = "DELETE FROM $tableCourse WHERE access_url_id = ".$id;
-        $result = Database::query($sql);
+        Database::query($sql);
         /*
         $sql = "DELETE FROM $tableCourseCategory WHERE access_url_id = ".$id;
-        $result = Database::query($sql);
+        Database::query($sql);
         */
         $sql = "DELETE FROM $tableSession WHERE access_url_id = ".$id;
-        $result = Database::query($sql);
+        Database::query($sql);
         $sql = "DELETE FROM $tableGroup WHERE access_url_id = ".$id;
-        $result = Database::query($sql);
+        Database::query($sql);
         $sql = "DELETE FROM $tableUser WHERE access_url_id = ".$id;
-        $result = Database::query($sql);
+        Database::query($sql);
 
         $sql= "DELETE FROM $table WHERE id = ".$id;
-        $result = Database::query($sql);
+        Database::query($sql);
 
-        return $result;
+        return true;
     }
 
     /**
@@ -281,8 +281,9 @@ class UrlManager
         $table_url_rel_session = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
         $tbl_session = Database :: get_main_table(TABLE_MAIN_SESSION);
 
-        if (!empty($access_url_id))
-            $where ="WHERE $table_url_rel_session.access_url_id = ".intval($access_url_id);
+        if (!empty($access_url_id)) {
+            $where = "WHERE $table_url_rel_session.access_url_id = ".intval($access_url_id);
+        }
 
         $sql = "SELECT id, name, access_url_id
                 FROM $tbl_session u
@@ -430,8 +431,9 @@ class UrlManager
     {
         $table = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USERGROUP);
         $sql= "SELECT usergroup_id FROM $table
-               WHERE access_url_id = ".intval($urlId)." AND
-                     usergroup_id = ".intval($userGroupId);
+               WHERE 
+                    access_url_id = ".intval($urlId)." AND
+                    usergroup_id = ".intval($userGroupId);
         $result = Database::query($sql);
         $num = Database::num_rows($result);
 
@@ -472,13 +474,15 @@ class UrlManager
         $table_url_rel_user = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
         $result_array = array();
 
-        if (is_array($user_list) && is_array($url_list)){
+        if (is_array($user_list) && is_array($url_list)) {
             foreach ($url_list as $url_id) {
                 foreach ($user_list as $user_id) {
                     $count = UrlManager::relation_url_user_exist($user_id,$url_id);
-                    if ($count==0) {
+                    if ($count == 0) {
                         $sql = "INSERT INTO $table_url_rel_user
-                                SET user_id = ".intval($user_id).", access_url_id = ".intval($url_id);
+                                SET 
+                                    user_id = ".intval($user_id).", 
+                                    access_url_id = ".intval($url_id);
                         $result = Database::query($sql);
                         if ($result) {
                             $result_array[$url_id][$user_id] = 1;
@@ -643,14 +647,15 @@ class UrlManager
 
             return Database::insert_id();
         }
+
         return 0;
     }
 
     /**
      * Add a group of sessions into a group of URLs
      * @author Julio Montoya
-     * @param  array of session ids
-     * @param  array of url_ids
+     * @param  array $session_list of session ids
+     * @param  array $url_list of url_ids
      * @return array
      * */
     public static function add_sessions_to_urls($session_list, $url_list)
@@ -873,8 +878,8 @@ class UrlManager
     /**
      * Updates the access_url_rel_user table  with a given user list
      * @author Julio Montoya
-     * @param array user list
-     * @param int access_url_id
+     * @param array $user_list
+     * @param int $access_url_id
      * */
     public static function update_urls_rel_user($user_list, $access_url_id)
     {
@@ -954,8 +959,8 @@ class UrlManager
     /**
      * Updates the access_url_rel_course table  with a given user list
      * @author Julio Montoya
-     * @param array user list
-     * @param int access_url_id
+     * @param array $userGroupList user list
+     * @param int $urlId
      * */
     public static function update_urls_rel_usergroup($userGroupList, $urlId)
     {
@@ -987,8 +992,8 @@ class UrlManager
     /**
      * Updates the access_url_rel_course_category table with a given list
      * @author Julio Montoya
-     * @param array course category list
-     * @param int access_url_id
+     * @param array $list course category list
+     * @param int $urlId access_url_id
      **/
     public static function updateUrlRelCourseCategory($list, $urlId)
     {
@@ -1031,15 +1036,13 @@ class UrlManager
         }
     }
 
-
-
     /**
      * Updates the access_url_rel_session table with a given user list
      * @author Julio Montoya
-     * @param array user list
-     * @param int access_url_id
+     * @param array $session_list
+     * @param int $access_url_id
      * */
-    public static function update_urls_rel_session($session_list,$access_url_id)
+    public static function update_urls_rel_session($session_list, $access_url_id)
     {
         $table_url_rel_session	= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
 
@@ -1072,6 +1075,7 @@ class UrlManager
 
     /**
      * @param int $user_id
+     *
      * @return array
      */
     public static function get_access_url_from_user($user_id)
@@ -1083,6 +1087,7 @@ class UrlManager
                 WHERE user_id = ".intval($user_id);
         $result = Database::query($sql);
         $url_list = Database::store_result($result,'ASSOC');
+
         return $url_list;
     }
 
@@ -1130,6 +1135,7 @@ class UrlManager
         $sql = "SELECT id FROM $table_access_url WHERE url = '".Database::escape_string($url)."'";
         $result = Database::query($sql);
         $access_url_id = Database::result($result, 0, 0);
+
         return $access_url_id;
     }
 
@@ -1167,6 +1173,7 @@ class UrlManager
             }
         }
         $response->addAssign('ajax_list_courses', 'innerHTML', api_utf8_encode($return));
+
         return $response;
     }
 }
diff --git a/main/inc/lib/userportal.lib.php b/main/inc/lib/userportal.lib.php
index 2fccb6d5fc..9577a4ceca 100755
--- a/main/inc/lib/userportal.lib.php
+++ b/main/inc/lib/userportal.lib.php
@@ -49,7 +49,7 @@ class IndexManager
     /**
      * @param bool $setLoginForm
      */
-    function set_login_form($setLoginForm = true)
+    public function set_login_form($setLoginForm = true)
     {
         global $loginFailed;
         $this->tpl->setLoginForm($setLoginForm);
@@ -58,7 +58,7 @@ class IndexManager
     /**
      * @param array $personal_course_list
      */
-    function return_exercise_block($personal_course_list)
+    public function return_exercise_block($personal_course_list)
     {
         $exercise_list = array();
         if (!empty($personal_course_list)) {
@@ -286,7 +286,7 @@ class IndexManager
 		return $html;
 	}
 
-    function return_notice()
+    public function return_notice()
     {
         $user_selected_language = api_get_interface_language();
 
@@ -312,7 +312,7 @@ class IndexManager
         return $html;
     }
 
-    function return_help()
+    public function return_help()
     {
         $user_selected_language = api_get_interface_language();
         $platformLanguage       = api_get_setting('platformLanguage');
@@ -342,7 +342,10 @@ class IndexManager
         return $html;
     }
 
-    function return_skills_links()
+    /**
+     * @return null|string
+     */
+    public function return_skills_links()
     {
         $content = '';
         $content .= '<ul class="nav nav-pills nav-stacked">';
@@ -411,7 +414,7 @@ class IndexManager
      *
      * @version 1.0.1
      */
-    function handle_login_failed()
+    public function handle_login_failed()
     {
         return $this->tpl->handleLoginFailed();
     }
@@ -424,7 +427,7 @@ class IndexManager
      * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University - refactoring and code cleaning
      * @author Julio Montoya <gugli100@gmail.com>, Beeznest template modifs
      */
-    function return_courses_in_categories()
+    public function return_courses_in_categories()
     {
         $result = '';
         $stok = Security::get_token();
@@ -489,7 +492,8 @@ class IndexManager
                     LEFT JOIN $main_category_table t2 ON t1.code=t2.parent_id
                     LEFT JOIN $main_course_table t3 ON (t3.category_code = t1.code $platform_visible_courses)
                     WHERE t1.parent_id ". (empty ($category) ? "IS NULL" : "='$category'")."
-                    GROUP BY t1.name,t1.code,t1.parent_id,t1.children_count ORDER BY t1.tree_pos, t1.name";
+                    GROUP BY t1.name,t1.code,t1.parent_id,t1.children_count 
+                    ORDER BY t1.tree_pos, t1.name";
 
         // Showing only the category of courses of the current access_url_id
         if (api_is_multiple_url_enabled()) {
@@ -805,7 +809,7 @@ class IndexManager
     public function return_classes_block()
     {
         $html = '';
-        if (api_get_setting('show_groups_to_users') == 'true') {
+        if (api_get_setting('show_groups_to_users') === 'true') {
             $usergroup = new UserGroup();
             $usergroup_list = $usergroup->get_usergroup_by_user(api_get_user_id());
             $classes = '';
@@ -955,6 +959,9 @@ class IndexManager
         return $html;
     }
 
+    /**
+     * @return null|string
+     */
     public function return_navigation_links()
     {
         $html = '';
@@ -975,10 +982,10 @@ class IndexManager
                 $content .= '</li>';
             }
             $content .= '</ul>';
-    
+
             $html = self::show_right_block(get_lang('MainNavigation'), $content, 'navigation_link_block');
         }
-        
+
         return $html;
     }
 
@@ -1068,6 +1075,7 @@ class IndexManager
                 'courseCollapse'
             );
         }
+
         return $html;
     }