chamilo / chamilo-lms

main/gradebook/lib/be/learnpathlink.class.php

Indentation +242 added lines, -242 removed lines

@@ -9,260 +9,260 @@
  */
 class LearnpathLink extends AbstractLink
 {
-	private $course_info = null;
-	private $learnpath_table = null;
-	private $learnpath_data = null;
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->set_type(LINK_LEARNPATH);
-	}
-
-	/**
-	 * Generate an array of learnpaths that a teacher hasn't created a link for.
-	 * @return array 2-dimensional array - every element contains 2 subelements (id, name)
-	 */
-	public function get_not_created_links()
-	{
-		return false;
-		if (empty($this->course_code))
-			die('Error in get_not_created_links() : course code not set');
-
-		$tbl_grade_links = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_LINK);
-
-		$sql = 'SELECT id, name from '.$this->get_learnpath_table().' lp
+    private $course_info = null;
+    private $learnpath_table = null;
+    private $learnpath_data = null;
+
+    /**
+     * Constructor
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->set_type(LINK_LEARNPATH);
+    }
+
+    /**
+     * Generate an array of learnpaths that a teacher hasn't created a link for.
+     * @return array 2-dimensional array - every element contains 2 subelements (id, name)
+     */
+    public function get_not_created_links()
+    {
+        return false;
+        if (empty($this->course_code))
+            die('Error in get_not_created_links() : course code not set');
+
+        $tbl_grade_links = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_LINK);
+
+        $sql = 'SELECT id, name from '.$this->get_learnpath_table().' lp
 				WHERE c_id = '.$this->course_id.' AND id NOT IN '
-			.' (SELECT ref_id FROM '.$tbl_grade_links
-			.' WHERE type = '.LINK_LEARNPATH
-			." AND course_code = '".$this->get_course_code()."'"
-			.') AND lp.session_id='.api_get_session_id().'';
-
-		$result = Database::query($sql);
-
-		$cats=array();
-		while ($data=Database::fetch_array($result)) {
-			$cats[] = array ($data['id'], $data['name']);
-		}
-
-		return $cats;
-	}
-
-	/**
-	 * Generate an array of all learnpaths available.
-	 * @return array 2-dimensional array - every element contains 2 subelements (id, name)
-	 */
-	public function get_all_links()
-	{
-		if (empty($this->course_code))
-			die('Error in get_not_created_links() : course code not set');
-
-		$session_id = api_get_session_id();
-		if (empty($session_id)) {
-			$session_condition = api_get_session_condition(0, true);
-		} else {
-			$session_condition = api_get_session_condition($session_id, true, true);
-		}
-
-		$sql = 'SELECT id, name FROM '.$this->get_learnpath_table().'
+            .' (SELECT ref_id FROM '.$tbl_grade_links
+            .' WHERE type = '.LINK_LEARNPATH
+            ." AND course_code = '".$this->get_course_code()."'"
+            .') AND lp.session_id='.api_get_session_id().'';
+
+        $result = Database::query($sql);
+
+        $cats=array();
+        while ($data=Database::fetch_array($result)) {
+            $cats[] = array ($data['id'], $data['name']);
+        }
+
+        return $cats;
+    }
+
+    /**
+     * Generate an array of all learnpaths available.
+     * @return array 2-dimensional array - every element contains 2 subelements (id, name)
+     */
+    public function get_all_links()
+    {
+        if (empty($this->course_code))
+            die('Error in get_not_created_links() : course code not set');
+
+        $session_id = api_get_session_id();
+        if (empty($session_id)) {
+            $session_condition = api_get_session_condition(0, true);
+        } else {
+            $session_condition = api_get_session_condition($session_id, true, true);
+        }
+
+        $sql = 'SELECT id, name FROM '.$this->get_learnpath_table().'
                 WHERE c_id = '.$this->course_id.' '.$session_condition.' ';
-		$result = Database::query($sql);
+        $result = Database::query($sql);
 
-		$cats = array();
-		while ($data=Database::fetch_array($result)) {
-			$cats[] = array ($data['id'], $data['name']);
-		}
+        $cats = array();
+        while ($data=Database::fetch_array($result)) {
+            $cats[] = array ($data['id'], $data['name']);
+        }
 
-		return $cats;
-	}
+        return $cats;
+    }
 
 
-	/**
-	 * Has anyone used this learnpath yet ?
-	 */
-	public function has_results()
-	{
-		$tbl_stats = Database::get_course_table(TABLE_LP_VIEW);
-		$sql = "SELECT count(id) AS number FROM $tbl_stats
+    /**
+     * Has anyone used this learnpath yet ?
+     */
+    public function has_results()
+    {
+        $tbl_stats = Database::get_course_table(TABLE_LP_VIEW);
+        $sql = "SELECT count(id) AS number FROM $tbl_stats
 				WHERE c_id = ".$this->course_id." AND lp_id = ".$this->get_ref_id();
-		$result = Database::query($sql);
-		$number = Database::fetch_array($result,'NUM');
-		return ($number[0] != 0);
-	}
-
-	/**
-	 * Get the progress of this learnpath. Only the last attempt are taken into account.
-	 * @param $stud_id student id (default: all students who have results - then the average is returned)
-	 * @return	array (score, max) if student is given
-	 * 			array (sum of scores, number of scores) otherwise
-	 * 			or null if no scores available
-	 */
-	public function calc_score($stud_id = null, $type = null)
-	{
-		$tbl_stats = Database::get_course_table(TABLE_LP_VIEW);
-		$session_id = api_get_session_id();
-
-		$sql = "SELECT * FROM $tbl_stats
+        $result = Database::query($sql);
+        $number = Database::fetch_array($result,'NUM');
+        return ($number[0] != 0);
+    }
+
+    /**
+     * Get the progress of this learnpath. Only the last attempt are taken into account.
+     * @param $stud_id student id (default: all students who have results - then the average is returned)
+     * @return	array (score, max) if student is given
+     * 			array (sum of scores, number of scores) otherwise
+     * 			or null if no scores available
+     */
+    public function calc_score($stud_id = null, $type = null)
+    {
+        $tbl_stats = Database::get_course_table(TABLE_LP_VIEW);
+        $session_id = api_get_session_id();
+
+        $sql = "SELECT * FROM $tbl_stats
                 WHERE
                 	c_id = ".$this->course_id." AND
                     lp_id = ".$this->get_ref_id()." AND
                     session_id = $session_id ";
 
-		if (isset($stud_id))
-			$sql .= ' AND user_id = '.intval($stud_id);
-
-		// order by id, that way the student's first attempt is accessed first
-		$sql .= ' ORDER BY view_count DESC';
-
-		$scores = Database::query($sql);
-		// for 1 student
-		if (isset($stud_id)) {
-			if ($data = Database::fetch_assoc($scores)) {
-				return array ($data['progress'], 100);
-			} else
-				return null;
-		} else {
-			// all students -> get average
-			$students = array();  // user list, needed to make sure we only
-			// take first attempts into account
-			$rescount = 0;
-			$sum = 0;
-			$bestResult = 0;
-			$sumResult = 0;
-			while ($data = Database::fetch_array($scores)) {
-				if (!(array_key_exists($data['user_id'], $students))) {
-					$students[$data['user_id']] = $data['progress'];
-					$rescount++;
-					$sum += $data['progress'] / 100;
-					$sumResult += $data['progress'];
-
-					if ($data['progress'] > $bestResult) {
-						$bestResult = $data['progress'];
-					}
-				}
-			}
-
-			if ($rescount == 0) {
-				return null;
-			} else {
-
-				switch ($type) {
-					case 'best':
-						return array($bestResult, 100);
-						break;
-					case 'average':
-						return array($sumResult/$rescount, 100);
-						break;
-					case 'ranking':
-						return AbstractLink::getCurrentUserRanking($stud_id, $students);
-						break;
-					default:
-						return array($sum, $rescount);
-						break;
-				}
-			}
-		}
-	}
-
-	/**
-	 * Get URL where to go to if the user clicks on the link.
-	 */
-	public function get_link()
-	{
-		$url = api_get_path(WEB_PATH).'main/newscorm/lp_controller.php?cidReq='.$this->get_course_code().'&gradebook=view';
-		$session_id = api_get_session_id();
-		if (!api_is_allowed_to_edit() || $this->calc_score(api_get_user_id()) == null) {
-			$url .= '&action=view&session_id='.$session_id.'&lp_id='.$this->get_ref_id();
-		} else {
-			$url .= '&action=build&session_id='.$session_id.'&lp_id='.$this->get_ref_id();
-		}
-		return $url;
-	}
-
-	/**
-	 * Get name to display: same as learnpath title
-	 */
-	public function get_name()
-	{
-		$data = $this->get_learnpath_data();
-		return $data['name'];
-	}
-
-	/**
-	 * Get description to display: same as learnpath description
-	 */
-	public function get_description()
-	{
-		$data = $this->get_learnpath_data();
-		return $data['description'];
-	}
-
-	/**
-	 * Check if this still links to a learnpath
-	 */
-	public function is_valid_link() {
-		$sql = 'SELECT count(id) FROM '.$this->get_learnpath_table().'
+        if (isset($stud_id))
+            $sql .= ' AND user_id = '.intval($stud_id);
+
+        // order by id, that way the student's first attempt is accessed first
+        $sql .= ' ORDER BY view_count DESC';
+
+        $scores = Database::query($sql);
+        // for 1 student
+        if (isset($stud_id)) {
+            if ($data = Database::fetch_assoc($scores)) {
+                return array ($data['progress'], 100);
+            } else
+                return null;
+        } else {
+            // all students -> get average
+            $students = array();  // user list, needed to make sure we only
+            // take first attempts into account
+            $rescount = 0;
+            $sum = 0;
+            $bestResult = 0;
+            $sumResult = 0;
+            while ($data = Database::fetch_array($scores)) {
+                if (!(array_key_exists($data['user_id'], $students))) {
+                    $students[$data['user_id']] = $data['progress'];
+                    $rescount++;
+                    $sum += $data['progress'] / 100;
+                    $sumResult += $data['progress'];
+
+                    if ($data['progress'] > $bestResult) {
+                        $bestResult = $data['progress'];
+                    }
+                }
+            }
+
+            if ($rescount == 0) {
+                return null;
+            } else {
+
+                switch ($type) {
+                    case 'best':
+                        return array($bestResult, 100);
+                        break;
+                    case 'average':
+                        return array($sumResult/$rescount, 100);
+                        break;
+                    case 'ranking':
+                        return AbstractLink::getCurrentUserRanking($stud_id, $students);
+                        break;
+                    default:
+                        return array($sum, $rescount);
+                        break;
+                }
+            }
+        }
+    }
+
+    /**
+     * Get URL where to go to if the user clicks on the link.
+     */
+    public function get_link()
+    {
+        $url = api_get_path(WEB_PATH).'main/newscorm/lp_controller.php?cidReq='.$this->get_course_code().'&gradebook=view';
+        $session_id = api_get_session_id();
+        if (!api_is_allowed_to_edit() || $this->calc_score(api_get_user_id()) == null) {
+            $url .= '&action=view&session_id='.$session_id.'&lp_id='.$this->get_ref_id();
+        } else {
+            $url .= '&action=build&session_id='.$session_id.'&lp_id='.$this->get_ref_id();
+        }
+        return $url;
+    }
+
+    /**
+     * Get name to display: same as learnpath title
+     */
+    public function get_name()
+    {
+        $data = $this->get_learnpath_data();
+        return $data['name'];
+    }
+
+    /**
+     * Get description to display: same as learnpath description
+     */
+    public function get_description()
+    {
+        $data = $this->get_learnpath_data();
+        return $data['description'];
+    }
+
+    /**
+     * Check if this still links to a learnpath
+     */
+    public function is_valid_link() {
+        $sql = 'SELECT count(id) FROM '.$this->get_learnpath_table().'
                 WHERE c_id = '.$this->course_id.' AND id = '.$this->get_ref_id().' ';
-		$result = Database::query($sql);
-		$number = Database::fetch_row($result,'NUM');
-		return ($number[0] != 0);
-	}
-
-	public function get_type_name()
-	{
-		return get_lang('LearningPaths');
-	}
-
-	public function needs_name_and_description()
-	{
-		return false;
-	}
-
-	public function needs_max()
-	{
-		return false;
-	}
-
-	public function needs_results()
-	{
-		return false;
-	}
-
-	public function is_allowed_to_change_name()
-	{
-		return false;
-	}
-
-	// INTERNAL FUNCTIONS
-
-	/**
-	 * Lazy load function to get the database table of the learnpath
-	 */
-	private function get_learnpath_table()
-	{
-		$this->learnpath_table = Database :: get_course_table(TABLE_LP_MAIN);
-		return $this->learnpath_table;
-	}
-
-	/**
-	 * Lazy load function to get the database contents of this learnpath
-	 */
-	private function get_learnpath_data()
-	{
-		if (!isset($this->learnpath_data)) {
-			$sql = 'SELECT * FROM '.$this->get_learnpath_table().'
+        $result = Database::query($sql);
+        $number = Database::fetch_row($result,'NUM');
+        return ($number[0] != 0);
+    }
+
+    public function get_type_name()
+    {
+        return get_lang('LearningPaths');
+    }
+
+    public function needs_name_and_description()
+    {
+        return false;
+    }
+
+    public function needs_max()
+    {
+        return false;
+    }
+
+    public function needs_results()
+    {
+        return false;
+    }
+
+    public function is_allowed_to_change_name()
+    {
+        return false;
+    }
+
+    // INTERNAL FUNCTIONS
+
+    /**
+     * Lazy load function to get the database table of the learnpath
+     */
+    private function get_learnpath_table()
+    {
+        $this->learnpath_table = Database :: get_course_table(TABLE_LP_MAIN);
+        return $this->learnpath_table;
+    }
+
+    /**
+     * Lazy load function to get the database contents of this learnpath
+     */
+    private function get_learnpath_data()
+    {
+        if (!isset($this->learnpath_data)) {
+            $sql = 'SELECT * FROM '.$this->get_learnpath_table().'
                     WHERE c_id = '.$this->course_id.' AND id = '.$this->get_ref_id().' ';
-			$result = Database::query($sql);
-			$this->learnpath_data = Database::fetch_array($result);
-		}
-		return $this->learnpath_data;
-	}
-
-	public function get_icon_name()
-	{
-		return 'learnpath';
-	}
+            $result = Database::query($sql);
+            $this->learnpath_data = Database::fetch_array($result);
+        }
+        return $this->learnpath_data;
+    }
+
+    public function get_icon_name()
+    {
+        return 'learnpath';
+    }
 }

main/admin/user_list.php

Indentation +127 added lines, -127 removed lines

@@ -308,13 +308,13 @@ 
     $firstname = $userInfo['firstname'];
     $lastname = $userInfo['lastname'];
 
-	if (api_is_western_name_order()) {
-		$message = sprintf(get_lang('AttemptingToLoginAs'),$firstname, $lastname, $userId);
-	} else {
-		$message = sprintf(get_lang('AttemptingToLoginAs'), $lastname, $firstname, $userId);
-	}
+    if (api_is_western_name_order()) {
+        $message = sprintf(get_lang('AttemptingToLoginAs'),$firstname, $lastname, $userId);
+    } else {
+        $message = sprintf(get_lang('AttemptingToLoginAs'), $lastname, $firstname, $userId);
+    }
 
-	if ($userId) {
+    if ($userId) {
 
         // Logout the current user
         LoginDelete(api_get_user_id());
@@ -349,7 +349,7 @@ 
         Display :: display_footer();
         exit;
 
-	}
+    }
 }
 
 /**
@@ -388,7 +388,7 @@ 
     }*/
 
     if (!in_array($direction, array('ASC','DESC'))) {
-    	$direction = 'ASC';
+        $direction = 'ASC';
     }
     $column = intval($column);
     $from 	= intval($from);
@@ -399,23 +399,23 @@ 
         $sql .= " WHERE u.creator_id = ".api_get_user_id();
     }
 
-	$sql .= " ORDER BY col$column $direction ";
-	$sql .= " LIMIT $from,$number_of_items";
+    $sql .= " ORDER BY col$column $direction ";
+    $sql .= " LIMIT $from,$number_of_items";
 
-	$res = Database::query($sql);
+    $res = Database::query($sql);
 
-	$users = array ();
+    $users = array ();
     $t = time();
-	while ($user = Database::fetch_row($res)) {
-		$userPicture = UserManager::getUserPicture($user[0], USER_IMAGE_SIZE_SMALL);
-		$photo = '<img src="'.$userPicture.'" width="22" height="22" alt="'.api_get_person_name($user[2], $user[3]).'" title="'.api_get_person_name($user[2], $user[3]).'" />';
+    while ($user = Database::fetch_row($res)) {
+        $userPicture = UserManager::getUserPicture($user[0], USER_IMAGE_SIZE_SMALL);
+        $photo = '<img src="'.$userPicture.'" width="22" height="22" alt="'.api_get_person_name($user[2], $user[3]).'" title="'.api_get_person_name($user[2], $user[3]).'" />';
 
         if ($user[7] == 1 && !empty($user[10])) {
             // check expiration date
             $expiration_time = convert_sql_date($user[10]);
             // if expiration date is passed, store a special value for active field
             if ($expiration_time < $t) {
-        	   $user[7] = '-1';
+                $user[7] = '-1';
             }
         }
 
@@ -433,9 +433,9 @@ 
             api_get_local_time($user[9]),
             $user[0]
         );
-	}
+    }
 
-	return $users;
+    return $users;
 }
 
 /**
@@ -444,7 +444,7 @@ 
 * @return string HTML-code with a mailto-link
 */
 function email_filter($email) {
-	return Display :: encrypted_mailto_link($email, $email);
+    return Display :: encrypted_mailto_link($email, $email);
 }
 
 /**
@@ -453,7 +453,7 @@ 
 * @return string HTML-code with a mailto-link
 */
 function user_filter($name, $params, $row) {
-	return '<a href="'.api_get_path(WEB_PATH).'whoisonline.php?origin=user_list&id='.$row[0].'">'.$name.'</a>';
+    return '<a href="'.api_get_path(WEB_PATH).'whoisonline.php?origin=user_list&id='.$row[0].'">'.$name.'</a>';
 }
 
 /**
@@ -464,84 +464,84 @@ 
  * @return string Some HTML-code with modify-buttons
  */
 function modify_filter($user_id, $url_params, $row) {
-	global $charset, $_admins_list;
-	$is_admin   = in_array($user_id,$_admins_list);
-	$statusname = api_get_status_langvars();
-	$user_is_anonymous = false;
+    global $charset, $_admins_list;
+    $is_admin   = in_array($user_id,$_admins_list);
+    $statusname = api_get_status_langvars();
+    $user_is_anonymous = false;
     $current_user_status_label = $row['7'];
 
-	if ($current_user_status_label == $statusname[ANONYMOUS]) {
-		$user_is_anonymous =true;
-	}
-	$result = '';
-	if (!$user_is_anonymous) {
-		$icon = Display::return_icon('course.png', get_lang('Courses'), array('onmouseout' => 'clear_course_list (\'div_'.$user_id.'\')'));
-		$result .= '<a href="javascript:void(0)" onclick="load_course_list(\'div_'.$user_id.'\','.$user_id.')" >
+    if ($current_user_status_label == $statusname[ANONYMOUS]) {
+        $user_is_anonymous =true;
+    }
+    $result = '';
+    if (!$user_is_anonymous) {
+        $icon = Display::return_icon('course.png', get_lang('Courses'), array('onmouseout' => 'clear_course_list (\'div_'.$user_id.'\')'));
+        $result .= '<a href="javascript:void(0)" onclick="load_course_list(\'div_'.$user_id.'\','.$user_id.')" >
 			        '.$icon.'
 					<div class="blackboard_hide" id="div_'.$user_id.'">&nbsp;&nbsp;</div>
 					</a>';
 
         $icon = Display::return_icon('session.png', get_lang('Sessions'), array('onmouseout' => 'clear_session_list (\'div_s_'.$user_id.'\')'));
-		$result .= '<a href="javascript:void(0)" onclick="load_session_list(\'div_s_'.$user_id.'\','.$user_id.')" >
+        $result .= '<a href="javascript:void(0)" onclick="load_session_list(\'div_s_'.$user_id.'\','.$user_id.')" >
 					'.$icon.'
 					<div class="blackboard_hide" id="div_s_'.$user_id.'">&nbsp;&nbsp;</div>
 					</a>';
-	} else {
-		$result .= Display::return_icon('course_na.png',get_lang('Courses')).'&nbsp;&nbsp;';
-		$result .= Display::return_icon('course_na.png',get_lang('Sessions')).'&nbsp;&nbsp;';
-	}
+    } else {
+        $result .= Display::return_icon('course_na.png',get_lang('Courses')).'&nbsp;&nbsp;';
+        $result .= Display::return_icon('course_na.png',get_lang('Sessions')).'&nbsp;&nbsp;';
+    }
 
-	if (api_is_platform_admin()) {
-		if (!$user_is_anonymous) {
-			$result .= '<a href="user_information.php?user_id='.$user_id.'">'.Display::return_icon('synthese_view.gif', get_lang('Info')).'</a>&nbsp;&nbsp;';
-		} else {
-			$result .= Display::return_icon('synthese_view_na.gif', get_lang('Info')).'&nbsp;&nbsp;';
-		}
-	}
+    if (api_is_platform_admin()) {
+        if (!$user_is_anonymous) {
+            $result .= '<a href="user_information.php?user_id='.$user_id.'">'.Display::return_icon('synthese_view.gif', get_lang('Info')).'</a>&nbsp;&nbsp;';
+        } else {
+            $result .= Display::return_icon('synthese_view_na.gif', get_lang('Info')).'&nbsp;&nbsp;';
+        }
+    }
 
     //only allow platform admins to login_as, or session admins only for students (not teachers nor other admins)
     if (api_is_platform_admin() || (api_is_session_admin() && $current_user_status_label == $statusname[STUDENT])) {
-    	if (!$user_is_anonymous) {
+        if (!$user_is_anonymous) {
             if (api_global_admin_can_edit_admin($user_id)) {
                 $result .= '<a href="user_list.php?action=login_as&user_id='.$user_id.'&sec_token='.$_SESSION['sec_token'].'">'.Display::return_icon('login_as.png', get_lang('LoginAs')).'</a>&nbsp;&nbsp;';
             } else {
                 $result .= Display::return_icon('login_as_na.png', get_lang('LoginAs')).'&nbsp;&nbsp;';
             }
-    	} else {
-    		$result .= Display::return_icon('login_as_na.png', get_lang('LoginAs')).'&nbsp;&nbsp;';
-    	}
+        } else {
+            $result .= Display::return_icon('login_as_na.png', get_lang('LoginAs')).'&nbsp;&nbsp;';
+        }
     } else {
-    	$result .= Display::return_icon('login_as_na.png', get_lang('LoginAs')).'&nbsp;&nbsp;';
+        $result .= Display::return_icon('login_as_na.png', get_lang('LoginAs')).'&nbsp;&nbsp;';
     }
 
-	if ($current_user_status_label != $statusname[STUDENT]) {
-		$result .= Display::return_icon('statistics_na.gif', get_lang('Reporting')).'&nbsp;&nbsp;';
-	} else {
-		$result .= '<a href="../mySpace/myStudents.php?student='.$user_id.'">'.Display::return_icon('statistics.gif', get_lang('Reporting')).'</a>&nbsp;&nbsp;';
-	}
+    if ($current_user_status_label != $statusname[STUDENT]) {
+        $result .= Display::return_icon('statistics_na.gif', get_lang('Reporting')).'&nbsp;&nbsp;';
+    } else {
+        $result .= '<a href="../mySpace/myStudents.php?student='.$user_id.'">'.Display::return_icon('statistics.gif', get_lang('Reporting')).'</a>&nbsp;&nbsp;';
+    }
 
-	if (api_is_platform_admin(true)) {
+    if (api_is_platform_admin(true)) {
         $editProfileUrl = Display::getProfileEditionLink($user_id, true);
 
         if (!$user_is_anonymous && api_global_admin_can_edit_admin($user_id, null, true)) {
             $result .= '<a href="' . $editProfileUrl . '">'.Display::return_icon('edit.png', get_lang('Edit'), array(), ICON_SIZE_SMALL).'</a>&nbsp;';
-		} else {
+        } else {
             $result .= Display::return_icon('edit_na.png', get_lang('Edit'), array(), ICON_SIZE_SMALL).'</a>&nbsp;';
-		}
-	}
+        }
+    }
 
-	if ($is_admin) {
-		$result .= Display::return_icon('admin_star.png', get_lang('IsAdministrator'),array('width'=> ICON_SIZE_SMALL, 'heigth'=> ICON_SIZE_SMALL));
-	} else {
-		$result .= Display::return_icon('admin_star_na.png', get_lang('IsNotAdministrator'));
-	}
+    if ($is_admin) {
+        $result .= Display::return_icon('admin_star.png', get_lang('IsAdministrator'),array('width'=> ICON_SIZE_SMALL, 'heigth'=> ICON_SIZE_SMALL));
+    } else {
+        $result .= Display::return_icon('admin_star_na.png', get_lang('IsNotAdministrator'));
+    }
 
-	// actions for assigning sessions, courses or users
-	if (api_is_session_admin()) {
-		/*if ($row[0] == api_get_user_id()) {
+    // actions for assigning sessions, courses or users
+    if (api_is_session_admin()) {
+        /*if ($row[0] == api_get_user_id()) {
 			$result .= '<a href="dashboard_add_sessions_to_user.php?user='.$user_id.'">'.Display::return_icon('view_more_stats.gif', get_lang('AssignSessions')).'</a>&nbsp;&nbsp;';
 		}*/
-	} else {
+    } else {
         if ($current_user_status_label == $statusname[SESSIONADMIN]) {
             $result .= Display::url(
                 Display::return_icon('view_more_stats.gif', get_lang('AssignSessions')),
@@ -571,7 +571,7 @@ 
                 );
             }
         }
-	}
+    }
 
     if (api_is_platform_admin()) {
         $result .= ' <a data-title="'.get_lang('FreeBusyCalendar').'" href="'.api_get_path(WEB_AJAX_PATH).'agenda.ajax.php?a=get_user_agenda&user_id='.$user_id.'&modal_size=lg" class="agenda_opener ajax">'.
@@ -589,7 +589,7 @@ 
             }
         }
     }
-	return $result;
+    return $result;
 }
 
 
@@ -622,10 +622,10 @@ 
     if ($action == 'edit') {
         $result = Display::return_icon($image.'.png', get_lang('AccountExpired'), array(), 16);
     } elseif ($row['0']<>$_user['user_id']) {
-    	// you cannot lock yourself out otherwise you could disable all the accounts including your own => everybody is locked out and nobody can change it anymore.
-		$result = Display::return_icon($image.'.png', get_lang(ucfirst($action)), array('onclick'=>'active_user(this);', 'id'=>'img_'.$row['0']), 16).'</a>';
-	}
-	return $result;
+        // you cannot lock yourself out otherwise you could disable all the accounts including your own => everybody is locked out and nobody can change it anymore.
+        $result = Display::return_icon($image.'.png', get_lang(ucfirst($action)), array('onclick'=>'active_user(this);', 'id'=>'img_'.$row['0']), 16).'</a>';
+    }
+    return $result;
 }
 
 /**
@@ -638,8 +638,8 @@ 
  * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University, Belgium
  */
 function status_filter($status) {
-	$statusname = api_get_status_langvars();
-	return $statusname[$status];
+    $statusname = api_get_status_langvars();
+    return $statusname[$status];
 }
 
 if (isset($_GET['keyword']) || isset($_GET['keyword_firstname'])) {
@@ -655,8 +655,8 @@ 
 
 if (!empty($action)) {
     $check = Security::check_token('get');
-	if ($check) {
-		switch ($action) {
+    if ($check) {
+        switch ($action) {
             case 'add_user_to_my_url':
                 $user_id = $_REQUEST["user_id"];
                 $result = UrlManager::add_user_to_url($user_id, $current_access_url_id);
@@ -666,45 +666,45 @@ 
                     $message  = Display::return_message($message, 'confirmation');
                 }
                 break;
-			case 'delete_user':
-				if (api_is_platform_admin()) {
+            case 'delete_user':
+                if (api_is_platform_admin()) {
                     $user_to_delete = $_GET['user_id'];
                     $current_user_id = api_get_user_id();
 
-					if ($deleteUserAvailable && api_global_admin_can_edit_admin($_GET['user_id'])) {
-						if ($user_to_delete != $current_user_id && UserManager :: delete_user($_GET['user_id'])) {
-							$message = Display :: return_message(get_lang('UserDeleted'), 'confirmation');
-						} else {
-							$message = Display :: return_message(get_lang('CannotDeleteUserBecauseOwnsCourse'), 'error');
-						}
-					} else {
-						$message = Display :: return_message(get_lang('CannotDeleteUser'),'error');
-					}
-				}
-				break;
+                    if ($deleteUserAvailable && api_global_admin_can_edit_admin($_GET['user_id'])) {
+                        if ($user_to_delete != $current_user_id && UserManager :: delete_user($_GET['user_id'])) {
+                            $message = Display :: return_message(get_lang('UserDeleted'), 'confirmation');
+                        } else {
+                            $message = Display :: return_message(get_lang('CannotDeleteUserBecauseOwnsCourse'), 'error');
+                        }
+                    } else {
+                        $message = Display :: return_message(get_lang('CannotDeleteUser'),'error');
+                    }
+                }
+                break;
             case 'delete':
-				if (api_is_platform_admin()) {
-					$number_of_selected_users = count($_POST['id']);
-					$number_of_deleted_users = 0;
-					if (is_array($_POST['id'])) {
-						foreach ($_POST['id'] as $index => $user_id) {
-							if ($user_id != $_user['user_id']) {
-								if (UserManager::delete_user($user_id)) {
-									$number_of_deleted_users++;
-								}
-							}
-						}
-					}
-					if ($number_of_selected_users == $number_of_deleted_users) {
+                if (api_is_platform_admin()) {
+                    $number_of_selected_users = count($_POST['id']);
+                    $number_of_deleted_users = 0;
+                    if (is_array($_POST['id'])) {
+                        foreach ($_POST['id'] as $index => $user_id) {
+                            if ($user_id != $_user['user_id']) {
+                                if (UserManager::delete_user($user_id)) {
+                                    $number_of_deleted_users++;
+                                }
+                            }
+                        }
+                    }
+                    if ($number_of_selected_users == $number_of_deleted_users) {
                         $message = Display :: return_message(get_lang('SelectedUsersDeleted'), 'confirmation');
-					} else {
+                    } else {
                         $message = Display :: return_message(get_lang('SomeUsersNotDeleted'), 'error');
-					}
-				}
-				break;
-		}
-		Security::clear_token();
-	}
+                    }
+                }
+                break;
+        }
+        Security::clear_token();
+    }
 }
 
 // Create a search-box
@@ -724,24 +724,24 @@ 
 
 $actions  = '';
 if (api_is_platform_admin()) {
-	$actions .= '<div style="float:right;">'.
-		 '<a href="'.api_get_path(WEB_CODE_PATH).'admin/user_add.php">'.
-         Display::return_icon('new_user.png',get_lang('AddUsers'),'',ICON_SIZE_MEDIUM).'</a>'.
-		 '</div>';
+    $actions .= '<div style="float:right;">'.
+            '<a href="'.api_get_path(WEB_CODE_PATH).'admin/user_add.php">'.
+            Display::return_icon('new_user.png',get_lang('AddUsers'),'',ICON_SIZE_MEDIUM).'</a>'.
+            '</div>';
 }
 $actions .= $form->return_form();
 
 if (isset ($_GET['keyword'])) {
-	$parameters = array ('keyword' => Security::remove_XSS($_GET['keyword']));
+    $parameters = array ('keyword' => Security::remove_XSS($_GET['keyword']));
 } elseif (isset ($_GET['keyword_firstname'])) {
-	$parameters['keyword_firstname'] 	= Security::remove_XSS($_GET['keyword_firstname']);
-	$parameters['keyword_lastname']	 	= Security::remove_XSS($_GET['keyword_lastname']);
-	$parameters['keyword_username']	 	= Security::remove_XSS($_GET['keyword_username']);
-	$parameters['keyword_email'] 	 	= Security::remove_XSS($_GET['keyword_email']);
-	$parameters['keyword_officialcode'] = Security::remove_XSS($_GET['keyword_officialcode']);
-	$parameters['keyword_status'] 		= Security::remove_XSS($_GET['keyword_status']);
-	$parameters['keyword_active'] 		= Security::remove_XSS($_GET['keyword_active']);
-	$parameters['keyword_inactive'] 	= Security::remove_XSS($_GET['keyword_inactive']);
+    $parameters['keyword_firstname'] 	= Security::remove_XSS($_GET['keyword_firstname']);
+    $parameters['keyword_lastname']	 	= Security::remove_XSS($_GET['keyword_lastname']);
+    $parameters['keyword_username']	 	= Security::remove_XSS($_GET['keyword_username']);
+    $parameters['keyword_email'] 	 	= Security::remove_XSS($_GET['keyword_email']);
+    $parameters['keyword_officialcode'] = Security::remove_XSS($_GET['keyword_officialcode']);
+    $parameters['keyword_status'] 		= Security::remove_XSS($_GET['keyword_status']);
+    $parameters['keyword_active'] 		= Security::remove_XSS($_GET['keyword_active']);
+    $parameters['keyword_inactive'] 	= Security::remove_XSS($_GET['keyword_inactive']);
 }
 // Create a sortable table with user-data
 $parameters['sec_token'] = Security::get_token();
@@ -752,7 +752,7 @@ 
 $res_admin = Database::query($sql_admin);
 $_admins_list = array();
 while ($row_admin = Database::fetch_row($res_admin)) {
-	$_admins_list[] = $row_admin[0];
+    $_admins_list[] = $row_admin[0];
 }
 
 // Display Advanced search form.
@@ -808,11 +808,11 @@ 
 $table->set_header(2, get_lang('OfficialCode'));
 
 if (api_is_western_name_order()) {
-	$table->set_header(3, get_lang('FirstName'));
-	$table->set_header(4, get_lang('LastName'));
+    $table->set_header(3, get_lang('FirstName'));
+    $table->set_header(4, get_lang('LastName'));
 } else {
-	$table->set_header(3, get_lang('LastName'));
-	$table->set_header(4, get_lang('FirstName'));
+    $table->set_header(3, get_lang('LastName'));
+    $table->set_header(4, get_lang('FirstName'));
 }
 $table->set_header(5, get_lang('LoginName'));
 $table->set_header(6, get_lang('Email'));

main/inc/lib/attendance.lib.php

Indentation +1704 added lines, -1704 removed lines

@@ -11,50 +11,50 @@ 
  */
 class Attendance
 {
-	private $session_id;
-	private $course_id;
-	private $date_time;
-	private $name;
-	private $description;
-	private $attendance_qualify_title;
-	private $attendance_weight;
-	private $course_int_id;
-	public $category_id;
-
-	// constants
-	const DONE_ATTENDANCE_LOG_TYPE = 'done_attendance_sheet';
-	const UPDATED_ATTENDANCE_LOG_TYPE = 'updated_attendance_sheet';
-	const LOCKED_ATTENDANCE_LOG_TYPE = 'locked_attendance_sheet';
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		//$this->course_int_id = api_get_course_int_id();
-	}
-
-	/**
-	 * Get the total number of attendance inside current course and current session
-	 * @see SortableTable#get_total_number_of_items()
-	 */
-	public static function get_number_of_attendances($active = -1)
-	{
-		$tbl_attendance = Database :: get_course_table(TABLE_ATTENDANCE);
-		$session_id = api_get_session_id();
-		$condition_session = api_get_session_condition($session_id);
-		$course_id = api_get_course_int_id();
-		$sql = "SELECT COUNT(att.id) AS total_number_of_items
+    private $session_id;
+    private $course_id;
+    private $date_time;
+    private $name;
+    private $description;
+    private $attendance_qualify_title;
+    private $attendance_weight;
+    private $course_int_id;
+    public $category_id;
+
+    // constants
+    const DONE_ATTENDANCE_LOG_TYPE = 'done_attendance_sheet';
+    const UPDATED_ATTENDANCE_LOG_TYPE = 'updated_attendance_sheet';
+    const LOCKED_ATTENDANCE_LOG_TYPE = 'locked_attendance_sheet';
+
+    /**
+     * Constructor
+     */
+    public function __construct()
+    {
+        //$this->course_int_id = api_get_course_int_id();
+    }
+
+    /**
+     * Get the total number of attendance inside current course and current session
+     * @see SortableTable#get_total_number_of_items()
+     */
+    public static function get_number_of_attendances($active = -1)
+    {
+        $tbl_attendance = Database :: get_course_table(TABLE_ATTENDANCE);
+        $session_id = api_get_session_id();
+        $condition_session = api_get_session_condition($session_id);
+        $course_id = api_get_course_int_id();
+        $sql = "SELECT COUNT(att.id) AS total_number_of_items
 				FROM $tbl_attendance att
 		        WHERE c_id = $course_id $condition_session ";
-		if ($active == 1 || $active == 0) {
-			$sql .= "AND att.active = $active";
-		}
-		$res = Database::query($sql);
-		$obj = Database::fetch_object($res);
+        if ($active == 1 || $active == 0) {
+            $sql .= "AND att.active = $active";
+        }
+        $res = Database::query($sql);
+        $obj = Database::fetch_object($res);
 
-		return $obj->total_number_of_items;
-	}
+        return $obj->total_number_of_items;
+    }
 
     /**
      * Get attendance list only the id, name and attendance_qualify_max fields
@@ -90,36 +90,36 @@ 
         return $data;
     }
 
-	/**
-	 * Get the attendaces to display on the current page (fill the sortable-table)
-	 * @param   int     offset of first user to recover
-	 * @param   int     Number of users to get
-	 * @param   int     Column to sort on
-	 * @param   string  Order (ASC,DESC)
-	 * @see SortableTable#get_table_data($from)
-	 */
-	public static function get_attendance_data($from, $number_of_items, $column, $direction)
-	{
-		$tbl_attendance = Database::get_course_table(TABLE_ATTENDANCE);
-		$course_id = api_get_course_int_id();
-		$session_id = api_get_session_id();
-		$condition_session = api_get_session_condition($session_id);
-		$column = intval($column);
-		$from = intval($from);
-		$number_of_items = intval($number_of_items);
-
-		if (!in_array($direction, array('ASC','DESC'))) {
-			$direction = 'ASC';
-		}
-
-		$active_plus = '';
-		if ((isset($_GET['isStudentView']) && $_GET['isStudentView'] == 'true') ||
-			!api_is_allowed_to_edit(null, true)
-		) {
-			$active_plus = ' AND att.active = 1';
-		}
-
-		$sql = "SELECT
+    /**
+     * Get the attendaces to display on the current page (fill the sortable-table)
+     * @param   int     offset of first user to recover
+     * @param   int     Number of users to get
+     * @param   int     Column to sort on
+     * @param   string  Order (ASC,DESC)
+     * @see SortableTable#get_table_data($from)
+     */
+    public static function get_attendance_data($from, $number_of_items, $column, $direction)
+    {
+        $tbl_attendance = Database::get_course_table(TABLE_ATTENDANCE);
+        $course_id = api_get_course_int_id();
+        $session_id = api_get_session_id();
+        $condition_session = api_get_session_condition($session_id);
+        $column = intval($column);
+        $from = intval($from);
+        $number_of_items = intval($number_of_items);
+
+        if (!in_array($direction, array('ASC','DESC'))) {
+            $direction = 'ASC';
+        }
+
+        $active_plus = '';
+        if ((isset($_GET['isStudentView']) && $_GET['isStudentView'] == 'true') ||
+            !api_is_allowed_to_edit(null, true)
+        ) {
+            $active_plus = ' AND att.active = 1';
+        }
+
+        $sql = "SELECT
                     att.id AS col0,
                     att.name AS col1,
                     att.description AS col2,
@@ -134,318 +134,318 @@ 
 				ORDER BY col$column $direction
 				LIMIT $from,$number_of_items ";
 
-		$res = Database::query($sql);
-		$attendances = array ();
-		$user_info = api_get_user_info();
-		$allowDelete = api_get_setting('allow_delete_attendance');
-
-		while ($attendance = Database::fetch_row($res)) {
-
-			$student_param = '';
-			if (api_is_drh() && $_GET['student_id']) {
-				$student_param = '&student_id='.intval($_GET['student_id']);
-			}
-
-			$session_star = '';
-
-			if (api_get_session_id() == $attendance[6]) {
-				$session_star = api_get_session_image(api_get_session_id(), $user_info['status']);
-			}
-			if ($attendance[5] == 1) {
-
-				$isDrhOfCourse = CourseManager::isUserSubscribedInCourseAsDrh(
-					api_get_user_id(),
-					api_get_course_info()
-				);
-
-				if (api_is_allowed_to_edit(null, true) || $isDrhOfCourse) {
-					// Link to edit
-					$attendance[1] = '<a href="index.php?'.api_get_cidreq().'&action=attendance_sheet_list&attendance_id='.$attendance[0].$student_param.'">'.$attendance[1].'</a>'.$session_star;
-				} else {
-					// Link to view
-					$attendance[1] = '<a href="index.php?'.api_get_cidreq().'&action=attendance_sheet_list_no_edit&attendance_id='.$attendance[0].$student_param.'">'.$attendance[1].'</a>'.$session_star;
-				}
-
-			} else {
-				$attendance[1] = '<a class="muted" href="index.php?'.api_get_cidreq().'&action=attendance_sheet_list&attendance_id='.$attendance[0].$student_param.'">'.$attendance[1].'</a>'.$session_star;
-			}
-
-			if ($attendance[5] == 1) {
-				$attendance[3] = '<center>'.$attendance[3].'</center>';
-			} else {
-				$attendance[3] = '<center><span class="muted">'.$attendance[3].'</span></center>';
-			}
-
-			$attendance[3] = '<center>'.$attendance[3].'</center>';
-			if (api_is_allowed_to_edit(null, true)) {
-				$actions  = '';
-				$actions .= '<center>';
-
-				if (api_is_platform_admin()) {
-					$actions .= '<a href="index.php?'.api_get_cidreq().'&action=attendance_edit&attendance_id='.$attendance[0].'">'.
-						Display::return_icon('edit.png', get_lang('Edit'), array(), ICON_SIZE_SMALL).'</a>&nbsp;';
-					// Visible
-					if ($attendance[5] == 1) {
-						$actions .= '<a href="index.php?'.api_get_cidreq().'&action=attendance_set_invisible&attendance_id='.$attendance[0].'">'.
-							Display::return_icon('visible.png', get_lang('Hide'), array(), ICON_SIZE_SMALL).'</a>';
-					} else {
-						$actions .= '<a href="index.php?'.api_get_cidreq().'&action=attendance_set_visible&attendance_id='.$attendance[0].'">'.
-							Display::return_icon('invisible.png', get_lang('Show'), array(), ICON_SIZE_SMALL).'</a>';
-						$attendance[2] = '<span class="muted">'.$attendance[2].'</span>';
-					}
-					if ($allowDelete === 'true') {
-						$actions .= '<a href="index.php?' . api_get_cidreq() . '&action=attendance_delete&attendance_id=' . $attendance[0]. '">' .
-							Display::return_icon('delete.png', get_lang('Delete'), array(), ICON_SIZE_SMALL) . '</a>';
-					}
-				} else {
-					$is_locked_attendance = self::is_locked_attendance($attendance[0]);
-					if ($is_locked_attendance) {
-						$actions .= Display::return_icon('edit_na.png', get_lang('Edit')).'&nbsp;';
-						$actions .= Display::return_icon('visible.png', get_lang('Hide'));
-					} else {
-						$actions .= '<a href="index.php?'.api_get_cidreq().'&action=attendance_edit&attendance_id='.$attendance[0].'">'.
-							Display::return_icon('edit.png', get_lang('Edit'), array(), ICON_SIZE_SMALL).'</a>&nbsp;';
-
-						if ($attendance[5] == 1) {
-							$actions .= ' <a href="index.php?'.api_get_cidreq().'&action=attendance_set_invisible&attendance_id='.$attendance[0].'">'.
-								Display::return_icon('visible.png', get_lang('Hide'), array(), ICON_SIZE_SMALL).'</a>';
-						} else {
-							$actions .= ' <a href="index.php?'.api_get_cidreq().'&action=attendance_set_visible&attendance_id='.$attendance[0].'">'.
-								Display::return_icon('invisible.png', get_lang('Show'), array(), ICON_SIZE_SMALL).'</a>';
-							$attendance[2] = '<span class="muted">'.$attendance[2].'</span>';
-						}
-						if ($allowDelete === 'true') {
-							$actions .= ' <a href="index.php?' . api_get_cidreq() . '&action=attendance_delete&attendance_id=' . $attendance[0].'">' .
-								Display::return_icon('delete.png', get_lang('Delete'), array(), ICON_SIZE_SMALL) . '</a>';
-						}
-					}
-				}
-
-				// display lock/unlock icon
-				$is_done_all_calendar = self::is_all_attendance_calendar_done($attendance[0]);
-
-				if ($is_done_all_calendar) {
-					$locked   = $attendance[4];
-					if ($locked == 0) {
-						if (api_is_platform_admin()) {
-							$message_alert = get_lang('AreYouSureToLockTheAttendance');
-						} else {
-							$message_alert = get_lang('UnlockMessageInformation');
-						}
-						$actions .= '&nbsp;<a onclick="javascript:if(!confirm(\''.$message_alert.'\')) return false;" href="index.php?'.api_get_cidreq().'&action=lock_attendance&attendance_id='.$attendance[0].'">'.
+        $res = Database::query($sql);
+        $attendances = array ();
+        $user_info = api_get_user_info();
+        $allowDelete = api_get_setting('allow_delete_attendance');
+
+        while ($attendance = Database::fetch_row($res)) {
+
+            $student_param = '';
+            if (api_is_drh() && $_GET['student_id']) {
+                $student_param = '&student_id='.intval($_GET['student_id']);
+            }
+
+            $session_star = '';
+
+            if (api_get_session_id() == $attendance[6]) {
+                $session_star = api_get_session_image(api_get_session_id(), $user_info['status']);
+            }
+            if ($attendance[5] == 1) {
+
+                $isDrhOfCourse = CourseManager::isUserSubscribedInCourseAsDrh(
+                    api_get_user_id(),
+                    api_get_course_info()
+                );
+
+                if (api_is_allowed_to_edit(null, true) || $isDrhOfCourse) {
+                    // Link to edit
+                    $attendance[1] = '<a href="index.php?'.api_get_cidreq().'&action=attendance_sheet_list&attendance_id='.$attendance[0].$student_param.'">'.$attendance[1].'</a>'.$session_star;
+                } else {
+                    // Link to view
+                    $attendance[1] = '<a href="index.php?'.api_get_cidreq().'&action=attendance_sheet_list_no_edit&attendance_id='.$attendance[0].$student_param.'">'.$attendance[1].'</a>'.$session_star;
+                }
+
+            } else {
+                $attendance[1] = '<a class="muted" href="index.php?'.api_get_cidreq().'&action=attendance_sheet_list&attendance_id='.$attendance[0].$student_param.'">'.$attendance[1].'</a>'.$session_star;
+            }
+
+            if ($attendance[5] == 1) {
+                $attendance[3] = '<center>'.$attendance[3].'</center>';
+            } else {
+                $attendance[3] = '<center><span class="muted">'.$attendance[3].'</span></center>';
+            }
+
+            $attendance[3] = '<center>'.$attendance[3].'</center>';
+            if (api_is_allowed_to_edit(null, true)) {
+                $actions  = '';
+                $actions .= '<center>';
+
+                if (api_is_platform_admin()) {
+                    $actions .= '<a href="index.php?'.api_get_cidreq().'&action=attendance_edit&attendance_id='.$attendance[0].'">'.
+                        Display::return_icon('edit.png', get_lang('Edit'), array(), ICON_SIZE_SMALL).'</a>&nbsp;';
+                    // Visible
+                    if ($attendance[5] == 1) {
+                        $actions .= '<a href="index.php?'.api_get_cidreq().'&action=attendance_set_invisible&attendance_id='.$attendance[0].'">'.
+                            Display::return_icon('visible.png', get_lang('Hide'), array(), ICON_SIZE_SMALL).'</a>';
+                    } else {
+                        $actions .= '<a href="index.php?'.api_get_cidreq().'&action=attendance_set_visible&attendance_id='.$attendance[0].'">'.
+                            Display::return_icon('invisible.png', get_lang('Show'), array(), ICON_SIZE_SMALL).'</a>';
+                        $attendance[2] = '<span class="muted">'.$attendance[2].'</span>';
+                    }
+                    if ($allowDelete === 'true') {
+                        $actions .= '<a href="index.php?' . api_get_cidreq() . '&action=attendance_delete&attendance_id=' . $attendance[0]. '">' .
+                            Display::return_icon('delete.png', get_lang('Delete'), array(), ICON_SIZE_SMALL) . '</a>';
+                    }
+                } else {
+                    $is_locked_attendance = self::is_locked_attendance($attendance[0]);
+                    if ($is_locked_attendance) {
+                        $actions .= Display::return_icon('edit_na.png', get_lang('Edit')).'&nbsp;';
+                        $actions .= Display::return_icon('visible.png', get_lang('Hide'));
+                    } else {
+                        $actions .= '<a href="index.php?'.api_get_cidreq().'&action=attendance_edit&attendance_id='.$attendance[0].'">'.
+                            Display::return_icon('edit.png', get_lang('Edit'), array(), ICON_SIZE_SMALL).'</a>&nbsp;';
+
+                        if ($attendance[5] == 1) {
+                            $actions .= ' <a href="index.php?'.api_get_cidreq().'&action=attendance_set_invisible&attendance_id='.$attendance[0].'">'.
+                                Display::return_icon('visible.png', get_lang('Hide'), array(), ICON_SIZE_SMALL).'</a>';
+                        } else {
+                            $actions .= ' <a href="index.php?'.api_get_cidreq().'&action=attendance_set_visible&attendance_id='.$attendance[0].'">'.
+                                Display::return_icon('invisible.png', get_lang('Show'), array(), ICON_SIZE_SMALL).'</a>';
+                            $attendance[2] = '<span class="muted">'.$attendance[2].'</span>';
+                        }
+                        if ($allowDelete === 'true') {
+                            $actions .= ' <a href="index.php?' . api_get_cidreq() . '&action=attendance_delete&attendance_id=' . $attendance[0].'">' .
+                                Display::return_icon('delete.png', get_lang('Delete'), array(), ICON_SIZE_SMALL) . '</a>';
+                        }
+                    }
+                }
+
+                // display lock/unlock icon
+                $is_done_all_calendar = self::is_all_attendance_calendar_done($attendance[0]);
+
+                if ($is_done_all_calendar) {
+                    $locked   = $attendance[4];
+                    if ($locked == 0) {
+                        if (api_is_platform_admin()) {
+                            $message_alert = get_lang('AreYouSureToLockTheAttendance');
+                        } else {
+                            $message_alert = get_lang('UnlockMessageInformation');
+                        }
+                        $actions .= '&nbsp;<a onclick="javascript:if(!confirm(\''.$message_alert.'\')) return false;" href="index.php?'.api_get_cidreq().'&action=lock_attendance&attendance_id='.$attendance[0].'">'.
                             Display::return_icon('unlock.png', get_lang('LockAttendance')).'</a>';
-					} else {
-						if (api_is_platform_admin()) {
-							$actions .= '&nbsp;<a onclick="javascript:if(!confirm(\''.get_lang('AreYouSureToUnlockTheAttendance').'\')) return false;" href="index.php?'.api_get_cidreq().'&action=unlock_attendance&attendance_id='.$attendance[0].'">'.
-									Display::return_icon('locked.png', get_lang('UnlockAttendance')).'</a>';
-						} else {
-							$actions .= '&nbsp;'.Display::return_icon('locked_na.png', get_lang('LockedAttendance'));
-						}
-					}
-				}
-				$actions .= '</center>';
-
-				$attendances[] = array($attendance[0], $attendance[1], $attendance[2], $attendance[3],$actions);
-			} else {
-				$attendance[0] = '&nbsp;';
-				$attendances[] = array($attendance[0], $attendance[1], $attendance[2], $attendance[3]);
-			}
-		}
-		return $attendances;
-	}
-
-	/**
-	 * Get the attendances by id to display on the current page
-	 * @param  int     $attendance_id
-	 * @return array   attendance data
-	 */
-	public function get_attendance_by_id($attendance_id)
-	{
-		$tbl_attendance = Database :: get_course_table(TABLE_ATTENDANCE);
-		$attendance_id = intval($attendance_id);
-		$course_id = api_get_course_int_id();
-		$attendance_data = array();
-		$sql = "SELECT * FROM $tbl_attendance
+                    } else {
+                        if (api_is_platform_admin()) {
+                            $actions .= '&nbsp;<a onclick="javascript:if(!confirm(\''.get_lang('AreYouSureToUnlockTheAttendance').'\')) return false;" href="index.php?'.api_get_cidreq().'&action=unlock_attendance&attendance_id='.$attendance[0].'">'.
+                                    Display::return_icon('locked.png', get_lang('UnlockAttendance')).'</a>';
+                        } else {
+                            $actions .= '&nbsp;'.Display::return_icon('locked_na.png', get_lang('LockedAttendance'));
+                        }
+                    }
+                }
+                $actions .= '</center>';
+
+                $attendances[] = array($attendance[0], $attendance[1], $attendance[2], $attendance[3],$actions);
+            } else {
+                $attendance[0] = '&nbsp;';
+                $attendances[] = array($attendance[0], $attendance[1], $attendance[2], $attendance[3]);
+            }
+        }
+        return $attendances;
+    }
+
+    /**
+     * Get the attendances by id to display on the current page
+     * @param  int     $attendance_id
+     * @return array   attendance data
+     */
+    public function get_attendance_by_id($attendance_id)
+    {
+        $tbl_attendance = Database :: get_course_table(TABLE_ATTENDANCE);
+        $attendance_id = intval($attendance_id);
+        $course_id = api_get_course_int_id();
+        $attendance_data = array();
+        $sql = "SELECT * FROM $tbl_attendance
 				WHERE c_id = $course_id AND id = '$attendance_id'";
-		$res = Database::query($sql);
-		if (Database::num_rows($res) > 0) {
-			while ($row = Database::fetch_array($res)) {
-				$attendance_data = $row;
-			}
-		}
-		return $attendance_data;
-	}
-
-	/**
-	 * Add attendances sheet inside table. This is the *list of* dates, not
-	 * a specific date in itself.
-	 * @param  bool   true for adding link in gradebook or false otherwise (optional)
-	 * @return int    last attendance id
-	 */
-	public function attendance_add($link_to_gradebook = false)
-	{
-		$_course = api_get_course_info();
-		$tbl_attendance	= Database :: get_course_table(TABLE_ATTENDANCE);
-		$table_link = Database:: get_main_table(TABLE_MAIN_GRADEBOOK_LINK);
-		$session_id = api_get_session_id();
-		$user_id = api_get_user_id();
-		$course_code = $_course['code'];
-		$course_id = $_course['real_id'];
-		$title_gradebook= $this->attendance_qualify_title;
-		$value_calification = 0;
-		$weight_calification = floatval($this->attendance_weight);
-
-		$params = [
-			'c_id' => $course_id,
-			'name' => $this->name,
-			'description' => $this->description,
-			'attendance_qualify_title' => $title_gradebook,
-			'attendance_weight' => $weight_calification,
-			'session_id' => $session_id,
-			'active' => 1,
-			'attendance_qualify_max' => 0,
-			'locked' => 0
-		];
-		$last_id = Database::insert($tbl_attendance, $params);
-
-		if (!empty($last_id)) {
-
-			$sql = "UPDATE $tbl_attendance SET id = iid WHERE iid = $last_id";
-			Database::query($sql);
-
-			api_item_property_update(
-				$_course,
-				TOOL_ATTENDANCE,
-				$last_id,
-				"AttendanceAdded",
-				$user_id
-			);
-
-		}
-		// add link to gradebook
-		if ($link_to_gradebook && !empty($this->category_id)) {
-			$description = '';
+        $res = Database::query($sql);
+        if (Database::num_rows($res) > 0) {
+            while ($row = Database::fetch_array($res)) {
+                $attendance_data = $row;
+            }
+        }
+        return $attendance_data;
+    }
+
+    /**
+     * Add attendances sheet inside table. This is the *list of* dates, not
+     * a specific date in itself.
+     * @param  bool   true for adding link in gradebook or false otherwise (optional)
+     * @return int    last attendance id
+     */
+    public function attendance_add($link_to_gradebook = false)
+    {
+        $_course = api_get_course_info();
+        $tbl_attendance	= Database :: get_course_table(TABLE_ATTENDANCE);
+        $table_link = Database:: get_main_table(TABLE_MAIN_GRADEBOOK_LINK);
+        $session_id = api_get_session_id();
+        $user_id = api_get_user_id();
+        $course_code = $_course['code'];
+        $course_id = $_course['real_id'];
+        $title_gradebook= $this->attendance_qualify_title;
+        $value_calification = 0;
+        $weight_calification = floatval($this->attendance_weight);
+
+        $params = [
+            'c_id' => $course_id,
+            'name' => $this->name,
+            'description' => $this->description,
+            'attendance_qualify_title' => $title_gradebook,
+            'attendance_weight' => $weight_calification,
+            'session_id' => $session_id,
+            'active' => 1,
+            'attendance_qualify_max' => 0,
+            'locked' => 0
+        ];
+        $last_id = Database::insert($tbl_attendance, $params);
+
+        if (!empty($last_id)) {
+
+            $sql = "UPDATE $tbl_attendance SET id = iid WHERE iid = $last_id";
+            Database::query($sql);
+
+            api_item_property_update(
+                $_course,
+                TOOL_ATTENDANCE,
+                $last_id,
+                "AttendanceAdded",
+                $user_id
+            );
+
+        }
+        // add link to gradebook
+        if ($link_to_gradebook && !empty($this->category_id)) {
+            $description = '';
             $link_info = GradebookUtils::is_resource_in_course_gradebook(
                 $course_code,
                 7,
                 $last_id,
                 $session_id
             );
-			$link_id = $link_info['id'];
-			if (!$link_info) {
-				GradebookUtils::add_resource_to_course_gradebook(
-					$this->category_id,
-					$course_code,
-					7,
-					$last_id,
-					$title_gradebook,
-					$weight_calification,
-					$value_calification,
-					$description,
-					1,
-					$session_id
-				);
-			} else {
-				Database::query('UPDATE '.$table_link.' SET weight='.$weight_calification.' WHERE id='.$link_id.'');
-			}
-		}
-		return $last_id;
-	}
-
-	/**
-	 * edit attendances inside table
-	 * @param 	int	   attendance id
-	 * @param  	bool   true for adding link in gradebook or false otherwise (optional)
-	 * @return 	int    last id
-	 */
-	public function attendance_edit($attendance_id, $link_to_gradebook = false)
-	{
-		$_course = api_get_course_info();
-		$tbl_attendance = Database:: get_course_table(TABLE_ATTENDANCE);
-		$table_link = Database:: get_main_table(TABLE_MAIN_GRADEBOOK_LINK);
-
-		$session_id = api_get_session_id();
-		$user_id = api_get_user_id();
-		$attendance_id = intval($attendance_id);
-		$course_code = $_course['code'];
-		$course_id = $_course['real_id'];
-		$title_gradebook = $this->attendance_qualify_title;
-		$value_calification = 0;
-		$weight_calification = floatval($this->attendance_weight);
-
-		if (!empty($attendance_id)) {
-
-			$params = [
-				'name' => $this->name,
-				'description' => $this->description,
-				'attendance_qualify_title' => $title_gradebook,
-				'attendance_weight' => $weight_calification
-			];
-			Database::update(
-				$tbl_attendance,
-				$params,
-				['c_id = ? AND id = ?' => [$course_id, $attendance_id]]
-			);
-
-			api_item_property_update(
-				$_course,
-				TOOL_ATTENDANCE,
-				$attendance_id,
-				"AttendanceUpdated",
-				$user_id
-			);
-
-			// add link to gradebook
-			if ($link_to_gradebook && !empty($this->category_id)) {
-				$description = '';
-				$link_info = GradebookUtils::is_resource_in_course_gradebook(
-					$course_code,
-					7,
-					$attendance_id,
-					$session_id
-				);
-				if (!$link_info) {
-					GradebookUtils::add_resource_to_course_gradebook(
-						$this->category_id,
-						$course_code,
-						7,
-						$attendance_id,
-						$title_gradebook,
-						$weight_calification,
-						$value_calification,
-						$description,
-						1,
-						$session_id
-					);
-				} else {
-					Database::query('UPDATE '.$table_link.' SET weight='.$weight_calification.' WHERE id='.$link_info['id'].'');
-				}
-			}
-			return $attendance_id;
-		}
-		return null;
-	}
-
-	/**
-	 * Restore attendance
-	 * @param 	int|array	   one or many attendances id
-	 * @return 	int    		   affected rows
-	 */
-	public function attendance_restore($attendance_id)
-	{
-		$_course = api_get_course_info();
-		$tbl_attendance	= Database :: get_course_table(TABLE_ATTENDANCE);
-		$user_id = api_get_user_id();
-		$course_id = $_course['real_id'];
-		if (is_array($attendance_id)) {
-			foreach ($attendance_id as $id) {
-				$id	= intval($id);
-				$sql = "UPDATE $tbl_attendance SET active = 1
+            $link_id = $link_info['id'];
+            if (!$link_info) {
+                GradebookUtils::add_resource_to_course_gradebook(
+                    $this->category_id,
+                    $course_code,
+                    7,
+                    $last_id,
+                    $title_gradebook,
+                    $weight_calification,
+                    $value_calification,
+                    $description,
+                    1,
+                    $session_id
+                );
+            } else {
+                Database::query('UPDATE '.$table_link.' SET weight='.$weight_calification.' WHERE id='.$link_id.'');
+            }
+        }
+        return $last_id;
+    }
+
+    /**
+     * edit attendances inside table
+     * @param 	int	   attendance id
+     * @param  	bool   true for adding link in gradebook or false otherwise (optional)
+     * @return 	int    last id
+     */
+    public function attendance_edit($attendance_id, $link_to_gradebook = false)
+    {
+        $_course = api_get_course_info();
+        $tbl_attendance = Database:: get_course_table(TABLE_ATTENDANCE);
+        $table_link = Database:: get_main_table(TABLE_MAIN_GRADEBOOK_LINK);
+
+        $session_id = api_get_session_id();
+        $user_id = api_get_user_id();
+        $attendance_id = intval($attendance_id);
+        $course_code = $_course['code'];
+        $course_id = $_course['real_id'];
+        $title_gradebook = $this->attendance_qualify_title;
+        $value_calification = 0;
+        $weight_calification = floatval($this->attendance_weight);
+
+        if (!empty($attendance_id)) {
+
+            $params = [
+                'name' => $this->name,
+                'description' => $this->description,
+                'attendance_qualify_title' => $title_gradebook,
+                'attendance_weight' => $weight_calification
+            ];
+            Database::update(
+                $tbl_attendance,
+                $params,
+                ['c_id = ? AND id = ?' => [$course_id, $attendance_id]]
+            );
+
+            api_item_property_update(
+                $_course,
+                TOOL_ATTENDANCE,
+                $attendance_id,
+                "AttendanceUpdated",
+                $user_id
+            );
+
+            // add link to gradebook
+            if ($link_to_gradebook && !empty($this->category_id)) {
+                $description = '';
+                $link_info = GradebookUtils::is_resource_in_course_gradebook(
+                    $course_code,
+                    7,
+                    $attendance_id,
+                    $session_id
+                );
+                if (!$link_info) {
+                    GradebookUtils::add_resource_to_course_gradebook(
+                        $this->category_id,
+                        $course_code,
+                        7,
+                        $attendance_id,
+                        $title_gradebook,
+                        $weight_calification,
+                        $value_calification,
+                        $description,
+                        1,
+                        $session_id
+                    );
+                } else {
+                    Database::query('UPDATE '.$table_link.' SET weight='.$weight_calification.' WHERE id='.$link_info['id'].'');
+                }
+            }
+            return $attendance_id;
+        }
+        return null;
+    }
+
+    /**
+     * Restore attendance
+     * @param 	int|array	   one or many attendances id
+     * @return 	int    		   affected rows
+     */
+    public function attendance_restore($attendance_id)
+    {
+        $_course = api_get_course_info();
+        $tbl_attendance	= Database :: get_course_table(TABLE_ATTENDANCE);
+        $user_id = api_get_user_id();
+        $course_id = $_course['real_id'];
+        if (is_array($attendance_id)) {
+            foreach ($attendance_id as $id) {
+                $id	= intval($id);
+                $sql = "UPDATE $tbl_attendance SET active = 1
 						WHERE c_id = $course_id AND id = '$id'";
-				$result = Database::query($sql);
-				$affected_rows = Database::affected_rows($result);
-				if (!empty($affected_rows)) {
-					// update row item property table
+                $result = Database::query($sql);
+                $affected_rows = Database::affected_rows($result);
+                if (!empty($affected_rows)) {
+                    // update row item property table
                     api_item_property_update(
                         $_course,
                         TOOL_ATTENDANCE,
@@ -453,16 +453,16 @@ 
                         "restore",
                         $user_id
                     );
-				}
-			}
-		} else  {
-			$attendance_id	= intval($attendance_id);
-			$sql = "UPDATE $tbl_attendance SET active = 1
+                }
+            }
+        } else  {
+            $attendance_id	= intval($attendance_id);
+            $sql = "UPDATE $tbl_attendance SET active = 1
 					WHERE c_id = $course_id AND id = '$attendance_id'";
-			$result = Database::query($sql);
-			$affected_rows = Database::affected_rows($result);
-			if (!empty($affected_rows)) {
-				// update row item property table
+            $result = Database::query($sql);
+            $affected_rows = Database::affected_rows($result);
+            if (!empty($affected_rows)) {
+                // update row item property table
                 api_item_property_update(
                     $_course,
                     TOOL_ATTENDANCE,
@@ -470,33 +470,33 @@ 
                     "restore",
                     $user_id
                 );
-			}
-		}
-
-		return $affected_rows;
-	}
-
-	/**
-	 * Delete attendances
-	 * @param 	int|array	$attendance_id   one or many attendances id
-	 * @return 	int    		   affected rows
-	 */
-	public function attendance_delete($attendance_id)
-	{
-		$_course = api_get_course_info();
-		$tbl_attendance	= Database :: get_course_table(TABLE_ATTENDANCE);
+            }
+        }
+
+        return $affected_rows;
+    }
+
+    /**
+     * Delete attendances
+     * @param 	int|array	$attendance_id   one or many attendances id
+     * @return 	int    		   affected rows
+     */
+    public function attendance_delete($attendance_id)
+    {
+        $_course = api_get_course_info();
+        $tbl_attendance	= Database :: get_course_table(TABLE_ATTENDANCE);
         $user_id = api_get_user_id();
         $course_id = $_course['real_id'];
 
-		if (is_array($attendance_id)) {
-			foreach ($attendance_id as $id) {
-				$id	= intval($id);
-				$sql = "UPDATE $tbl_attendance SET active = 2
+        if (is_array($attendance_id)) {
+            foreach ($attendance_id as $id) {
+                $id	= intval($id);
+                $sql = "UPDATE $tbl_attendance SET active = 2
 						WHERE c_id = $course_id AND id = '$id'";
-				$result = Database::query($sql);
-				$affected_rows = Database::affected_rows($result);
-				if (!empty($affected_rows)) {
-					// update row item property table
+                $result = Database::query($sql);
+                $affected_rows = Database::affected_rows($result);
+                if (!empty($affected_rows)) {
+                    // update row item property table
                     api_item_property_update(
                         $_course,
                         TOOL_ATTENDANCE,
@@ -504,142 +504,142 @@ 
                         "delete",
                         $user_id
                     );
-				}
-			}
-		} else  {
-			$attendance_id= intval($attendance_id);
-			$sql = "UPDATE $tbl_attendance SET active = 2
+                }
+            }
+        } else  {
+            $attendance_id= intval($attendance_id);
+            $sql = "UPDATE $tbl_attendance SET active = 2
 					WHERE c_id = $course_id AND id = '$attendance_id'";
 
-			$result = Database::query($sql);
-			$affected_rows = Database::affected_rows($result);
-			if (!empty($affected_rows)) {
-				// update row item property table
-				api_item_property_update(
-					$_course,
-					TOOL_ATTENDANCE,
-					$attendance_id,
-					"delete",
-					$user_id
-				);
-			}
-		}
-
-		return $affected_rows;
-	}
-
-	/**
-	 * Changes visibility
-	 * @param int|array	$attendanceId   one or many attendances id
-	 * @param int status
+            $result = Database::query($sql);
+            $affected_rows = Database::affected_rows($result);
+            if (!empty($affected_rows)) {
+                // update row item property table
+                api_item_property_update(
+                    $_course,
+                    TOOL_ATTENDANCE,
+                    $attendance_id,
+                    "delete",
+                    $user_id
+                );
+            }
+        }
+
+        return $affected_rows;
+    }
+
+    /**
+     * Changes visibility
+     * @param int|array	$attendanceId   one or many attendances id
+     * @param int status
      *
-	 * @return 	int affected rows
-	 */
-	public function changeVisibility($attendanceId, $status = 1)
-	{
-		$_course = api_get_course_info();
-		$tbl_attendance	= Database :: get_course_table(TABLE_ATTENDANCE);
-		$user_id = api_get_user_id();
-		$course_id = $_course['real_id'];
-		$status = intval($status);
-
-		$action = 'visible';
-		if ($status == 0) {
-			$action = 'invisible';
-		}
-
-		if (is_array($attendanceId)) {
-			foreach ($attendanceId as $id) {
-				$id	= intval($id);
-				$sql = "UPDATE $tbl_attendance SET active = $status
+     * @return 	int affected rows
+     */
+    public function changeVisibility($attendanceId, $status = 1)
+    {
+        $_course = api_get_course_info();
+        $tbl_attendance	= Database :: get_course_table(TABLE_ATTENDANCE);
+        $user_id = api_get_user_id();
+        $course_id = $_course['real_id'];
+        $status = intval($status);
+
+        $action = 'visible';
+        if ($status == 0) {
+            $action = 'invisible';
+        }
+
+        if (is_array($attendanceId)) {
+            foreach ($attendanceId as $id) {
+                $id	= intval($id);
+                $sql = "UPDATE $tbl_attendance SET active = $status
 						WHERE c_id = $course_id AND id = '$id'";
-				$result = Database::query($sql);
-				$affected_rows = Database::affected_rows($result);
-				if (!empty($affected_rows)) {
-					// update row item property table
-					api_item_property_update($_course, TOOL_ATTENDANCE, $id, $action, $user_id);
-				}
-			}
-		} else  {
-			$attendanceId	= intval($attendanceId);
-			$sql = "UPDATE $tbl_attendance SET active = $status
+                $result = Database::query($sql);
+                $affected_rows = Database::affected_rows($result);
+                if (!empty($affected_rows)) {
+                    // update row item property table
+                    api_item_property_update($_course, TOOL_ATTENDANCE, $id, $action, $user_id);
+                }
+            }
+        } else  {
+            $attendanceId	= intval($attendanceId);
+            $sql = "UPDATE $tbl_attendance SET active = $status
 					WHERE c_id = $course_id AND id = '$attendanceId'";
-			$result = Database::query($sql);
-			$affected_rows = Database::affected_rows($result);
-			if (!empty($affected_rows)) {
-				// update row item property table
-				api_item_property_update(
-					$_course,
-					TOOL_ATTENDANCE,
-					$attendanceId,
-					$action,
-					$user_id
-				);
-			}
-		}
-
-		return $affected_rows;
-	}
-
-	/**
-	 * Lock or unlock an attendance
-	 * @param   int     attendance id
-	 * @param   bool    True to lock or false otherwise
-	 */
-	public function lock_attendance($attendance_id, $lock = true)
-	{
-		$tbl_attendance = Database::get_course_table(TABLE_ATTENDANCE);
-		$course_id = api_get_course_int_id();
-		$attendance_id = intval($attendance_id);
-		$locked = ($lock)?1:0;
-		$upd = "UPDATE $tbl_attendance SET locked = $locked
+            $result = Database::query($sql);
+            $affected_rows = Database::affected_rows($result);
+            if (!empty($affected_rows)) {
+                // update row item property table
+                api_item_property_update(
+                    $_course,
+                    TOOL_ATTENDANCE,
+                    $attendanceId,
+                    $action,
+                    $user_id
+                );
+            }
+        }
+
+        return $affected_rows;
+    }
+
+    /**
+     * Lock or unlock an attendance
+     * @param   int     attendance id
+     * @param   bool    True to lock or false otherwise
+     */
+    public function lock_attendance($attendance_id, $lock = true)
+    {
+        $tbl_attendance = Database::get_course_table(TABLE_ATTENDANCE);
+        $course_id = api_get_course_int_id();
+        $attendance_id = intval($attendance_id);
+        $locked = ($lock)?1:0;
+        $upd = "UPDATE $tbl_attendance SET locked = $locked
 				WHERE c_id = $course_id AND id = $attendance_id";
-		$result = Database::query($upd);
-		$affected_rows = Database::affected_rows($result);
-		if ($affected_rows && $lock) {
-			// Save attendance sheet log
-			$lastedit_date = api_get_utc_datetime();
-			$lastedit_type = self::LOCKED_ATTENDANCE_LOG_TYPE;
-			$lastedit_user_id = api_get_user_id();
-			$this->save_attendance_sheet_log(
-				$attendance_id,
-				$lastedit_date,
-				$lastedit_type,
-				$lastedit_user_id
-			);
-		}
-		return $affected_rows;
-	}
-
-	/**
-	 * Get registered users inside current course
-	 * @param 	int	   $attendance_id attendance id for showing attendance result field (optional)
-	 * @param int $groupId
-	 * @return 	array  users data
-	 */
-	public function get_users_rel_course($attendance_id = 0, $groupId = null)
-	{
-		$current_session_id = api_get_session_id();
-		$current_course_id  = api_get_course_id();
-		$currentCourseIntId = api_get_course_int_id();
-
-		$studentInGroup = array();
-
-		if (!empty($current_session_id)) {
-			$a_course_users = CourseManager:: get_user_list_from_course_code(
-				$current_course_id,
-				$current_session_id,
-				'',
-				'lastname'
-			);
-		} else {
-			$a_course_users = CourseManager:: get_user_list_from_course_code(
-				$current_course_id,
-				0,
-				'',
-				'lastname'
-			);
-		}
+        $result = Database::query($upd);
+        $affected_rows = Database::affected_rows($result);
+        if ($affected_rows && $lock) {
+            // Save attendance sheet log
+            $lastedit_date = api_get_utc_datetime();
+            $lastedit_type = self::LOCKED_ATTENDANCE_LOG_TYPE;
+            $lastedit_user_id = api_get_user_id();
+            $this->save_attendance_sheet_log(
+                $attendance_id,
+                $lastedit_date,
+                $lastedit_type,
+                $lastedit_user_id
+            );
+        }
+        return $affected_rows;
+    }
+
+    /**
+     * Get registered users inside current course
+     * @param 	int	   $attendance_id attendance id for showing attendance result field (optional)
+     * @param int $groupId
+     * @return 	array  users data
+     */
+    public function get_users_rel_course($attendance_id = 0, $groupId = null)
+    {
+        $current_session_id = api_get_session_id();
+        $current_course_id  = api_get_course_id();
+        $currentCourseIntId = api_get_course_int_id();
+
+        $studentInGroup = array();
+
+        if (!empty($current_session_id)) {
+            $a_course_users = CourseManager:: get_user_list_from_course_code(
+                $current_course_id,
+                $current_session_id,
+                '',
+                'lastname'
+            );
+        } else {
+            $a_course_users = CourseManager:: get_user_list_from_course_code(
+                $current_course_id,
+                0,
+                '',
+                'lastname'
+            );
+        }
 
         if (!empty($groupId)) {
             $students = GroupManager::getStudents($groupId);
@@ -650,192 +650,192 @@ 
             }
         }
 
-		// get registered users inside current course
-		$a_users = array();
-		foreach ($a_course_users as $key => $user_data) {
-			$value = array();
-			$uid = $user_data['user_id'];
-			$userInfo = api_get_user_info($uid);
-
-			$status = $user_data['status'];
-
-			if (!empty($groupId)) {
-				if (!isset($studentInGroup[$uid])) {
-					continue;
-				}
-			}
-
-			$user_status_in_session = null;
-			$user_status_in_course  = null;
-
-			if (api_get_session_id()) {
-				$user_status_in_session = SessionManager::get_user_status_in_course_session(
-					$uid,
-					$currentCourseIntId,
-					$current_session_id
-				);
-			} else {
-				$user_status_in_course = CourseManager::get_user_in_course_status(
-					$uid,
-					$current_course_id
-				);
-			}
-
-			// Not taking into account DRH or COURSEMANAGER
-			if ($uid <= 1 ||
-				$status == DRH ||
-				$user_status_in_course == COURSEMANAGER ||
-				$user_status_in_session == 2
-			) {
-				continue;
-			}
-
-			if (!empty($attendance_id)) {
-				$user_faults = $this->get_faults_of_user($uid, $attendance_id, $groupId);
-				$value['attendance_result'] = $user_faults['faults'].'/'.$user_faults['total'].' ('.$user_faults['faults_porcent'].'%)';
-				$value['result_color_bar'] 	= $user_faults['color_bar'];
-			}
+        // get registered users inside current course
+        $a_users = array();
+        foreach ($a_course_users as $key => $user_data) {
+            $value = array();
+            $uid = $user_data['user_id'];
+            $userInfo = api_get_user_info($uid);
+
+            $status = $user_data['status'];
+
+            if (!empty($groupId)) {
+                if (!isset($studentInGroup[$uid])) {
+                    continue;
+                }
+            }
+
+            $user_status_in_session = null;
+            $user_status_in_course  = null;
+
+            if (api_get_session_id()) {
+                $user_status_in_session = SessionManager::get_user_status_in_course_session(
+                    $uid,
+                    $currentCourseIntId,
+                    $current_session_id
+                );
+            } else {
+                $user_status_in_course = CourseManager::get_user_in_course_status(
+                    $uid,
+                    $current_course_id
+                );
+            }
+
+            // Not taking into account DRH or COURSEMANAGER
+            if ($uid <= 1 ||
+                $status == DRH ||
+                $user_status_in_course == COURSEMANAGER ||
+                $user_status_in_session == 2
+            ) {
+                continue;
+            }
+
+            if (!empty($attendance_id)) {
+                $user_faults = $this->get_faults_of_user($uid, $attendance_id, $groupId);
+                $value['attendance_result'] = $user_faults['faults'].'/'.$user_faults['total'].' ('.$user_faults['faults_porcent'].'%)';
+                $value['result_color_bar'] 	= $user_faults['color_bar'];
+            }
 
             $photo = Display::img($userInfo['avatar_small'], $userInfo['complete_name'], [], false);
 
-			$value['photo'] = $photo;
-			$value['firstname'] = $user_data['firstname'];
-			$value['lastname'] = $user_data['lastname'];
-			$value['username'] = $user_data['username'];
-			$value['user_id'] = $uid;
-
-			//Sending only 5 items in the array instead of 60
-			$a_users[$key] = $value;
-		}
-
-		return $a_users;
-	}
-
-	/**
-	 * add attendances sheet inside table
-	 * @param 	int	   $calendar_id attendance calendar id
-	 * @param  	array  $users_present present users during current class
-	 * @param	int	   $attendance_id
-	 * @return 	int    affected rows
-	 */
-	public function attendance_sheet_add($calendar_id, $users_present, $attendance_id)
-	{
-		$tbl_attendance_sheet 	= Database::get_course_table(TABLE_ATTENDANCE_SHEET);
-		$tbl_attendance_calendar= Database::get_course_table(TABLE_ATTENDANCE_CALENDAR);
-
-		$calendar_id = intval($calendar_id);
-		$attendance_id = intval($attendance_id);
-		$users = $this->get_users_rel_course();
-		$course_id = api_get_course_int_id();
-
-		$user_ids = array_keys($users);
-		$users_absent = array_diff($user_ids,$users_present);
-		$affected_rows = 0;
-
-		// get last edit type
-		$calendar_data = $this->get_attendance_calendar_by_id($calendar_id);
-		$lastedit_type = self::DONE_ATTENDANCE_LOG_TYPE;
-		if ($calendar_data['done_attendance']) {
-			$lastedit_type = self::UPDATED_ATTENDANCE_LOG_TYPE;
-		}
-
-		// save users present in class
-		foreach ($users_present as $user_present) {
-			$uid = intval($user_present);
-			// check if user already was registered with the $calendar_id
-			$sql = "SELECT user_id FROM $tbl_attendance_sheet
+            $value['photo'] = $photo;
+            $value['firstname'] = $user_data['firstname'];
+            $value['lastname'] = $user_data['lastname'];
+            $value['username'] = $user_data['username'];
+            $value['user_id'] = $uid;
+
+            //Sending only 5 items in the array instead of 60
+            $a_users[$key] = $value;
+        }
+
+        return $a_users;
+    }
+
+    /**
+     * add attendances sheet inside table
+     * @param 	int	   $calendar_id attendance calendar id
+     * @param  	array  $users_present present users during current class
+     * @param	int	   $attendance_id
+     * @return 	int    affected rows
+     */
+    public function attendance_sheet_add($calendar_id, $users_present, $attendance_id)
+    {
+        $tbl_attendance_sheet 	= Database::get_course_table(TABLE_ATTENDANCE_SHEET);
+        $tbl_attendance_calendar= Database::get_course_table(TABLE_ATTENDANCE_CALENDAR);
+
+        $calendar_id = intval($calendar_id);
+        $attendance_id = intval($attendance_id);
+        $users = $this->get_users_rel_course();
+        $course_id = api_get_course_int_id();
+
+        $user_ids = array_keys($users);
+        $users_absent = array_diff($user_ids,$users_present);
+        $affected_rows = 0;
+
+        // get last edit type
+        $calendar_data = $this->get_attendance_calendar_by_id($calendar_id);
+        $lastedit_type = self::DONE_ATTENDANCE_LOG_TYPE;
+        if ($calendar_data['done_attendance']) {
+            $lastedit_type = self::UPDATED_ATTENDANCE_LOG_TYPE;
+        }
+
+        // save users present in class
+        foreach ($users_present as $user_present) {
+            $uid = intval($user_present);
+            // check if user already was registered with the $calendar_id
+            $sql = "SELECT user_id FROM $tbl_attendance_sheet
 					WHERE c_id = $course_id AND user_id='$uid' AND attendance_calendar_id = '$calendar_id'";
-			$rs  = Database::query($sql);
-			if (Database::num_rows($rs) == 0) {
-				$sql = "INSERT INTO $tbl_attendance_sheet SET
+            $rs  = Database::query($sql);
+            if (Database::num_rows($rs) == 0) {
+                $sql = "INSERT INTO $tbl_attendance_sheet SET
 						c_id					= $course_id,
 						user_id 				= '$uid',
 						attendance_calendar_id 	= '$calendar_id',
 						presence 				= 1";
-				$result = Database::query($sql);
+                $result = Database::query($sql);
 
-				$affected_rows += Database::affected_rows($result);
-			} else {
-				$sql = "UPDATE $tbl_attendance_sheet SET presence = 1
+                $affected_rows += Database::affected_rows($result);
+            } else {
+                $sql = "UPDATE $tbl_attendance_sheet SET presence = 1
 						WHERE
 							c_id = $course_id AND
 							user_id ='$uid' AND
 							attendance_calendar_id = '$calendar_id'
 						";
-				$result = Database::query($sql);
-				$affected_rows += Database::affected_rows($result);
-			}
-		}
-
-		// save users absent in class
-		foreach ($users_absent as $user_absent) {
-			$uid = intval($user_absent);
-			// check if user already was registered with the $calendar_id
-			$sql = "SELECT user_id FROM $tbl_attendance_sheet
+                $result = Database::query($sql);
+                $affected_rows += Database::affected_rows($result);
+            }
+        }
+
+        // save users absent in class
+        foreach ($users_absent as $user_absent) {
+            $uid = intval($user_absent);
+            // check if user already was registered with the $calendar_id
+            $sql = "SELECT user_id FROM $tbl_attendance_sheet
 					WHERE c_id = $course_id AND user_id='$uid' AND attendance_calendar_id = '$calendar_id'";
-			$rs  = Database::query($sql);
-			if (Database::num_rows($rs) == 0) {
-				$sql = "INSERT INTO $tbl_attendance_sheet SET
+            $rs  = Database::query($sql);
+            if (Database::num_rows($rs) == 0) {
+                $sql = "INSERT INTO $tbl_attendance_sheet SET
 						c_id = $course_id,
 						user_id ='$uid',
 						attendance_calendar_id = '$calendar_id',
 						presence = 0";
-				$result = Database::query($sql);
+                $result = Database::query($sql);
 
-				Database::insert_id();
+                Database::insert_id();
 
-				$affected_rows += Database::affected_rows($result);
-			} else {
-				$sql = "UPDATE $tbl_attendance_sheet SET presence = 0
+                $affected_rows += Database::affected_rows($result);
+            } else {
+                $sql = "UPDATE $tbl_attendance_sheet SET presence = 0
 						WHERE
 							c_id = $course_id AND
 							user_id ='$uid' AND
 							attendance_calendar_id = '$calendar_id'";
-				$result = Database::query($sql);
-				$affected_rows += Database::affected_rows($result);
-			}
-		}
+                $result = Database::query($sql);
+                $affected_rows += Database::affected_rows($result);
+            }
+        }
 
-		// update done_attendance inside attendance calendar table
-		$sql = "UPDATE $tbl_attendance_calendar SET done_attendance = 1
+        // update done_attendance inside attendance calendar table
+        $sql = "UPDATE $tbl_attendance_calendar SET done_attendance = 1
 				WHERE  c_id = $course_id AND id = '$calendar_id'";
-		Database::query($sql);
-
-		// save users' results
-		$this->update_users_results($user_ids, $attendance_id);
-
-		if ($affected_rows) {
-			//save attendance sheet log
-			$lastedit_date = api_get_utc_datetime();
-			$lastedit_user_id = api_get_user_id();
-			$calendar_date_value = $calendar_data['date_time'];
-			$this->save_attendance_sheet_log(
-				$attendance_id,
-				$lastedit_date,
-				$lastedit_type,
-				$lastedit_user_id,
-				$calendar_date_value
-			);
-		}
-
-		return $affected_rows;
-	}
-
-	/**
-	 * update users' attendance results
-	 * @param 	array  $user_ids registered users inside current course
-	 * @param	int	   $attendance_id
-	 * @return 	void
-	 */
-	public function update_users_results($user_ids, $attendance_id)
-	{
-		$tbl_attendance_sheet = Database::get_course_table(TABLE_ATTENDANCE_SHEET);
-		$tbl_attendance_result = Database::get_course_table(TABLE_ATTENDANCE_RESULT);
-		$tbl_attendance = Database::get_course_table(TABLE_ATTENDANCE);
-		$course_id = api_get_course_int_id();
-
-		$attendance_id = intval($attendance_id);
-		// fill results about presence of students
+        Database::query($sql);
+
+        // save users' results
+        $this->update_users_results($user_ids, $attendance_id);
+
+        if ($affected_rows) {
+            //save attendance sheet log
+            $lastedit_date = api_get_utc_datetime();
+            $lastedit_user_id = api_get_user_id();
+            $calendar_date_value = $calendar_data['date_time'];
+            $this->save_attendance_sheet_log(
+                $attendance_id,
+                $lastedit_date,
+                $lastedit_type,
+                $lastedit_user_id,
+                $calendar_date_value
+            );
+        }
+
+        return $affected_rows;
+    }
+
+    /**
+     * update users' attendance results
+     * @param 	array  $user_ids registered users inside current course
+     * @param	int	   $attendance_id
+     * @return 	void
+     */
+    public function update_users_results($user_ids, $attendance_id)
+    {
+        $tbl_attendance_sheet = Database::get_course_table(TABLE_ATTENDANCE_SHEET);
+        $tbl_attendance_result = Database::get_course_table(TABLE_ATTENDANCE_RESULT);
+        $tbl_attendance = Database::get_course_table(TABLE_ATTENDANCE);
+        $course_id = api_get_course_int_id();
+
+        $attendance_id = intval($attendance_id);
+        // fill results about presence of students
         $attendance_calendar = $this->get_attendance_calendar(
             $attendance_id,
             'all',
@@ -843,82 +843,82 @@ 
             null,
             true
         );
-		$calendar_ids = array();
-		// get all dates from calendar by current attendance
-		foreach ($attendance_calendar as $cal) {
-			$calendar_ids[] = $cal['id'];
-		}
-
-		// get count of presences by users inside current attendance and save like results
-		if (count($user_ids) > 0) {
-			foreach ($user_ids as $uid) {
-				$count_presences = 0;
-				if (count($calendar_ids) > 0) {
-					$sql = "SELECT count(presence) as count_presences
+        $calendar_ids = array();
+        // get all dates from calendar by current attendance
+        foreach ($attendance_calendar as $cal) {
+            $calendar_ids[] = $cal['id'];
+        }
+
+        // get count of presences by users inside current attendance and save like results
+        if (count($user_ids) > 0) {
+            foreach ($user_ids as $uid) {
+                $count_presences = 0;
+                if (count($calendar_ids) > 0) {
+                    $sql = "SELECT count(presence) as count_presences
 							FROM $tbl_attendance_sheet
 					        WHERE
 					        	c_id = $course_id AND
 					        	user_id = '$uid' AND
 					        	attendance_calendar_id IN (".implode(',', $calendar_ids).") AND
 					        	presence = 1";
-					$rs_count  = Database::query($sql);
-					$row_count = Database::fetch_array($rs_count);
-					$count_presences = $row_count['count_presences'];
-				}
+                    $rs_count  = Database::query($sql);
+                    $row_count = Database::fetch_array($rs_count);
+                    $count_presences = $row_count['count_presences'];
+                }
 
-				// save results
-				$sql = "SELECT id FROM $tbl_attendance_result
+                // save results
+                $sql = "SELECT id FROM $tbl_attendance_result
 						WHERE
 							c_id = $course_id AND
 							user_id = '$uid' AND
 							attendance_id = '$attendance_id' ";
-				$rs_check_result = Database::query($sql);
+                $rs_check_result = Database::query($sql);
 
-				if (Database::num_rows($rs_check_result) > 0) {
-					// update result
-					$sql = "UPDATE $tbl_attendance_result SET
+                if (Database::num_rows($rs_check_result) > 0) {
+                    // update result
+                    $sql = "UPDATE $tbl_attendance_result SET
 							score = '$count_presences'
 							WHERE
 								c_id = $course_id AND
 								user_id='$uid' AND
 								attendance_id='$attendance_id'";
-					Database::query($sql);
-				} else {
-					// insert new result
-					$sql = "INSERT INTO $tbl_attendance_result SET
+                    Database::query($sql);
+                } else {
+                    // insert new result
+                    $sql = "INSERT INTO $tbl_attendance_result SET
 							c_id = $course_id ,
 							user_id			= '$uid',
 							attendance_id 	= '$attendance_id',
 							score			= '$count_presences'";
-					Database::query($sql);
+                    Database::query($sql);
 
-					$insertId = Database::insert_id();
+                    $insertId = Database::insert_id();
                     if ($insertId) {
                         $sql = "UPDATE $tbl_attendance_result SET id = iid WHERE iid = $insertId";
                         Database::query($sql);
                     }
-				}
-			}
-		}
+                }
+            }
+        }
 
-		// update attendance qualify max
-		$count_done_calendar = self::get_done_attendance_calendar($attendance_id);
+        // update attendance qualify max
+        $count_done_calendar = self::get_done_attendance_calendar($attendance_id);
 
-		$sql = "UPDATE $tbl_attendance SET
+        $sql = "UPDATE $tbl_attendance SET
 				attendance_qualify_max = '$count_done_calendar'
 				WHERE c_id = $course_id AND id = '$attendance_id'";
-		Database::query($sql);
-	}
-
-	/**
-	 * update attendance_sheet_log table, is used as history of an attendance sheet
-	 * @param   int     Attendance id
-	 * @param   string  Last edit datetime
-	 * @param   string  Event type ('locked_attendance', 'done_attendance_sheet' ...)
-	 * @param   int     Last edit user id
-	 * @param   string  Calendar datetime value (optional, when event type is 'done_attendance_sheet')
-	 * @return  int     Affected rows
-	 */
+        Database::query($sql);
+    }
+
+    /**
+     * update attendance_sheet_log table, is used as history of an attendance sheet
+     * @param   int     Attendance id
+     * @param   string  Last edit datetime
+     * @param   string  Event type ('locked_attendance', 'done_attendance_sheet' ...)
+     * @param   int     Last edit user id
+     * @param   string  Calendar datetime value (optional, when event type is 'done_attendance_sheet')
+     * @return  int     Affected rows
+     */
     public function save_attendance_sheet_log(
         $attendance_id,
         $lastedit_date,
@@ -926,22 +926,22 @@ 
         $lastedit_user_id,
         $calendar_date_value = null
     ) {
-		$course_id = api_get_course_int_id();
+        $course_id = api_get_course_int_id();
 
-		// define table
-		$tbl_attendance_sheet_log = Database::get_course_table(TABLE_ATTENDANCE_SHEET_LOG);
+        // define table
+        $tbl_attendance_sheet_log = Database::get_course_table(TABLE_ATTENDANCE_SHEET_LOG);
 
-		// protect data
-		$attendance_id = intval($attendance_id);
-		$lastedit_user_id = intval($lastedit_user_id);
+        // protect data
+        $attendance_id = intval($attendance_id);
+        $lastedit_user_id = intval($lastedit_user_id);
 
-		if (isset($calendar_date_value)) {
-			$calendar_date_value = $calendar_date_value;
-		} else {
-			$calendar_date_value = '';
-		}
+        if (isset($calendar_date_value)) {
+            $calendar_date_value = $calendar_date_value;
+        } else {
+            $calendar_date_value = '';
+        }
 
-		// save data
+        // save data
         $params = [
             'c_id' => $course_id,
             'attendance_id' => $attendance_id,
@@ -950,228 +950,228 @@ 
             'lastedit_user_id' => $lastedit_user_id,
             'calendar_date_value' => $calendar_date_value,
         ];
-		$insertId = Database::insert($tbl_attendance_sheet_log, $params);
+        $insertId = Database::insert($tbl_attendance_sheet_log, $params);
         if ($insertId) {
             $sql = "UPDATE $tbl_attendance_sheet_log SET id = iid WHERE iid = $insertId";
             Database::query($sql);
         }
 
-		return $insertId;
-	}
-
-	/**
-	 * Get number of done attendances inside current sheet
-	 * @param	int	   attendance id
-	 * @return 	int	   number of done attendances
-	 */
-	public static function get_done_attendance_calendar($attendance_id)
-	{
-		$tbl_attendance_calendar = Database::get_course_table(TABLE_ATTENDANCE_CALENDAR);
-		$attendance_id = intval($attendance_id);
-		$course_id = api_get_course_int_id();
-		$sql = "SELECT count(done_attendance) as count
+        return $insertId;
+    }
+
+    /**
+     * Get number of done attendances inside current sheet
+     * @param	int	   attendance id
+     * @return 	int	   number of done attendances
+     */
+    public static function get_done_attendance_calendar($attendance_id)
+    {
+        $tbl_attendance_calendar = Database::get_course_table(TABLE_ATTENDANCE_CALENDAR);
+        $attendance_id = intval($attendance_id);
+        $course_id = api_get_course_int_id();
+        $sql = "SELECT count(done_attendance) as count
                 FROM $tbl_attendance_calendar
                 WHERE
                     c_id = $course_id AND
                     attendance_id = '$attendance_id' AND
                     done_attendance = 1
                 ";
-		$rs  = Database::query($sql);
-		$row = Database::fetch_array($rs);
-		$count = $row['count'];
-		return $count;
-	}
-
-	/**
-	 * Get results of faults (absents) by user
-	 * @param int $user_id
-	 * @param int $attendance_id
-	 * @param int $groupId
-	 * @return 	array  results containing number of faults, total done attendance,
-	 * percent of faults and color depend on result (red, orange)
-	 */
-	public function get_faults_of_user($user_id, $attendance_id, $groupId = null)
-	{
-		// initializing database table and variables
-		$user_id 		= intval($user_id);
-		$attendance_id 	= intval($attendance_id);
-		$results = array();
-		$calendar_count = self::get_number_of_attendance_calendar($attendance_id, $groupId, NULL, $user_id);
-		// $total_done_attendance 	= $attendance_data['attendance_qualify_max'];
+        $rs  = Database::query($sql);
+        $row = Database::fetch_array($rs);
+        $count = $row['count'];
+        return $count;
+    }
+
+    /**
+     * Get results of faults (absents) by user
+     * @param int $user_id
+     * @param int $attendance_id
+     * @param int $groupId
+     * @return 	array  results containing number of faults, total done attendance,
+     * percent of faults and color depend on result (red, orange)
+     */
+    public function get_faults_of_user($user_id, $attendance_id, $groupId = null)
+    {
+        // initializing database table and variables
+        $user_id 		= intval($user_id);
+        $attendance_id 	= intval($attendance_id);
+        $results = array();
+        $calendar_count = self::get_number_of_attendance_calendar($attendance_id, $groupId, NULL, $user_id);
+        // $total_done_attendance 	= $attendance_data['attendance_qualify_max'];
         $total_done_attendance 	= self::get_number_of_attendance_calendar($attendance_id, $groupId, true, $user_id);
-		$attendance_user_score  = $this->get_user_score($user_id, $attendance_id, $groupId);
+        $attendance_user_score  = $this->get_user_score($user_id, $attendance_id, $groupId);
 
-		//This is the main change of the BT#1381
-		//$total_done_attendance = $calendar_count;
+        //This is the main change of the BT#1381
+        //$total_done_attendance = $calendar_count;
 
-		// calculate results
-		$faults = $total_done_attendance - $attendance_user_score;
+        // calculate results
+        $faults = $total_done_attendance - $attendance_user_score;
 
         if (empty($calendar_count)) {
             $faults = 0;
         }
 
         $faults = $faults > 0 ? $faults : 0;
-		$faults_porcent = $calendar_count > 0 ?round(($faults*100)/$calendar_count,0):0;
+        $faults_porcent = $calendar_count > 0 ?round(($faults*100)/$calendar_count,0):0;
         $results['faults'] = $faults;
         $results['total'] = $calendar_count;
         $results['faults_porcent'] = $faults_porcent;
-		$color_bar = '';
+        $color_bar = '';
 
         if ($faults_porcent > 25) {
             $color_bar = '#f28989';
-		} else if ($faults_porcent > 10) {
-			$color_bar = '#F90';
-		}
-		$results['color_bar'] = $color_bar;
-
-		return $results;
-	}
-
-	/**
-	 * Get results of faults average for all courses by user
-	 * @param	int	   $user_id
-	 * @return 	array  results containing number of faults, total done attendance,
-	 * percentage of faults and color depend on result (red, orange)
-	 */
-	public function get_faults_average_inside_courses($user_id)
-	{
-		// get all courses of current user
-		$courses = CourseManager::get_courses_list_by_user_id($user_id, true);
-
-		$user_id = intval($user_id);
-		$results = array();
-		$total_faults = $total_weight = $porcent = 0;
-		foreach ($courses as $course) {
-			//$course_code = $course['code'];
-			//$course_info = api_get_course_info($course_code);
-			$course_id = $course['real_id'];
-			$tbl_attendance_result 	= Database::get_course_table(TABLE_ATTENDANCE_RESULT);
-
-			$attendances_by_course = $this->get_attendances_list($course_id);
-
-			foreach ($attendances_by_course as $attendance) {
-				// get total faults and total weight
-				$total_done_attendance 	= $attendance['attendance_qualify_max'];
-				$sql = "SELECT score
+        } else if ($faults_porcent > 10) {
+            $color_bar = '#F90';
+        }
+        $results['color_bar'] = $color_bar;
+
+        return $results;
+    }
+
+    /**
+     * Get results of faults average for all courses by user
+     * @param	int	   $user_id
+     * @return 	array  results containing number of faults, total done attendance,
+     * percentage of faults and color depend on result (red, orange)
+     */
+    public function get_faults_average_inside_courses($user_id)
+    {
+        // get all courses of current user
+        $courses = CourseManager::get_courses_list_by_user_id($user_id, true);
+
+        $user_id = intval($user_id);
+        $results = array();
+        $total_faults = $total_weight = $porcent = 0;
+        foreach ($courses as $course) {
+            //$course_code = $course['code'];
+            //$course_info = api_get_course_info($course_code);
+            $course_id = $course['real_id'];
+            $tbl_attendance_result 	= Database::get_course_table(TABLE_ATTENDANCE_RESULT);
+
+            $attendances_by_course = $this->get_attendances_list($course_id);
+
+            foreach ($attendances_by_course as $attendance) {
+                // get total faults and total weight
+                $total_done_attendance 	= $attendance['attendance_qualify_max'];
+                $sql = "SELECT score
 						FROM $tbl_attendance_result
                         WHERE
                         	c_id = $course_id AND
                         	user_id = $user_id AND
                         	attendance_id = ".$attendance['id'];
-				$rs = Database::query($sql);
-				$score = 0;
-				if (Database::num_rows($rs) > 0) {
-					$row = Database::fetch_array($rs);
-					$score = $row['score'];
-				}
-				$faults = $total_done_attendance-$score;
-				$faults = $faults > 0 ? $faults:0;
-				$total_faults += $faults;
-				$total_weight += $total_done_attendance;
-			}
-		}
-
-		$porcent = $total_weight > 0 ?round(($total_faults*100)/$total_weight,0):0;
-		$results['faults'] 	= $total_faults;
-		$results['total']	= $total_weight;
-		$results['porcent'] = $porcent;
-
-		return $results;
-	}
-
-	/**
-	 * Get results of faults average by course
-	 * @param	int	   $user_id
-	 * @param 	string	$course_code
-	 * @param	int	   Session id (optional)
-	 * @return 	array  results containing number of faults,
-	 * total done attendance, porcent of faults and color depend on result (red, orange)
-	 */
-	public function get_faults_average_by_course($user_id, $course_code, $session_id = null)
-	{
-		// Database tables and variables
-		$course_info = api_get_course_info($course_code);
-		$tbl_attendance_result 	= Database::get_course_table(TABLE_ATTENDANCE_RESULT);
-		$user_id = intval($user_id);
-		$results = array();
-		$total_faults = $total_weight = $porcent = 0;
-		$attendances_by_course = $this->get_attendances_list($course_info['real_id'], $session_id);
-
-		foreach ($attendances_by_course as $attendance) {
-			// Get total faults and total weight
-			$total_done_attendance 	= $attendance['attendance_qualify_max'];
-			$sql = "SELECT score FROM $tbl_attendance_result
-					WHERE
+                $rs = Database::query($sql);
+                $score = 0;
+                if (Database::num_rows($rs) > 0) {
+                    $row = Database::fetch_array($rs);
+                    $score = $row['score'];
+                }
+                $faults = $total_done_attendance-$score;
+                $faults = $faults > 0 ? $faults:0;
+                $total_faults += $faults;
+                $total_weight += $total_done_attendance;
+            }
+        }
+
+        $porcent = $total_weight > 0 ?round(($total_faults*100)/$total_weight,0):0;
+        $results['faults'] 	= $total_faults;
+        $results['total']	= $total_weight;
+        $results['porcent'] = $porcent;
+
+        return $results;
+    }
+
+    /**
+     * Get results of faults average by course
+     * @param	int	   $user_id
+     * @param 	string	$course_code
+     * @param	int	   Session id (optional)
+     * @return 	array  results containing number of faults,
+     * total done attendance, porcent of faults and color depend on result (red, orange)
+     */
+    public function get_faults_average_by_course($user_id, $course_code, $session_id = null)
+    {
+        // Database tables and variables
+        $course_info = api_get_course_info($course_code);
+        $tbl_attendance_result 	= Database::get_course_table(TABLE_ATTENDANCE_RESULT);
+        $user_id = intval($user_id);
+        $results = array();
+        $total_faults = $total_weight = $porcent = 0;
+        $attendances_by_course = $this->get_attendances_list($course_info['real_id'], $session_id);
+
+        foreach ($attendances_by_course as $attendance) {
+            // Get total faults and total weight
+            $total_done_attendance 	= $attendance['attendance_qualify_max'];
+            $sql = "SELECT score FROM $tbl_attendance_result
+					WHERE
 						c_id = {$course_info['real_id']} AND
 						user_id = $user_id AND
 						attendance_id=".$attendance['id'];
-			$rs = Database::query($sql);
-			$score = 0;
-			if (Database::num_rows($rs) > 0) {
-				$row = Database::fetch_array($rs);
-				$score = $row['score'];
-			}
-			$faults = $total_done_attendance-$score;
-			$faults = $faults > 0 ? $faults:0;
-			$total_faults += $faults;
-			$total_weight += $total_done_attendance;
-		}
-
-		$porcent = $total_weight > 0 ?round(($total_faults*100)/$total_weight,0):0;
-		$results['faults'] 	= $total_faults;
-		$results['total']	= $total_weight;
-		$results['porcent'] = $porcent;
-
-		return $results;
-	}
-
-	/**
-	 * Get registered users' attendance sheet inside current course
-	 * @param	int	   $attendance_id
-	 * @param	int	   $user_id for showing data for only one user (optional)
-	 * @return 	array  users attendance sheet data
-	 */
-	public function get_users_attendance_sheet($attendance_id, $user_id = 0, $groupId = null)
-	{
-		$tbl_attendance_sheet 	= Database::get_course_table(TABLE_ATTENDANCE_SHEET);
-		$tbl_attendance_calendar= Database::get_course_table(TABLE_ATTENDANCE_CALENDAR);
-
-		$attendance_calendar = $this->get_attendance_calendar($attendance_id, 'all', null, $groupId);
-		$calendar_ids = array();
-		// get all dates from calendar by current attendance
-		foreach ($attendance_calendar as $cal) {
-			$calendar_ids[] = $cal['id'];
-		}
-
-		$course_id = api_get_course_int_id();
-
-		$data = array();
-		if (empty($user_id)) {
-			// get all registered users inside current course
-			$users = $this->get_users_rel_course();
-			$user_ids = array_keys($users);
-			if (count($calendar_ids) > 0 && count($user_ids) > 0) {
-				foreach ($user_ids as $uid) {
-					$sql = "SELECT * FROM $tbl_attendance_sheet
+            $rs = Database::query($sql);
+            $score = 0;
+            if (Database::num_rows($rs) > 0) {
+                $row = Database::fetch_array($rs);
+                $score = $row['score'];
+            }
+            $faults = $total_done_attendance-$score;
+            $faults = $faults > 0 ? $faults:0;
+            $total_faults += $faults;
+            $total_weight += $total_done_attendance;
+        }
+
+        $porcent = $total_weight > 0 ?round(($total_faults*100)/$total_weight,0):0;
+        $results['faults'] 	= $total_faults;
+        $results['total']	= $total_weight;
+        $results['porcent'] = $porcent;
+
+        return $results;
+    }
+
+    /**
+     * Get registered users' attendance sheet inside current course
+     * @param	int	   $attendance_id
+     * @param	int	   $user_id for showing data for only one user (optional)
+     * @return 	array  users attendance sheet data
+     */
+    public function get_users_attendance_sheet($attendance_id, $user_id = 0, $groupId = null)
+    {
+        $tbl_attendance_sheet 	= Database::get_course_table(TABLE_ATTENDANCE_SHEET);
+        $tbl_attendance_calendar= Database::get_course_table(TABLE_ATTENDANCE_CALENDAR);
+
+        $attendance_calendar = $this->get_attendance_calendar($attendance_id, 'all', null, $groupId);
+        $calendar_ids = array();
+        // get all dates from calendar by current attendance
+        foreach ($attendance_calendar as $cal) {
+            $calendar_ids[] = $cal['id'];
+        }
+
+        $course_id = api_get_course_int_id();
+
+        $data = array();
+        if (empty($user_id)) {
+            // get all registered users inside current course
+            $users = $this->get_users_rel_course();
+            $user_ids = array_keys($users);
+            if (count($calendar_ids) > 0 && count($user_ids) > 0) {
+                foreach ($user_ids as $uid) {
+                    $sql = "SELECT * FROM $tbl_attendance_sheet
 					        WHERE
 					        	c_id = $course_id AND
 					        	user_id = '$uid' AND
 					        	attendance_calendar_id IN(".implode(',',$calendar_ids).")
 							";
-					$res = Database::query($sql);
-					if (Database::num_rows($res) > 0) {
-						while ($row = Database::fetch_array($res)) {
-							$data[$uid][$row['attendance_calendar_id']]['presence'] = $row['presence'];
-						}
-					}
-				}
-			}
-		} else {
-			// Get attendance for current user
-			$user_id = intval($user_id);
-			if (count($calendar_ids) > 0) {
-				$sql = "SELECT cal.date_time, att.presence
+                    $res = Database::query($sql);
+                    if (Database::num_rows($res) > 0) {
+                        while ($row = Database::fetch_array($res)) {
+                            $data[$uid][$row['attendance_calendar_id']]['presence'] = $row['presence'];
+                        }
+                    }
+                }
+            }
+        } else {
+            // Get attendance for current user
+            $user_id = intval($user_id);
+            if (count($calendar_ids) > 0) {
+                $sql = "SELECT cal.date_time, att.presence
                         FROM $tbl_attendance_sheet att
 						INNER JOIN  $tbl_attendance_calendar cal
 						ON cal.id = att.attendance_calendar_id
@@ -1181,87 +1181,87 @@ 
 							att.user_id = '$user_id' AND
 							att.attendance_calendar_id IN (".implode(',',$calendar_ids).")
                         ORDER BY date_time";
-				$res = Database::query($sql);
-				if (Database::num_rows($res) > 0) {
-					while ($row = Database::fetch_array($res)) {
-						$row['date_time'] = api_convert_and_format_date($row['date_time'], null, date_default_timezone_get());
-						$data[$user_id][] = $row;
-					}
-				}
-			}
-		}
-		return $data;
-	}
-
-	/**
-	 * Get next attendance calendar without presences (done attendances)
-	 * @param	int	attendance id
-	 * @return 	int attendance calendar id
-	 */
-	public function get_next_attendance_calendar_id($attendance_id)
-	{
-		$tbl_attendance_calendar = Database::get_course_table(TABLE_ATTENDANCE_CALENDAR);
-		$attendance_id = intval($attendance_id);
-		$course_id = api_get_course_int_id();
-
-		$sql = "SELECT id FROM $tbl_attendance_calendar
+                $res = Database::query($sql);
+                if (Database::num_rows($res) > 0) {
+                    while ($row = Database::fetch_array($res)) {
+                        $row['date_time'] = api_convert_and_format_date($row['date_time'], null, date_default_timezone_get());
+                        $data[$user_id][] = $row;
+                    }
+                }
+            }
+        }
+        return $data;
+    }
+
+    /**
+     * Get next attendance calendar without presences (done attendances)
+     * @param	int	attendance id
+     * @return 	int attendance calendar id
+     */
+    public function get_next_attendance_calendar_id($attendance_id)
+    {
+        $tbl_attendance_calendar = Database::get_course_table(TABLE_ATTENDANCE_CALENDAR);
+        $attendance_id = intval($attendance_id);
+        $course_id = api_get_course_int_id();
+
+        $sql = "SELECT id FROM $tbl_attendance_calendar
 		        WHERE
 		        	c_id = $course_id AND
 		        	attendance_id = '$attendance_id' AND
 		        	done_attendance = 0
 		        ORDER BY date_time
 		        LIMIT 1";
-		$rs = Database::query($sql);
-		$next_calendar_id = 0;
-		if (Database::num_rows($rs) > 0) {
-			$row = Database::fetch_array($rs);
-			$next_calendar_id = $row['id'];
-		}
-		return $next_calendar_id;
-	}
-
-	/**
-	 * Get next attendance calendar datetime without presences (done attendances)
-	 * @param	int	attendance id
-	 * @return 	int UNIX time format datetime
-	 */
-	public function get_next_attendance_calendar_datetime($attendance_id)
-	{
-		$tbl_attendance_calendar = Database::get_course_table(TABLE_ATTENDANCE_CALENDAR);
-		$course_id = api_get_course_int_id();
-		$attendance_id = intval($attendance_id);
-		$sql = "SELECT id, date_time FROM $tbl_attendance_calendar
+        $rs = Database::query($sql);
+        $next_calendar_id = 0;
+        if (Database::num_rows($rs) > 0) {
+            $row = Database::fetch_array($rs);
+            $next_calendar_id = $row['id'];
+        }
+        return $next_calendar_id;
+    }
+
+    /**
+     * Get next attendance calendar datetime without presences (done attendances)
+     * @param	int	attendance id
+     * @return 	int UNIX time format datetime
+     */
+    public function get_next_attendance_calendar_datetime($attendance_id)
+    {
+        $tbl_attendance_calendar = Database::get_course_table(TABLE_ATTENDANCE_CALENDAR);
+        $course_id = api_get_course_int_id();
+        $attendance_id = intval($attendance_id);
+        $sql = "SELECT id, date_time FROM $tbl_attendance_calendar
 				WHERE
 					c_id = $course_id AND
 					attendance_id = '$attendance_id' AND
 					done_attendance = 0
 				ORDER BY date_time
 				LIMIT 1";
-		$rs = Database::query($sql);
-		$next_calendar_datetime = 0;
-		if (Database::num_rows($rs) > 0) {
-			$row = Database::fetch_array($rs);
-			$next_calendar_datetime = api_get_local_time($row['date_time']);
-		}
-
-		return $next_calendar_datetime;
-	}
-
-	/**
-	 * Get user' score from current attendance
-	 * @param	int	$user_id
-	 * @param	int $attendance_id
-	 * @return	int score
-	 */
-	public function get_user_score($user_id, $attendance_id, $groupId = null)
-	{
-		$tbl_attendance_result 	= Database::get_course_table(TABLE_ATTENDANCE_RESULT);
+        $rs = Database::query($sql);
+        $next_calendar_datetime = 0;
+        if (Database::num_rows($rs) > 0) {
+            $row = Database::fetch_array($rs);
+            $next_calendar_datetime = api_get_local_time($row['date_time']);
+        }
+
+        return $next_calendar_datetime;
+    }
+
+    /**
+     * Get user' score from current attendance
+     * @param	int	$user_id
+     * @param	int $attendance_id
+     * @return	int score
+     */
+    public function get_user_score($user_id, $attendance_id, $groupId = null)
+    {
+        $tbl_attendance_result 	= Database::get_course_table(TABLE_ATTENDANCE_RESULT);
         $tbl_attendance_sheet = Database::get_course_table(TABLE_ATTENDANCE_SHEET);
         $tbl_attendance_cal_rel_group = Database::get_course_table(TABLE_ATTENDANCE_CALENDAR_REL_GROUP);
         $tbl_attendance_cal = Database::get_course_table(TABLE_ATTENDANCE_CALENDAR);
-		$user_id = intval($user_id);
-		$attendance_id = intval($attendance_id);
-		$course_id = api_get_course_int_id();
+        $user_id = intval($user_id);
+        $attendance_id = intval($attendance_id);
+        $course_id = api_get_course_int_id();
         if (empty($groupId)) {
             $sql = "SELECT score FROM $tbl_attendance_result
                     WHERE
@@ -1285,68 +1285,68 @@ 
                         )
                     ";
         }
-		$rs = Database::query($sql);
-		$score = 0;
-		if (Database::num_rows($rs) > 0) {
-			$row = Database::fetch_array($rs);
-			$score = $row['score'];
-		}
-
-		return $score;
-	}
-
-	/**
-	 * Get attendance calendar data by id
-	 * @param	int	attendance calendar id
-	 * @return	array attendance calendar data
-	 */
-	public function get_attendance_calendar_by_id($calendar_id)
-	{
-		$tbl_attendance_calendar = Database::get_course_table(TABLE_ATTENDANCE_CALENDAR);
-		$calendar_id = intval($calendar_id);
-		$course_id = api_get_course_int_id();
-		$sql = "SELECT * FROM $tbl_attendance_calendar
+        $rs = Database::query($sql);
+        $score = 0;
+        if (Database::num_rows($rs) > 0) {
+            $row = Database::fetch_array($rs);
+            $score = $row['score'];
+        }
+
+        return $score;
+    }
+
+    /**
+     * Get attendance calendar data by id
+     * @param	int	attendance calendar id
+     * @return	array attendance calendar data
+     */
+    public function get_attendance_calendar_by_id($calendar_id)
+    {
+        $tbl_attendance_calendar = Database::get_course_table(TABLE_ATTENDANCE_CALENDAR);
+        $calendar_id = intval($calendar_id);
+        $course_id = api_get_course_int_id();
+        $sql = "SELECT * FROM $tbl_attendance_calendar
 				WHERE c_id = $course_id AND id = '$calendar_id' ";
-		$rs = Database::query($sql);
-		$data = array();
-		if (Database::num_rows($rs) > 0) {
-			while ($row = Database::fetch_array($rs)) {
-				$row['date_time'] = api_get_local_time($row['date_time']);
-				$data = $row;
-			}
-		}
-
-		return $data;
-	}
-
-	/**
-	 * Get all attendance calendar data inside current attendance
-	 * @param int	$attendance_id
-	 * @param string $type
-	 * @param int $calendar_id
-	 * @param int $groupId
-	 * @param bool $showAll = false show group calendar items or not
-	 *
-	 * @return	array attendance calendar data
-	 */
-	public function get_attendance_calendar(
-		$attendance_id,
-		$type = 'all',
-		$calendar_id = null,
-		$groupId = null,
-		$showAll = false
-	) {
-		$tbl_attendance_calendar = Database::get_course_table(TABLE_ATTENDANCE_CALENDAR);
+        $rs = Database::query($sql);
+        $data = array();
+        if (Database::num_rows($rs) > 0) {
+            while ($row = Database::fetch_array($rs)) {
+                $row['date_time'] = api_get_local_time($row['date_time']);
+                $data = $row;
+            }
+        }
+
+        return $data;
+    }
+
+    /**
+     * Get all attendance calendar data inside current attendance
+     * @param int	$attendance_id
+     * @param string $type
+     * @param int $calendar_id
+     * @param int $groupId
+     * @param bool $showAll = false show group calendar items or not
+     *
+     * @return	array attendance calendar data
+     */
+    public function get_attendance_calendar(
+        $attendance_id,
+        $type = 'all',
+        $calendar_id = null,
+        $groupId = null,
+        $showAll = false
+    ) {
+        $tbl_attendance_calendar = Database::get_course_table(TABLE_ATTENDANCE_CALENDAR);
         $tbl_acrg = Database::get_course_table(TABLE_ATTENDANCE_CALENDAR_REL_GROUP);
-		$attendance_id = intval($attendance_id);
-		$course_id = api_get_course_int_id();
-		$groupCondition = null;
+        $attendance_id = intval($attendance_id);
+        $course_id = api_get_course_int_id();
+        $groupCondition = null;
 
-		if ($showAll) {
-			$sql = "SELECT * FROM $tbl_attendance_calendar c
+        if ($showAll) {
+            $sql = "SELECT * FROM $tbl_attendance_calendar c
 					WHERE c_id = $course_id AND attendance_id = '$attendance_id'";
-		} else {
-			$sql = "SELECT * FROM $tbl_attendance_calendar c
+        } else {
+            $sql = "SELECT * FROM $tbl_attendance_calendar c
 					WHERE
 						c_id = $course_id AND
 						attendance_id = '$attendance_id' AND
@@ -1355,11 +1355,11 @@ 
 							WHERE c_id = $course_id AND group_id != 0 AND group_id IS NOT NULL
 						)
 					";
-		}
+        }
 
-		if (!empty($groupId)) {
-			$groupId = intval($groupId);
-			$sql = "SELECT c.* FROM $tbl_attendance_calendar c
+        if (!empty($groupId)) {
+            $groupId = intval($groupId);
+            $sql = "SELECT c.* FROM $tbl_attendance_calendar c
 					INNER JOIN $tbl_acrg g
 					ON c.c_id = g.c_id AND c.id = g.calendar_id
 					WHERE
@@ -1367,62 +1367,62 @@ 
 					    g.group_id = '$groupId' AND
 					    c.attendance_id = '$attendance_id'
                    ";
-		}
-
-		if (!in_array($type, array('today', 'all', 'all_done', 'all_not_done','calendar_id'))) {
-			$type = 'all';
-		}
-
-		switch ($type) {
-			case 'calendar_id':
-				$calendar_id = intval($calendar_id);
-				if (!empty($calendar_id)) {
-					$sql.= " AND c.id = $calendar_id";
-				}
-				break;
-			case 'today':
-				//$sql .= ' AND DATE_FORMAT(date_time,"%d-%m-%Y") = DATE_FORMAT("'.api_get_utc_datetime().'", "%d-%m-%Y" )';
-				break;
-			case 'all_done':
-				$sql .= " AND done_attendance = 1 ";
-				break;
-			case 'all_not_done':
-				$sql .= " AND done_attendance = 0 ";
-				break;
-			case 'all':
-			default:
-				break;
-		}
-		$sql .= " ORDER BY date_time ";
+        }
 
-		$rs = Database::query($sql);
-		$data = array();
-		if (Database::num_rows($rs) > 0) {
-			while ($row = Database::fetch_array($rs,'ASSOC')) {
-				$row['db_date_time'] = $row['date_time'];
-				$row['date_time'] = api_get_local_time($row['date_time']);
-				$row['date'] = api_format_date($row['date_time'], DATE_FORMAT_SHORT);
-				$row['time'] = api_format_date($row['date_time'], TIME_NO_SEC_FORMAT);
-				$row['groups'] = $this->getGroupListByAttendanceCalendar($row['id'], $course_id);
-				if ($type == 'today') {
-					if (date('d-m-Y', api_strtotime($row['date_time'], 'UTC')) == date('d-m-Y', time())) {
-						$data[] = $row;
-					}
-				} else {
-					$data[] = $row;
-				}
-			}
-		}
-
-		return $data;
-	}
-
-	/**
-	 * Get number of attendance calendar inside current attendance
-	 * @param	int	$attendance_id
-	 * @param	int	$groupId
-	 * @return	int number of dates in attendance calendar
-	 */
+        if (!in_array($type, array('today', 'all', 'all_done', 'all_not_done','calendar_id'))) {
+            $type = 'all';
+        }
+
+        switch ($type) {
+            case 'calendar_id':
+                $calendar_id = intval($calendar_id);
+                if (!empty($calendar_id)) {
+                    $sql.= " AND c.id = $calendar_id";
+                }
+                break;
+            case 'today':
+                //$sql .= ' AND DATE_FORMAT(date_time,"%d-%m-%Y") = DATE_FORMAT("'.api_get_utc_datetime().'", "%d-%m-%Y" )';
+                break;
+            case 'all_done':
+                $sql .= " AND done_attendance = 1 ";
+                break;
+            case 'all_not_done':
+                $sql .= " AND done_attendance = 0 ";
+                break;
+            case 'all':
+            default:
+                break;
+        }
+        $sql .= " ORDER BY date_time ";
+
+        $rs = Database::query($sql);
+        $data = array();
+        if (Database::num_rows($rs) > 0) {
+            while ($row = Database::fetch_array($rs,'ASSOC')) {
+                $row['db_date_time'] = $row['date_time'];
+                $row['date_time'] = api_get_local_time($row['date_time']);
+                $row['date'] = api_format_date($row['date_time'], DATE_FORMAT_SHORT);
+                $row['time'] = api_format_date($row['date_time'], TIME_NO_SEC_FORMAT);
+                $row['groups'] = $this->getGroupListByAttendanceCalendar($row['id'], $course_id);
+                if ($type == 'today') {
+                    if (date('d-m-Y', api_strtotime($row['date_time'], 'UTC')) == date('d-m-Y', time())) {
+                        $data[] = $row;
+                    }
+                } else {
+                    $data[] = $row;
+                }
+            }
+        }
+
+        return $data;
+    }
+
+    /**
+     * Get number of attendance calendar inside current attendance
+     * @param	int	$attendance_id
+     * @param	int	$groupId
+     * @return	int number of dates in attendance calendar
+     */
     public static function get_number_of_attendance_calendar($attendance_id, $groupId = 0, $done_attendance = NULL, $userId = 0)
     {
         $tbl_attendance_calendar = Database::get_course_table(TABLE_ATTENDANCE_CALENDAR);
@@ -1508,112 +1508,112 @@ 
 
 
     /**
-	 * Get count dates inside attendance calendar by attendance id
-	 * @param	int	$attendance_id
-	 * @return	int     count of dates
-	 */
-	public static function get_count_dates_inside_attendance_calendar($attendance_id)
-	{
-		$tbl_attendance_calendar = Database::get_course_table(TABLE_ATTENDANCE_CALENDAR);
-		$attendance_id = intval($attendance_id);
-		$course_id = api_get_course_int_id();
-		$sql = "SELECT count(id) FROM $tbl_attendance_calendar
+     * Get count dates inside attendance calendar by attendance id
+     * @param	int	$attendance_id
+     * @return	int     count of dates
+     */
+    public static function get_count_dates_inside_attendance_calendar($attendance_id)
+    {
+        $tbl_attendance_calendar = Database::get_course_table(TABLE_ATTENDANCE_CALENDAR);
+        $attendance_id = intval($attendance_id);
+        $course_id = api_get_course_int_id();
+        $sql = "SELECT count(id) FROM $tbl_attendance_calendar
                 WHERE
                 	c_id = $course_id AND
                 	attendance_id = '$attendance_id'";
-		$rs = Database::query($sql);
-		$count = 0;
-		if (Database::num_rows($rs) > 0) {
-			$row = Database::fetch_row($rs);
-			$count = $row[0];
-		}
-		return $count;
-	}
-
-	/**
-	 * check if all calendar of an attendance is done
-	 * @param   int     $attendance_id
-	 * @return  bool    True if all calendar is done, otherwise false
-	 */
-	public static function is_all_attendance_calendar_done($attendance_id)
-	{
-		$attendance_id = intval($attendance_id);
-		$done_calendar = self::get_done_attendance_calendar($attendance_id);
-		$count_dates_in_calendar = self::get_count_dates_inside_attendance_calendar($attendance_id);
-		$number_of_dates = self::get_number_of_attendance_calendar($attendance_id);
-
-		$result = false;
-		if ($number_of_dates && (intval($count_dates_in_calendar) == intval($done_calendar))) {
-			$result = true;
-		}
-		return $result;
-	}
-
-	/**
-	 * check if an attendance is locked
-	 * @param   int $attendance_id
-	 * @param   bool
-	 */
-	public static function is_locked_attendance($attendance_id)
-	{
-		//use gradebook lock
-		$result = api_resource_is_locked_by_gradebook($attendance_id, LINK_ATTENDANCE);
-		return $result;
-	}
-
-	/**
-	 * Add new datetime inside attendance calendar table
-	 * @param	int		$attendance_id
-	 * @param 	array 	$groupList
-	 * @return	int affected rows
-	 */
-	public function attendance_calendar_add($attendance_id, $groupList = array())
-	{
-		$tbl_attendance_calendar = Database::get_course_table(TABLE_ATTENDANCE_CALENDAR);
-		$affected_rows = 0;
-		$attendance_id = intval($attendance_id);
-		$course_id = api_get_course_int_id();
-		// check if datetime already exists inside the table
-		/*$sql = "SELECT id FROM $tbl_attendance_calendar
+        $rs = Database::query($sql);
+        $count = 0;
+        if (Database::num_rows($rs) > 0) {
+            $row = Database::fetch_row($rs);
+            $count = $row[0];
+        }
+        return $count;
+    }
+
+    /**
+     * check if all calendar of an attendance is done
+     * @param   int     $attendance_id
+     * @return  bool    True if all calendar is done, otherwise false
+     */
+    public static function is_all_attendance_calendar_done($attendance_id)
+    {
+        $attendance_id = intval($attendance_id);
+        $done_calendar = self::get_done_attendance_calendar($attendance_id);
+        $count_dates_in_calendar = self::get_count_dates_inside_attendance_calendar($attendance_id);
+        $number_of_dates = self::get_number_of_attendance_calendar($attendance_id);
+
+        $result = false;
+        if ($number_of_dates && (intval($count_dates_in_calendar) == intval($done_calendar))) {
+            $result = true;
+        }
+        return $result;
+    }
+
+    /**
+     * check if an attendance is locked
+     * @param   int $attendance_id
+     * @param   bool
+     */
+    public static function is_locked_attendance($attendance_id)
+    {
+        //use gradebook lock
+        $result = api_resource_is_locked_by_gradebook($attendance_id, LINK_ATTENDANCE);
+        return $result;
+    }
+
+    /**
+     * Add new datetime inside attendance calendar table
+     * @param	int		$attendance_id
+     * @param 	array 	$groupList
+     * @return	int affected rows
+     */
+    public function attendance_calendar_add($attendance_id, $groupList = array())
+    {
+        $tbl_attendance_calendar = Database::get_course_table(TABLE_ATTENDANCE_CALENDAR);
+        $affected_rows = 0;
+        $attendance_id = intval($attendance_id);
+        $course_id = api_get_course_int_id();
+        // check if datetime already exists inside the table
+        /*$sql = "SELECT id FROM $tbl_attendance_calendar
 		        WHERE
 		        	c_id = $course_id AND
 		        	date_time='".Database::escape_string($this->date_time)."' AND
 		        	attendance_id = '$attendance_id'";
 		$rs = Database::query($sql);
 		if (Database::num_rows($rs) == 0) {*/
-			$params = array(
-				'c_id' =>  $course_id,
-				'date_time' => $this->date_time,
-				'attendance_id' => $attendance_id,
+            $params = array(
+                'c_id' =>  $course_id,
+                'date_time' => $this->date_time,
+                'attendance_id' => $attendance_id,
                 'done_attendance' => 0
-			);
-			$id = Database::insert($tbl_attendance_calendar, $params);
-
-			if ($id) {
-				$sql = "UPDATE $tbl_attendance_calendar SET id = iid WHERE iid = $id";
-				Database::query($sql);
-				$affected_rows++;
-			}
-			$this->addAttendanceCalendarToGroup($id, $course_id, $groupList);
-		//}
-
-		// update locked attendance
-		$is_all_calendar_done = self::is_all_attendance_calendar_done($attendance_id);
-		if (!$is_all_calendar_done) {
-			self::lock_attendance($attendance_id, false);
-		} else {
-			self::lock_attendance($attendance_id);
-		}
-		return $affected_rows;
-	}
-
-	/**
-	 * @param int   $calendarId
-	 * @param int 	$courseId
-	 * @param array $groupList
-	 */
-	public function addAttendanceCalendarToGroup($calendarId, $courseId, $groupList)
-	{
+            );
+            $id = Database::insert($tbl_attendance_calendar, $params);
+
+            if ($id) {
+                $sql = "UPDATE $tbl_attendance_calendar SET id = iid WHERE iid = $id";
+                Database::query($sql);
+                $affected_rows++;
+            }
+            $this->addAttendanceCalendarToGroup($id, $course_id, $groupList);
+        //}
+
+        // update locked attendance
+        $is_all_calendar_done = self::is_all_attendance_calendar_done($attendance_id);
+        if (!$is_all_calendar_done) {
+            self::lock_attendance($attendance_id, false);
+        } else {
+            self::lock_attendance($attendance_id);
+        }
+        return $affected_rows;
+    }
+
+    /**
+     * @param int   $calendarId
+     * @param int 	$courseId
+     * @param array $groupList
+     */
+    public function addAttendanceCalendarToGroup($calendarId, $courseId, $groupList)
+    {
         if (empty($groupList)) {
             return false;
         }
@@ -1641,506 +1641,506 @@ 
                 Database::insert($table, $params);
             }
         }
-	}
-
-	/**
-	 * @param int $calendarId
-	 * @param int $courseId
-	 * @param int $groupId
-	 * @return array
-	 */
-	public function getGroupListByAttendanceCalendar($calendarId, $courseId)
-	{
-		$table = Database::get_course_table(TABLE_ATTENDANCE_CALENDAR_REL_GROUP);
-		return Database::select(
-			'*',
-			$table,
-			array('where'=>
-				array(
-					'calendar_id = ? AND c_id = ?' => array($calendarId, $courseId)
-				)
-			)
-		);
-	}
-
-	/**
-	 * @param int $calendarId
-	 * @param int $courseId
-	 * @param int $groupId
-	 * @return array
-	 */
-	public function getAttendanceCalendarGroup($calendarId, $courseId, $groupId)
-	{
-		$table = Database::get_course_table(TABLE_ATTENDANCE_CALENDAR_REL_GROUP);
-		return Database::select(
-			'*',
-			$table,
-			array('where'=>
-				array(
-					'calendar_id = ? AND c_id = ? AND group_id = ?' => array($calendarId, $courseId, $groupId)
-				)
-			)
-		);
-	}
-
-	/**
-	 * @param int $calendarId
-	 * @param int $courseId
-	 * @param int $groupId
+    }
+
+    /**
+     * @param int $calendarId
+     * @param int $courseId
+     * @param int $groupId
+     * @return array
+     */
+    public function getGroupListByAttendanceCalendar($calendarId, $courseId)
+    {
+        $table = Database::get_course_table(TABLE_ATTENDANCE_CALENDAR_REL_GROUP);
+        return Database::select(
+            '*',
+            $table,
+            array('where'=>
+                array(
+                    'calendar_id = ? AND c_id = ?' => array($calendarId, $courseId)
+                )
+            )
+        );
+    }
+
+    /**
+     * @param int $calendarId
+     * @param int $courseId
+     * @param int $groupId
+     * @return array
+     */
+    public function getAttendanceCalendarGroup($calendarId, $courseId, $groupId)
+    {
+        $table = Database::get_course_table(TABLE_ATTENDANCE_CALENDAR_REL_GROUP);
+        return Database::select(
+            '*',
+            $table,
+            array('where'=>
+                array(
+                    'calendar_id = ? AND c_id = ? AND group_id = ?' => array($calendarId, $courseId, $groupId)
+                )
+            )
+        );
+    }
+
+    /**
+     * @param int $calendarId
+     * @param int $courseId
+     * @param int $groupId
      *
-	 * @return array
-	 */
-	public function deleteAttendanceCalendarGroup($calendarId, $courseId)
-	{
-		$table = Database::get_course_table(TABLE_ATTENDANCE_CALENDAR_REL_GROUP);
-		Database::delete(
-			$table,
-			array(
-				'calendar_id = ? AND c_id = ?' => array($calendarId, $courseId)
-			)
-		);
-	}
-
-	/**
-	 * save repeated date inside attendance calendar table
-	 * @param int $attendance_id
-	 * @param int $start_date start date in tms
-	 * @param int $end_date end date in tms
-	 * @param string $repeat_type daily, weekly, monthlyByDate
-	 * @param array $groupList
-	 */
-	public function attendance_repeat_calendar_add(
-		$attendance_id,
-		$start_date,
-		$end_date,
-		$repeat_type,
-		$groupList = array()
-	) {
-		$attendance_id = intval($attendance_id);
-		// save start date
-		$datetimezone = api_get_utc_datetime($start_date);
-		$this->set_date_time($datetimezone);
-		$this->attendance_calendar_add($attendance_id, $groupList);
-
-		// 86400 = 24 hours in seconds
-		// 604800 = 1 week in seconds
-		// Saves repeated dates
-		switch ($repeat_type) {
-			case 'daily':
-				$j = 1;
-				for ($i = $start_date + 86400; ($i <= $end_date); $i += 86400) {
-					$datetimezone = api_get_utc_datetime($i);
-					$this->set_date_time($datetimezone);
-					$this->attendance_calendar_add($attendance_id, $groupList);
-					$j++;
-				}
-				break;
-			case 'weekly':
-				$j = 1;
-				for ($i = $start_date + 604800; ($i <= $end_date); $i += 604800) {
-					$datetimezone = api_get_utc_datetime($i);
-					$this->set_date_time($datetimezone);
-					$this->attendance_calendar_add($attendance_id, $groupList);
-					$j++;
-				}
-				break;
-			case 'monthlyByDate':
-				$j = 1;
-				//@todo fix bug with february
-				for ($i = $start_date + 2419200; ($i <= $end_date); $i += 2419200) {
-					$datetimezone = api_get_utc_datetime($i);
-					$this->set_date_time($datetimezone);
-					$this->attendance_calendar_add($attendance_id, $groupList);
-					$j++;
-				}
-				break;
-		}
-	}
-
-	/**
-	 * Adds x months to a UNIX timestamp
-	 * @param   int     The timestamp
-	 * @param   int     The number of years to add
-	 * @return  int     The new timestamp
-	 */
-	private function add_month($timestamp, $num=1)
-	{
-		$values = api_get_utc_datetime($timestamp);
-		$values = str_replace(array(':','-',' '), '/', $values);
-		list($y, $m, $d, $h, $n, $s) = split('/',$values);
-		if($m+$num>12) {
-			$y += floor($num/12);
-			$m += $num%12;
-		} else {
-			$m += $num;
-		}
-		//date_default_timezone_set('UTC');
-		// return mktime($h, $n, $s, $m, $d, $y);
-		$result = api_strtotime($y.'-'.$m.'-'.$d.' '.$h.':'.$n.':'.$s, 'UTC');
-		if (!empty($result)) {
-			return $result;
-		}
-		return false;
-	}
-
-	/**
-	 * edit a datetime inside attendance calendar table
-	 * @param	int	attendance calendar id
-	 * @param	int	attendance id
-	 * @return	int affected rows
-	 */
-	public function attendance_calendar_edit($calendar_id, $attendance_id)
-	{
-		$tbl_attendance_calendar = Database::get_course_table(TABLE_ATTENDANCE_CALENDAR);
-		$affected_rows = 0;
-		$attendance_id = intval($attendance_id);
-		$course_id = api_get_course_int_id();
-		// check if datetime already exists inside the table
-		$sql = "SELECT id FROM $tbl_attendance_calendar
+     * @return array
+     */
+    public function deleteAttendanceCalendarGroup($calendarId, $courseId)
+    {
+        $table = Database::get_course_table(TABLE_ATTENDANCE_CALENDAR_REL_GROUP);
+        Database::delete(
+            $table,
+            array(
+                'calendar_id = ? AND c_id = ?' => array($calendarId, $courseId)
+            )
+        );
+    }
+
+    /**
+     * save repeated date inside attendance calendar table
+     * @param int $attendance_id
+     * @param int $start_date start date in tms
+     * @param int $end_date end date in tms
+     * @param string $repeat_type daily, weekly, monthlyByDate
+     * @param array $groupList
+     */
+    public function attendance_repeat_calendar_add(
+        $attendance_id,
+        $start_date,
+        $end_date,
+        $repeat_type,
+        $groupList = array()
+    ) {
+        $attendance_id = intval($attendance_id);
+        // save start date
+        $datetimezone = api_get_utc_datetime($start_date);
+        $this->set_date_time($datetimezone);
+        $this->attendance_calendar_add($attendance_id, $groupList);
+
+        // 86400 = 24 hours in seconds
+        // 604800 = 1 week in seconds
+        // Saves repeated dates
+        switch ($repeat_type) {
+            case 'daily':
+                $j = 1;
+                for ($i = $start_date + 86400; ($i <= $end_date); $i += 86400) {
+                    $datetimezone = api_get_utc_datetime($i);
+                    $this->set_date_time($datetimezone);
+                    $this->attendance_calendar_add($attendance_id, $groupList);
+                    $j++;
+                }
+                break;
+            case 'weekly':
+                $j = 1;
+                for ($i = $start_date + 604800; ($i <= $end_date); $i += 604800) {
+                    $datetimezone = api_get_utc_datetime($i);
+                    $this->set_date_time($datetimezone);
+                    $this->attendance_calendar_add($attendance_id, $groupList);
+                    $j++;
+                }
+                break;
+            case 'monthlyByDate':
+                $j = 1;
+                //@todo fix bug with february
+                for ($i = $start_date + 2419200; ($i <= $end_date); $i += 2419200) {
+                    $datetimezone = api_get_utc_datetime($i);
+                    $this->set_date_time($datetimezone);
+                    $this->attendance_calendar_add($attendance_id, $groupList);
+                    $j++;
+                }
+                break;
+        }
+    }
+
+    /**
+     * Adds x months to a UNIX timestamp
+     * @param   int     The timestamp
+     * @param   int     The number of years to add
+     * @return  int     The new timestamp
+     */
+    private function add_month($timestamp, $num=1)
+    {
+        $values = api_get_utc_datetime($timestamp);
+        $values = str_replace(array(':','-',' '), '/', $values);
+        list($y, $m, $d, $h, $n, $s) = split('/',$values);
+        if($m+$num>12) {
+            $y += floor($num/12);
+            $m += $num%12;
+        } else {
+            $m += $num;
+        }
+        //date_default_timezone_set('UTC');
+        // return mktime($h, $n, $s, $m, $d, $y);
+        $result = api_strtotime($y.'-'.$m.'-'.$d.' '.$h.':'.$n.':'.$s, 'UTC');
+        if (!empty($result)) {
+            return $result;
+        }
+        return false;
+    }
+
+    /**
+     * edit a datetime inside attendance calendar table
+     * @param	int	attendance calendar id
+     * @param	int	attendance id
+     * @return	int affected rows
+     */
+    public function attendance_calendar_edit($calendar_id, $attendance_id)
+    {
+        $tbl_attendance_calendar = Database::get_course_table(TABLE_ATTENDANCE_CALENDAR);
+        $affected_rows = 0;
+        $attendance_id = intval($attendance_id);
+        $course_id = api_get_course_int_id();
+        // check if datetime already exists inside the table
+        $sql = "SELECT id FROM $tbl_attendance_calendar
 		        WHERE
 		        	c_id = $course_id AND
 		        	date_time = '".Database::escape_string($this->date_time)."' AND
 		        	attendance_id = '$attendance_id'";
-		$rs = Database::query($sql);
+        $rs = Database::query($sql);
 
-		if (Database::num_rows($rs) == 0) {
-			$sql = "UPDATE $tbl_attendance_calendar
+        if (Database::num_rows($rs) == 0) {
+            $sql = "UPDATE $tbl_attendance_calendar
 					SET date_time='".Database::escape_string($this->date_time)."'
 					WHERE c_id = $course_id AND id = '".intval($calendar_id)."'";
-			Database::query($sql);
-		}
-
-		// update locked attendance
-		$is_all_calendar_done = self::is_all_attendance_calendar_done($attendance_id);
-		if (!$is_all_calendar_done) {
-			self::lock_attendance($attendance_id, false);
-		} else {
-			self::lock_attendance($attendance_id);
-		}
-
-		return $affected_rows;
-	}
-
-	/**
-	 * delete a datetime from attendance calendar table
-	 * @param	int		attendance calendar id
-	 * @param	int		attendance id
-	 * @param	bool	true for removing all calendar inside current attendance, false for removing by calendar id
-	 * @return	int affected rows
-	 */
-	public function attendance_calendar_delete($calendar_id, $attendance_id , $all_delete = false)
-	{
-		$tbl_attendance_calendar = Database::get_course_table(TABLE_ATTENDANCE_CALENDAR);
-		$tbl_attendance_sheet = Database::get_course_table(TABLE_ATTENDANCE_SHEET);
-
-		$attendance_id = intval($attendance_id);
-		// get all registered users inside current course
-		$users = $this->get_users_rel_course();
-		$user_ids = array_keys($users);
-		$course_id = api_get_course_int_id();
-		$affected_rows = 0;
-		if ($all_delete) {
-			$attendance_calendar = $this->get_attendance_calendar($attendance_id);
-			// get all dates from calendar by current attendance
-			if (!empty($attendance_calendar)) {
-				foreach ($attendance_calendar as $cal) {
-					// delete all data from attendance sheet
-					$sql = "DELETE FROM $tbl_attendance_sheet
+            Database::query($sql);
+        }
+
+        // update locked attendance
+        $is_all_calendar_done = self::is_all_attendance_calendar_done($attendance_id);
+        if (!$is_all_calendar_done) {
+            self::lock_attendance($attendance_id, false);
+        } else {
+            self::lock_attendance($attendance_id);
+        }
+
+        return $affected_rows;
+    }
+
+    /**
+     * delete a datetime from attendance calendar table
+     * @param	int		attendance calendar id
+     * @param	int		attendance id
+     * @param	bool	true for removing all calendar inside current attendance, false for removing by calendar id
+     * @return	int affected rows
+     */
+    public function attendance_calendar_delete($calendar_id, $attendance_id , $all_delete = false)
+    {
+        $tbl_attendance_calendar = Database::get_course_table(TABLE_ATTENDANCE_CALENDAR);
+        $tbl_attendance_sheet = Database::get_course_table(TABLE_ATTENDANCE_SHEET);
+
+        $attendance_id = intval($attendance_id);
+        // get all registered users inside current course
+        $users = $this->get_users_rel_course();
+        $user_ids = array_keys($users);
+        $course_id = api_get_course_int_id();
+        $affected_rows = 0;
+        if ($all_delete) {
+            $attendance_calendar = $this->get_attendance_calendar($attendance_id);
+            // get all dates from calendar by current attendance
+            if (!empty($attendance_calendar)) {
+                foreach ($attendance_calendar as $cal) {
+                    // delete all data from attendance sheet
+                    $sql = "DELETE FROM $tbl_attendance_sheet
 							WHERE c_id = $course_id AND attendance_calendar_id = '".intval($cal['id'])."'";
-					Database::query($sql);
-					// delete data from attendance calendar
-					$sql = "DELETE FROM $tbl_attendance_calendar
+                    Database::query($sql);
+                    // delete data from attendance calendar
+                    $sql = "DELETE FROM $tbl_attendance_calendar
 							WHERE c_id = $course_id AND id = '".intval($cal['id'])."'";
-					Database::query($sql);
-
-					$this->deleteAttendanceCalendarGroup($cal['id'], $course_id);
-					$affected_rows++;
-				}
-			}
-		} else {
-			// delete just one row from attendance sheet by the calendar id
-			$sql = "DELETE FROM $tbl_attendance_sheet
+                    Database::query($sql);
+
+                    $this->deleteAttendanceCalendarGroup($cal['id'], $course_id);
+                    $affected_rows++;
+                }
+            }
+        } else {
+            // delete just one row from attendance sheet by the calendar id
+            $sql = "DELETE FROM $tbl_attendance_sheet
 					WHERE c_id = $course_id AND attendance_calendar_id = '".intval($calendar_id)."'";
-			Database::query($sql);
-			// delete data from attendance calendar
-			$sql = "DELETE FROM $tbl_attendance_calendar
+            Database::query($sql);
+            // delete data from attendance calendar
+            $sql = "DELETE FROM $tbl_attendance_calendar
 					WHERE c_id = $course_id AND id = '".intval($calendar_id)."'";
-			Database::query($sql);
-
-			$this->deleteAttendanceCalendarGroup($calendar_id, $course_id);
-			$affected_rows++;
-		}
-
-		// update users' results
-		$this->update_users_results($user_ids, $attendance_id);
-
-		return $affected_rows;
-	}
-
-	/** Setters for fields of attendances tables **/
-	public function set_session_id($session_id)
-	{
-		$this->session_id = $session_id;
-	}
-
-	public function set_course_id($course_id)
-	{
-		$this->course_id = $course_id;
-	}
-
-	public function set_date_time($datetime)
-	{
-		$this->date_time = $datetime;
-	}
-
-	public function set_name($name)
-	{
-		$this->name = $name;
-	}
-
-	public function set_description($description)
-	{
-		$this->description = $description;
-	}
-
-	public function set_attendance_qualify_title($attendance_qualify_title)
-	{
-		$this->attendance_qualify_title = $attendance_qualify_title;
-	}
-
-	public function set_attendance_weight($attendance_weight)
-	{
-		$this->attendance_weight = $attendance_weight;
-	}
-
-	/** Getters for fields of attendances tables **/
-	public function get_session_id()
-	{
-		return $this->session_id;
-	}
-
-	public function get_course_id()
-	{
-		return $this->course_id;
-	}
-
-	public function get_date_time()
-	{
-		return $this->date_time;
-	}
-
-	public function get_name()
-	{
-		return $this->name;
-	}
-
-	public function get_description()
-	{
-		return $this->description;
-	}
-
-	public function get_attendance_qualify_title()
-	{
-		return $this->attendance_qualify_title;
-	}
-
-	public function get_attendance_weight()
-	{
-		return $this->attendance_weight;
-	}
-
-	/**
-	 * @param string $startDate in UTC time
-	 * @param string $endDate in UTC time
-	 *
-	 * @return array
-	 */
-	public function getAttendanceLogin($startDate, $endDate)
-	{
-		if (empty($startDate) || $startDate == '0000-00-00' ||
-			empty($endDate) || $endDate == '0000-00-00'
-		) {
-			return false;
-		}
-
-		$sessionId = api_get_session_id();
-		$courseCode  = api_get_course_id();
-		if (!empty($sessionId)) {
-			$users = CourseManager:: get_user_list_from_course_code(
-				$courseCode,
-				$sessionId,
-				'',
-				'lastname',
-				0
-			);
-		} else {
-			$users = CourseManager:: get_user_list_from_course_code(
-				$courseCode,
-				0,
-				'',
-				'lastname',
-				STUDENT
-			);
-		}
-
-		$dateTimeStartOriginal = new DateTime($startDate);
-		$dateTimeStart = new DateTime($startDate);
-		$dateTimeEnd= new DateTime($endDate);
-		$interval = $dateTimeStart->diff($dateTimeEnd);
-		$days = intval($interval->format('%a'));
-
-		$dateList = array($dateTimeStart->format('Y-m-d'));
-		$headers = array(
-			get_lang('User'),
-			$dateTimeStart->format('Y-m-d')
-		);
-
-		for ($i = 0; $i < $days; $i++) {
-			$dateTimeStart = $dateTimeStart->add(new DateInterval('P1D'));
-			$date = $dateTimeStart->format('Y-m-d');
-			$dateList[] = $date;
-			$headers[] = $date;
-		}
-
-		$accessData = CourseManager::getCourseAccessPerCourseAndSession(
-			$courseCode,
-			$sessionId,
-			$dateTimeStartOriginal->format('Y-m-d H:i:s'),
-			$dateTimeEnd->format('Y-m-d H:i:s')
-		);
-
-		$results = array();
-		if (!empty($accessData)) {
-			foreach ($accessData as $data) {
-				$onlyDate = substr($data['login_course_date'], 0, 10);
-				$results[$data['user_id']][$onlyDate] = true;
-			}
-		}
-
-		return array(
-			'users' => $users,
-			'dateList' => $dateList,
-			'headers' => $headers,
-			'results' => $results
-		);
-	}
-
-	/**
-	 * @param string $startDate in UTC time
-	 * @param string $endDate in UTC time
-	 *
-	 * @return string
-	 */
-	public function getAttendanceLoginTable($startDate, $endDate)
-	{
-		$data = $this->getAttendanceLogin($startDate, $endDate);
-
-		if (!$data) {
-			return null;
-		}
-
-		$headers = $data['headers'];
-		$dateList = $data['dateList'];
-		$users = $data['users'];
-		$results = $data['results'];
-
-		$table = new HTML_Table(array('class' => 'data_table'));
-		$row = 0;
-		$column = 0;
-		foreach ($headers as $header) {
-			$table->setHeaderContents($row, $column, $header);
-			$column++;
-		}
-		$row = 1;
-		foreach ($users as $user) {
-			$table->setCellContents(
-				$row,
-				0,
-				$user['lastname'].' '.$user['firstname'].' ('.$user['username'].')'
-			);
-			$row ++;
-		}
-
-		$column = 1;
-		$row = 1;
-		foreach ($users as $user) {
-			foreach ($dateList as $date) {
-				$status = null;
-				if (isset($results[$user['user_id']]) &&
-					isset($results[$user['user_id']][$date])
-				) {
-					$status = 'X';
-				}
-				$table->setCellContents($row, $column, $status);
-				$column++;
-			}
-			$row++;
-			$column = 1;
-		}
-
-		return $table->toHtml();
-	}
-
-	/**
-	 * @param string $startDate in UTC time
-	 * @param string $endDate in UTC time
-	 *
-	 * @return string
-	 */
-	public function exportAttendanceLogin($startDate, $endDate)
-	{
-		$data = $this->getAttendanceLogin($startDate, $endDate);
-
-		if (!$data) {
-			return null;
-		}
-		$users = $data['users'];
-		$results = $data['results'];
-
-		$table = new HTML_Table(array('class' => 'data_table'));
-
-		$table->setHeaderContents(0, 0, get_lang('User'));
-		$table->setHeaderContents(0, 1, get_lang('Date'));
-
-		$row = 1;
-		foreach ($users as $user) {
-			$table->setCellContents(
-				$row,
-				0,
-				$user['lastname'].' '.$user['firstname'].' ('.$user['username'].')'
-			);
-			$row++;
-		}
-		$table->setColAttributes(0, array('style' => 'width:28%'));
-
-		$row = 1;
-		foreach ($users as $user) {
-			if (isset($results[$user['user_id']]) &&
-				!empty($results[$user['user_id']])
-			) {
-				$dates = implode(', ', array_keys($results[$user['user_id']]));
-				$table->setCellContents($row, 1, $dates);
-			}
-			$row++;
-		}
-
-		//$tableToString = null;
-
-		//$sessionInfo = api_get_session_info(api_get_session_id());
-		//if (!empty($sessionInfo)) {
-		/*$tableToString .= '<strong>'.get_lang('PeriodToDisplay').'</strong>: '.
+            Database::query($sql);
+
+            $this->deleteAttendanceCalendarGroup($calendar_id, $course_id);
+            $affected_rows++;
+        }
+
+        // update users' results
+        $this->update_users_results($user_ids, $attendance_id);
+
+        return $affected_rows;
+    }
+
+    /** Setters for fields of attendances tables **/
+    public function set_session_id($session_id)
+    {
+        $this->session_id = $session_id;
+    }
+
+    public function set_course_id($course_id)
+    {
+        $this->course_id = $course_id;
+    }
+
+    public function set_date_time($datetime)
+    {
+        $this->date_time = $datetime;
+    }
+
+    public function set_name($name)
+    {
+        $this->name = $name;
+    }
+
+    public function set_description($description)
+    {
+        $this->description = $description;
+    }
+
+    public function set_attendance_qualify_title($attendance_qualify_title)
+    {
+        $this->attendance_qualify_title = $attendance_qualify_title;
+    }
+
+    public function set_attendance_weight($attendance_weight)
+    {
+        $this->attendance_weight = $attendance_weight;
+    }
+
+    /** Getters for fields of attendances tables **/
+    public function get_session_id()
+    {
+        return $this->session_id;
+    }
+
+    public function get_course_id()
+    {
+        return $this->course_id;
+    }
+
+    public function get_date_time()
+    {
+        return $this->date_time;
+    }
+
+    public function get_name()
+    {
+        return $this->name;
+    }
+
+    public function get_description()
+    {
+        return $this->description;
+    }
+
+    public function get_attendance_qualify_title()
+    {
+        return $this->attendance_qualify_title;
+    }
+
+    public function get_attendance_weight()
+    {
+        return $this->attendance_weight;
+    }
+
+    /**
+     * @param string $startDate in UTC time
+     * @param string $endDate in UTC time
+     *
+     * @return array
+     */
+    public function getAttendanceLogin($startDate, $endDate)
+    {
+        if (empty($startDate) || $startDate == '0000-00-00' ||
+            empty($endDate) || $endDate == '0000-00-00'
+        ) {
+            return false;
+        }
+
+        $sessionId = api_get_session_id();
+        $courseCode  = api_get_course_id();
+        if (!empty($sessionId)) {
+            $users = CourseManager:: get_user_list_from_course_code(
+                $courseCode,
+                $sessionId,
+                '',
+                'lastname',
+                0
+            );
+        } else {
+            $users = CourseManager:: get_user_list_from_course_code(
+                $courseCode,
+                0,
+                '',
+                'lastname',
+                STUDENT
+            );
+        }
+
+        $dateTimeStartOriginal = new DateTime($startDate);
+        $dateTimeStart = new DateTime($startDate);
+        $dateTimeEnd= new DateTime($endDate);
+        $interval = $dateTimeStart->diff($dateTimeEnd);
+        $days = intval($interval->format('%a'));
+
+        $dateList = array($dateTimeStart->format('Y-m-d'));
+        $headers = array(
+            get_lang('User'),
+            $dateTimeStart->format('Y-m-d')
+        );
+
+        for ($i = 0; $i < $days; $i++) {
+            $dateTimeStart = $dateTimeStart->add(new DateInterval('P1D'));
+            $date = $dateTimeStart->format('Y-m-d');
+            $dateList[] = $date;
+            $headers[] = $date;
+        }
+
+        $accessData = CourseManager::getCourseAccessPerCourseAndSession(
+            $courseCode,
+            $sessionId,
+            $dateTimeStartOriginal->format('Y-m-d H:i:s'),
+            $dateTimeEnd->format('Y-m-d H:i:s')
+        );
+
+        $results = array();
+        if (!empty($accessData)) {
+            foreach ($accessData as $data) {
+                $onlyDate = substr($data['login_course_date'], 0, 10);
+                $results[$data['user_id']][$onlyDate] = true;
+            }
+        }
+
+        return array(
+            'users' => $users,
+            'dateList' => $dateList,
+            'headers' => $headers,
+            'results' => $results
+        );
+    }
+
+    /**
+     * @param string $startDate in UTC time
+     * @param string $endDate in UTC time
+     *
+     * @return string
+     */
+    public function getAttendanceLoginTable($startDate, $endDate)
+    {
+        $data = $this->getAttendanceLogin($startDate, $endDate);
+
+        if (!$data) {
+            return null;
+        }
+
+        $headers = $data['headers'];
+        $dateList = $data['dateList'];
+        $users = $data['users'];
+        $results = $data['results'];
+
+        $table = new HTML_Table(array('class' => 'data_table'));
+        $row = 0;
+        $column = 0;
+        foreach ($headers as $header) {
+            $table->setHeaderContents($row, $column, $header);
+            $column++;
+        }
+        $row = 1;
+        foreach ($users as $user) {
+            $table->setCellContents(
+                $row,
+                0,
+                $user['lastname'].' '.$user['firstname'].' ('.$user['username'].')'
+            );
+            $row ++;
+        }
+
+        $column = 1;
+        $row = 1;
+        foreach ($users as $user) {
+            foreach ($dateList as $date) {
+                $status = null;
+                if (isset($results[$user['user_id']]) &&
+                    isset($results[$user['user_id']][$date])
+                ) {
+                    $status = 'X';
+                }
+                $table->setCellContents($row, $column, $status);
+                $column++;
+            }
+            $row++;
+            $column = 1;
+        }
+
+        return $table->toHtml();
+    }
+
+    /**
+     * @param string $startDate in UTC time
+     * @param string $endDate in UTC time
+     *
+     * @return string
+     */
+    public function exportAttendanceLogin($startDate, $endDate)
+    {
+        $data = $this->getAttendanceLogin($startDate, $endDate);
+
+        if (!$data) {
+            return null;
+        }
+        $users = $data['users'];
+        $results = $data['results'];
+
+        $table = new HTML_Table(array('class' => 'data_table'));
+
+        $table->setHeaderContents(0, 0, get_lang('User'));
+        $table->setHeaderContents(0, 1, get_lang('Date'));
+
+        $row = 1;
+        foreach ($users as $user) {
+            $table->setCellContents(
+                $row,
+                0,
+                $user['lastname'].' '.$user['firstname'].' ('.$user['username'].')'
+            );
+            $row++;
+        }
+        $table->setColAttributes(0, array('style' => 'width:28%'));
+
+        $row = 1;
+        foreach ($users as $user) {
+            if (isset($results[$user['user_id']]) &&
+                !empty($results[$user['user_id']])
+            ) {
+                $dates = implode(', ', array_keys($results[$user['user_id']]));
+                $table->setCellContents($row, 1, $dates);
+            }
+            $row++;
+        }
+
+        //$tableToString = null;
+
+        //$sessionInfo = api_get_session_info(api_get_session_id());
+        //if (!empty($sessionInfo)) {
+        /*$tableToString .= '<strong>'.get_lang('PeriodToDisplay').'</strong>: '.
 			sprintf(get_lang('FromDateXToDateY'), $startDate, $endDate);*/
-		//}
-
-		$tableToString = $table->toHtml();
-
-		$params = array(
-			'filename' => get_lang('Attendance') . '_' . api_get_utc_datetime(),
-			'pdf_title' => get_lang('Attendance'),
-			'course_code' => api_get_course_id(),
-			'show_real_course_teachers' => true
-		);
-		$pdf = new PDF('A4', null, $params);
-		$pdf->html_to_pdf_with_template($tableToString);
-	}
+        //}
+
+        $tableToString = $table->toHtml();
+
+        $params = array(
+            'filename' => get_lang('Attendance') . '_' . api_get_utc_datetime(),
+            'pdf_title' => get_lang('Attendance'),
+            'course_code' => api_get_course_id(),
+            'show_real_course_teachers' => true
+        );
+        $pdf = new PDF('A4', null, $params);
+        $pdf->html_to_pdf_with_template($tableToString);
+    }
 }

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

Indentation +17 added lines, -17 removed lines

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

main/inc/lib/login.lib.php

Indentation +6 added lines, -6 removed lines

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

plugin/bbb/lib/bbb_api.php

Indentation +403 added lines, -403 removed lines

@@ -44,107 +44,107 @@ 
 
 class BigBlueButtonBN {
 
-	private $_securitySalt;
-	private $_bbbServerBaseUrl;
+    private $_securitySalt;
+    private $_bbbServerBaseUrl;
 
-	/* ___________ General Methods for the BigBlueButton Class __________ */
+    /* ___________ General Methods for the BigBlueButton Class __________ */
 
-	function __construct() {
-	/*
+    function __construct() {
+    /*
 	Establish just our basic elements in the constructor:
 	*/
-		// BASE CONFIGS - set these for your BBB server in config.php and they will
-		// simply flow in here via the constants:
-		$this->_securitySalt 		= CONFIG_SECURITY_SALT;
-		$this->_bbbServerBaseUrl 	= CONFIG_SERVER_BASE_URL;
-	}
-
-	private function _processXmlResponse($url){
-	/*
+        // BASE CONFIGS - set these for your BBB server in config.php and they will
+        // simply flow in here via the constants:
+        $this->_securitySalt 		= CONFIG_SECURITY_SALT;
+        $this->_bbbServerBaseUrl 	= CONFIG_SERVER_BASE_URL;
+    }
+
+    private function _processXmlResponse($url){
+    /*
 	A private utility method used by other public methods to process XML responses.
 	*/
-		if (extension_loaded('curl')) {
-			$ch = curl_init() or die ( curl_error($ch) );
-			$timeout = 10;
-			curl_setopt( $ch, CURLOPT_SSL_VERIFYPEER, false);
-			curl_setopt( $ch, CURLOPT_URL, $url );
-			curl_setopt( $ch, CURLOPT_RETURNTRANSFER, 1 );
-			curl_setopt( $ch, CURLOPT_CONNECTTIMEOUT, $timeout);
-			$data = curl_exec( $ch );
-			curl_close( $ch );
-
-			if($data)
-				return (new SimpleXMLElement($data));
-			else
-				return false;
-		}
-		return (simplexml_load_file($url));
-	}
-
-	private function _requiredParam($param) {
-		/* Process required params and throw errors if we don't get values */
-		if ((isset($param)) && ($param != '')) {
-			return $param;
-		}
-		elseif (!isset($param)) {
-			throw new Exception('Missing parameter.');
-		}
-		else {
-			throw new Exception(''.$param.' is required.');
-		}
-	}
-
-	private function _optionalParam($param) {
-		/* Pass most optional params through as set value, or set to '' */
-		/* Don't know if we'll use this one, but let's build it in case. */
-		if ((isset($param)) && ($param != '')) {
-			return $param;
-		}
-		else {
-			$param = '';
-			return $param;
-		}
-	}
-
-	/* __________________ BBB ADMINISTRATION METHODS _________________ */
-	/* The methods in the following section support the following categories of the BBB API:
+        if (extension_loaded('curl')) {
+            $ch = curl_init() or die ( curl_error($ch) );
+            $timeout = 10;
+            curl_setopt( $ch, CURLOPT_SSL_VERIFYPEER, false);
+            curl_setopt( $ch, CURLOPT_URL, $url );
+            curl_setopt( $ch, CURLOPT_RETURNTRANSFER, 1 );
+            curl_setopt( $ch, CURLOPT_CONNECTTIMEOUT, $timeout);
+            $data = curl_exec( $ch );
+            curl_close( $ch );
+
+            if($data)
+                return (new SimpleXMLElement($data));
+            else
+                return false;
+        }
+        return (simplexml_load_file($url));
+    }
+
+    private function _requiredParam($param) {
+        /* Process required params and throw errors if we don't get values */
+        if ((isset($param)) && ($param != '')) {
+            return $param;
+        }
+        elseif (!isset($param)) {
+            throw new Exception('Missing parameter.');
+        }
+        else {
+            throw new Exception(''.$param.' is required.');
+        }
+    }
+
+    private function _optionalParam($param) {
+        /* Pass most optional params through as set value, or set to '' */
+        /* Don't know if we'll use this one, but let's build it in case. */
+        if ((isset($param)) && ($param != '')) {
+            return $param;
+        }
+        else {
+            $param = '';
+            return $param;
+        }
+    }
+
+    /* __________________ BBB ADMINISTRATION METHODS _________________ */
+    /* The methods in the following section support the following categories of the BBB API:
 	-- create
 	-- join
 	-- end
 	*/
 
-	public function getCreateMeetingUrl($creationParams) {
-		/*
+    public function getCreateMeetingUrl($creationParams) {
+        /*
 		USAGE:
 		(see $creationParams array in createMeetingArray method.)
 		*/
-		$this->_meetingId = $this->_requiredParam($creationParams['meetingId']);
-		$this->_meetingName = $this->_requiredParam($creationParams['meetingName']);
-		// Set up the basic creation URL:
-		$creationUrl = $this->_bbbServerBaseUrl."api/create?";
-		// Add params:
-		$params =
-		'name='.urlencode($this->_meetingName).
-		'&meetingID='.urlencode($this->_meetingId).
-		'&attendeePW='.urlencode($creationParams['attendeePw']).
-		'&moderatorPW='.urlencode($creationParams['moderatorPw']).
-		'&dialNumber='.urlencode($creationParams['dialNumber']).
-		'&voiceBridge='.urlencode($creationParams['voiceBridge']).
-		'&webVoice='.urlencode($creationParams['webVoice']).
-		'&logoutURL='.urlencode($creationParams['logoutUrl']).
-		'&maxParticipants='.urlencode($creationParams['maxParticipants']).
-		'&record='.urlencode($creationParams['record']).
-		'&duration='.urlencode($creationParams['duration']);
-		//'&meta_category='.urlencode($creationParams['meta_category']);
-		$welcomeMessage = $creationParams['welcomeMsg'];
-		if(trim($welcomeMessage))
-			$params .= '&welcome='.urlencode($welcomeMessage);
-		// Return the complete URL:
-		return ( $creationUrl.$params.'&checksum='.sha1("create".$params.$this->_securitySalt) );
-	}
-
-	public function createMeetingWithXmlResponseArray($creationParams) {
-		/*
+        $this->_meetingId = $this->_requiredParam($creationParams['meetingId']);
+        $this->_meetingName = $this->_requiredParam($creationParams['meetingName']);
+        // Set up the basic creation URL:
+        $creationUrl = $this->_bbbServerBaseUrl."api/create?";
+        // Add params:
+        $params =
+        'name='.urlencode($this->_meetingName).
+        '&meetingID='.urlencode($this->_meetingId).
+        '&attendeePW='.urlencode($creationParams['attendeePw']).
+        '&moderatorPW='.urlencode($creationParams['moderatorPw']).
+        '&dialNumber='.urlencode($creationParams['dialNumber']).
+        '&voiceBridge='.urlencode($creationParams['voiceBridge']).
+        '&webVoice='.urlencode($creationParams['webVoice']).
+        '&logoutURL='.urlencode($creationParams['logoutUrl']).
+        '&maxParticipants='.urlencode($creationParams['maxParticipants']).
+        '&record='.urlencode($creationParams['record']).
+        '&duration='.urlencode($creationParams['duration']);
+        //'&meta_category='.urlencode($creationParams['meta_category']);
+        $welcomeMessage = $creationParams['welcomeMsg'];
+        if(trim($welcomeMessage))
+            $params .= '&welcome='.urlencode($welcomeMessage);
+        // Return the complete URL:
+        return ( $creationUrl.$params.'&checksum='.sha1("create".$params.$this->_securitySalt) );
+    }
+
+    public function createMeetingWithXmlResponseArray($creationParams) {
+        /*
 		USAGE:
 		$creationParams = array(
 			'name' => 'Meeting Name',	-- A name for the meeting (or username)
@@ -162,34 +162,34 @@ 
 			'meta_category' => '', 		-- Use to pass additional info to BBB server. See API docs to enable.
 		);
 		*/
-		$xml = $this->_processXmlResponse($this->getCreateMeetingURL($creationParams));
+        $xml = $this->_processXmlResponse($this->getCreateMeetingURL($creationParams));
 
         if ($xml) {
-			if($xml->meetingID)
-				return array(
-					'returncode' => $xml->returncode,
-					'message' => $xml->message,
-					'messageKey' => $xml->messageKey,
-					'meetingId' => $xml->meetingID,
-					'attendeePw' => $xml->attendeePW,
-					'moderatorPw' => $xml->moderatorPW,
-					'hasBeenForciblyEnded' => $xml->hasBeenForciblyEnded,
-					'createTime' => $xml->createTime
-					);
-			else
-				return array(
-					'returncode' => $xml->returncode,
-					'message' => $xml->message,
-					'messageKey' => $xml->messageKey
-					);
-		}
-		else {
-			return null;
-		}
-	}
-
-	public function getJoinMeetingURL($joinParams) {
-		/*
+            if($xml->meetingID)
+                return array(
+                    'returncode' => $xml->returncode,
+                    'message' => $xml->message,
+                    'messageKey' => $xml->messageKey,
+                    'meetingId' => $xml->meetingID,
+                    'attendeePw' => $xml->attendeePW,
+                    'moderatorPw' => $xml->moderatorPW,
+                    'hasBeenForciblyEnded' => $xml->hasBeenForciblyEnded,
+                    'createTime' => $xml->createTime
+                    );
+            else
+                return array(
+                    'returncode' => $xml->returncode,
+                    'message' => $xml->message,
+                    'messageKey' => $xml->messageKey
+                    );
+        }
+        else {
+            return null;
+        }
+    }
+
+    public function getJoinMeetingURL($joinParams) {
+        /*
 		NOTE: At this point, we don't use a corresponding joinMeetingWithXmlResponse here because the API
 		doesn't respond on success, but you can still code that method if you need it. Or, you can take the URL
 		that's returned from this method and simply send your users off to that URL in your code.
@@ -203,249 +203,249 @@ 
 			'webVoiceConf' => ''		-- OPTIONAL - string
 		);
 		*/
-		$this->_meetingId = $this->_requiredParam($joinParams['meetingId']);
-		$this->_username = $this->_requiredParam($joinParams['username']);
-		$this->_password = $this->_requiredParam($joinParams['password']);
-		// Establish the basic join URL:
-		$joinUrl = $this->_bbbServerBaseUrl."api/join?";
-		// Add parameters to the URL:
-		$params =
-		'meetingID='.urlencode($this->_meetingId).
-		'&fullName='.urlencode($this->_username).
-		'&password='.urlencode($this->_password).
-		'&userID='.urlencode($joinParams['userID']).
-		'&webVoiceConf='.urlencode($joinParams['webVoiceConf']);
-		// Only use createTime if we really want to use it. If it's '', then don't pass it:
-		if (((isset($joinParams['createTime'])) && ($joinParams['createTime'] != ''))) {
-			$params .= '&createTime='.urlencode($joinParams['createTime']);
-		}
-		// Return the URL:
-		return ($joinUrl.$params.'&checksum='.sha1("join".$params.$this->_securitySalt));
-	}
-
-	public function getEndMeetingURL($endParams) {
-		/* USAGE:
+        $this->_meetingId = $this->_requiredParam($joinParams['meetingId']);
+        $this->_username = $this->_requiredParam($joinParams['username']);
+        $this->_password = $this->_requiredParam($joinParams['password']);
+        // Establish the basic join URL:
+        $joinUrl = $this->_bbbServerBaseUrl."api/join?";
+        // Add parameters to the URL:
+        $params =
+        'meetingID='.urlencode($this->_meetingId).
+        '&fullName='.urlencode($this->_username).
+        '&password='.urlencode($this->_password).
+        '&userID='.urlencode($joinParams['userID']).
+        '&webVoiceConf='.urlencode($joinParams['webVoiceConf']);
+        // Only use createTime if we really want to use it. If it's '', then don't pass it:
+        if (((isset($joinParams['createTime'])) && ($joinParams['createTime'] != ''))) {
+            $params .= '&createTime='.urlencode($joinParams['createTime']);
+        }
+        // Return the URL:
+        return ($joinUrl.$params.'&checksum='.sha1("join".$params.$this->_securitySalt));
+    }
+
+    public function getEndMeetingURL($endParams) {
+        /* USAGE:
 		$endParams = array (
 			'meetingId' => '1234',		-- REQUIRED - The unique id for the meeting
 			'password' => 'mp'			-- REQUIRED - The moderator password for the meeting
 		);
 		*/
-		$this->_meetingId = $this->_requiredParam($endParams['meetingId']);
-		$this->_password = $this->_requiredParam($endParams['password']);
-		$endUrl = $this->_bbbServerBaseUrl."api/end?";
-		$params =
-		'meetingID='.urlencode($this->_meetingId).
-		'&password='.urlencode($this->_password);
-		return ($endUrl.$params.'&checksum='.sha1("end".$params.$this->_securitySalt));
-	}
-
-	public function endMeetingWithXmlResponseArray($endParams) {
-		/* USAGE:
+        $this->_meetingId = $this->_requiredParam($endParams['meetingId']);
+        $this->_password = $this->_requiredParam($endParams['password']);
+        $endUrl = $this->_bbbServerBaseUrl."api/end?";
+        $params =
+        'meetingID='.urlencode($this->_meetingId).
+        '&password='.urlencode($this->_password);
+        return ($endUrl.$params.'&checksum='.sha1("end".$params.$this->_securitySalt));
+    }
+
+    public function endMeetingWithXmlResponseArray($endParams) {
+        /* USAGE:
 		$endParams = array (
 			'meetingId' => '1234',		-- REQUIRED - The unique id for the meeting
 			'password' => 'mp'			-- REQUIRED - The moderator password for the meeting
 		);
 		*/
-		$xml = $this->_processXmlResponse($this->getEndMeetingURL($endParams));
-		if ($xml) {
-			return array(
-				'returncode' => $xml->returncode,
-				'message' => $xml->message,
-				'messageKey' => $xml->messageKey
-				);
-		}
-		else {
-			return null;
-		}
-
-	}
-
-	/* __________________ BBB MONITORING METHODS _________________ */
-	/* The methods in the following section support the following categories of the BBB API:
+        $xml = $this->_processXmlResponse($this->getEndMeetingURL($endParams));
+        if ($xml) {
+            return array(
+                'returncode' => $xml->returncode,
+                'message' => $xml->message,
+                'messageKey' => $xml->messageKey
+                );
+        }
+        else {
+            return null;
+        }
+
+    }
+
+    /* __________________ BBB MONITORING METHODS _________________ */
+    /* The methods in the following section support the following categories of the BBB API:
 	-- isMeetingRunning
 	-- getMeetings
 	-- getMeetingInfo
 	*/
 
-	public function getIsMeetingRunningUrl($meetingId) {
-		/* USAGE:
+    public function getIsMeetingRunningUrl($meetingId) {
+        /* USAGE:
 		$meetingId = '1234'		-- REQUIRED - The unique id for the meeting
 		*/
-		$this->_meetingId = $this->_requiredParam($meetingId);
-		$runningUrl = $this->_bbbServerBaseUrl."api/isMeetingRunning?";
-		$params =
-		'meetingID='.urlencode($this->_meetingId);
-		return ($runningUrl.$params.'&checksum='.sha1("isMeetingRunning".$params.$this->_securitySalt));
-	}
-
-	public function isMeetingRunningWithXmlResponseArray($meetingId) {
-		/* USAGE:
+        $this->_meetingId = $this->_requiredParam($meetingId);
+        $runningUrl = $this->_bbbServerBaseUrl."api/isMeetingRunning?";
+        $params =
+        'meetingID='.urlencode($this->_meetingId);
+        return ($runningUrl.$params.'&checksum='.sha1("isMeetingRunning".$params.$this->_securitySalt));
+    }
+
+    public function isMeetingRunningWithXmlResponseArray($meetingId) {
+        /* USAGE:
 		$meetingId = '1234'		-- REQUIRED - The unique id for the meeting
 		*/
-		$xml = $this->_processXmlResponse($this->getIsMeetingRunningUrl($meetingId));
-		if($xml) {
-			return array(
-				'returncode' => $xml->returncode,
-				'running' => $xml->running 	// -- Returns true/false.
-				);
-		}
-		else {
-			return null;
-		}
-
-	}
-
-	public function getGetMeetingsUrl() {
-		/* Simply formulate the getMeetings URL
+        $xml = $this->_processXmlResponse($this->getIsMeetingRunningUrl($meetingId));
+        if($xml) {
+            return array(
+                'returncode' => $xml->returncode,
+                'running' => $xml->running 	// -- Returns true/false.
+                );
+        }
+        else {
+            return null;
+        }
+
+    }
+
+    public function getGetMeetingsUrl() {
+        /* Simply formulate the getMeetings URL
 		We do this in a separate function so we have the option to just get this
 		URL and print it if we want for some reason.
 		*/
-		$getMeetingsUrl = $this->_bbbServerBaseUrl."api/getMeetings?checksum=".sha1("getMeetings".$this->_securitySalt);
-		return $getMeetingsUrl;
-	}
+        $getMeetingsUrl = $this->_bbbServerBaseUrl."api/getMeetings?checksum=".sha1("getMeetings".$this->_securitySalt);
+        return $getMeetingsUrl;
+    }
 
-	public function getMeetingsWithXmlResponseArray() {
-		/* USAGE:
+    public function getMeetingsWithXmlResponseArray() {
+        /* USAGE:
 		We don't need to pass any parameters with this one, so we just send the query URL off to BBB
 		and then handle the results that we get in the XML response.
 		*/
-		$xml = $this->_processXmlResponse($this->getGetMeetingsUrl());
-		if($xml) {
-			// If we don't get a success code, stop processing and return just the returncode:
-			if ($xml->returncode != 'SUCCESS') {
-				$result = array(
-					'returncode' => $xml->returncode
-				);
-				return $result;
-			}
-			elseif ($xml->messageKey == 'noMeetings') {
-				/* No meetings on server, so return just this info: */
-				$result = array(
-					'returncode' => $xml->returncode,
-					'messageKey' => $xml->messageKey,
-					'message' => $xml->message
-				);
-				return $result;
-			}
-			else {
-				// In this case, we have success and meetings. First return general response:
-				$result = array(
-					'returncode' => $xml->returncode,
-					'messageKey' => $xml->messageKey,
-					'message' => $xml->message
-				);
-				// Then interate through meeting results and return them as part of the array:
-				foreach ($xml->meetings->meeting as $m) {
-					$result[] = array(
-						'meetingId' => $m->meetingID,
-						'meetingName' => $m->meetingName,
-						'createTime' => $m->createTime,
-						'attendeePw' => $m->attendeePW,
-						'moderatorPw' => $m->moderatorPW,
-						'hasBeenForciblyEnded' => $m->hasBeenForciblyEnded,
-						'running' => $m->running
-						);
-					}
-				return $result;
-			}
-		}
-		else {
-			return null;
-		}
-
-	}
-
-	public function getMeetingInfoUrl($infoParams) {
-		/* USAGE:
+        $xml = $this->_processXmlResponse($this->getGetMeetingsUrl());
+        if($xml) {
+            // If we don't get a success code, stop processing and return just the returncode:
+            if ($xml->returncode != 'SUCCESS') {
+                $result = array(
+                    'returncode' => $xml->returncode
+                );
+                return $result;
+            }
+            elseif ($xml->messageKey == 'noMeetings') {
+                /* No meetings on server, so return just this info: */
+                $result = array(
+                    'returncode' => $xml->returncode,
+                    'messageKey' => $xml->messageKey,
+                    'message' => $xml->message
+                );
+                return $result;
+            }
+            else {
+                // In this case, we have success and meetings. First return general response:
+                $result = array(
+                    'returncode' => $xml->returncode,
+                    'messageKey' => $xml->messageKey,
+                    'message' => $xml->message
+                );
+                // Then interate through meeting results and return them as part of the array:
+                foreach ($xml->meetings->meeting as $m) {
+                    $result[] = array(
+                        'meetingId' => $m->meetingID,
+                        'meetingName' => $m->meetingName,
+                        'createTime' => $m->createTime,
+                        'attendeePw' => $m->attendeePW,
+                        'moderatorPw' => $m->moderatorPW,
+                        'hasBeenForciblyEnded' => $m->hasBeenForciblyEnded,
+                        'running' => $m->running
+                        );
+                    }
+                return $result;
+            }
+        }
+        else {
+            return null;
+        }
+
+    }
+
+    public function getMeetingInfoUrl($infoParams) {
+        /* USAGE:
 		$infoParams = array(
 			'meetingId' => '1234',		-- REQUIRED - The unique id for the meeting
 			'password' => 'mp'			-- REQUIRED - The moderator password for the meeting
 		);
 		*/
-		$this->_meetingId = $this->_requiredParam($infoParams['meetingId']);
-		$this->_password = $this->_requiredParam($infoParams['password']);
-		$infoUrl = $this->_bbbServerBaseUrl."api/getMeetingInfo?";
-		$params =
-		'meetingID='.urlencode($this->_meetingId).
-		'&password='.urlencode($this->_password);
-		return ($infoUrl.$params.'&checksum='.sha1("getMeetingInfo".$params.$this->_securitySalt));
-	}
-
-	public function getMeetingInfoWithXmlResponseArray($infoParams) {
-		/* USAGE:
+        $this->_meetingId = $this->_requiredParam($infoParams['meetingId']);
+        $this->_password = $this->_requiredParam($infoParams['password']);
+        $infoUrl = $this->_bbbServerBaseUrl."api/getMeetingInfo?";
+        $params =
+        'meetingID='.urlencode($this->_meetingId).
+        '&password='.urlencode($this->_password);
+        return ($infoUrl.$params.'&checksum='.sha1("getMeetingInfo".$params.$this->_securitySalt));
+    }
+
+    public function getMeetingInfoWithXmlResponseArray($infoParams) {
+        /* USAGE:
 		$infoParams = array(
 			'meetingId' => '1234',		-- REQUIRED - The unique id for the meeting
 			'password' => 'mp'			-- REQUIRED - The moderator password for the meeting
 		);
 		*/
-		$xml = $this->_processXmlResponse($this->getMeetingInfoUrl($infoParams));
-		if($xml) {
-			// If we don't get a success code or messageKey, find out why:
-			if (($xml->returncode != 'SUCCESS') || ($xml->messageKey == null)) {
-				$result = array(
-					'returncode' => $xml->returncode,
-					'messageKey' => $xml->messageKey,
-					'message' => $xml->message
-				);
-				return $result;
-			}
-			else {
-				// In this case, we have success and meeting info:
-				$result = array(
-					'returncode' => $xml->returncode,
-					'meetingName' => $xml->meetingName,
-					'meetingId' => $xml->meetingID,
-					'createTime' => $xml->createTime,
-					'voiceBridge' => $xml->voiceBridge,
-					'attendeePw' => $xml->attendeePW,
-					'moderatorPw' => $xml->moderatorPW,
-					'running' => $xml->running,
-					'recording' => $xml->recording,
-					'hasBeenForciblyEnded' => $xml->hasBeenForciblyEnded,
-					'startTime' => $xml->startTime,
-					'endTime' => $xml->endTime,
-					'participantCount' => $xml->participantCount,
-					'maxUsers' => $xml->maxUsers,
-					'moderatorCount' => $xml->moderatorCount,
-				);
-				// Then interate through attendee results and return them as part of the array:
-				foreach ($xml->attendees->attendee as $a) {
-					$result[] = array(
-						'userId' => $a->userID,
-						'fullName' => $a->fullName,
-						'role' => $a->role
-						);
-					}
-				return $result;
-			}
-		}
-		else {
-			return null;
-		}
-
-	}
-
-	/* __________________ BBB RECORDING METHODS _________________ */
-	/* The methods in the following section support the following categories of the BBB API:
+        $xml = $this->_processXmlResponse($this->getMeetingInfoUrl($infoParams));
+        if($xml) {
+            // If we don't get a success code or messageKey, find out why:
+            if (($xml->returncode != 'SUCCESS') || ($xml->messageKey == null)) {
+                $result = array(
+                    'returncode' => $xml->returncode,
+                    'messageKey' => $xml->messageKey,
+                    'message' => $xml->message
+                );
+                return $result;
+            }
+            else {
+                // In this case, we have success and meeting info:
+                $result = array(
+                    'returncode' => $xml->returncode,
+                    'meetingName' => $xml->meetingName,
+                    'meetingId' => $xml->meetingID,
+                    'createTime' => $xml->createTime,
+                    'voiceBridge' => $xml->voiceBridge,
+                    'attendeePw' => $xml->attendeePW,
+                    'moderatorPw' => $xml->moderatorPW,
+                    'running' => $xml->running,
+                    'recording' => $xml->recording,
+                    'hasBeenForciblyEnded' => $xml->hasBeenForciblyEnded,
+                    'startTime' => $xml->startTime,
+                    'endTime' => $xml->endTime,
+                    'participantCount' => $xml->participantCount,
+                    'maxUsers' => $xml->maxUsers,
+                    'moderatorCount' => $xml->moderatorCount,
+                );
+                // Then interate through attendee results and return them as part of the array:
+                foreach ($xml->attendees->attendee as $a) {
+                    $result[] = array(
+                        'userId' => $a->userID,
+                        'fullName' => $a->fullName,
+                        'role' => $a->role
+                        );
+                    }
+                return $result;
+            }
+        }
+        else {
+            return null;
+        }
+
+    }
+
+    /* __________________ BBB RECORDING METHODS _________________ */
+    /* The methods in the following section support the following categories of the BBB API:
 	-- getRecordings
 	-- publishRecordings
 	-- deleteRecordings
 	*/
 
-	public function getRecordingsUrl($recordingParams) {
-		/* USAGE:
+    public function getRecordingsUrl($recordingParams) {
+        /* USAGE:
 		$recordingParams = array(
 			'meetingId' => '1234',		-- OPTIONAL - comma separate if multiple ids
 		);
 		*/
-		$recordingsUrl = $this->_bbbServerBaseUrl."api/getRecordings?";
-		$params = 'meetingID='.urlencode($recordingParams['meetingId']);
-		return ($recordingsUrl.$params.'&checksum='.sha1("getRecordings".$params.$this->_securitySalt));
+        $recordingsUrl = $this->_bbbServerBaseUrl."api/getRecordings?";
+        $params = 'meetingID='.urlencode($recordingParams['meetingId']);
+        return ($recordingsUrl.$params.'&checksum='.sha1("getRecordings".$params.$this->_securitySalt));
 
-	}
+    }
 
-	public function getRecordingsWithXmlResponseArray($recordingParams) {
-		/* USAGE:
+    public function getRecordingsWithXmlResponseArray($recordingParams) {
+        /* USAGE:
 		$recordingParams = array(
 			'meetingId' => '1234',		-- OPTIONAL - comma separate if multiple ids
 		);
@@ -453,121 +453,121 @@ 
 		when creating a meeting, it will kick users out after the duration. Should
 		probably be required in user code when 'recording' is set to true.
 		*/
-		$xml = $this->_processXmlResponse($this->getRecordingsUrl($recordingParams));
-		if($xml) {
-			// If we don't get a success code or messageKey, find out why:
-			if (($xml->returncode != 'SUCCESS') || ($xml->messageKey == null)) {
-				$result = array(
-					'returncode' => $xml->returncode,
-					'messageKey' => $xml->messageKey,
-					'message' => $xml->message
-				);
-				return $result;
-			}
-			else {
-				// In this case, we have success and recording info:
-				$result = array(
-					'returncode' => $xml->returncode,
-					'messageKey' => $xml->messageKey,
-					'message' => $xml->message
-				);
-
-				foreach ($xml->recordings->recording as $r) {
-					$result[] = array(
-						'recordId' => $r->recordID,
-						'meetingId' => $r->meetingID,
-						'name' => $r->name,
-						'published' => $r->published,
-						'startTime' => $r->startTime,
-						'endTime' => $r->endTime,
-						'playbackFormatType' => $r->playback->format->type,
-						'playbackFormatUrl' => $r->playback->format->url,
-						'playbackFormatLength' => $r->playback->format->length,
-						'metadataTitle' => $r->metadata->title,
-						'metadataSubject' => $r->metadata->subject,
-						'metadataDescription' => $r->metadata->description,
-						'metadataCreator' => $r->metadata->creator,
-						'metadataContributor' => $r->metadata->contributor,
-						'metadataLanguage' => $r->metadata->language,
-						// Add more here as needed for your app depending on your
-						// use of metadata when creating recordings.
-						);
-					}
-				return $result;
-			}
-		}
-		else {
-			return null;
-		}
-	}
-
-	public function getPublishRecordingsUrl($recordingParams) {
-		/* USAGE:
+        $xml = $this->_processXmlResponse($this->getRecordingsUrl($recordingParams));
+        if($xml) {
+            // If we don't get a success code or messageKey, find out why:
+            if (($xml->returncode != 'SUCCESS') || ($xml->messageKey == null)) {
+                $result = array(
+                    'returncode' => $xml->returncode,
+                    'messageKey' => $xml->messageKey,
+                    'message' => $xml->message
+                );
+                return $result;
+            }
+            else {
+                // In this case, we have success and recording info:
+                $result = array(
+                    'returncode' => $xml->returncode,
+                    'messageKey' => $xml->messageKey,
+                    'message' => $xml->message
+                );
+
+                foreach ($xml->recordings->recording as $r) {
+                    $result[] = array(
+                        'recordId' => $r->recordID,
+                        'meetingId' => $r->meetingID,
+                        'name' => $r->name,
+                        'published' => $r->published,
+                        'startTime' => $r->startTime,
+                        'endTime' => $r->endTime,
+                        'playbackFormatType' => $r->playback->format->type,
+                        'playbackFormatUrl' => $r->playback->format->url,
+                        'playbackFormatLength' => $r->playback->format->length,
+                        'metadataTitle' => $r->metadata->title,
+                        'metadataSubject' => $r->metadata->subject,
+                        'metadataDescription' => $r->metadata->description,
+                        'metadataCreator' => $r->metadata->creator,
+                        'metadataContributor' => $r->metadata->contributor,
+                        'metadataLanguage' => $r->metadata->language,
+                        // Add more here as needed for your app depending on your
+                        // use of metadata when creating recordings.
+                        );
+                    }
+                return $result;
+            }
+        }
+        else {
+            return null;
+        }
+    }
+
+    public function getPublishRecordingsUrl($recordingParams) {
+        /* USAGE:
 		$recordingParams = array(
 			'recordId' => '1234',		-- REQUIRED - comma separate if multiple ids
 			'publish' => 'true',		-- REQUIRED - boolean: true/false
 		);
 		*/
-		$recordingsUrl = $this->_bbbServerBaseUrl."api/publishRecordings?";
-		$params =
-		'recordID='.urlencode($recordingParams['recordId']).
-		'&publish='.urlencode($recordingParams['publish']);
-		return ($recordingsUrl.$params.'&checksum='.sha1("publishRecordings".$params.$this->_securitySalt));
+        $recordingsUrl = $this->_bbbServerBaseUrl."api/publishRecordings?";
+        $params =
+        'recordID='.urlencode($recordingParams['recordId']).
+        '&publish='.urlencode($recordingParams['publish']);
+        return ($recordingsUrl.$params.'&checksum='.sha1("publishRecordings".$params.$this->_securitySalt));
 
-	}
+    }
 
-	public function publishRecordingsWithXmlResponseArray($recordingParams) {
-		/* USAGE:
+    public function publishRecordingsWithXmlResponseArray($recordingParams) {
+        /* USAGE:
 		$recordingParams = array(
 			'recordId' => '1234',		-- REQUIRED - comma separate if multiple ids
 			'publish' => 'true',		-- REQUIRED - boolean: true/false
 		);
 		*/
-		$xml = $this->_processXmlResponse($this->getPublishRecordingsUrl($recordingParams));
-		if($xml) {
-			return array(
-				'returncode' => $xml->returncode,
-				'published' => $xml->published 	// -- Returns true/false.
-				);
-		}
-		else {
-			return null;
-		}
-
-
-	}
-
-	public function getDeleteRecordingsUrl($recordingParams) {
-		/* USAGE:
+        $xml = $this->_processXmlResponse($this->getPublishRecordingsUrl($recordingParams));
+        if($xml) {
+            return array(
+                'returncode' => $xml->returncode,
+                'published' => $xml->published 	// -- Returns true/false.
+                );
+        }
+        else {
+            return null;
+        }
+
+
+    }
+
+    public function getDeleteRecordingsUrl($recordingParams) {
+        /* USAGE:
 		$recordingParams = array(
 			'recordId' => '1234',		-- REQUIRED - comma separate if multiple ids
 		);
 		*/
-		$recordingsUrl = $this->_bbbServerBaseUrl."api/deleteRecordings?";
-		$params =
-		'recordID='.urlencode($recordingParams['recordId']);
-		return ($recordingsUrl.$params.'&checksum='.sha1("deleteRecordings".$params.$this->_securitySalt));
-	}
-
-	public function deleteRecordingsWithXmlResponseArray($recordingParams) {
-		/* USAGE:
+        $recordingsUrl = $this->_bbbServerBaseUrl."api/deleteRecordings?";
+        $params =
+        'recordID='.urlencode($recordingParams['recordId']);
+        return ($recordingsUrl.$params.'&checksum='.sha1("deleteRecordings".$params.$this->_securitySalt));
+    }
+
+    public function deleteRecordingsWithXmlResponseArray($recordingParams) {
+        /* USAGE:
 		$recordingParams = array(
 			'recordId' => '1234',		-- REQUIRED - comma separate if multiple ids
 		);
 		*/
 
-		$xml = $this->_processXmlResponse($this->getDeleteRecordingsUrl($recordingParams));
-		if($xml) {
-			return array(
-				'returncode' => $xml->returncode,
-				'deleted' => $xml->deleted 	// -- Returns true/false.
-				);
-		}
-		else {
-			return null;
-		}
-
-	}
+        $xml = $this->_processXmlResponse($this->getDeleteRecordingsUrl($recordingParams));
+        if($xml) {
+            return array(
+                'returncode' => $xml->returncode,
+                'deleted' => $xml->deleted 	// -- Returns true/false.
+                );
+        }
+        else {
+            return null;
+        }
+
+    }
 
 
 

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

Indentation +66 added lines, -66 removed lines

@@ -10,65 +10,65 @@ 
  */
 class HTML_QuickForm_receivers extends HTML_QuickForm_group
 {
-	/**
-	 * Array of all receivers
-	 */
-	var $receivers;
-	/**
-	 * Array of selected receivers
-	 */
-	var $receivers_selected;
-	/**
-	 * Constructor
-	 * @param string $elementName
-	 * @param string $elementLabel
-	 * @param array $attributes This should contain the keys 'receivers' and
-	 * 'receivers_selected'
-	 */
-	public function __construct($elementName = null, $elementLabel = null, $attributes = null)
-	{
-		$this->receivers = $attributes['receivers'];
-		$this->receivers_selected = $attributes['receivers_selected'];
-		unset($attributes['receivers']);
-		unset($attributes['receivers_selected']);
-		parent::__construct($elementName, $elementLabel, $attributes);
-		$this->_persistantFreeze = true;
-		$this->_appendName = true;
-		$this->_type = 'receivers';
-	}
-	/**
-	 * Create the form elements to build this element group
-	 */
-	function _createElements()
-	{
-		$this->_elements[] = new HTML_QuickForm_Radio('receivers', '', get_lang('Everybody'), '0', array ('onclick' => 'javascript:receivers_hide(\'receivers_to\')'));
-		$this->_elements[0]->setChecked(true);
-		$this->_elements[] = new HTML_QuickForm_Radio('receivers', '', get_lang('SelectGroupsUsers'), '1', array ('onclick' => 'javascript:receivers_show(\'receivers_to\')'));
-		$this->_elements[] = new HTML_QuickForm_advmultiselect('to', '', $this->receivers);
-		$this->_elements[2]->setSelected($this->receivers_selected);
-	}
-	/**
-	 * HTML representation
-	 */
-	public function toHtml()
-	{
-		include_once ('HTML/QuickForm/Renderer/Default.php');
-		$this->_separator = '<br/>';
-		$renderer = & new HTML_QuickForm_Renderer_Default();
-		$renderer->setElementTemplate('{element}');
-		$select_boxes = $this->_elements[2];
-		$select_boxes->setElementTemplate('<div style="margin-left:20px;display:block;" id="receivers_'.$select_boxes->getName().'">'.$select_boxes->_elementTemplate.'</div>');
-		parent :: accept($renderer);
-		$js = $this->getElementJS();
-		return $renderer->toHtml().$js;
-	}
+    /**
+     * Array of all receivers
+     */
+    var $receivers;
+    /**
+     * Array of selected receivers
+     */
+    var $receivers_selected;
+    /**
+     * Constructor
+     * @param string $elementName
+     * @param string $elementLabel
+     * @param array $attributes This should contain the keys 'receivers' and
+     * 'receivers_selected'
+     */
+    public function __construct($elementName = null, $elementLabel = null, $attributes = null)
+    {
+        $this->receivers = $attributes['receivers'];
+        $this->receivers_selected = $attributes['receivers_selected'];
+        unset($attributes['receivers']);
+        unset($attributes['receivers_selected']);
+        parent::__construct($elementName, $elementLabel, $attributes);
+        $this->_persistantFreeze = true;
+        $this->_appendName = true;
+        $this->_type = 'receivers';
+    }
+    /**
+     * Create the form elements to build this element group
+     */
+    function _createElements()
+    {
+        $this->_elements[] = new HTML_QuickForm_Radio('receivers', '', get_lang('Everybody'), '0', array ('onclick' => 'javascript:receivers_hide(\'receivers_to\')'));
+        $this->_elements[0]->setChecked(true);
+        $this->_elements[] = new HTML_QuickForm_Radio('receivers', '', get_lang('SelectGroupsUsers'), '1', array ('onclick' => 'javascript:receivers_show(\'receivers_to\')'));
+        $this->_elements[] = new HTML_QuickForm_advmultiselect('to', '', $this->receivers);
+        $this->_elements[2]->setSelected($this->receivers_selected);
+    }
+    /**
+     * HTML representation
+     */
+    public function toHtml()
+    {
+        include_once ('HTML/QuickForm/Renderer/Default.php');
+        $this->_separator = '<br/>';
+        $renderer = & new HTML_QuickForm_Renderer_Default();
+        $renderer->setElementTemplate('{element}');
+        $select_boxes = $this->_elements[2];
+        $select_boxes->setElementTemplate('<div style="margin-left:20px;display:block;" id="receivers_'.$select_boxes->getName().'">'.$select_boxes->_elementTemplate.'</div>');
+        parent :: accept($renderer);
+        $js = $this->getElementJS();
+        return $renderer->toHtml().$js;
+    }
 
-	/**
-	 * Get the necessary javascript
-	 */
+    /**
+     * Get the necessary javascript
+     */
     public function getElementJS()
-	{
-		$js = "<script type=\"text/javascript\">
+    {
+        $js = "<script type=\"text/javascript\">
 					/* <![CDATA[ */
 					receivers_hide('receivers_to');
 					function receivers_show(item) {
@@ -81,14 +81,14 @@ 
 					}
 					/* ]]> */
 					</script>\n";
-		return $js;
-	}
-	/**
-	 * accept renderer
-	 */
-	function accept(& $renderer, $required = false, $error = null)
-	{
-		$renderer->renderElement($this, $required, $error);
-	}
+        return $js;
+    }
+    /**
+     * accept renderer
+     */
+    function accept(& $renderer, $required = false, $error = null)
+    {
+        $renderer->renderElement($this, $required, $error);
+    }
 }
 ?>

main/inc/lib/xajax/xajax.inc.php

Indentation +1165 added lines, -1165 removed lines

@@ -47,7 +47,7 @@ 
  */
 if (!defined ('XAJAX_DEFAULT_CHAR_ENCODING'))
 {
-	define ('XAJAX_DEFAULT_CHAR_ENCODING', 'utf-8' );
+    define ('XAJAX_DEFAULT_CHAR_ENCODING', 'utf-8' );
 }
 
 /**
@@ -55,11 +55,11 @@ 
  */
 if (!defined ('XAJAX_GET'))
 {
-	define ('XAJAX_GET', 0);
+    define ('XAJAX_GET', 0);
 }
 if (!defined ('XAJAX_POST'))
 {
-	define ('XAJAX_POST', 1);
+    define ('XAJAX_POST', 1);
 }
 
 /**
@@ -72,1145 +72,1145 @@ 
  */
 class xajax
 {
-	/**#@+
+    /**#@+
 	 * @access protected
 	 */
-	/**
-	 * @var array Array of PHP functions that will be callable through javascript wrappers
-	 */
-	var $aFunctions;
-	/**
-	 * @var array Array of object callbacks that will allow Javascript to call PHP methods (key=function name)
-	 */
-	var $aObjects;
-	/**
-	 * @var array Array of RequestTypes to be used with each function (key=function name)
-	 */
-	var $aFunctionRequestTypes;
-	/**
-	 * @var array Array of Include Files for any external functions (key=function name)
-	 */
-	var $aFunctionIncludeFiles;
-	/**
-	 * @var string Name of the PHP function to call if no callable function was found
-	 */
-	var $sCatchAllFunction;
-	/**
-	 * @var string Name of the PHP function to call before any other function
-	 */
-	var $sPreFunction;
-	/**
-	 * @var string The URI for making requests to the xajax object
-	 */
-	var $sRequestURI;
-	/**
-	 * @var string The prefix to prepend to the javascript wraper function name
-	 */
-	var $sWrapperPrefix;
-	/**
-	 * @var boolean Show debug messages (default false)
-	 */
-	var $bDebug;
-	/**
-	 * @var boolean Show messages in the client browser's status bar (default false)
-	 */
-	var $bStatusMessages;
-	/**
-	 * @var boolean Allow xajax to exit after processing a request (default true)
-	 */
-	var $bExitAllowed;
-	/**
-	 * @var boolean Use wait cursor in browser (default true)
-	 */
-	var $bWaitCursor;
-	/**
-	 * @var boolean Use an special xajax error handler so the errors are sent to the browser properly (default false)
-	 */
-	var $bErrorHandler;
-	/**
-	 * @var string Specify what, if any, file xajax should log errors to (and more information in a future release)
-	 */
-	var $sLogFile;
-	/**
-	 * @var boolean Clean all output buffers before outputting response (default false)
-	 */
-	var $bCleanBuffer;
-	/**
-	 * @var string String containing the character encoding used
-	 */
-	var $sEncoding;
-	/**
-	 * @var boolean Decode input request args from UTF-8 (default false)
-	 */
-	var $bDecodeUTF8Input;
-	/**
-	 * @var boolean Convert special characters to HTML entities (default false)
-	 */
-	var $bOutputEntities;
-	/**
-	 * @var array Array for parsing complex objects
-	 */
-	var $aObjArray;
-	/**
-	 * @var integer Position in $aObjArray
-	 */
-	var $iPos;
-
-	/**#@-*/
-
-	/**
-	 * Constructor. You can set some extra xajax options right away or use
-	 * individual methods later to set options.
-	 *
-	 * @param string  defaults to the current browser URI
-	 * @param string  defaults to "xajax_";
-	 * @param string  defaults to XAJAX_DEFAULT_CHAR_ENCODING defined above
-	 * @param boolean defaults to false
-	 */
-	public function __construct($sRequestURI="",$sWrapperPrefix="xajax_",$sEncoding=XAJAX_DEFAULT_CHAR_ENCODING,$bDebug=false)
-	{
-		$this->aFunctions = array();
-		$this->aObjects = array();
-		$this->aFunctionIncludeFiles = array();
-		$this->sRequestURI = $sRequestURI;
-		if ($this->sRequestURI == "")
-			$this->sRequestURI = $this->_detectURI();
-		$this->sWrapperPrefix = $sWrapperPrefix;
-		$this->bDebug = $bDebug;
-		$this->bStatusMessages = false;
-		$this->bWaitCursor = true;
-		$this->bExitAllowed = true;
-		$this->bErrorHandler = false;
-		$this->sLogFile = "";
-		$this->bCleanBuffer = false;
-		$this->setCharEncoding($sEncoding);
-		$this->bDecodeUTF8Input = false;
-		$this->bOutputEntities = false;
-	}
-
-	/**
-	 * Sets the URI to which requests will be made.
-	 * <i>Usage:</i> <kbd>$xajax->setRequestURI("http://www.xajaxproject.org");</kbd>
-	 *
-	 * @param string the URI (can be absolute or relative) of the PHP script
-	 *               that will be accessed when an xajax request occurs
-	 */
-	function setRequestURI($sRequestURI)
-	{
-		$this->sRequestURI = $sRequestURI;
-	}
-
-	/**
-	 * Sets the prefix that will be appended to the Javascript wrapper
-	 * functions (default is "xajax_").
-	 *
-	 * @param string
-	 */
-	//
-	function setWrapperPrefix($sPrefix)
-	{
-		$this->sWrapperPrefix = $sPrefix;
-	}
-
-	/**
-	 * Enables debug messages for xajax.
-	 * */
-	function debugOn()
-	{
-		$this->bDebug = true;
-	}
-
-	/**
-	 * Disables debug messages for xajax (default behavior).
-	 */
-	function debugOff()
-	{
-		$this->bDebug = false;
-	}
-
-	/**
-	 * Enables messages in the browser's status bar for xajax.
-	 */
-	function statusMessagesOn()
-	{
-		$this->bStatusMessages = true;
-	}
-
-	/**
-	 * Disables messages in the browser's status bar for xajax (default behavior).
-	 */
-	function statusMessagesOff()
-	{
-		$this->bStatusMessages = false;
-	}
-
-	/**
-	 * Enables the wait cursor to be displayed in the browser (default behavior).
-	 */
-	function waitCursorOn()
-	{
-		$this->bWaitCursor = true;
-	}
-
-	/**
-	 * Disables the wait cursor to be displayed in the browser.
-	 */
-	function waitCursorOff()
-	{
-		$this->bWaitCursor = false;
-	}
-
-	/**
-	 * Enables xajax to exit immediately after processing a request and
-	 * sending the response back to the browser (default behavior).
-	 */
-	function exitAllowedOn()
-	{
-		$this->bExitAllowed = true;
-	}
-
-	/**
-	 * Disables xajax's default behavior of exiting immediately after
-	 * processing a request and sending the response back to the browser.
-	 */
-	function exitAllowedOff()
-	{
-		$this->bExitAllowed = false;
-	}
-
-	/**
-	 * Turns on xajax's error handling system so that PHP errors that occur
-	 * during a request are trapped and pushed to the browser in the form of
-	 * a Javascript alert.
-	 */
-	function errorHandlerOn()
-	{
-		$this->bErrorHandler = true;
-	}
-
-	/**
-	 * Turns off xajax's error handling system (default behavior).
-	 */
-	function errorHandlerOff()
-	{
-		$this->bErrorHandler = false;
-	}
-
-	/**
-	 * Specifies a log file that will be written to by xajax during a request
-	 * (used only by the error handling system at present). If you don't invoke
-	 * this method, or you pass in "", then no log file will be written to.
-	 * <i>Usage:</i> <kbd>$xajax->setLogFile("/xajax_logs/errors.log");</kbd>
-	 */
-	function setLogFile($sFilename)
-	{
-		$this->sLogFile = $sFilename;
-	}
-
-	/**
-	 * Causes xajax to clean out all output buffers before outputting a
-	 * response (default behavior).
-	 */
-	function cleanBufferOn()
-	{
-		$this->bCleanBuffer = true;
-	}
-	/**
-	 * Turns off xajax's output buffer cleaning.
-	 */
-	function cleanBufferOff()
-	{
-		$this->bCleanBuffer = false;
-	}
-
-	/**
-	 * Sets the character encoding for the HTTP output based on
-	 * <kbd>$sEncoding</kbd>, which is a string containing the character
-	 * encoding to use. You don't need to use this method normally, since the
-	 * character encoding for the response gets set automatically based on the
-	 * <kbd>XAJAX_DEFAULT_CHAR_ENCODING</kbd> constant.
-	 * <i>Usage:</i> <kbd>$xajax->setCharEncoding("utf-8");</kbd>
-	 *
-	 * @param string the encoding type to use (utf-8, iso-8859-1, etc.)
-	 */
-	function setCharEncoding($sEncoding)
-	{
-		$this->sEncoding = $sEncoding;
-	}
-
-	/**
-	 * Causes xajax to decode the input request args from UTF-8 to the current
-	 * encoding if possible. Either the iconv or mb_string extension must be
-	 * present for optimal functionality.
-	 */
-	function decodeUTF8InputOn()
-	{
-		$this->bDecodeUTF8Input = true;
-	}
-
-	/**
-	 * Turns off decoding the input request args from UTF-8 (default behavior).
-	 */
-	function decodeUTF8InputOff()
-	{
-		$this->bDecodeUTF8Input = false;
-	}
-
-	/**
-	 * Tells the response object to convert special characters to HTML entities
-	 * automatically (only works if the mb_string extension is available).
-	 */
-	function outputEntitiesOn()
-	{
-		$this->bOutputEntities = true;
-	}
-
-	/**
-	 * Tells the response object to output special characters intact. (default
-	 * behavior).
-	 */
-	function outputEntitiesOff()
-	{
-		$this->bOutputEntities = false;
-	}
-
-	/**
-	 * Registers a PHP function or method to be callable through xajax in your
-	 * Javascript. If you want to register a function, pass in the name of that
-	 * function. If you want to register a static class method, pass in an
-	 * array like so:
-	 * <kbd>array("myFunctionName", "myClass", "myMethod")</kbd>
-	 * For an object instance method, use an object variable for the second
-	 * array element (and in PHP 4 make sure you put an & before the variable
-	 * to pass the object by reference). Note: the function name is what you
-	 * call via Javascript, so it can be anything as long as it doesn't
-	 * conflict with any other registered function name.
-	 *
-	 * <i>Usage:</i> <kbd>$xajax->registerFunction("myFunction");</kbd>
-	 * or: <kbd>$xajax->registerFunction(array("myFunctionName", &$myObject, "myMethod"));</kbd>
-	 *
-	 * @param mixed  contains the function name or an object callback array
-	 * @param mixed  request type (XAJAX_GET/XAJAX_POST) that should be used
-	 *               for this function.  Defaults to XAJAX_POST.
-	 */
-	function registerFunction($mFunction,$sRequestType=XAJAX_POST)
-	{
-		if (is_array($mFunction)) {
-			$this->aFunctions[$mFunction[0]] = 1;
-			$this->aFunctionRequestTypes[$mFunction[0]] = $sRequestType;
-			$this->aObjects[$mFunction[0]] = array_slice($mFunction, 1);
-		}
-		else {
-			$this->aFunctions[$mFunction] = 1;
-			$this->aFunctionRequestTypes[$mFunction] = $sRequestType;
-		}
-	}
-
-	/**
-	 * Registers a PHP function to be callable through xajax which is located
-	 * in some other file.  If the function is requested the external file will
-	 * be included to define the function before the function is called.
-	 *
-	 * <i>Usage:</i> <kbd>$xajax->registerExternalFunction("myFunction","myFunction.inc.php",XAJAX_POST);</kbd>
-	 *
-	 * @param string contains the function name or an object callback array
-	 *               ({@link xajax::registerFunction() see registerFunction} for
-	 *               more info on object callback arrays)
-	 * @param string contains the path and filename of the include file
-	 * @param mixed  the RequestType (XAJAX_GET/XAJAX_POST) that should be used
-	 *		          for this function. Defaults to XAJAX_POST.
-	 */
-	function registerExternalFunction($mFunction,$sIncludeFile,$sRequestType=XAJAX_POST)
-	{
-		$this->registerFunction($mFunction, $sRequestType);
-
-		if (is_array($mFunction)) {
-			$this->aFunctionIncludeFiles[$mFunction[0]] = $sIncludeFile;
-		}
-		else {
-			$this->aFunctionIncludeFiles[$mFunction] = $sIncludeFile;
-		}
-	}
-
-	/**
-	 * Registers a PHP function to be called when xajax cannot find the
-	 * function being called via Javascript. Because this is technically
-	 * impossible when using "wrapped" functions, the catch-all feature is
-	 * only useful when you're directly using the xajax.call() Javascript
-	 * method. Use the catch-all feature when you want more dynamic ability to
-	 * intercept unknown calls and handle them in a custom way.
-	 *
-	 * <i>Usage:</i> <kbd>$xajax->registerCatchAllFunction("myCatchAllFunction");</kbd>
-	 *
-	 * @param string contains the function name or an object callback array
-	 *               ({@link xajax::registerFunction() see registerFunction} for
-	 *               more info on object callback arrays)
-	 */
-	function registerCatchAllFunction($mFunction)
-	{
-		if (is_array($mFunction)) {
-			$this->sCatchAllFunction = $mFunction[0];
-			$this->aObjects[$mFunction[0]] = array_slice($mFunction, 1);
-		}
-		else {
-			$this->sCatchAllFunction = $mFunction;
-		}
-	}
-
-	/**
-	 * Registers a PHP function to be called before xajax calls the requested
-	 * function. xajax will automatically add the request function's response
-	 * to the pre-function's response to create a single response. Another
-	 * feature is the ability to return not just a response, but an array with
-	 * the first element being false (a boolean) and the second being the
-	 * response. In this case, the pre-function's response will be returned to
-	 * the browser without xajax calling the requested function.
-	 *
-	 * <i>Usage:</i> <kbd>$xajax->registerPreFunction("myPreFunction");</kbd>
-	 *
-	 * @param string contains the function name or an object callback array
-	 *               ({@link xajax::registerFunction() see registerFunction} for
-	 *               more info on object callback arrays)
-	 */
-	function registerPreFunction($mFunction)
-	{
-		if (is_array($mFunction)) {
-			$this->sPreFunction = $mFunction[0];
-			$this->aObjects[$mFunction[0]] = array_slice($mFunction, 1);
-		}
-		else {
-			$this->sPreFunction = $mFunction;
-		}
-	}
-
-	/**
-	 * Returns true if xajax can process the request, false if otherwise.
-	 * You can use this to determine if xajax needs to process the request or
-	 * not.
-	 *
-	 * @return boolean
-	 */
-	function canProcessRequests()
-	{
-		if ($this->getRequestMode() != -1) return true;
-		return false;
-	}
-
-	/**
-	 * Returns the current request mode (XAJAX_GET or XAJAX_POST), or -1 if
-	 * there is none.
-	 *
-	 * @return mixed
-	 */
-	function getRequestMode()
-	{
-		if (!empty($_GET["xajax"]))
-			return XAJAX_GET;
-
-		if (!empty($_POST["xajax"]))
-			return XAJAX_POST;
-
-		return -1;
-	}
-
-	/**
-	 * This is the main communications engine of xajax. The engine handles all
-	 * incoming xajax requests, calls the apporiate PHP functions (or
-	 * class/object methods) and passes the XML responses back to the
-	 * Javascript response handler. If your RequestURI is the same as your Web
-	 * page then this function should be called before any headers or HTML has
-	 * been sent.
-	 */
-	function processRequests()
-	{
-
-		$requestMode = -1;
-		$sFunctionName = "";
-		$bFoundFunction = true;
-		$bFunctionIsCatchAll = false;
-		$sFunctionNameForSpecial = "";
-		$aArgs = array();
-		$sPreResponse = "";
-		$bEndRequest = false;
-		$sResponse = "";
-
-		$requestMode = $this->getRequestMode();
-		if ($requestMode == -1) return;
-
-		if ($requestMode == XAJAX_POST)
-		{
-			$sFunctionName = $_POST["xajax"];
-
-			if (!empty($_POST["xajaxargs"]))
-				$aArgs = $_POST["xajaxargs"];
-		}
-		else
-		{
-			header ("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
-			header ("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
-			header ("Cache-Control: no-cache, must-revalidate");
-			header ("Pragma: no-cache");
-
-			$sFunctionName = $_GET["xajax"];
-
-			if (!empty($_GET["xajaxargs"]))
-				$aArgs = $_GET["xajaxargs"];
-		}
-
-		// Use xajax error handler if necessary
-		if ($this->bErrorHandler) {
-			$GLOBALS['xajaxErrorHandlerText'] = "";
-			set_error_handler("xajaxErrorHandler");
-		}
-
-		if ($this->sPreFunction) {
-			if (!$this->_isFunctionCallable($this->sPreFunction)) {
-				$bFoundFunction = false;
-				$objResponse = new xajaxResponse();
-				$objResponse->addAlert("Unknown Pre-Function ". $this->sPreFunction);
-				$sResponse = $objResponse->getXML();
-			}
-		}
-		//include any external dependencies associated with this function name
-		if (array_key_exists($sFunctionName,$this->aFunctionIncludeFiles))
-		{
-			ob_start();
-			include_once($this->aFunctionIncludeFiles[$sFunctionName]);
-			ob_end_clean();
-		}
-
-		if ($bFoundFunction) {
-			$sFunctionNameForSpecial = $sFunctionName;
-			if (!array_key_exists($sFunctionName, $this->aFunctions))
-			{
-				if ($this->sCatchAllFunction) {
-					$sFunctionName = $this->sCatchAllFunction;
-					$bFunctionIsCatchAll = true;
-				}
-				else {
-					$bFoundFunction = false;
-					$objResponse = new xajaxResponse();
-					$objResponse->addAlert("Unknown Function $sFunctionName.");
-					$sResponse = $objResponse->getXML();
-				}
-			}
-			else if ($this->aFunctionRequestTypes[$sFunctionName] != $requestMode)
-			{
-				$bFoundFunction = false;
-				$objResponse = new xajaxResponse();
-				$objResponse->addAlert("Incorrect Request Type.");
-				$sResponse = $objResponse->getXML();
-			}
-		}
-
-		if ($bFoundFunction)
-		{
-			for ($i = 0; $i < sizeof($aArgs); $i++)
-			{
-				// If magic quotes is on, then we need to strip the slashes from the args
-				if (get_magic_quotes_gpc() == 1 && is_string($aArgs[$i])) {
-
-					$aArgs[$i] = stripslashes($aArgs[$i]);
-				}
-				if (stristr($aArgs[$i],"<xjxobj>") != false)
-				{
-					$aArgs[$i] = $this->_xmlToArray("xjxobj",$aArgs[$i]);
-				}
-				else if (stristr($aArgs[$i],"<xjxquery>") != false)
-				{
-					$aArgs[$i] = $this->_xmlToArray("xjxquery",$aArgs[$i]);
-				}
-				else if ($this->bDecodeUTF8Input)
-				{
-					$aArgs[$i] = $this->_decodeUTF8Data($aArgs[$i]);
-				}
-			}
-
-			if ($this->sPreFunction) {
-				$mPreResponse = $this->_callFunction($this->sPreFunction, array($sFunctionNameForSpecial, $aArgs));
-				if (is_array($mPreResponse) && $mPreResponse[0] === false) {
-					$bEndRequest = true;
-					$sPreResponse = $mPreResponse[1];
-				}
-				else {
-					$sPreResponse = $mPreResponse;
-				}
-				if (is_a($sPreResponse, "xajaxResponse")) {
-					$sPreResponse = $sPreResponse->getXML();
-				}
-				if ($bEndRequest) $sResponse = $sPreResponse;
-			}
-
-			if (!$bEndRequest) {
-				if (!$this->_isFunctionCallable($sFunctionName)) {
-					$objResponse = new xajaxResponse();
-					$objResponse->addAlert("The Registered Function $sFunctionName Could Not Be Found.");
-					$sResponse = $objResponse->getXML();
-				}
-				else {
-					if ($bFunctionIsCatchAll) {
-						$aArgs = array($sFunctionNameForSpecial, $aArgs);
-					}
-					$sResponse = $this->_callFunction($sFunctionName, $aArgs);
-				}
-				if (is_a($sResponse, "xajaxResponse")) {
-					$sResponse = $sResponse->getXML();
-				}
-				if (!is_string($sResponse) || strpos($sResponse, "<xjx>") === FALSE) {
-					$objResponse = new xajaxResponse();
-					$objResponse->addAlert("No XML Response Was Returned By Function $sFunctionName.");
-					$sResponse = $objResponse->getXML();
-				}
-				else if ($sPreResponse != "") {
-					$sNewResponse = new xajaxResponse($this->sEncoding, $this->bOutputEntities);
-					$sNewResponse->loadXML($sPreResponse);
-					$sNewResponse->loadXML($sResponse);
-					$sResponse = $sNewResponse->getXML();
-				}
-			}
-		}
-
-		$sContentHeader = "Content-type: text/xml;";
-		if ($this->sEncoding && strlen(trim($this->sEncoding)) > 0)
-			$sContentHeader .= " charset=".$this->sEncoding;
-		header($sContentHeader);
-		if ($this->bErrorHandler && !empty( $GLOBALS['xajaxErrorHandlerText'] )) {
-			$sErrorResponse = new xajaxResponse();
-			$sErrorResponse->addAlert("** PHP Error Messages: **" . $GLOBALS['xajaxErrorHandlerText']);
-			if ($this->sLogFile) {
-				$fH = @fopen($this->sLogFile, "a");
-				if (!$fH) {
-					$sErrorResponse->addAlert("** Logging Error **\n\nxajax was unable to write to the error log file:\n" . $this->sLogFile);
-				}
-				else {
-					fwrite($fH, "** xajax Error Log - " . strftime("%b %e %Y %I:%M:%S %p") . " **" . $GLOBALS['xajaxErrorHandlerText'] . "\n\n\n");
-					fclose($fH);
-				}
-			}
-
-			$sErrorResponse->loadXML($sResponse);
-			$sResponse = $sErrorResponse->getXML();
-
-		}
-		if ($this->bCleanBuffer) while (@ob_end_clean());
-		print $sResponse;
-		if ($this->bErrorHandler) restore_error_handler();
-
-		if ($this->bExitAllowed)
-			exit();
-	}
-
-	/**
-	 * Prints the xajax Javascript header and wrapper code into your page by
-	 * printing the output of the getJavascript() method. It should only be
-	 * called between the <pre><head> </head></pre> tags in your HTML page.
-	 * Remember, if you only want to obtain the result of this function, use
-	 * {@link xajax::getJavascript()} instead.
-	 *
-	 * <i>Usage:</i>
-	 * <code>
-	 *  <head>
-	 *		...
-	 *		< ?php $xajax->printJavascript(); ? >
-	 * </code>
-	 *
-	 * @param string the relative address of the folder where xajax has been
-	 *               installed. For instance, if your PHP file is
-	 *               "http://www.myserver.com/myfolder/mypage.php"
-	 *               and xajax was installed in
-	 *               "http://www.myserver.com/anotherfolder", then $sJsURI
-	 *               should be set to "../anotherfolder". Defaults to assuming
-	 *               xajax is in the same folder as your PHP file.
-	 * @param string the relative folder/file pair of the xajax Javascript
-	 *               engine located within the xajax installation folder.
-	 *               Defaults to xajax_js/xajax.js.
-	 */
-	function printJavascript($sJsURI="", $sJsFile=NULL)
-	{
-		print $this->getJavascript($sJsURI, $sJsFile);
-	}
-
-	/**
-	 * Returns the xajax Javascript code that should be added to your HTML page
-	 * between the <kbd><head> </head></kbd> tags.
-	 *
-	 * <i>Usage:</i>
-	 * <code>
-	 *  < ?php $xajaxJSHead = $xajax->getJavascript(); ? >
-	 *	<head>
-	 *		...
-	 *		< ?php echo $xajaxJSHead; ? >
-	 * </code>
-	 *
-	 * @param string the relative address of the folder where xajax has been
-	 *               installed. For instance, if your PHP file is
-	 *               "http://www.myserver.com/myfolder/mypage.php"
-	 *               and xajax was installed in
-	 *               "http://www.myserver.com/anotherfolder", then $sJsURI
-	 *               should be set to "../anotherfolder". Defaults to assuming
-	 *               xajax is in the same folder as your PHP file.
-	 * @param string the relative folder/file pair of the xajax Javascript
-	 *               engine located within the xajax installation folder.
-	 *               Defaults to xajax_js/xajax.js.
-	 * @return string
-	 */
-	function getJavascript($sJsURI="", $sJsFile=NULL)
-	{
-		$html = $this->getJavascriptConfig();
-		$html .= $this->getJavascriptInclude($sJsURI, $sJsFile);
-
-		return $html;
-	}
-
-	/**
-	 * Returns a string containing inline Javascript that sets up the xajax
-	 * runtime (typically called internally by xajax from get/printJavascript).
-	 *
-	 * @return string
-	 */
-	function getJavascriptConfig()
-	{
-		$html  = "\t<script type=\"text/javascript\">\n";
-		$html .= "var xajaxRequestUri=\"".$this->sRequestURI."\";\n";
-		$html .= "var xajaxDebug=".($this->bDebug?"true":"false").";\n";
-		$html .= "var xajaxStatusMessages=".($this->bStatusMessages?"true":"false").";\n";
-		$html .= "var xajaxWaitCursor=".($this->bWaitCursor?"true":"false").";\n";
-		$html .= "var xajaxDefinedGet=".XAJAX_GET.";\n";
-		$html .= "var xajaxDefinedPost=".XAJAX_POST.";\n";
-		$html .= "var xajaxLoaded=false;\n";
-
-		foreach($this->aFunctions as $sFunction => $bExists) {
-			$html .= $this->_wrap($sFunction,$this->aFunctionRequestTypes[$sFunction]);
-		}
-
-		$html .= "\t</script>\n";
-		return $html;
-	}
-
-	/**
-	 * Returns a string containing a Javascript include of the xajax.js file
-	 * along with a check to see if the file loaded after six seconds
-	 * (typically called internally by xajax from get/printJavascript).
-	 *
-	 * @param string the relative address of the folder where xajax has been
-	 *               installed. For instance, if your PHP file is
-	 *               "http://www.myserver.com/myfolder/mypage.php"
-	 *               and xajax was installed in
-	 *               "http://www.myserver.com/anotherfolder", then $sJsURI
-	 *               should be set to "../anotherfolder". Defaults to assuming
-	 *               xajax is in the same folder as your PHP file.
-	 * @param string the relative folder/file pair of the xajax Javascript
-	 *               engine located within the xajax installation folder.
-	 *               Defaults to xajax_js/xajax.js.
-	 * @return string
-	 */
-	function getJavascriptInclude($sJsURI="", $sJsFile=NULL)
-	{
-		if ($sJsFile == NULL) $sJsFile = "xajax_js/xajax.js";
-
-		if ($sJsURI != "" && substr($sJsURI, -1) != "/") $sJsURI .= "/";
-
-		$html = "\t<script type=\"text/javascript\" src=\"" . $sJsURI . $sJsFile . "\"></script>\n";
-		$html .= "\t<script type=\"text/javascript\">\n";
-		$html .= "window.setTimeout(function () { if (!xajaxLoaded) { alert('Error: the xajax Javascript file could not be included. Perhaps the URL is incorrect?\\nURL: {$sJsURI}{$sJsFile}'); } }, 6000);\n";
-		$html .= "\t</script>\n";
-		return $html;
-	}
-
-	/**
-	 * This method can be used to create a new xajax.js file out of the
-	 * xajax_uncompressed.js file (which will only happen if xajax.js doesn't
-	 * already exist on the filesystem).
-	 *
-	 * @param string an optional argument containing the full server file path
-	 *               of xajax.js.
-	 */
-	function autoCompressJavascript($sJsFullFilename=NULL)
-	{
-		$sJsFile = "xajax_js/xajax.js";
-
-		if ($sJsFullFilename) {
-			$realJsFile = $sJsFullFilename;
-		}
-		else {
-			$realPath = realpath(dirname(__FILE__));
-			$realJsFile = $realPath . "/". $sJsFile;
-		}
-
-		// Create a compressed file if necessary
-		if (!file_exists($realJsFile)) {
-			$srcFile = str_replace(".js", "_uncompressed.js", $realJsFile);
-			if (!file_exists($srcFile)) {
-				trigger_error("The xajax uncompressed Javascript file could not be found in the <b>" . dirname($realJsFile) . "</b> folder. Error ", E_USER_ERROR);
-			}
-			require(dirname(__FILE__)."/xajaxCompress.php");
-			$javaScript = implode('', file($srcFile));
-			$compressedScript = xajaxCompressJavascript($javaScript);
-			$fH = @fopen($realJsFile, "w");
-			if (!$fH) {
-				trigger_error("The xajax compressed javascript file could not be written in the <b>" . dirname($realJsFile) . "</b> folder. Error ", E_USER_ERROR);
-			}
-			else {
-				fwrite($fH, $compressedScript);
-				fclose($fH);
-			}
-		}
-	}
-
-	/**
-	 * Returns the current URL based upon the SERVER vars.
-	 *
-	 * @access private
-	 * @return string
-	 */
-	function _detectURI() {
-		$aURL = array();
-
-		// Try to get the request URL
-		if (!empty($_SERVER['REQUEST_URI'])) {
-			$aURL = parse_url($_SERVER['REQUEST_URI']);
-		}
-
-		// Fill in the empty values
-		if (empty($aURL['scheme'])) {
-			if (!empty($_SERVER['HTTP_SCHEME'])) {
-				$aURL['scheme'] = $_SERVER['HTTP_SCHEME'];
-			} else {
-				$aURL['scheme'] = (!empty($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) != 'off') ? 'https' : 'http';
-			}
-		}
-
-		if (empty($aURL['host'])) {
-			if (!empty($_SERVER['HTTP_HOST'])) {
-				if (strpos($_SERVER['HTTP_HOST'], ':') > 0) {
-					list($aURL['host'], $aURL['port']) = explode(':', $_SERVER['HTTP_HOST']);
-				} else {
-					$aURL['host'] = $_SERVER['HTTP_HOST'];
-				}
-			} else if (!empty($_SERVER['SERVER_NAME'])) {
-				$aURL['host'] = $_SERVER['SERVER_NAME'];
-			} else {
-				print "xajax Error: xajax failed to automatically identify your Request URI.";
-				print "Please set the Request URI explicitly when you instantiate the xajax object.";
-				exit();
-			}
-		}
-
-		if (empty($aURL['port']) && !empty($_SERVER['SERVER_PORT'])) {
-			$aURL['port'] = $_SERVER['SERVER_PORT'];
-		}
-
-		if (empty($aURL['path'])) {
-			if (!empty($_SERVER['PATH_INFO'])) {
-				$sPath = parse_url($_SERVER['PATH_INFO']);
-			} else {
-				$sPath = parse_url(api_get_self());
-			}
-			$aURL['path'] = $sPath['path'];
-			unset($sPath);
-		}
-
-		if (!empty($aURL['query'])) {
-			$aURL['query'] = '?'.$aURL['query'];
-		}
-
-		// Build the URL: Start with scheme, user and pass
-		$sURL = $aURL['scheme'].'://';
-		if (!empty($aURL['user'])) {
-			$sURL.= $aURL['user'];
-			if (!empty($aURL['pass'])) {
-				$sURL.= ':'.$aURL['pass'];
-			}
-			$sURL.= '@';
-		}
-
-		// Add the host
-		$sURL.= $aURL['host'];
-
-		// Add the port if needed
-		if (!empty($aURL['port']) && (($aURL['scheme'] == 'http' && $aURL['port'] != 80) || ($aURL['scheme'] == 'https' && $aURL['port'] != 443))) {
-			$sURL.= ':'.$aURL['port'];
-		}
-
-		// Add the path and the query string
-		$sURL.= $aURL['path'].@$aURL['query'];
-
-		// Clean up
-		unset($aURL);
-		return $sURL;
-	}
-
-	/**
-	 * Returns true if the function name is associated with an object callback,
-	 * false if not.
-	 *
-	 * @param string the name of the function
-	 * @access private
-	 * @return boolean
-	 */
-	function _isObjectCallback($sFunction)
-	{
-		if (array_key_exists($sFunction, $this->aObjects)) return true;
-		return false;
-	}
-
-	/**
-	 * Returns true if the function or object callback can be called, false if
-	 * not.
-	 *
-	 * @param string the name of the function
-	 * @access private
-	 * @return boolean
-	 */
-	function _isFunctionCallable($sFunction)
-	{
-		if ($this->_isObjectCallback($sFunction)) {
-			if (is_object($this->aObjects[$sFunction][0])) {
-				return method_exists($this->aObjects[$sFunction][0], $this->aObjects[$sFunction][1]);
-			}
-			else {
-				return is_callable($this->aObjects[$sFunction]);
-			}
-		}
-		else {
-			return function_exists($sFunction);
-		}
-	}
-
-	/**
-	 * Calls the function, class method, or object method with the supplied
-	 * arguments.
-	 *
-	 * @param string the name of the function
-	 * @param array  arguments to pass to the function
-	 * @access private
-	 * @return mixed the output of the called function or method
-	 */
-	function _callFunction($sFunction, $aArgs)
-	{
-		if ($this->_isObjectCallback($sFunction)) {
-			$mReturn = call_user_func_array($this->aObjects[$sFunction], $aArgs);
-		}
-		else {
-			$mReturn = call_user_func_array($sFunction, $aArgs);
-		}
-		return $mReturn;
-	}
-
-	/**
-	 * Generates the Javascript wrapper for the specified PHP function.
-	 *
-	 * @param string the name of the function
-	 * @param mixed  the request type
-	 * @access private
-	 * @return string
-	 */
-	function _wrap($sFunction,$sRequestType=XAJAX_POST)
-	{
-		$js = "function ".$this->sWrapperPrefix."$sFunction(){return xajax.call(\"$sFunction\", arguments, ".$sRequestType.");}\n";
-		return $js;
-	}
-
-	/**
-	 * Takes a string containing xajax xjxobj XML or xjxquery XML and builds an
-	 * array representation of it to pass as an argument to the PHP function
-	 * being called.
-	 *
-	 * @param string the root tag of the XML
-	 * @param string XML to convert
-	 * @access private
-	 * @return array
-	 */
-	function _xmlToArray($rootTag, $sXml)
-	{
-		$aArray = array();
-		$sXml = str_replace("<$rootTag>","<$rootTag>|~|",$sXml);
-		$sXml = str_replace("</$rootTag>","</$rootTag>|~|",$sXml);
-		$sXml = str_replace("<e>","<e>|~|",$sXml);
-		$sXml = str_replace("</e>","</e>|~|",$sXml);
-		$sXml = str_replace("<k>","<k>|~|",$sXml);
-		$sXml = str_replace("</k>","|~|</k>|~|",$sXml);
-		$sXml = str_replace("<v>","<v>|~|",$sXml);
-		$sXml = str_replace("</v>","|~|</v>|~|",$sXml);
-		$sXml = str_replace("<q>","<q>|~|",$sXml);
-		$sXml = str_replace("</q>","|~|</q>|~|",$sXml);
-
-		$this->aObjArray = explode("|~|",$sXml);
-
-		$this->iPos = 0;
-		$aArray = $this->_parseObjXml($rootTag);
-
-		return $aArray;
-	}
-
-	/**
-	 * A recursive function that generates an array from the contents of
-	 * $this->aObjArray.
-	 *
-	 * @param string the root tag of the XML
-	 * @access private
-	 * @return array
-	 */
-	function _parseObjXml($rootTag)
-	{
-		$aArray = array();
-
-		if ($rootTag == "xjxobj")
-		{
-			while(!stristr($this->aObjArray[$this->iPos],"</xjxobj>"))
-			{
-				$this->iPos++;
-				if(stristr($this->aObjArray[$this->iPos],"<e>"))
-				{
-					$key = "";
-					$value = null;
-
-					$this->iPos++;
-					while(!stristr($this->aObjArray[$this->iPos],"</e>"))
-					{
-						if(stristr($this->aObjArray[$this->iPos],"<k>"))
-						{
-							$this->iPos++;
-							while(!stristr($this->aObjArray[$this->iPos],"</k>"))
-							{
-								$key .= $this->aObjArray[$this->iPos];
-								$this->iPos++;
-							}
-						}
-						if(stristr($this->aObjArray[$this->iPos],"<v>"))
-						{
-							$this->iPos++;
-							while(!stristr($this->aObjArray[$this->iPos],"</v>"))
-							{
-								if(stristr($this->aObjArray[$this->iPos],"<xjxobj>"))
-								{
-									$value = $this->_parseObjXml("xjxobj");
-									$this->iPos++;
-								}
-								else
-								{
-									$value .= $this->aObjArray[$this->iPos];
-									if ($this->bDecodeUTF8Input)
-									{
-										$value = $this->_decodeUTF8Data($value);
-									}
-								}
-								$this->iPos++;
-							}
-						}
-						$this->iPos++;
-					}
-
-					$aArray[$key]=$value;
-				}
-			}
-		}
-
-		if ($rootTag == "xjxquery")
-		{
-			$sQuery = "";
-			$this->iPos++;
-			while(!stristr($this->aObjArray[$this->iPos],"</xjxquery>"))
-			{
-				if (stristr($this->aObjArray[$this->iPos],"<q>") || stristr($this->aObjArray[$this->iPos],"</q>"))
-				{
-					$this->iPos++;
-					continue;
-				}
-				$sQuery	.= $this->aObjArray[$this->iPos];
-				$this->iPos++;
-			}
-
-			parse_str($sQuery, $aArray);
-			if ($this->bDecodeUTF8Input)
-			{
-				foreach($aArray as $key => $value)
-				{
-					$aArray[$key] = $this->_decodeUTF8Data($value);
-				}
-			}
-			// If magic quotes is on, then we need to strip the slashes from the
-			// array values because of the parse_str pass which adds slashes
-			if (get_magic_quotes_gpc() == 1) {
-				$newArray = array();
-				foreach ($aArray as $sKey => $sValue) {
-					if (is_string($sValue))
-						$newArray[$sKey] = stripslashes($sValue);
-					else
-						$newArray[$sKey] = $sValue;
-				}
-				$aArray = $newArray;
-			}
-		}
-
-		return $aArray;
-	}
-
-	/**
-	 * Decodes string data from UTF-8 to the current xajax encoding.
-	 *
-	 * @param string data to convert
-	 * @access private
-	 * @return string converted data
-	 */
-	function _decodeUTF8Data($sData)
-	{
-		$sValue = $sData;
-		if ($this->bDecodeUTF8Input)
-		{
-			$sFuncToUse = NULL;
-
-			// An adaptation for the Dokeos LMS, 22-AUG-2009.
-			if (function_exists('api_convert_encoding'))
-			{
-				$sFuncToUse = "api_convert_encoding";
-			}
-			//if (function_exists('iconv'))
-			elseif (function_exists('iconv'))
-			//
-			{
-				$sFuncToUse = "iconv";
-			}
-			else if (function_exists('mb_convert_encoding'))
-			{
-				$sFuncToUse = "mb_convert_encoding";
-			}
-			else if ($this->sEncoding == "ISO-8859-1")
-			{
-				$sFuncToUse = "utf8_decode";
-			}
-			else
-			{
-				trigger_error("The incoming xajax data could not be converted from UTF-8", E_USER_NOTICE);
-			}
-
-			if ($sFuncToUse)
-			{
-				if (is_string($sValue))
-				{
-					if ($sFuncToUse == "iconv")
-					{
-						$sValue = iconv("UTF-8", $this->sEncoding.'//TRANSLIT', $sValue);
-					}
-					else if ($sFuncToUse == "mb_convert_encoding")
-					{
-						$sValue = mb_convert_encoding($sValue, $this->sEncoding, "UTF-8");
-					}
-					// Added code, an adaptation for the Dokeos LMS, 22-AUG-2009.
-					else if ($sFuncToUse == "api_convert_encoding")
-					{
-						$sValue = api_convert_encoding($sValue, $this->sEncoding, "UTF-8");
-					}
-					//
-					else
-					{
-						$sValue = utf8_decode($sValue);
-					}
-				}
-			}
-		}
-		return $sValue;
-	}
+    /**
+     * @var array Array of PHP functions that will be callable through javascript wrappers
+     */
+    var $aFunctions;
+    /**
+     * @var array Array of object callbacks that will allow Javascript to call PHP methods (key=function name)
+     */
+    var $aObjects;
+    /**
+     * @var array Array of RequestTypes to be used with each function (key=function name)
+     */
+    var $aFunctionRequestTypes;
+    /**
+     * @var array Array of Include Files for any external functions (key=function name)
+     */
+    var $aFunctionIncludeFiles;
+    /**
+     * @var string Name of the PHP function to call if no callable function was found
+     */
+    var $sCatchAllFunction;
+    /**
+     * @var string Name of the PHP function to call before any other function
+     */
+    var $sPreFunction;
+    /**
+     * @var string The URI for making requests to the xajax object
+     */
+    var $sRequestURI;
+    /**
+     * @var string The prefix to prepend to the javascript wraper function name
+     */
+    var $sWrapperPrefix;
+    /**
+     * @var boolean Show debug messages (default false)
+     */
+    var $bDebug;
+    /**
+     * @var boolean Show messages in the client browser's status bar (default false)
+     */
+    var $bStatusMessages;
+    /**
+     * @var boolean Allow xajax to exit after processing a request (default true)
+     */
+    var $bExitAllowed;
+    /**
+     * @var boolean Use wait cursor in browser (default true)
+     */
+    var $bWaitCursor;
+    /**
+     * @var boolean Use an special xajax error handler so the errors are sent to the browser properly (default false)
+     */
+    var $bErrorHandler;
+    /**
+     * @var string Specify what, if any, file xajax should log errors to (and more information in a future release)
+     */
+    var $sLogFile;
+    /**
+     * @var boolean Clean all output buffers before outputting response (default false)
+     */
+    var $bCleanBuffer;
+    /**
+     * @var string String containing the character encoding used
+     */
+    var $sEncoding;
+    /**
+     * @var boolean Decode input request args from UTF-8 (default false)
+     */
+    var $bDecodeUTF8Input;
+    /**
+     * @var boolean Convert special characters to HTML entities (default false)
+     */
+    var $bOutputEntities;
+    /**
+     * @var array Array for parsing complex objects
+     */
+    var $aObjArray;
+    /**
+     * @var integer Position in $aObjArray
+     */
+    var $iPos;
+
+    /**#@-*/
+
+    /**
+     * Constructor. You can set some extra xajax options right away or use
+     * individual methods later to set options.
+     *
+     * @param string  defaults to the current browser URI
+     * @param string  defaults to "xajax_";
+     * @param string  defaults to XAJAX_DEFAULT_CHAR_ENCODING defined above
+     * @param boolean defaults to false
+     */
+    public function __construct($sRequestURI="",$sWrapperPrefix="xajax_",$sEncoding=XAJAX_DEFAULT_CHAR_ENCODING,$bDebug=false)
+    {
+        $this->aFunctions = array();
+        $this->aObjects = array();
+        $this->aFunctionIncludeFiles = array();
+        $this->sRequestURI = $sRequestURI;
+        if ($this->sRequestURI == "")
+            $this->sRequestURI = $this->_detectURI();
+        $this->sWrapperPrefix = $sWrapperPrefix;
+        $this->bDebug = $bDebug;
+        $this->bStatusMessages = false;
+        $this->bWaitCursor = true;
+        $this->bExitAllowed = true;
+        $this->bErrorHandler = false;
+        $this->sLogFile = "";
+        $this->bCleanBuffer = false;
+        $this->setCharEncoding($sEncoding);
+        $this->bDecodeUTF8Input = false;
+        $this->bOutputEntities = false;
+    }
+
+    /**
+     * Sets the URI to which requests will be made.
+     * <i>Usage:</i> <kbd>$xajax->setRequestURI("http://www.xajaxproject.org");</kbd>
+     *
+     * @param string the URI (can be absolute or relative) of the PHP script
+     *               that will be accessed when an xajax request occurs
+     */
+    function setRequestURI($sRequestURI)
+    {
+        $this->sRequestURI = $sRequestURI;
+    }
+
+    /**
+     * Sets the prefix that will be appended to the Javascript wrapper
+     * functions (default is "xajax_").
+     *
+     * @param string
+     */
+    //
+    function setWrapperPrefix($sPrefix)
+    {
+        $this->sWrapperPrefix = $sPrefix;
+    }
+
+    /**
+     * Enables debug messages for xajax.
+     * */
+    function debugOn()
+    {
+        $this->bDebug = true;
+    }
+
+    /**
+     * Disables debug messages for xajax (default behavior).
+     */
+    function debugOff()
+    {
+        $this->bDebug = false;
+    }
+
+    /**
+     * Enables messages in the browser's status bar for xajax.
+     */
+    function statusMessagesOn()
+    {
+        $this->bStatusMessages = true;
+    }
+
+    /**
+     * Disables messages in the browser's status bar for xajax (default behavior).
+     */
+    function statusMessagesOff()
+    {
+        $this->bStatusMessages = false;
+    }
+
+    /**
+     * Enables the wait cursor to be displayed in the browser (default behavior).
+     */
+    function waitCursorOn()
+    {
+        $this->bWaitCursor = true;
+    }
+
+    /**
+     * Disables the wait cursor to be displayed in the browser.
+     */
+    function waitCursorOff()
+    {
+        $this->bWaitCursor = false;
+    }
+
+    /**
+     * Enables xajax to exit immediately after processing a request and
+     * sending the response back to the browser (default behavior).
+     */
+    function exitAllowedOn()
+    {
+        $this->bExitAllowed = true;
+    }
+
+    /**
+     * Disables xajax's default behavior of exiting immediately after
+     * processing a request and sending the response back to the browser.
+     */
+    function exitAllowedOff()
+    {
+        $this->bExitAllowed = false;
+    }
+
+    /**
+     * Turns on xajax's error handling system so that PHP errors that occur
+     * during a request are trapped and pushed to the browser in the form of
+     * a Javascript alert.
+     */
+    function errorHandlerOn()
+    {
+        $this->bErrorHandler = true;
+    }
+
+    /**
+     * Turns off xajax's error handling system (default behavior).
+     */
+    function errorHandlerOff()
+    {
+        $this->bErrorHandler = false;
+    }
+
+    /**
+     * Specifies a log file that will be written to by xajax during a request
+     * (used only by the error handling system at present). If you don't invoke
+     * this method, or you pass in "", then no log file will be written to.
+     * <i>Usage:</i> <kbd>$xajax->setLogFile("/xajax_logs/errors.log");</kbd>
+     */
+    function setLogFile($sFilename)
+    {
+        $this->sLogFile = $sFilename;
+    }
+
+    /**
+     * Causes xajax to clean out all output buffers before outputting a
+     * response (default behavior).
+     */
+    function cleanBufferOn()
+    {
+        $this->bCleanBuffer = true;
+    }
+    /**
+     * Turns off xajax's output buffer cleaning.
+     */
+    function cleanBufferOff()
+    {
+        $this->bCleanBuffer = false;
+    }
+
+    /**
+     * Sets the character encoding for the HTTP output based on
+     * <kbd>$sEncoding</kbd>, which is a string containing the character
+     * encoding to use. You don't need to use this method normally, since the
+     * character encoding for the response gets set automatically based on the
+     * <kbd>XAJAX_DEFAULT_CHAR_ENCODING</kbd> constant.
+     * <i>Usage:</i> <kbd>$xajax->setCharEncoding("utf-8");</kbd>
+     *
+     * @param string the encoding type to use (utf-8, iso-8859-1, etc.)
+     */
+    function setCharEncoding($sEncoding)
+    {
+        $this->sEncoding = $sEncoding;
+    }
+
+    /**
+     * Causes xajax to decode the input request args from UTF-8 to the current
+     * encoding if possible. Either the iconv or mb_string extension must be
+     * present for optimal functionality.
+     */
+    function decodeUTF8InputOn()
+    {
+        $this->bDecodeUTF8Input = true;
+    }
+
+    /**
+     * Turns off decoding the input request args from UTF-8 (default behavior).
+     */
+    function decodeUTF8InputOff()
+    {
+        $this->bDecodeUTF8Input = false;
+    }
+
+    /**
+     * Tells the response object to convert special characters to HTML entities
+     * automatically (only works if the mb_string extension is available).
+     */
+    function outputEntitiesOn()
+    {
+        $this->bOutputEntities = true;
+    }
+
+    /**
+     * Tells the response object to output special characters intact. (default
+     * behavior).
+     */
+    function outputEntitiesOff()
+    {
+        $this->bOutputEntities = false;
+    }
+
+    /**
+     * Registers a PHP function or method to be callable through xajax in your
+     * Javascript. If you want to register a function, pass in the name of that
+     * function. If you want to register a static class method, pass in an
+     * array like so:
+     * <kbd>array("myFunctionName", "myClass", "myMethod")</kbd>
+     * For an object instance method, use an object variable for the second
+     * array element (and in PHP 4 make sure you put an & before the variable
+     * to pass the object by reference). Note: the function name is what you
+     * call via Javascript, so it can be anything as long as it doesn't
+     * conflict with any other registered function name.
+     *
+     * <i>Usage:</i> <kbd>$xajax->registerFunction("myFunction");</kbd>
+     * or: <kbd>$xajax->registerFunction(array("myFunctionName", &$myObject, "myMethod"));</kbd>
+     *
+     * @param mixed  contains the function name or an object callback array
+     * @param mixed  request type (XAJAX_GET/XAJAX_POST) that should be used
+     *               for this function.  Defaults to XAJAX_POST.
+     */
+    function registerFunction($mFunction,$sRequestType=XAJAX_POST)
+    {
+        if (is_array($mFunction)) {
+            $this->aFunctions[$mFunction[0]] = 1;
+            $this->aFunctionRequestTypes[$mFunction[0]] = $sRequestType;
+            $this->aObjects[$mFunction[0]] = array_slice($mFunction, 1);
+        }
+        else {
+            $this->aFunctions[$mFunction] = 1;
+            $this->aFunctionRequestTypes[$mFunction] = $sRequestType;
+        }
+    }
+
+    /**
+     * Registers a PHP function to be callable through xajax which is located
+     * in some other file.  If the function is requested the external file will
+     * be included to define the function before the function is called.
+     *
+     * <i>Usage:</i> <kbd>$xajax->registerExternalFunction("myFunction","myFunction.inc.php",XAJAX_POST);</kbd>
+     *
+     * @param string contains the function name or an object callback array
+     *               ({@link xajax::registerFunction() see registerFunction} for
+     *               more info on object callback arrays)
+     * @param string contains the path and filename of the include file
+     * @param mixed  the RequestType (XAJAX_GET/XAJAX_POST) that should be used
+     *		          for this function. Defaults to XAJAX_POST.
+     */
+    function registerExternalFunction($mFunction,$sIncludeFile,$sRequestType=XAJAX_POST)
+    {
+        $this->registerFunction($mFunction, $sRequestType);
+
+        if (is_array($mFunction)) {
+            $this->aFunctionIncludeFiles[$mFunction[0]] = $sIncludeFile;
+        }
+        else {
+            $this->aFunctionIncludeFiles[$mFunction] = $sIncludeFile;
+        }
+    }
+
+    /**
+     * Registers a PHP function to be called when xajax cannot find the
+     * function being called via Javascript. Because this is technically
+     * impossible when using "wrapped" functions, the catch-all feature is
+     * only useful when you're directly using the xajax.call() Javascript
+     * method. Use the catch-all feature when you want more dynamic ability to
+     * intercept unknown calls and handle them in a custom way.
+     *
+     * <i>Usage:</i> <kbd>$xajax->registerCatchAllFunction("myCatchAllFunction");</kbd>
+     *
+     * @param string contains the function name or an object callback array
+     *               ({@link xajax::registerFunction() see registerFunction} for
+     *               more info on object callback arrays)
+     */
+    function registerCatchAllFunction($mFunction)
+    {
+        if (is_array($mFunction)) {
+            $this->sCatchAllFunction = $mFunction[0];
+            $this->aObjects[$mFunction[0]] = array_slice($mFunction, 1);
+        }
+        else {
+            $this->sCatchAllFunction = $mFunction;
+        }
+    }
+
+    /**
+     * Registers a PHP function to be called before xajax calls the requested
+     * function. xajax will automatically add the request function's response
+     * to the pre-function's response to create a single response. Another
+     * feature is the ability to return not just a response, but an array with
+     * the first element being false (a boolean) and the second being the
+     * response. In this case, the pre-function's response will be returned to
+     * the browser without xajax calling the requested function.
+     *
+     * <i>Usage:</i> <kbd>$xajax->registerPreFunction("myPreFunction");</kbd>
+     *
+     * @param string contains the function name or an object callback array
+     *               ({@link xajax::registerFunction() see registerFunction} for
+     *               more info on object callback arrays)
+     */
+    function registerPreFunction($mFunction)
+    {
+        if (is_array($mFunction)) {
+            $this->sPreFunction = $mFunction[0];
+            $this->aObjects[$mFunction[0]] = array_slice($mFunction, 1);
+        }
+        else {
+            $this->sPreFunction = $mFunction;
+        }
+    }
+
+    /**
+     * Returns true if xajax can process the request, false if otherwise.
+     * You can use this to determine if xajax needs to process the request or
+     * not.
+     *
+     * @return boolean
+     */
+    function canProcessRequests()
+    {
+        if ($this->getRequestMode() != -1) return true;
+        return false;
+    }
+
+    /**
+     * Returns the current request mode (XAJAX_GET or XAJAX_POST), or -1 if
+     * there is none.
+     *
+     * @return mixed
+     */
+    function getRequestMode()
+    {
+        if (!empty($_GET["xajax"]))
+            return XAJAX_GET;
+
+        if (!empty($_POST["xajax"]))
+            return XAJAX_POST;
+
+        return -1;
+    }
+
+    /**
+     * This is the main communications engine of xajax. The engine handles all
+     * incoming xajax requests, calls the apporiate PHP functions (or
+     * class/object methods) and passes the XML responses back to the
+     * Javascript response handler. If your RequestURI is the same as your Web
+     * page then this function should be called before any headers or HTML has
+     * been sent.
+     */
+    function processRequests()
+    {
+
+        $requestMode = -1;
+        $sFunctionName = "";
+        $bFoundFunction = true;
+        $bFunctionIsCatchAll = false;
+        $sFunctionNameForSpecial = "";
+        $aArgs = array();
+        $sPreResponse = "";
+        $bEndRequest = false;
+        $sResponse = "";
+
+        $requestMode = $this->getRequestMode();
+        if ($requestMode == -1) return;
+
+        if ($requestMode == XAJAX_POST)
+        {
+            $sFunctionName = $_POST["xajax"];
+
+            if (!empty($_POST["xajaxargs"]))
+                $aArgs = $_POST["xajaxargs"];
+        }
+        else
+        {
+            header ("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+            header ("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
+            header ("Cache-Control: no-cache, must-revalidate");
+            header ("Pragma: no-cache");
+
+            $sFunctionName = $_GET["xajax"];
+
+            if (!empty($_GET["xajaxargs"]))
+                $aArgs = $_GET["xajaxargs"];
+        }
+
+        // Use xajax error handler if necessary
+        if ($this->bErrorHandler) {
+            $GLOBALS['xajaxErrorHandlerText'] = "";
+            set_error_handler("xajaxErrorHandler");
+        }
+
+        if ($this->sPreFunction) {
+            if (!$this->_isFunctionCallable($this->sPreFunction)) {
+                $bFoundFunction = false;
+                $objResponse = new xajaxResponse();
+                $objResponse->addAlert("Unknown Pre-Function ". $this->sPreFunction);
+                $sResponse = $objResponse->getXML();
+            }
+        }
+        //include any external dependencies associated with this function name
+        if (array_key_exists($sFunctionName,$this->aFunctionIncludeFiles))
+        {
+            ob_start();
+            include_once($this->aFunctionIncludeFiles[$sFunctionName]);
+            ob_end_clean();
+        }
+
+        if ($bFoundFunction) {
+            $sFunctionNameForSpecial = $sFunctionName;
+            if (!array_key_exists($sFunctionName, $this->aFunctions))
+            {
+                if ($this->sCatchAllFunction) {
+                    $sFunctionName = $this->sCatchAllFunction;
+                    $bFunctionIsCatchAll = true;
+                }
+                else {
+                    $bFoundFunction = false;
+                    $objResponse = new xajaxResponse();
+                    $objResponse->addAlert("Unknown Function $sFunctionName.");
+                    $sResponse = $objResponse->getXML();
+                }
+            }
+            else if ($this->aFunctionRequestTypes[$sFunctionName] != $requestMode)
+            {
+                $bFoundFunction = false;
+                $objResponse = new xajaxResponse();
+                $objResponse->addAlert("Incorrect Request Type.");
+                $sResponse = $objResponse->getXML();
+            }
+        }
+
+        if ($bFoundFunction)
+        {
+            for ($i = 0; $i < sizeof($aArgs); $i++)
+            {
+                // If magic quotes is on, then we need to strip the slashes from the args
+                if (get_magic_quotes_gpc() == 1 && is_string($aArgs[$i])) {
+
+                    $aArgs[$i] = stripslashes($aArgs[$i]);
+                }
+                if (stristr($aArgs[$i],"<xjxobj>") != false)
+                {
+                    $aArgs[$i] = $this->_xmlToArray("xjxobj",$aArgs[$i]);
+                }
+                else if (stristr($aArgs[$i],"<xjxquery>") != false)
+                {
+                    $aArgs[$i] = $this->_xmlToArray("xjxquery",$aArgs[$i]);
+                }
+                else if ($this->bDecodeUTF8Input)
+                {
+                    $aArgs[$i] = $this->_decodeUTF8Data($aArgs[$i]);
+                }
+            }
+
+            if ($this->sPreFunction) {
+                $mPreResponse = $this->_callFunction($this->sPreFunction, array($sFunctionNameForSpecial, $aArgs));
+                if (is_array($mPreResponse) && $mPreResponse[0] === false) {
+                    $bEndRequest = true;
+                    $sPreResponse = $mPreResponse[1];
+                }
+                else {
+                    $sPreResponse = $mPreResponse;
+                }
+                if (is_a($sPreResponse, "xajaxResponse")) {
+                    $sPreResponse = $sPreResponse->getXML();
+                }
+                if ($bEndRequest) $sResponse = $sPreResponse;
+            }
+
+            if (!$bEndRequest) {
+                if (!$this->_isFunctionCallable($sFunctionName)) {
+                    $objResponse = new xajaxResponse();
+                    $objResponse->addAlert("The Registered Function $sFunctionName Could Not Be Found.");
+                    $sResponse = $objResponse->getXML();
+                }
+                else {
+                    if ($bFunctionIsCatchAll) {
+                        $aArgs = array($sFunctionNameForSpecial, $aArgs);
+                    }
+                    $sResponse = $this->_callFunction($sFunctionName, $aArgs);
+                }
+                if (is_a($sResponse, "xajaxResponse")) {
+                    $sResponse = $sResponse->getXML();
+                }
+                if (!is_string($sResponse) || strpos($sResponse, "<xjx>") === FALSE) {
+                    $objResponse = new xajaxResponse();
+                    $objResponse->addAlert("No XML Response Was Returned By Function $sFunctionName.");
+                    $sResponse = $objResponse->getXML();
+                }
+                else if ($sPreResponse != "") {
+                    $sNewResponse = new xajaxResponse($this->sEncoding, $this->bOutputEntities);
+                    $sNewResponse->loadXML($sPreResponse);
+                    $sNewResponse->loadXML($sResponse);
+                    $sResponse = $sNewResponse->getXML();
+                }
+            }
+        }
+
+        $sContentHeader = "Content-type: text/xml;";
+        if ($this->sEncoding && strlen(trim($this->sEncoding)) > 0)
+            $sContentHeader .= " charset=".$this->sEncoding;
+        header($sContentHeader);
+        if ($this->bErrorHandler && !empty( $GLOBALS['xajaxErrorHandlerText'] )) {
+            $sErrorResponse = new xajaxResponse();
+            $sErrorResponse->addAlert("** PHP Error Messages: **" . $GLOBALS['xajaxErrorHandlerText']);
+            if ($this->sLogFile) {
+                $fH = @fopen($this->sLogFile, "a");
+                if (!$fH) {
+                    $sErrorResponse->addAlert("** Logging Error **\n\nxajax was unable to write to the error log file:\n" . $this->sLogFile);
+                }
+                else {
+                    fwrite($fH, "** xajax Error Log - " . strftime("%b %e %Y %I:%M:%S %p") . " **" . $GLOBALS['xajaxErrorHandlerText'] . "\n\n\n");
+                    fclose($fH);
+                }
+            }
+
+            $sErrorResponse->loadXML($sResponse);
+            $sResponse = $sErrorResponse->getXML();
+
+        }
+        if ($this->bCleanBuffer) while (@ob_end_clean());
+        print $sResponse;
+        if ($this->bErrorHandler) restore_error_handler();
+
+        if ($this->bExitAllowed)
+            exit();
+    }
+
+    /**
+     * Prints the xajax Javascript header and wrapper code into your page by
+     * printing the output of the getJavascript() method. It should only be
+     * called between the <pre><head> </head></pre> tags in your HTML page.
+     * Remember, if you only want to obtain the result of this function, use
+     * {@link xajax::getJavascript()} instead.
+     *
+     * <i>Usage:</i>
+     * <code>
+     *  <head>
+     *		...
+     *		< ?php $xajax->printJavascript(); ? >
+     * </code>
+     *
+     * @param string the relative address of the folder where xajax has been
+     *               installed. For instance, if your PHP file is
+     *               "http://www.myserver.com/myfolder/mypage.php"
+     *               and xajax was installed in
+     *               "http://www.myserver.com/anotherfolder", then $sJsURI
+     *               should be set to "../anotherfolder". Defaults to assuming
+     *               xajax is in the same folder as your PHP file.
+     * @param string the relative folder/file pair of the xajax Javascript
+     *               engine located within the xajax installation folder.
+     *               Defaults to xajax_js/xajax.js.
+     */
+    function printJavascript($sJsURI="", $sJsFile=NULL)
+    {
+        print $this->getJavascript($sJsURI, $sJsFile);
+    }
+
+    /**
+     * Returns the xajax Javascript code that should be added to your HTML page
+     * between the <kbd><head> </head></kbd> tags.
+     *
+     * <i>Usage:</i>
+     * <code>
+     *  < ?php $xajaxJSHead = $xajax->getJavascript(); ? >
+     *	<head>
+     *		...
+     *		< ?php echo $xajaxJSHead; ? >
+     * </code>
+     *
+     * @param string the relative address of the folder where xajax has been
+     *               installed. For instance, if your PHP file is
+     *               "http://www.myserver.com/myfolder/mypage.php"
+     *               and xajax was installed in
+     *               "http://www.myserver.com/anotherfolder", then $sJsURI
+     *               should be set to "../anotherfolder". Defaults to assuming
+     *               xajax is in the same folder as your PHP file.
+     * @param string the relative folder/file pair of the xajax Javascript
+     *               engine located within the xajax installation folder.
+     *               Defaults to xajax_js/xajax.js.
+     * @return string
+     */
+    function getJavascript($sJsURI="", $sJsFile=NULL)
+    {
+        $html = $this->getJavascriptConfig();
+        $html .= $this->getJavascriptInclude($sJsURI, $sJsFile);
+
+        return $html;
+    }
+
+    /**
+     * Returns a string containing inline Javascript that sets up the xajax
+     * runtime (typically called internally by xajax from get/printJavascript).
+     *
+     * @return string
+     */
+    function getJavascriptConfig()
+    {
+        $html  = "\t<script type=\"text/javascript\">\n";
+        $html .= "var xajaxRequestUri=\"".$this->sRequestURI."\";\n";
+        $html .= "var xajaxDebug=".($this->bDebug?"true":"false").";\n";
+        $html .= "var xajaxStatusMessages=".($this->bStatusMessages?"true":"false").";\n";
+        $html .= "var xajaxWaitCursor=".($this->bWaitCursor?"true":"false").";\n";
+        $html .= "var xajaxDefinedGet=".XAJAX_GET.";\n";
+        $html .= "var xajaxDefinedPost=".XAJAX_POST.";\n";
+        $html .= "var xajaxLoaded=false;\n";
+
+        foreach($this->aFunctions as $sFunction => $bExists) {
+            $html .= $this->_wrap($sFunction,$this->aFunctionRequestTypes[$sFunction]);
+        }
+
+        $html .= "\t</script>\n";
+        return $html;
+    }
+
+    /**
+     * Returns a string containing a Javascript include of the xajax.js file
+     * along with a check to see if the file loaded after six seconds
+     * (typically called internally by xajax from get/printJavascript).
+     *
+     * @param string the relative address of the folder where xajax has been
+     *               installed. For instance, if your PHP file is
+     *               "http://www.myserver.com/myfolder/mypage.php"
+     *               and xajax was installed in
+     *               "http://www.myserver.com/anotherfolder", then $sJsURI
+     *               should be set to "../anotherfolder". Defaults to assuming
+     *               xajax is in the same folder as your PHP file.
+     * @param string the relative folder/file pair of the xajax Javascript
+     *               engine located within the xajax installation folder.
+     *               Defaults to xajax_js/xajax.js.
+     * @return string
+     */
+    function getJavascriptInclude($sJsURI="", $sJsFile=NULL)
+    {
+        if ($sJsFile == NULL) $sJsFile = "xajax_js/xajax.js";
+
+        if ($sJsURI != "" && substr($sJsURI, -1) != "/") $sJsURI .= "/";
+
+        $html = "\t<script type=\"text/javascript\" src=\"" . $sJsURI . $sJsFile . "\"></script>\n";
+        $html .= "\t<script type=\"text/javascript\">\n";
+        $html .= "window.setTimeout(function () { if (!xajaxLoaded) { alert('Error: the xajax Javascript file could not be included. Perhaps the URL is incorrect?\\nURL: {$sJsURI}{$sJsFile}'); } }, 6000);\n";
+        $html .= "\t</script>\n";
+        return $html;
+    }
+
+    /**
+     * This method can be used to create a new xajax.js file out of the
+     * xajax_uncompressed.js file (which will only happen if xajax.js doesn't
+     * already exist on the filesystem).
+     *
+     * @param string an optional argument containing the full server file path
+     *               of xajax.js.
+     */
+    function autoCompressJavascript($sJsFullFilename=NULL)
+    {
+        $sJsFile = "xajax_js/xajax.js";
+
+        if ($sJsFullFilename) {
+            $realJsFile = $sJsFullFilename;
+        }
+        else {
+            $realPath = realpath(dirname(__FILE__));
+            $realJsFile = $realPath . "/". $sJsFile;
+        }
+
+        // Create a compressed file if necessary
+        if (!file_exists($realJsFile)) {
+            $srcFile = str_replace(".js", "_uncompressed.js", $realJsFile);
+            if (!file_exists($srcFile)) {
+                trigger_error("The xajax uncompressed Javascript file could not be found in the <b>" . dirname($realJsFile) . "</b> folder. Error ", E_USER_ERROR);
+            }
+            require(dirname(__FILE__)."/xajaxCompress.php");
+            $javaScript = implode('', file($srcFile));
+            $compressedScript = xajaxCompressJavascript($javaScript);
+            $fH = @fopen($realJsFile, "w");
+            if (!$fH) {
+                trigger_error("The xajax compressed javascript file could not be written in the <b>" . dirname($realJsFile) . "</b> folder. Error ", E_USER_ERROR);
+            }
+            else {
+                fwrite($fH, $compressedScript);
+                fclose($fH);
+            }
+        }
+    }
+
+    /**
+     * Returns the current URL based upon the SERVER vars.
+     *
+     * @access private
+     * @return string
+     */
+    function _detectURI() {
+        $aURL = array();
+
+        // Try to get the request URL
+        if (!empty($_SERVER['REQUEST_URI'])) {
+            $aURL = parse_url($_SERVER['REQUEST_URI']);
+        }
+
+        // Fill in the empty values
+        if (empty($aURL['scheme'])) {
+            if (!empty($_SERVER['HTTP_SCHEME'])) {
+                $aURL['scheme'] = $_SERVER['HTTP_SCHEME'];
+            } else {
+                $aURL['scheme'] = (!empty($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) != 'off') ? 'https' : 'http';
+            }
+        }
+
+        if (empty($aURL['host'])) {
+            if (!empty($_SERVER['HTTP_HOST'])) {
+                if (strpos($_SERVER['HTTP_HOST'], ':') > 0) {
+                    list($aURL['host'], $aURL['port']) = explode(':', $_SERVER['HTTP_HOST']);
+                } else {
+                    $aURL['host'] = $_SERVER['HTTP_HOST'];
+                }
+            } else if (!empty($_SERVER['SERVER_NAME'])) {
+                $aURL['host'] = $_SERVER['SERVER_NAME'];
+            } else {
+                print "xajax Error: xajax failed to automatically identify your Request URI.";
+                print "Please set the Request URI explicitly when you instantiate the xajax object.";
+                exit();
+            }
+        }
+
+        if (empty($aURL['port']) && !empty($_SERVER['SERVER_PORT'])) {
+            $aURL['port'] = $_SERVER['SERVER_PORT'];
+        }
+
+        if (empty($aURL['path'])) {
+            if (!empty($_SERVER['PATH_INFO'])) {
+                $sPath = parse_url($_SERVER['PATH_INFO']);
+            } else {
+                $sPath = parse_url(api_get_self());
+            }
+            $aURL['path'] = $sPath['path'];
+            unset($sPath);
+        }
+
+        if (!empty($aURL['query'])) {
+            $aURL['query'] = '?'.$aURL['query'];
+        }
+
+        // Build the URL: Start with scheme, user and pass
+        $sURL = $aURL['scheme'].'://';
+        if (!empty($aURL['user'])) {
+            $sURL.= $aURL['user'];
+            if (!empty($aURL['pass'])) {
+                $sURL.= ':'.$aURL['pass'];
+            }
+            $sURL.= '@';
+        }
+
+        // Add the host
+        $sURL.= $aURL['host'];
+
+        // Add the port if needed
+        if (!empty($aURL['port']) && (($aURL['scheme'] == 'http' && $aURL['port'] != 80) || ($aURL['scheme'] == 'https' && $aURL['port'] != 443))) {
+            $sURL.= ':'.$aURL['port'];
+        }
+
+        // Add the path and the query string
+        $sURL.= $aURL['path'].@$aURL['query'];
+
+        // Clean up
+        unset($aURL);
+        return $sURL;
+    }
+
+    /**
+     * Returns true if the function name is associated with an object callback,
+     * false if not.
+     *
+     * @param string the name of the function
+     * @access private
+     * @return boolean
+     */
+    function _isObjectCallback($sFunction)
+    {
+        if (array_key_exists($sFunction, $this->aObjects)) return true;
+        return false;
+    }
+
+    /**
+     * Returns true if the function or object callback can be called, false if
+     * not.
+     *
+     * @param string the name of the function
+     * @access private
+     * @return boolean
+     */
+    function _isFunctionCallable($sFunction)
+    {
+        if ($this->_isObjectCallback($sFunction)) {
+            if (is_object($this->aObjects[$sFunction][0])) {
+                return method_exists($this->aObjects[$sFunction][0], $this->aObjects[$sFunction][1]);
+            }
+            else {
+                return is_callable($this->aObjects[$sFunction]);
+            }
+        }
+        else {
+            return function_exists($sFunction);
+        }
+    }
+
+    /**
+     * Calls the function, class method, or object method with the supplied
+     * arguments.
+     *
+     * @param string the name of the function
+     * @param array  arguments to pass to the function
+     * @access private
+     * @return mixed the output of the called function or method
+     */
+    function _callFunction($sFunction, $aArgs)
+    {
+        if ($this->_isObjectCallback($sFunction)) {
+            $mReturn = call_user_func_array($this->aObjects[$sFunction], $aArgs);
+        }
+        else {
+            $mReturn = call_user_func_array($sFunction, $aArgs);
+        }
+        return $mReturn;
+    }
+
+    /**
+     * Generates the Javascript wrapper for the specified PHP function.
+     *
+     * @param string the name of the function
+     * @param mixed  the request type
+     * @access private
+     * @return string
+     */
+    function _wrap($sFunction,$sRequestType=XAJAX_POST)
+    {
+        $js = "function ".$this->sWrapperPrefix."$sFunction(){return xajax.call(\"$sFunction\", arguments, ".$sRequestType.");}\n";
+        return $js;
+    }
+
+    /**
+     * Takes a string containing xajax xjxobj XML or xjxquery XML and builds an
+     * array representation of it to pass as an argument to the PHP function
+     * being called.
+     *
+     * @param string the root tag of the XML
+     * @param string XML to convert
+     * @access private
+     * @return array
+     */
+    function _xmlToArray($rootTag, $sXml)
+    {
+        $aArray = array();
+        $sXml = str_replace("<$rootTag>","<$rootTag>|~|",$sXml);
+        $sXml = str_replace("</$rootTag>","</$rootTag>|~|",$sXml);
+        $sXml = str_replace("<e>","<e>|~|",$sXml);
+        $sXml = str_replace("</e>","</e>|~|",$sXml);
+        $sXml = str_replace("<k>","<k>|~|",$sXml);
+        $sXml = str_replace("</k>","|~|</k>|~|",$sXml);
+        $sXml = str_replace("<v>","<v>|~|",$sXml);
+        $sXml = str_replace("</v>","|~|</v>|~|",$sXml);
+        $sXml = str_replace("<q>","<q>|~|",$sXml);
+        $sXml = str_replace("</q>","|~|</q>|~|",$sXml);
+
+        $this->aObjArray = explode("|~|",$sXml);
+
+        $this->iPos = 0;
+        $aArray = $this->_parseObjXml($rootTag);
+
+        return $aArray;
+    }
+
+    /**
+     * A recursive function that generates an array from the contents of
+     * $this->aObjArray.
+     *
+     * @param string the root tag of the XML
+     * @access private
+     * @return array
+     */
+    function _parseObjXml($rootTag)
+    {
+        $aArray = array();
+
+        if ($rootTag == "xjxobj")
+        {
+            while(!stristr($this->aObjArray[$this->iPos],"</xjxobj>"))
+            {
+                $this->iPos++;
+                if(stristr($this->aObjArray[$this->iPos],"<e>"))
+                {
+                    $key = "";
+                    $value = null;
+
+                    $this->iPos++;
+                    while(!stristr($this->aObjArray[$this->iPos],"</e>"))
+                    {
+                        if(stristr($this->aObjArray[$this->iPos],"<k>"))
+                        {
+                            $this->iPos++;
+                            while(!stristr($this->aObjArray[$this->iPos],"</k>"))
+                            {
+                                $key .= $this->aObjArray[$this->iPos];
+                                $this->iPos++;
+                            }
+                        }
+                        if(stristr($this->aObjArray[$this->iPos],"<v>"))
+                        {
+                            $this->iPos++;
+                            while(!stristr($this->aObjArray[$this->iPos],"</v>"))
+                            {
+                                if(stristr($this->aObjArray[$this->iPos],"<xjxobj>"))
+                                {
+                                    $value = $this->_parseObjXml("xjxobj");
+                                    $this->iPos++;
+                                }
+                                else
+                                {
+                                    $value .= $this->aObjArray[$this->iPos];
+                                    if ($this->bDecodeUTF8Input)
+                                    {
+                                        $value = $this->_decodeUTF8Data($value);
+                                    }
+                                }
+                                $this->iPos++;
+                            }
+                        }
+                        $this->iPos++;
+                    }
+
+                    $aArray[$key]=$value;
+                }
+            }
+        }
+
+        if ($rootTag == "xjxquery")
+        {
+            $sQuery = "";
+            $this->iPos++;
+            while(!stristr($this->aObjArray[$this->iPos],"</xjxquery>"))
+            {
+                if (stristr($this->aObjArray[$this->iPos],"<q>") || stristr($this->aObjArray[$this->iPos],"</q>"))
+                {
+                    $this->iPos++;
+                    continue;
+                }
+                $sQuery	.= $this->aObjArray[$this->iPos];
+                $this->iPos++;
+            }
+
+            parse_str($sQuery, $aArray);
+            if ($this->bDecodeUTF8Input)
+            {
+                foreach($aArray as $key => $value)
+                {
+                    $aArray[$key] = $this->_decodeUTF8Data($value);
+                }
+            }
+            // If magic quotes is on, then we need to strip the slashes from the
+            // array values because of the parse_str pass which adds slashes
+            if (get_magic_quotes_gpc() == 1) {
+                $newArray = array();
+                foreach ($aArray as $sKey => $sValue) {
+                    if (is_string($sValue))
+                        $newArray[$sKey] = stripslashes($sValue);
+                    else
+                        $newArray[$sKey] = $sValue;
+                }
+                $aArray = $newArray;
+            }
+        }
+
+        return $aArray;
+    }
+
+    /**
+     * Decodes string data from UTF-8 to the current xajax encoding.
+     *
+     * @param string data to convert
+     * @access private
+     * @return string converted data
+     */
+    function _decodeUTF8Data($sData)
+    {
+        $sValue = $sData;
+        if ($this->bDecodeUTF8Input)
+        {
+            $sFuncToUse = NULL;
+
+            // An adaptation for the Dokeos LMS, 22-AUG-2009.
+            if (function_exists('api_convert_encoding'))
+            {
+                $sFuncToUse = "api_convert_encoding";
+            }
+            //if (function_exists('iconv'))
+            elseif (function_exists('iconv'))
+            //
+            {
+                $sFuncToUse = "iconv";
+            }
+            else if (function_exists('mb_convert_encoding'))
+            {
+                $sFuncToUse = "mb_convert_encoding";
+            }
+            else if ($this->sEncoding == "ISO-8859-1")
+            {
+                $sFuncToUse = "utf8_decode";
+            }
+            else
+            {
+                trigger_error("The incoming xajax data could not be converted from UTF-8", E_USER_NOTICE);
+            }
+
+            if ($sFuncToUse)
+            {
+                if (is_string($sValue))
+                {
+                    if ($sFuncToUse == "iconv")
+                    {
+                        $sValue = iconv("UTF-8", $this->sEncoding.'//TRANSLIT', $sValue);
+                    }
+                    else if ($sFuncToUse == "mb_convert_encoding")
+                    {
+                        $sValue = mb_convert_encoding($sValue, $this->sEncoding, "UTF-8");
+                    }
+                    // Added code, an adaptation for the Dokeos LMS, 22-AUG-2009.
+                    else if ($sFuncToUse == "api_convert_encoding")
+                    {
+                        $sValue = api_convert_encoding($sValue, $this->sEncoding, "UTF-8");
+                    }
+                    //
+                    else
+                    {
+                        $sValue = utf8_decode($sValue);
+                    }
+                }
+            }
+        }
+        return $sValue;
+    }
 
 }// end class xajax
 
@@ -1220,31 +1220,31 @@ 
  */
 function xajaxErrorHandler($errno, $errstr, $errfile, $errline)
 {
-	$errorReporting = error_reporting();
-	if (($errno & $errorReporting) == 0) return;
-
-	if ($errno == E_NOTICE) {
-		$errTypeStr = "NOTICE";
-	}
-	else if ($errno == E_WARNING) {
-		$errTypeStr = "WARNING";
-	}
-	else if ($errno == E_USER_NOTICE) {
-		$errTypeStr = "USER NOTICE";
-	}
-	else if ($errno == E_USER_WARNING) {
-		$errTypeStr = "USER WARNING";
-	}
-	else if ($errno == E_USER_ERROR) {
-		$errTypeStr = "USER FATAL ERROR";
-	}
-	else if ($errno == E_STRICT) {
-		return;
-	}
-	else {
-		$errTypeStr = "UNKNOWN: $errno";
-	}
-	$GLOBALS['xajaxErrorHandlerText'] .= "\n----\n[$errTypeStr] $errstr\nerror in line $errline of file $errfile";
+    $errorReporting = error_reporting();
+    if (($errno & $errorReporting) == 0) return;
+
+    if ($errno == E_NOTICE) {
+        $errTypeStr = "NOTICE";
+    }
+    else if ($errno == E_WARNING) {
+        $errTypeStr = "WARNING";
+    }
+    else if ($errno == E_USER_NOTICE) {
+        $errTypeStr = "USER NOTICE";
+    }
+    else if ($errno == E_USER_WARNING) {
+        $errTypeStr = "USER WARNING";
+    }
+    else if ($errno == E_USER_ERROR) {
+        $errTypeStr = "USER FATAL ERROR";
+    }
+    else if ($errno == E_STRICT) {
+        return;
+    }
+    else {
+        $errTypeStr = "UNKNOWN: $errno";
+    }
+    $GLOBALS['xajaxErrorHandlerText'] .= "\n----\n[$errTypeStr] $errstr\nerror in line $errline of file $errfile";
 }
 
 ?>

main/survey/survey_invite.php

Indentation +93 added lines, -93 removed lines

@@ -18,10 +18,10 @@ 
 $this_section = SECTION_COURSES;
 
 if (!api_is_allowed_to_edit(false, true)) {
-	Display :: display_header(get_lang('ToolSurvey'));
-	Display :: display_error_message(get_lang('NotAllowed'), false);
-	Display :: display_footer();
-	exit;
+    Display :: display_header(get_lang('ToolSurvey'));
+    Display :: display_error_message(get_lang('NotAllowed'), false);
+    Display :: display_footer();
+    exit;
 }
 
 // Database table definitions
@@ -37,15 +37,15 @@ 
 $survey_id = Security::remove_XSS($_GET['survey_id']);
 $survey_data = SurveyManager::get_survey($survey_id);
 if (empty($survey_data)) {
-	Display :: display_header(get_lang('ToolSurvey'));
-	Display :: display_error_message(get_lang('InvallidSurvey'), false);
-	Display :: display_footer();
-	exit;
+    Display :: display_header(get_lang('ToolSurvey'));
+    Display :: display_error_message(get_lang('InvallidSurvey'), false);
+    Display :: display_footer();
+    exit;
 }
 
 $urlname = strip_tags(api_substr(api_html_entity_decode($survey_data['title'], ENT_QUOTES), 0, 40));
 if (api_strlen(strip_tags($survey_data['title'])) > 40) {
-	$urlname .= '...';
+    $urlname .= '...';
 }
 
 // Breadcrumbs
@@ -80,23 +80,23 @@ 
 		WHERE c_id = $course_id AND code='".Database::escape_string($survey_data['code'])."'";
 $result = Database::query($sql);
 if (Database::num_rows($result) > 1) {
-	Display::display_warning_message(get_lang('IdenticalSurveycodeWarning'));
+    Display::display_warning_message(get_lang('IdenticalSurveycodeWarning'));
 }
 
 // Invited / answered message
 if ($survey_data['invited'] > 0 && !isset($_POST['submit'])) {
-	$message  = '<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey_invitation.php?view=answered&survey_id='.$survey_data['survey_id'].'">'.$survey_data['answered'].'</a> ';
-	$message .= get_lang('HaveAnswered').' ';
-	$message .= '<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey_invitation.php?view=invited&survey_id='.$survey_data['survey_id'].'">'.$survey_data['invited'].'</a> ';
-	$message .= get_lang('WereInvited');
-	Display::display_normal_message($message, false);
+    $message  = '<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey_invitation.php?view=answered&survey_id='.$survey_data['survey_id'].'">'.$survey_data['answered'].'</a> ';
+    $message .= get_lang('HaveAnswered').' ';
+    $message .= '<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey_invitation.php?view=invited&survey_id='.$survey_data['survey_id'].'">'.$survey_data['invited'].'</a> ';
+    $message .= get_lang('WereInvited');
+    Display::display_normal_message($message, false);
 }
 
 // Building the form for publishing the survey
 $form = new FormValidator(
-	'publish_form',
-	'post',
-	api_get_self().'?survey_id='.$survey_id.'&'.api_get_cidreq()
+    'publish_form',
+    'post',
+    api_get_self().'?survey_id='.$survey_id.'&'.api_get_cidreq()
 );
 $form->addElement('header', '', $tool_name);
 
@@ -109,7 +109,7 @@ 
 );
 $possible_users = array();
 foreach ($complete_user_list as & $user) {
-	$possible_users[$user['user_id']] = api_get_person_name($user['firstname'], $user['lastname']);
+    $possible_users[$user['user_id']] = api_get_person_name($user['firstname'], $user['lastname']);
 }
 
 
@@ -125,10 +125,10 @@ 
 
 // Additional users
 $form->addElement(
-	'textarea',
-	'additional_users',
-	array(get_lang('AdditonalUsers'), get_lang('AdditonalUsersComment')),
-	array('rows' => 5)
+    'textarea',
+    'additional_users',
+    array(get_lang('AdditonalUsers'), get_lang('AdditonalUsersComment')),
+    array('rows' => 5)
 );
 
 $form->addElement('html', '<div id="check_mail">');
@@ -141,15 +141,15 @@ 
 $form->addText('mail_title', get_lang('MailTitle'), false);
 // The text of the mail
 $form->addHtmlEditor(
-	'mail_text',
-	array(get_lang('MailText'), get_lang('UseLinkSyntax')),
-	false,
-	array('ToolbarSet' => 'Survey', 'Height' => '150')
+    'mail_text',
+    array(get_lang('MailText'), get_lang('UseLinkSyntax')),
+    false,
+    array('ToolbarSet' => 'Survey', 'Height' => '150')
 );
 $form->addElement('html', '</div>');
 // You cab send a reminder to unanswered people if the survey is not anonymous
 if ($survey_data['anonymous'] != 1) {
-	$form->addElement('checkbox', 'remindUnAnswered', '', get_lang('RemindUnanswered'));
+    $form->addElement('checkbox', 'remindUnAnswered', '', get_lang('RemindUnanswered'));
 }
 // Allow resending to all selected users
 $form->addElement('checkbox', 'resend_to_all', '', get_lang('ReminderResendToAllUsers'));
@@ -163,11 +163,11 @@ 
 }*/
 $portal_url = api_get_path(WEB_PATH);
 if (api_is_multiple_url_enabled()) {
-	$access_url_id = api_get_current_access_url_id();
-	if ($access_url_id != -1) {
-		$url = api_get_access_url($access_url_id);
-		$portal_url = $url['url'];
-	}
+    $access_url_id = api_get_current_access_url_id();
+    if ($access_url_id != -1) {
+        $url = api_get_access_url($access_url_id);
+        $portal_url = $url['url'];
+    }
 }
 
 // Show the URL that can be used by users to fill a survey without invitation
@@ -177,56 +177,56 @@ 
 $form->addElement('label', null, $auto_survey_link);
 
 if ($form->validate()) {
-   	$values = $form->exportValues();
+        $values = $form->exportValues();
     if (isset($values['send_mail']) && $values['send_mail'] == 1) {
         if (empty($values['mail_title']) || empty($values['mail_text'])) {
             Display :: display_error_message(get_lang('FormHasErrorsPleaseComplete'));
             // Getting the invited users
-        	$defaults = SurveyUtil::get_invited_users($survey_data['code']);
-
-        	// Getting the survey mail text
-        	if (!empty($survey_data['reminder_mail'])) {
-        		$defaults['mail_text'] = $survey_data['reminder_mail'];
-        	} else {
-        		$defaults['mail_text'] = $survey_data['invite_mail'];
-        	}
-        	$defaults['mail_title'] = $survey_data['mail_subject'];
-        	$defaults['send_mail'] = 1;
-        	$form->setDefaults($defaults);
+            $defaults = SurveyUtil::get_invited_users($survey_data['code']);
+
+            // Getting the survey mail text
+            if (!empty($survey_data['reminder_mail'])) {
+                $defaults['mail_text'] = $survey_data['reminder_mail'];
+            } else {
+                $defaults['mail_text'] = $survey_data['invite_mail'];
+            }
+            $defaults['mail_title'] = $survey_data['mail_subject'];
+            $defaults['send_mail'] = 1;
+            $form->setDefaults($defaults);
             $form->display();
             return;
         }
     }
     // Save the invitation mail
-	SurveyUtil::save_invite_mail(
-		$values['mail_text'],
-		$values['mail_title'],
-		!empty($survey_data['invite_mail'])
-	);
+    SurveyUtil::save_invite_mail(
+        $values['mail_text'],
+        $values['mail_title'],
+        !empty($survey_data['invite_mail'])
+    );
 
     $resendAll = isset($values['resend_to_all']) ? $values['resend_to_all'] : '';
     $sendMail = isset($values['send_mail']) ? $values['send_mail'] : '';
     $remindUnAnswered = isset($values['remindUnAnswered']) ? $values['remindUnAnswered'] : '';
 
-	// Saving the invitations for the course users
-	$count_course_users = SurveyUtil::saveInvitations(
-		$values['users'],
-		$values['mail_title'],
-		$values['mail_text'],
+    // Saving the invitations for the course users
+    $count_course_users = SurveyUtil::saveInvitations(
+        $values['users'],
+        $values['mail_title'],
+        $values['mail_text'],
         $resendAll,
         $sendMail,
         $remindUnAnswered
-	);
+    );
 
-	// Saving the invitations for the additional users
-	$values['additional_users'] = $values['additional_users'].';'; 	// This is for the case when you enter only one email
-	$temp = str_replace(',', ';', $values['additional_users']);		// This is to allow , and ; as email separators
-	$additional_users = explode(';', $temp);
-	for ($i = 0; $i < count($additional_users); $i++) {
-		$additional_users[$i] = trim($additional_users[$i]);
-	}
+    // Saving the invitations for the additional users
+    $values['additional_users'] = $values['additional_users'].';'; 	// This is for the case when you enter only one email
+    $temp = str_replace(',', ';', $values['additional_users']);		// This is to allow , and ; as email separators
+    $additional_users = explode(';', $temp);
+    for ($i = 0; $i < count($additional_users); $i++) {
+        $additional_users[$i] = trim($additional_users[$i]);
+    }
 
-	$counter_additional_users = SurveyUtil::saveInvitations(
+    $counter_additional_users = SurveyUtil::saveInvitations(
         $additional_users,
         $values['mail_title'],
         $values['mail_text'],
@@ -235,43 +235,43 @@ 
         $remindUnAnswered
     );
 
-	// Updating the invited field in the survey table
-	SurveyUtil::update_count_invited($survey_data['code']);
-	$total_count = $count_course_users + $counter_additional_users;
+    // Updating the invited field in the survey table
+    SurveyUtil::update_count_invited($survey_data['code']);
+    $total_count = $count_course_users + $counter_additional_users;
     $table_survey = Database :: get_course_table(TABLE_SURVEY);
-	// Counting the number of people that are invited
-	$sql = "SELECT * FROM $table_survey
+    // Counting the number of people that are invited
+    $sql = "SELECT * FROM $table_survey
 	        WHERE
 	        	c_id = $course_id AND
 	        	code = '".Database::escape_string($survey_data['code'])."'
 			";
-	$result = Database::query($sql);
-	$row = Database::fetch_array($result);
-	$total_invited = $row['invited'];
+    $result = Database::query($sql);
+    $row = Database::fetch_array($result);
+    $total_invited = $row['invited'];
     if ($total_invited > 0) {
-    	$message  = '<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey_invitation.php?view=answered&survey_id='.$survey_data['survey_id'].'">'.
-			$survey_data['answered'].'</a> ';
-    	$message .= get_lang('HaveAnswered').' ';
-    	$message .= '<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey_invitation.php?view=invited&survey_id='.$survey_data['survey_id'].'">'.
-			$total_invited.'</a> ';
-    	$message .= get_lang('WereInvited');
-    	Display::display_normal_message($message, false);
-    	Display::display_confirmation_message($total_count.' '.get_lang('InvitationsSend'));
+        $message  = '<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey_invitation.php?view=answered&survey_id='.$survey_data['survey_id'].'">'.
+            $survey_data['answered'].'</a> ';
+        $message .= get_lang('HaveAnswered').' ';
+        $message .= '<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey_invitation.php?view=invited&survey_id='.$survey_data['survey_id'].'">'.
+            $total_invited.'</a> ';
+        $message .= get_lang('WereInvited');
+        Display::display_normal_message($message, false);
+        Display::display_confirmation_message($total_count.' '.get_lang('InvitationsSend'));
     }
 } else {
-	// Getting the invited users
-	$defaults = SurveyUtil::get_invited_users($survey_data['code']);
-
-	// Getting the survey mail text
-	if (!empty($survey_data['reminder_mail'])) {
-		$defaults['mail_text'] = $survey_data['reminder_mail'];
-	} else {
-		$defaults['mail_text'] = $survey_data['invite_mail'];
-	}
-	$defaults['mail_title'] = $survey_data['mail_subject'];
-	$defaults['send_mail'] = 1;
-
-	$form->setDefaults($defaults);
+    // Getting the invited users
+    $defaults = SurveyUtil::get_invited_users($survey_data['code']);
+
+    // Getting the survey mail text
+    if (!empty($survey_data['reminder_mail'])) {
+        $defaults['mail_text'] = $survey_data['reminder_mail'];
+    } else {
+        $defaults['mail_text'] = $survey_data['invite_mail'];
+    }
+    $defaults['mail_title'] = $survey_data['mail_subject'];
+    $defaults['send_mail'] = 1;
+
+    $form->setDefaults($defaults);
     $form->display();
 }
 Display :: display_footer();