chamilo / chamilo-lms

main/gradebook/lib/fe/usertable.class.php

Indentation +116 added lines, -116 removed lines

@@ -10,128 +10,128 @@
  */
 class UserTable extends SortableTable
 {
-	private $userid;
-	private $datagen;
+    private $userid;
+    private $datagen;
 
-	/**
-	 * Constructor
-	 */
-	public function __construct($userid, $evals = array(), $links = array(), $addparams = null)
-	{
-		parent :: __construct ('userlist', null, null, 0);
-		$this->userid = $userid;
-		$this->datagen = new UserDataGenerator($userid, $evals, $links);
-		if (isset($addparams)) {
-			$this->set_additional_parameters($addparams);
-		}
-		$column = 0;
-		$this->set_header($column++, get_lang('Type'));
-		$this->set_header($column++, get_lang('Evaluation'));
-		$this->set_header($column++, get_lang('Course'));
-		$this->set_header($column++, get_lang('Category'));
-		$this->set_header($column++, get_lang('EvaluationAverage'));
-		$this->set_header($column++, get_lang('Result'));
+    /**
+     * Constructor
+     */
+    public function __construct($userid, $evals = array(), $links = array(), $addparams = null)
+    {
+        parent :: __construct ('userlist', null, null, 0);
+        $this->userid = $userid;
+        $this->datagen = new UserDataGenerator($userid, $evals, $links);
+        if (isset($addparams)) {
+            $this->set_additional_parameters($addparams);
+        }
+        $column = 0;
+        $this->set_header($column++, get_lang('Type'));
+        $this->set_header($column++, get_lang('Evaluation'));
+        $this->set_header($column++, get_lang('Course'));
+        $this->set_header($column++, get_lang('Category'));
+        $this->set_header($column++, get_lang('EvaluationAverage'));
+        $this->set_header($column++, get_lang('Result'));
 
-		$scoredisplay = ScoreDisplay :: instance();
-		if ($scoredisplay->is_custom()) {
-			$this->set_header($column++, get_lang('Display'));
-		}
-	}
+        $scoredisplay = ScoreDisplay :: instance();
+        if ($scoredisplay->is_custom()) {
+            $this->set_header($column++, get_lang('Display'));
+        }
+    }
 
-	/**
-	 * Function used by SortableTable to get total number of items in the table
-	 */
-	function get_total_number_of_items()
-	{
-		return $this->datagen->get_total_items_count();
-	}
+    /**
+     * Function used by SortableTable to get total number of items in the table
+     */
+    function get_total_number_of_items()
+    {
+        return $this->datagen->get_total_items_count();
+    }
 
-	/**
-	 * Function used by SortableTable to generate the data to display
-	 */
-	public function get_table_data($from = 1, $per_page = null, $column = null, $direction = null, $sort = null)
-	{
-		$scoredisplay = ScoreDisplay :: instance();
+    /**
+     * Function used by SortableTable to generate the data to display
+     */
+    public function get_table_data($from = 1, $per_page = null, $column = null, $direction = null, $sort = null)
+    {
+        $scoredisplay = ScoreDisplay :: instance();
 
-		// determine sorting type
-		switch ($this->column) {
-			// Type
-			case 0:
-				$sorting = UserDataGenerator :: UDG_SORT_TYPE;
-				break;
-			case 1:
-				$sorting = UserDataGenerator :: UDG_SORT_NAME;
-				break;
-			case 2:
-				$sorting = UserDataGenerator :: UDG_SORT_COURSE;
-				break;
-			case 3:
-				$sorting = UserDataGenerator :: UDG_SORT_CATEGORY;
-				break;
-			case 4:
-				$sorting = UserDataGenerator :: UDG_SORT_AVERAGE;
-				break;
-			case 5:
-				$sorting = UserDataGenerator :: UDG_SORT_SCORE;
-				break;
-			case 6:
-				$sorting = UserDataGenerator :: UDG_SORT_MASK;
-				break;
-		}
-		if ($this->direction == 'DESC') {
-			$sorting |= UserDataGenerator :: UDG_SORT_DESC;
-		} else {
-			$sorting |= UserDataGenerator :: UDG_SORT_ASC;
-		}
-		$data_array = $this->datagen->get_data($sorting, $from, $this->per_page);
-		// generate the data to display
-		$sortable_data = array();
-		foreach ($data_array as $data) {
-			if ($data[2]!="") {//filter by course removed
-				$row = array ();
-				$row[] = $this->build_type_column($data[0]);
-				$row[] = $this->build_name_link($data[0]);
-				$row[] = $data[2];
-				$row[] = $data[3];
-				$row[] = $data[4];
-				$row[] = $data[5];
-				if ($scoredisplay->is_custom())
-					$row[] = $data[6];
-				$sortable_data[] = $row;
-			}
-		}
+        // determine sorting type
+        switch ($this->column) {
+            // Type
+            case 0:
+                $sorting = UserDataGenerator :: UDG_SORT_TYPE;
+                break;
+            case 1:
+                $sorting = UserDataGenerator :: UDG_SORT_NAME;
+                break;
+            case 2:
+                $sorting = UserDataGenerator :: UDG_SORT_COURSE;
+                break;
+            case 3:
+                $sorting = UserDataGenerator :: UDG_SORT_CATEGORY;
+                break;
+            case 4:
+                $sorting = UserDataGenerator :: UDG_SORT_AVERAGE;
+                break;
+            case 5:
+                $sorting = UserDataGenerator :: UDG_SORT_SCORE;
+                break;
+            case 6:
+                $sorting = UserDataGenerator :: UDG_SORT_MASK;
+                break;
+        }
+        if ($this->direction == 'DESC') {
+            $sorting |= UserDataGenerator :: UDG_SORT_DESC;
+        } else {
+            $sorting |= UserDataGenerator :: UDG_SORT_ASC;
+        }
+        $data_array = $this->datagen->get_data($sorting, $from, $this->per_page);
+        // generate the data to display
+        $sortable_data = array();
+        foreach ($data_array as $data) {
+            if ($data[2]!="") {//filter by course removed
+                $row = array ();
+                $row[] = $this->build_type_column($data[0]);
+                $row[] = $this->build_name_link($data[0]);
+                $row[] = $data[2];
+                $row[] = $data[3];
+                $row[] = $data[4];
+                $row[] = $data[5];
+                if ($scoredisplay->is_custom())
+                    $row[] = $data[6];
+                $sortable_data[] = $row;
+            }
+        }
 
-		return $sortable_data;
-	}
+        return $sortable_data;
+    }
 
-	/**
-	 * @param $item
-	 * @return string
-	 */
-	private function build_type_column($item)
-	{
-		return GradebookUtils::build_type_icon_tag($item->get_icon_name());
-	}
+    /**
+     * @param $item
+     * @return string
+     */
+    private function build_type_column($item)
+    {
+        return GradebookUtils::build_type_icon_tag($item->get_icon_name());
+    }
 
-	/**
-	 * @param $item
-	 * @return string
-	 */
-	private function build_name_link($item)
-	{
-		switch ($item->get_item_type()) {
-			// evaluation
-			case 'E' :
-				return ' '
-				. '<a href="gradebook_view_result.php?selecteval=' . $item->get_id() . '">'
-				. $item->get_name()
-				. '</a>';
-			// link
-			case 'L' :
-				return '&nbsp;<a href="' . $item->get_link() . '">'
-				. $item->get_name()
-				. '</a>'
-				. '&nbsp;[' . $item->get_type_name() . ']';
-		}
-	}
+    /**
+     * @param $item
+     * @return string
+     */
+    private function build_name_link($item)
+    {
+        switch ($item->get_item_type()) {
+            // evaluation
+            case 'E' :
+                return '&nbsp;'
+                . '<a href="gradebook_view_result.php?selecteval=' . $item->get_id() . '">'
+                . $item->get_name()
+                . '</a>';
+            // link
+            case 'L' :
+                return '&nbsp;<a href="' . $item->get_link() . '">'
+                . $item->get_name()
+                . '</a>'
+                . '&nbsp;[' . $item->get_type_name() . ']';
+        }
+    }
 }

app/Resources/public/assets/ckeditor/samples/old/assets/posteddata.php

Indentation +9 added lines, -9 removed lines

@@ -27,22 +27,22 @@
 

 if (!empty($_POST))

 {

-	foreach ( $_POST as $key => $value )

-	{

-		if ( ( !is_string($value) && !is_numeric($value) ) || !is_string($key) )

-			continue;

+    foreach ( $_POST as $key => $value )

+    {

+        if ( ( !is_string($value) && !is_numeric($value) ) || !is_string($key) )

+            continue;

 

-		if ( get_magic_quotes_gpc() )

-			$value = htmlspecialchars( stripslashes((string)$value) );

-		else

-			$value = htmlspecialchars( (string)$value );

+        if ( get_magic_quotes_gpc() )

+            $value = htmlspecialchars( stripslashes((string)$value) );

+        else

+            $value = htmlspecialchars( (string)$value );

 ?>

 		<tr>

 			<th style="vertical-align: top"><?php echo htmlspecialchars( (string)$key ); ?></th>

 			<td><pre class="samples"><?php echo $value; ?></pre></td>

 		</tr>

 	<?php

-	}

+    }

 }

 ?>

 	</table>

main/inc/lib/system_announcements.lib.php

Indentation +428 added lines, -428 removed lines

@@ -10,17 +10,17 @@ 
     CONST VISIBLE_STUDENT = 2;
     CONST VISIBLE_TEACHER = 3;
 
-	/**
-	 * Displays all announcements
-	 * @param int $visible VISIBLE_GUEST, VISIBLE_STUDENT or VISIBLE_TEACHER
-	 * @param int $id The identifier of the announcement to display
-	 */
-	public static function display_announcements($visible, $id = -1)
+    /**
+     * Displays all announcements
+     * @param int $visible VISIBLE_GUEST, VISIBLE_STUDENT or VISIBLE_TEACHER
+     * @param int $id The identifier of the announcement to display
+     */
+    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();
@@ -55,47 +55,47 @@ 
                         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>
+        $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">
+                } else {
+                    echo '<div class="system_announcement">
 							<div class="system_announcement_title">'
-								.$announcement->display_date.'
+                                .$announcement->display_date.'
 								<a name="ann'.$announcement->id.'" href="'.$url.'?'.$query_string.'#ann'.$announcement->id.'">'.$announcement->title.'</a>
 							</div>';
-				}
-				echo '<br />';
-			}
-			echo '</div>';
-		}
-		return;
-	}
+                }
+                echo '<br />';
+            }
+            echo '</div>';
+        }
+        return;
+    }
 
     /**
      * @param $visible
@@ -106,100 +106,100 @@ 
      */
     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."
+        $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;
-		}
-
-	    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>
+        }
+
+        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.'
+                                    .$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;
-	}
+                $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;
+    }
 
     /**
      * @param int $user_id
@@ -207,23 +207,23 @@ 
      */
     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 @@ 
      */
     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.'
+        $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()
+        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()
     {
-		$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
+        $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";
-
-		$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
-	 */
+        $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;
+    }
+
+    /**
+     * 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,115 +321,115 @@ 
         $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;
-		}
-
-		$start = api_get_utc_datetime($date_start);
+            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);
         $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);
-
-
-		$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,
-		];
-
-		$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;
-
-		}
-
-		return false;
-	}
+        //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,
+        ];
+
+        $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;
+
+        }
+
+        return false;
+    }
 
     /**
-    * Makes the announcement id visible only for groups in groups_array
-    * @param int announcement id
-    * @param array array of group id
-    **/
+     * Makes the announcement id visible only for groups in groups_array
+     * @param int announcement id
+     * @param array array of group id
+     **/
     public static function announcement_for_groups($announcement_id, $group_array)
     {
         $tbl_announcement_group = Database:: get_main_table(
@@ -463,10 +463,10 @@ 
     }
 
     /**
-    * Gets the groups of this announce
-    * @param int announcement id
-    * @return array array of group id
-    **/
+     * Gets the groups of this announce
+     * @param int announcement id
+     * @return array array of group id
+     **/
     public static function get_announcement_groups($announcement_id)
     {
         $tbl_announcement_group = Database :: get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS_GROUPS);
@@ -485,15 +485,15 @@ 
         return $groups;
     }
 
-	/**
-	 * Updates an announcement to the database
-	 * @param integer $id      : id of the announcement
-	 * @param string  $title   : title of the announcement
-	 * @param string  $content : content of the announcement
-	 * @param array $date_start: start date of announcement (0 => day ; 1 => month ; 2 => year ; 3 => hour ; 4 => minute)
-	 * @param array $date_end : end date of announcement (0 => day ; 1 => month ; 2 => year ; 3 => hour ; 4 => minute)
-	 * @return	bool	True on success, false on failure
-	 */
+    /**
+     * Updates an announcement to the database
+     * @param integer $id      : id of the announcement
+     * @param string  $title   : title of the announcement
+     * @param string  $content : content of the announcement
+     * @param array $date_start: start date of announcement (0 => day ; 1 => month ; 2 => year ; 3 => hour ; 4 => minute)
+     * @param array $date_end : end date of announcement (0 => day ; 1 => month ; 2 => year ; 3 => hour ; 4 => minute)
+     * @return	bool	True on success, false on failure
+     */
     public static function update_announcement(
         $id,
         $title,
@@ -509,43 +509,43 @@ 
     ) {
         $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] ||
+        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;
-		}
+            Display :: display_normal_message(get_lang('InvalidEndDate'));
+            return false;
+        }
 
-		if (strlen(trim($title)) == 0) {
-			Display::display_normal_message(get_lang('InvalidTitle'));
-			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);
+        //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);
 
@@ -595,84 +595,84 @@ 
         $em->merge($announcement);
         $em->flush();
 
-		return true;
-	}
+        return true;
+    }
 
-	/**
-	 * Deletes an announcement
-	 * @param 	int $id The identifier of the announcement that should be
-	 * @return	bool	True on success, false on failure
-	 */
-	public static function delete_announcement($id)
+    /**
+     * Deletes an announcement
+     * @param 	int $id The identifier of the announcement that should be
+     * @return	bool	True on success, false on failure
+     */
+    public static function delete_announcement($id)
     {
-		$db_table = Database :: get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS);
-		$id = intval($id);
-		$sql = "DELETE FROM ".$db_table." WHERE id =".$id;
-		$res = Database::query($sql);
-		if ($res === false) {
-
-			return false;
-		}
-		return true;
-	}
-
-	/**
-	 * Gets an announcement
-	 * @param 	int		$id The identifier of the announcement that should be
-	 * @return	object	Object of class StdClass or the required class, containing the query result row
-	 */
-	public static function get_announcement($id)
+        $db_table = Database :: get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS);
+        $id = intval($id);
+        $sql = "DELETE FROM ".$db_table." WHERE id =".$id;
+        $res = Database::query($sql);
+        if ($res === false) {
+
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * Gets an announcement
+     * @param 	int		$id The identifier of the announcement that should be
+     * @return	object	Object of class StdClass or the required class, containing the query result row
+     */
+    public static function get_announcement($id)
     {
-		$db_table = Database :: get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS);
-		$id = intval($id);
-		$sql = "SELECT * FROM ".$db_table." WHERE id = ".$id;
-		$announcement = Database::fetch_object(Database::query($sql));
-
-		return $announcement;
-	}
-
-	/**
-	 * Change the visibility of an announcement
-	 * @param 	int $announcement_id
-	 * @param 	int $user For who should the visibility be changed
+        $db_table = Database :: get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS);
+        $id = intval($id);
+        $sql = "SELECT * FROM ".$db_table." WHERE id = ".$id;
+        $announcement = Database::fetch_object(Database::query($sql));
+
+        return $announcement;
+    }
+
+    /**
+     * Change the visibility of an announcement
+     * @param 	int $announcement_id
+     * @param 	int $user For who should the visibility be changed
      * (possible values are VISIBLE_TEACHER, VISIBLE_STUDENT, VISIBLE_GUEST)
-	 * @return 	bool	True on success, false on failure
-	 */
-	public static function set_visibility($announcement_id, $user, $visible)
+     * @return 	bool	True on success, false on failure
+     */
+    public static function set_visibility($announcement_id, $user, $visible)
     {
-		$db_table = Database::get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS);
-		$visible = intval($visible);
-		$announcement_id = intval($announcement_id);
+        $db_table = Database::get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS);
+        $visible = intval($visible);
+        $announcement_id = intval($announcement_id);
 
         if (!in_array($user, array(self::VISIBLE_GUEST, self::VISIBLE_STUDENT, self::VISIBLE_TEACHER))) {
             return false;
         }
 
-		$field = ($user == self::VISIBLE_TEACHER ? 'visible_teacher' : ($user == self::VISIBLE_STUDENT ? 'visible_student' : 'visible_guest'));
+        $field = ($user == self::VISIBLE_TEACHER ? 'visible_teacher' : ($user == self::VISIBLE_STUDENT ? 'visible_student' : 'visible_guest'));
 
-		$sql = "UPDATE ".$db_table." SET ".$field." = '".$visible."'
+        $sql = "UPDATE ".$db_table." SET ".$field." = '".$visible."'
 		        WHERE id='".$announcement_id."'";
-		$res = Database::query($sql);
-
-		if ($res === false) {
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * Send a system announcement by e-mail to all teachers/students depending on parameters
-	 * @param	string	Title
-	 * @param	string	Content
-	 * @param	int		Whether to send to all teachers (1) or not (0)
-	 * @param	int		Whether to send to all students (1) or not (0)
-	 * @param	string	Language (optional, considered for all languages if left empty)
+        $res = Database::query($sql);
+
+        if ($res === false) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Send a system announcement by e-mail to all teachers/students depending on parameters
+     * @param	string	Title
+     * @param	string	Content
+     * @param	int		Whether to send to all teachers (1) or not (0)
+     * @param	int		Whether to send to all students (1) or not (0)
+     * @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;
+        global $charset;
 
         $title = api_html_entity_decode(stripslashes($title), ENT_QUOTES, $charset);
         $content = api_html_entity_decode(stripslashes(str_replace(array('\r\n', '\n', '\r'),'', $content)), ENT_QUOTES, $charset);
@@ -691,22 +691,22 @@ 
         }
 
         if ($teacher <> 0 AND $student == 0) {
-			$sql = "SELECT DISTINCT u.user_id FROM $user_table u $url_condition WHERE status = '1' ";
-		}
+            $sql = "SELECT DISTINCT u.user_id FROM $user_table u $url_condition WHERE status = '1' ";
+        }
 
-		if ($teacher == 0 AND $student <> 0) {
-			$sql = "SELECT DISTINCT u.user_id FROM $user_table u $url_condition WHERE status = '5' ";
-		}
+        if ($teacher == 0 AND $student <> 0) {
+            $sql = "SELECT DISTINCT u.user_id FROM $user_table u $url_condition WHERE status = '5' ";
+        }
 
-		if ($teacher<> 0 AND $student <> 0) {
-			$sql = "SELECT DISTINCT u.user_id FROM $user_table u $url_condition WHERE 1 = 1 ";
-		}
+        if ($teacher<> 0 AND $student <> 0) {
+            $sql = "SELECT DISTINCT u.user_id FROM $user_table u $url_condition WHERE 1 = 1 ";
+        }
 
-		if (!empty($language)) { //special condition because language was already treated for SQL insert before
-			$sql .= " AND language = '".Database::escape_string($language)."' ";
-		}
+        if (!empty($language)) { //special condition because language was already treated for SQL insert before
+            $sql .= " AND language = '".Database::escape_string($language)."' ";
+        }
 
-		if (api_is_multiple_url_enabled()) {
+        if (api_is_multiple_url_enabled()) {
             $sql .= " AND access_url_id = '".$current_access_url_id."' ";
         }
 
@@ -716,25 +716,25 @@ 
         // Expiration date
         $sql .= " AND (expiration_date = '' OR expiration_date IS NULL OR expiration_date > '$now') ";
 
-		if ((empty($teacher) or $teacher == '0') AND  (empty($student) or $student == '0')) {
-			return true;
-		}
+        if ((empty($teacher) or $teacher == '0') AND  (empty($student) or $student == '0')) {
+            return true;
+        }
 
-		$result = Database::query($sql);
-		if ($result === false) {
-			return false;
-		}
+        $result = Database::query($sql);
+        if ($result === false) {
+            return false;
+        }
 
         $message_sent = false;
 
-		while ($row = Database::fetch_array($result,'ASSOC')) {
+        while ($row = Database::fetch_array($result,'ASSOC')) {
             MessageManager::send_message_simple($row['user_id'], $title, $content);
             $message_sent = true;
-		}
-		return $message_sent; //true if at least one e-mail was sent
-	}
+        }
+        return $message_sent; //true if at least one e-mail was sent
+    }
 
-	/**
+    /**
      * Displays announcements as an slideshow
      * @param int $visible VISIBLE_GUEST, VISIBLE_STUDENT or VISIBLE_TEACHER
      * @param int $id The identifier of the announcement to display

plugin/customfooter/lib/customfooter_plugin.class.php

Indentation +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
         parent::__construct('1.1', 'Valery Fremaux');
     }
 
-	function pix_url($pixname, $size = 16) {
+    function pix_url($pixname, $size = 16) {
         global $_configuration;
 
         if (file_exists($_configuration['root_sys'].'/plugin/customplugin/pix/'.$pixname.'.png')){

main/document/create_paint.php

Indentation +13 added lines, -13 removed lines

@@ -50,26 +50,26 @@ 
 // Please, do not modify this dirname formatting
 
 if (strstr($dir, '..')) {
-	$dir = '/';
+    $dir = '/';
 }
 
 if ($dir[0] == '.') {
-	$dir = substr($dir, 1);
+    $dir = substr($dir, 1);
 }
 
 if ($dir[0] != '/') {
-	$dir = '/'.$dir;
+    $dir = '/'.$dir;
 }
 
 if ($dir[strlen($dir) - 1] != '/') {
-	$dir .= '/';
+    $dir .= '/';
 }
 
 $filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document'.$dir;
 
 if (!is_dir($filepath)) {
-	$filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document/';
-	$dir = '/';
+    $filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document/';
+    $dir = '/';
 }
 
 $groupId = api_get_group_id();
@@ -97,7 +97,7 @@ 
 }
 
 if (!($is_allowed_to_edit || $_SESSION['group_member_with_upload_rights'] ||
-	DocumentManager::is_my_shared_folder($_user['user_id'], Security::remove_XSS($dir), api_get_session_id()))
+    DocumentManager::is_my_shared_folder($_user['user_id'], Security::remove_XSS($dir), api_get_session_id()))
 ) {
     api_not_allowed(true);
 }
@@ -114,7 +114,7 @@ 
 
 // Interbreadcrumb for the current directory root path
 if (empty($document_data['parents'])) {
-	$interbreadcrumb[] = array('url' => '#', 'name' => $document_data['title']);
+    $interbreadcrumb[] = array('url' => '#', 'name' => $document_data['title']);
 } else {
     foreach ($document_data['parents'] as $document_sub_data) {
         $interbreadcrumb[] = array('url' => $document_sub_data['document_url'], 'name' => $document_sub_data['title']);
@@ -147,17 +147,17 @@ 
 $locktitle="false";
 
 if ($_SERVER['HTTP_HOST']=="localhost") {
-	$path_and_file= api_get_path(SYS_PATH).'/crossdomain.xml';
-	if (!file_exists($path_and_file)) {
-		$crossdomain='<?xml version="1.0"?>
+    $path_and_file= api_get_path(SYS_PATH).'/crossdomain.xml';
+    if (!file_exists($path_and_file)) {
+        $crossdomain='<?xml version="1.0"?>
 			<!DOCTYPE cross-domain-policy SYSTEM "http://www.adobe.com/xml/dtds/cross-domain-policy.dtd">
 			<cross-domain-policy>
 				<allow-access-from domain="cdn.pixlr.com" />
 				<site-control permitted-cross-domain-policies="master-only"/>
 				<allow-http-request-headers-from domain="cnd.pixlr.com" headers="*" secure="true"/>
 			</cross-domain-policy>';//more open domain="*"
-		@file_put_contents($path_and_file, $crossdomain);
-	}
+        @file_put_contents($path_and_file, $crossdomain);
+    }
     $credentials = "true";
 } else {
     $credentials = "false";

main/gradebook/lib/fe/resulttable.class.php

Indentation +154 added lines, -154 removed lines

@@ -10,166 +10,166 @@
  */
 class ResultTable extends SortableTable
 {
-	private $datagen;
-	private $evaluation;
-	private $allresults;
-	private $iscourse;
-
-	/**
-	 * Constructor
-	 */
+    private $datagen;
+    private $evaluation;
+    private $allresults;
+    private $iscourse;
+
+    /**
+     * Constructor
+     */
     public function __construct($evaluation, $results = array(), $iscourse, $addparams = null,$forprint = false)
-	{
-    	parent :: __construct('resultlist', null, null, (api_is_western_name_order() xor api_sort_by_first_name()) ? 2 : 1);
-
-		$this->datagen = new ResultsDataGenerator($evaluation, $results, true);
-
-		$this->evaluation = $evaluation;
-		$this->iscourse = $iscourse;
-		$this->forprint = $forprint;
-
-		if (isset ($addparams))  {
-			$this->set_additional_parameters($addparams);
-		}
-		$scoredisplay = ScoreDisplay :: instance();
-		$column= 0;
-		if ($this->iscourse == '1') {
-			$this->set_header($column++, '', false);
-			$this->set_form_actions(array (
-					'delete' => get_lang('Delete')
-			));
-		}
-		if (api_is_western_name_order()) {
-			$this->set_header($column++, get_lang('FirstName'));
-			$this->set_header($column++, get_lang('LastName'));
-		} else {
-			$this->set_header($column++, get_lang('LastName'));
-			$this->set_header($column++, get_lang('FirstName'));
-		}
-		$this->set_header($column++, get_lang('Score'));
-		if ($scoredisplay->is_custom()) {
-			$this->set_header($column++, get_lang('Display'));
-		}
-		if (!$this->forprint) {
-			$this->set_header($column++, get_lang('Modify'),false);
-		}
+    {
+        parent :: __construct('resultlist', null, null, (api_is_western_name_order() xor api_sort_by_first_name()) ? 2 : 1);
+
+        $this->datagen = new ResultsDataGenerator($evaluation, $results, true);
+
+        $this->evaluation = $evaluation;
+        $this->iscourse = $iscourse;
+        $this->forprint = $forprint;
+
+        if (isset ($addparams))  {
+            $this->set_additional_parameters($addparams);
+        }
+        $scoredisplay = ScoreDisplay :: instance();
+        $column= 0;
+        if ($this->iscourse == '1') {
+            $this->set_header($column++, '', false);
+            $this->set_form_actions(array (
+                    'delete' => get_lang('Delete')
+            ));
+        }
+        if (api_is_western_name_order()) {
+            $this->set_header($column++, get_lang('FirstName'));
+            $this->set_header($column++, get_lang('LastName'));
+        } else {
+            $this->set_header($column++, get_lang('LastName'));
+            $this->set_header($column++, get_lang('FirstName'));
+        }
+        $this->set_header($column++, get_lang('Score'));
+        if ($scoredisplay->is_custom()) {
+            $this->set_header($column++, get_lang('Display'));
+        }
+        if (!$this->forprint) {
+            $this->set_header($column++, get_lang('Modify'),false);
+        }
     }
 
 
-	/**
-	 * Function used by SortableTable to get total number of items in the table
-	 */
-	public function get_total_number_of_items ()
+    /**
+     * Function used by SortableTable to get total number of items in the table
+     */
+    public function get_total_number_of_items ()
     {
-		return $this->datagen->get_total_results_count();
-	}
-
-	/**
-	 * Function used by SortableTable to generate the data to display
-	 */
-	public function get_table_data($from = 1, $per_page = null, $column = null, $direction = null, $sort = null) {
-
-		$is_western_name_order = api_is_western_name_order();
-		$scoredisplay = ScoreDisplay :: instance();
-
-		// determine sorting type
-		$col_adjust = $this->iscourse == '1' ? 1 : 0;
-
-		switch ($this->column) {
-			// first name or last name
-			case (0 + $col_adjust):
-				if ($is_western_name_order) {
-					$sorting = ResultsDataGenerator :: RDG_SORT_FIRSTNAME;
-				} else {
-					$sorting = ResultsDataGenerator :: RDG_SORT_LASTNAME;
-				}
-				break;
+        return $this->datagen->get_total_results_count();
+    }
+
+    /**
+     * Function used by SortableTable to generate the data to display
+     */
+    public function get_table_data($from = 1, $per_page = null, $column = null, $direction = null, $sort = null) {
+
+        $is_western_name_order = api_is_western_name_order();
+        $scoredisplay = ScoreDisplay :: instance();
+
+        // determine sorting type
+        $col_adjust = $this->iscourse == '1' ? 1 : 0;
+
+        switch ($this->column) {
             // first name or last name
-			case (1 + $col_adjust):
-				if ($is_western_name_order) {
-					$sorting = ResultsDataGenerator :: RDG_SORT_LASTNAME;
-				} else {
-					$sorting = ResultsDataGenerator :: RDG_SORT_FIRSTNAME;
-				}
-				break;
+            case (0 + $col_adjust):
+                if ($is_western_name_order) {
+                    $sorting = ResultsDataGenerator :: RDG_SORT_FIRSTNAME;
+                } else {
+                    $sorting = ResultsDataGenerator :: RDG_SORT_LASTNAME;
+                }
+                break;
+            // first name or last name
+            case (1 + $col_adjust):
+                if ($is_western_name_order) {
+                    $sorting = ResultsDataGenerator :: RDG_SORT_LASTNAME;
+                } else {
+                    $sorting = ResultsDataGenerator :: RDG_SORT_FIRSTNAME;
+                }
+                break;
             //Score
-			case (2 + $col_adjust):
-				$sorting = ResultsDataGenerator :: RDG_SORT_SCORE;
-				break;
-			case (3 + $col_adjust):
-				$sorting = ResultsDataGenerator :: RDG_SORT_MASK;
-				break;
-		}
-
-		if ($this->direction == 'DESC') {
-			$sorting |= ResultsDataGenerator :: RDG_SORT_DESC;
-		} else {
-			$sorting |= ResultsDataGenerator :: RDG_SORT_ASC;
-		}
-
-		$data_array = $this->datagen->get_data($sorting, $from, $this->per_page);
-
-		// generate the data to display
-		$sortable_data = array();
-		foreach ($data_array as $item) {
-			$row = array ();
-			if ($this->iscourse == '1') {
-				 $row[] = $item['result_id'];
-			}
-			if ($is_western_name_order) {
-				$row[] = $item['firstname'];
-				$row[] = $item['lastname'];
-			} else {
-				$row[] = $item['lastname'];
-				$row[] = $item['firstname'];
-			}
-
-			$row[] =  Display::bar_progress($item['percentage_score'], false, $item['score']);
+            case (2 + $col_adjust):
+                $sorting = ResultsDataGenerator :: RDG_SORT_SCORE;
+                break;
+            case (3 + $col_adjust):
+                $sorting = ResultsDataGenerator :: RDG_SORT_MASK;
+                break;
+        }
+
+        if ($this->direction == 'DESC') {
+            $sorting |= ResultsDataGenerator :: RDG_SORT_DESC;
+        } else {
+            $sorting |= ResultsDataGenerator :: RDG_SORT_ASC;
+        }
+
+        $data_array = $this->datagen->get_data($sorting, $from, $this->per_page);
+
+        // generate the data to display
+        $sortable_data = array();
+        foreach ($data_array as $item) {
+            $row = array ();
+            if ($this->iscourse == '1') {
+                    $row[] = $item['result_id'];
+            }
+            if ($is_western_name_order) {
+                $row[] = $item['firstname'];
+                $row[] = $item['lastname'];
+            } else {
+                $row[] = $item['lastname'];
+                $row[] = $item['firstname'];
+            }
+
+            $row[] =  Display::bar_progress($item['percentage_score'], false, $item['score']);
             //$row[] =  Display::bar_progress($item['percentage_score'], true);
-			if ($scoredisplay->is_custom()) {
-				$row[] = $item['display'];
-			}
-			if (!$this->forprint) {
-				$row[] = $this->build_edit_column ($item);
-			}
-			$sortable_data[] = $row;
-		}
-
-		return $sortable_data;
-	}
-
-	private function build_edit_column ($item)
-	{
-		$status = CourseManager::get_user_in_course_status(api_get_user_id(), api_get_course_id());
-		$locked_status = $this->evaluation->get_locked();
-		if (api_is_allowed_to_edit(null, true) && $locked_status == 0) {
-			//api_is_course_admin()
-			$edit_column = '<a href="' . api_get_self() . '?editres=' . $item['result_id'] . '&selecteval=' . $this->evaluation->get_id().'&'.api_get_cidreq().'">'.
-				Display::return_icon('edit.png', get_lang('Modify'),'','22').'</a>';
-			$edit_column .= ' <a href="' . api_get_self() . '?delete_mark=' . $item['result_id'] . '&selecteval=' . $this->evaluation->get_id().'&'.api_get_cidreq().'">'.
-				Display::return_icon('delete.png', get_lang('Delete'),'','22').'</a>';
-		}
-
-		if ($this->evaluation->get_course_code() == null) {
-			$edit_column .= '&nbsp;<a href="' . api_get_self() . '?resultdelete=' . $item['result_id'] . '&selecteval=' . $this->evaluation->get_id() . '" onclick="return confirmationuser();">';
-			$edit_column .= Display::return_icon('delete.png', get_lang('Delete'));
-			$edit_column .= '</a>';
-		    $edit_column .= '&nbsp;<a href="user_stats.php?userid=' . $item['id'] . '&selecteval=' . $this->evaluation->get_id() . '&'.api_get_cidreq().'">';
-			$edit_column .= Display::return_icon('statistics.gif', get_lang('Statistics'));
-		    $edit_column .= '</a>';
-		}
-
-		// Evaluation's origin is a link
-		if ($this->evaluation->get_category_id() < 0) {
-			$link = LinkFactory::get_evaluation_link($this->evaluation->get_id());
-			$doc_url = $link->get_view_url($item['id']);
-
-			if ($doc_url != null) {
-				$edit_column .= '&nbsp;<a href="'. $doc_url . '" target="_blank">';
-				$edit_column .= Display::return_icon('link.gif', get_lang('OpenDocument')).'</a>';
-			}
-		}
-
-		return $edit_column;
-	}
+            if ($scoredisplay->is_custom()) {
+                $row[] = $item['display'];
+            }
+            if (!$this->forprint) {
+                $row[] = $this->build_edit_column ($item);
+            }
+            $sortable_data[] = $row;
+        }
+
+        return $sortable_data;
+    }
+
+    private function build_edit_column ($item)
+    {
+        $status = CourseManager::get_user_in_course_status(api_get_user_id(), api_get_course_id());
+        $locked_status = $this->evaluation->get_locked();
+        if (api_is_allowed_to_edit(null, true) && $locked_status == 0) {
+            //api_is_course_admin()
+            $edit_column = '<a href="' . api_get_self() . '?editres=' . $item['result_id'] . '&selecteval=' . $this->evaluation->get_id().'&'.api_get_cidreq().'">'.
+                Display::return_icon('edit.png', get_lang('Modify'),'','22').'</a>';
+            $edit_column .= ' <a href="' . api_get_self() . '?delete_mark=' . $item['result_id'] . '&selecteval=' . $this->evaluation->get_id().'&'.api_get_cidreq().'">'.
+                Display::return_icon('delete.png', get_lang('Delete'),'','22').'</a>';
+        }
+
+        if ($this->evaluation->get_course_code() == null) {
+            $edit_column .= '&nbsp;<a href="' . api_get_self() . '?resultdelete=' . $item['result_id'] . '&selecteval=' . $this->evaluation->get_id() . '" onclick="return confirmationuser();">';
+            $edit_column .= Display::return_icon('delete.png', get_lang('Delete'));
+            $edit_column .= '</a>';
+            $edit_column .= '&nbsp;<a href="user_stats.php?userid=' . $item['id'] . '&selecteval=' . $this->evaluation->get_id() . '&'.api_get_cidreq().'">';
+            $edit_column .= Display::return_icon('statistics.gif', get_lang('Statistics'));
+            $edit_column .= '</a>';
+        }
+
+        // Evaluation's origin is a link
+        if ($this->evaluation->get_category_id() < 0) {
+            $link = LinkFactory::get_evaluation_link($this->evaluation->get_id());
+            $doc_url = $link->get_view_url($item['id']);
+
+            if ($doc_url != null) {
+                $edit_column .= '&nbsp;<a href="'. $doc_url . '" target="_blank">';
+                $edit_column .= Display::return_icon('link.gif', get_lang('OpenDocument')).'</a>';
+            }
+        }
+
+        return $edit_column;
+    }
 }

main/document/edit_paint.php

Indentation +35 added lines, -35 removed lines

@@ -61,44 +61,44 @@ 
 /* Please, do not modify this dirname formatting */
 
 if (strstr($dir, '..')) {
-	$dir = '/';
+    $dir = '/';
 }
 
 if ($dir[0] == '.') {
-	$dir = substr($dir, 1);
+    $dir = substr($dir, 1);
 }
 
 if ($dir[0] != '/') {
-	$dir = '/'.$dir;
+    $dir = '/'.$dir;
 }
 
 if ($dir[strlen($dir) - 1] != '/') {
-	$dir .= '/';
+    $dir .= '/';
 }
 
 $filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document'.$dir;
 
 if (!is_dir($filepath)) {
-	$filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document/';
-	$dir = '/';
+    $filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document/';
+    $dir = '/';
 }
 
 //groups //TODO:clean
 if (!empty($groupId)) {
-	$interbreadcrumb[] = array(
-		'url' => api_get_path(WEB_CODE_PATH).'group/group_space.php?'.api_get_cidreq(),
-		'name' => get_lang('GroupSpace'),
-	);
-	$group_document = true;
-	$noPHP_SELF = true;
+    $interbreadcrumb[] = array(
+        'url' => api_get_path(WEB_CODE_PATH).'group/group_space.php?'.api_get_cidreq(),
+        'name' => get_lang('GroupSpace'),
+    );
+    $group_document = true;
+    $noPHP_SELF = true;
 }
 
 $is_certificate_mode = DocumentManager::is_certificate_mode($dir);
 
 if (!$is_certificate_mode)
-	$interbreadcrumb[]= array("url" => "./document.php?curdirpath=".urlencode($my_cur_dir_path).'&'.api_get_cidreq(), "name"=> get_lang('Documents'));
+    $interbreadcrumb[]= array("url" => "./document.php?curdirpath=".urlencode($my_cur_dir_path).'&'.api_get_cidreq(), "name"=> get_lang('Documents'));
 else
-	$interbreadcrumb[]= array ('url' => '../gradebook/'.$_SESSION['gradebook_dest'], 'name' => get_lang('Gradebook'));
+    $interbreadcrumb[]= array ('url' => '../gradebook/'.$_SESSION['gradebook_dest'], 'name' => get_lang('Gradebook'));
 
 // Interbreadcrumb for the current directory root path
 if (empty($document_data['parents'])) {
@@ -113,10 +113,10 @@ 
 }
 
 $is_allowedToEdit = api_is_allowed_to_edit(null, true) || $_SESSION['group_member_with_upload_rights'] ||
-	DocumentManager::is_my_shared_folder(api_get_user_id(), $dir, $current_session_id);
+    DocumentManager::is_my_shared_folder(api_get_user_id(), $dir, $current_session_id);
 
 if (!$is_allowedToEdit) {
-	api_not_allowed(true);
+    api_not_allowed(true);
 }
 
 Event::event_access_tool(TOOL_DOCUMENT);
@@ -148,21 +148,21 @@ 
 $locktitle="false";
 
 if ($_SERVER['HTTP_HOST']=="localhost") {
-	$path_and_file= api_get_path(SYS_PATH).'/crossdomain.xml';
-	if (!file_exists($path_and_file)) {
-		$crossdomain='<?xml version="1.0"?>
+    $path_and_file= api_get_path(SYS_PATH).'/crossdomain.xml';
+    if (!file_exists($path_and_file)) {
+        $crossdomain='<?xml version="1.0"?>
 			<!DOCTYPE cross-domain-policy SYSTEM "http://www.adobe.com/xml/dtds/cross-domain-policy.dtd">
 			<cross-domain-policy>
 				<allow-access-from domain="cdn.pixlr.com" />
 				<site-control permitted-cross-domain-policies="master-only"/>
 				<allow-http-request-headers-from domain="cnd.pixlr.com" headers="*" secure="true"/>
 			</cross-domain-policy>';//more open domain="*"
-		@file_put_contents($path_and_file, $crossdomain);
-	}
-	$credentials="true";
+        @file_put_contents($path_and_file, $crossdomain);
+    }
+    $credentials="true";
 }
 else {
-	$credentials="false";
+    $credentials="false";
 }
 
 //make temp images
@@ -175,23 +175,23 @@ 
 $htaccess=api_get_path(SYS_ARCHIVE_PATH).'temp/images/.htaccess';
 if (!file_exists($htaccess)) {
 
-	$htaccess_content="order deny,allow\r\nallow from all\r\nOptions -Indexes";
+    $htaccess_content="order deny,allow\r\nallow from all\r\nOptions -Indexes";
 
-	$fp = @ fopen(api_get_path(SYS_ARCHIVE_PATH).'temp/images/.htaccess', 'w');
-	if ($fp) {
-		fwrite($fp, $htaccess_content);
-		fclose($fp);
-	}
+    $fp = @ fopen(api_get_path(SYS_ARCHIVE_PATH).'temp/images/.htaccess', 'w');
+    if ($fp) {
+        fwrite($fp, $htaccess_content);
+        fclose($fp);
+    }
 }
 
 $html_index=api_get_path(SYS_ARCHIVE_PATH).'temp/images/index.html';
 if (!file_exists($html_index)) {
-	$html_index_content="<html><head></head><body></body></html>";
-	$fp = @ fopen(api_get_path(SYS_ARCHIVE_PATH).'temp/images/index.html', 'w');
-	if ($fp) {
-		fwrite($fp, $html_index_content);
-		fclose($fp);
-	}
+    $html_index_content="<html><head></head><body></body></html>";
+    $fp = @ fopen(api_get_path(SYS_ARCHIVE_PATH).'temp/images/index.html', 'w');
+    if ($fp) {
+        fwrite($fp, $html_index_content);
+        fclose($fp);
+    }
 }
 
 //encript temp name file

custompages/first_login-dist.php

Indentation +23 added lines, -23 removed lines

@@ -14,7 +14,7 @@ 
  * Security checks
  */
 if (! isset($_SESSION['conditional_login']['uid']))
-  die("Not Authorised");
+    die("Not Authorised");
 
 if (isset($_POST['password'])) {
     $u = api_get_user_info($_SESSION['conditional_login']['uid']);
@@ -27,26 +27,26 @@ 
         exit();
     }
     $password = $_POST['password'];
-	$updated = UserManager::update_user(
-		$u['user_id'],
-		$u['firstname'],
-		$u['lastname'],
-		$u['username'],
-		$password,
-		$u['auth_source'],
-		$u['email'],
-		$u['status'],
-		$u['official_code'],
-		$u['phone'],
-		$u['picture_uri'],
-		$u['expiration_date'],
-		$u['active'],
-		$u['creator_id'],
-		$u['hr_dept_id'],
-		null,
-		$u['language'],
-		''
-	);
+    $updated = UserManager::update_user(
+        $u['user_id'],
+        $u['firstname'],
+        $u['lastname'],
+        $u['username'],
+        $password,
+        $u['auth_source'],
+        $u['email'],
+        $u['status'],
+        $u['official_code'],
+        $u['phone'],
+        $u['picture_uri'],
+        $u['expiration_date'],
+        $u['active'],
+        $u['creator_id'],
+        $u['hr_dept_id'],
+        null,
+        $u['language'],
+        ''
+    );
 
     if ($updated !== false) {
         UserManager::update_extra_field_value($u['user_id'], 'already_logged_in', 'true');
@@ -104,8 +104,8 @@ 
 		<div id="changepassword-form-box" class="form-box">
       <div class="info"> <?php echo custompages_get_lang('FirstLoginChangePassword');?> </div>
 		<?php if (isset($error_message)) {
-			echo '<div id="changepassword-form-error" class="form-error">'.$error_message.'</div>';
-		}?>
+            echo '<div id="changepassword-form-error" class="form-error">'.$error_message.'</div>';
+        }?>
 			<form id="changepassword-form" class="form" method="post">
 				<div>
           <label for="password">*<?php echo custompages_get_lang('Password');?></label>

main/auth/ldap/authldap.php

Indentation +20 added lines, -21 removed lines

@@ -46,10 +46,9 @@ 
     - Universite Jean Monet (J Dubois / Michel Courbon)
     - Michel Panckoucke for reporting and fixing a bug
     - Patrick Cool: fixing security hole
-
-    *    @author Roan Embrechts
-    *    @version 3.0
-    *    @package chamilo.auth.ldap
+ *    @author Roan Embrechts
+ *    @version 3.0
+ *    @package chamilo.auth.ldap
  * Note:
  * If you are using a firewall, you might need to check port 389 is open in
  * order for Chamilo to communicate with the LDAP server.
@@ -211,8 +210,8 @@ 
     $language = api_get_setting('platformLanguage');
     if (empty($language)) { $language = 'english'; }
     $_userId = UserManager::create_user($prenom, $nom, $status,
-                     $email, $uname, $password, $official_code,
-                     $language,'', '', 'ldap');
+                        $email, $uname, $password, $official_code,
+                        $language,'', '', 'ldap');
 
     //echo "new user added to Chamilo, id = $_userId";
 
@@ -271,7 +270,7 @@ 
         // Open anonymous LDAP connection
         $result=false;
         $ldap_bind_res = ldap_handle_bind($ds,$result);
-	// Executing the search with the $filter parametr
+    // Executing the search with the $filter parametr
         //error_log('Searching for '.$filter.' on LDAP server',0);
         $sr=ldap_search($ds,$ldap_basedn,$filter);
         $info = ldap_get_entries($ds, $sr);
@@ -564,35 +563,35 @@ 
         foreach ($UserList as $enreg_user) {
             $enreg_user = (int) $enreg_user;
             Database::query("INSERT IGNORE ".
-              " INTO $tbl_session_rel_course_rel_user ".
-              "(session_id,c_id,user_id) VALUES ".
-              "('$id_session','$enreg_course','$enreg_user')");
+                " INTO $tbl_session_rel_course_rel_user ".
+                "(session_id,c_id,user_id) VALUES ".
+                "('$id_session','$enreg_course','$enreg_user')");
         }
         $sql = "SELECT COUNT(user_id) as nbUsers ".
-               " FROM $tbl_session_rel_course_rel_user " .
-               " WHERE session_id='$id_session' ".
-               " AND c_id='$enreg_course'";
+                " FROM $tbl_session_rel_course_rel_user " .
+                " WHERE session_id='$id_session' ".
+                " AND c_id='$enreg_course'";
         $rs = Database::query($sql);
         list($nbr_users) = Database::fetch_array($rs);
         Database::query("UPDATE $tbl_session_rel_course  ".
-               " SET nbr_users=$nbr_users " .
-               " WHERE session_id='$id_session' ".
-               " AND c_id='$enreg_course'");
+                " SET nbr_users=$nbr_users " .
+                " WHERE session_id='$id_session' ".
+                " AND c_id='$enreg_course'");
     }
     foreach ($UserList as $enreg_user) {
         $enreg_user = (int) $enreg_user;
         Database::query("INSERT IGNORE INTO $tbl_session_rel_user ".
-               " (session_id, user_id, registered_at) " .
-               " VALUES('$id_session','$enreg_user', '" . api_get_utc_datetime() . "')");
+                " (session_id, user_id, registered_at) " .
+                " VALUES('$id_session','$enreg_user', '" . api_get_utc_datetime() . "')");
     }
     // We update the number of users in the session
     $sql = "SELECT COUNT(user_id) as nbUsers FROM $tbl_session_rel_user ".
-           " WHERE session_id='$id_session' ".
-           " AND relation_type<>".SESSION_RELATION_TYPE_RRHH." ";
+            " WHERE session_id='$id_session' ".
+            " AND relation_type<>".SESSION_RELATION_TYPE_RRHH." ";
     $rs = Database::query($sql);
     list($nbr_users) = Database::fetch_array($rs);
     Database::query("UPDATE $tbl_session SET nbr_users=$nbr_users ".
-           " WHERE id='$id_session'");
+            " WHERE id='$id_session'");
 }
 
 function syncro_users() {