chamilo / chamilo-lms

main/inc/lib/internationalization_database/transliteration/xbd.php

Indentation +1 added lines, -1 removed lines

@@ -2,7 +2,7 @@
 // $Id: xbd.php,v 1.1.8.1 2008/06/12 20:34:32 smk Exp $
 
 return array(
-  'en' => array('bols', 'bolt', 'bolp', 'bolh', 'bom', 'bob', 'bobs', 'bos', 'boss', 'bong', 'boj', 'boc', 'bok', 'bot', 'bop', 'boh',
+    'en' => array('bols', 'bolt', 'bolp', 'bolh', 'bom', 'bob', 'bobs', 'bos', 'boss', 'bong', 'boj', 'boc', 'bok', 'bot', 'bop', 'boh',
     'bwa', 'bwag', 'bwagg', 'bwags', 'bwan', 'bwanj', 'bwanh', 'bwad', 'bwal', 'bwalg', 'bwalm', 'bwalb', 'bwals', 'bwalt', 'bwalp', 'bwalh',
     'bwam', 'bwab', 'bwabs', 'bwas', 'bwass', 'bwang', 'bwaj', 'bwac', 'bwak', 'bwat', 'bwap', 'bwah', 'bwae', 'bwaeg', 'bwaegg', 'bwaegs',
     'bwaen', 'bwaenj', 'bwaenh', 'bwaed', 'bwael', 'bwaelg', 'bwaelm', 'bwaelb', 'bwaels', 'bwaelt', 'bwaelp', 'bwaelh', 'bwaem', 'bwaeb', 'bwaebs', 'bwaes',

main/inc/lib/login_redirection.class.php

Spacing +6 added lines, -6 removed lines

@@ -18,30 +18,30 @@ 
         if (api_is_student() && !api_get_setting('student_page_after_login') == '') {
             $redirect_url = html_entity_decode(api_get_setting('student_page_after_login'));
             if ($redirect_url[0] == "/") {
-                $redirect_url = substr(api_get_path(WEB_PATH), 0, -1) . $redirect_url;
+                $redirect_url = substr(api_get_path(WEB_PATH), 0, -1).$redirect_url;
             }
         }
         if (api_is_teacher() && !api_get_setting('teacher_page_after_login') == '') {
             $redirect_url = html_entity_decode(api_get_setting('teacher_page_after_login'));
             if ($redirect_url[0] == "/") {
-                $redirect_url = substr(api_get_path(WEB_PATH), 0, -1) . $redirect_url;
+                $redirect_url = substr(api_get_path(WEB_PATH), 0, -1).$redirect_url;
             }
         }
         if (api_is_drh() && !api_get_setting('drh_page_after_login') == '') {
             $redirect_url = html_entity_decode(api_get_setting('drh_page_after_login'));
             if ($redirect_url[0] == "/") {
-                $redirect_url = substr(api_get_path(WEB_PATH), 0, -1) . $redirect_url;
+                $redirect_url = substr(api_get_path(WEB_PATH), 0, -1).$redirect_url;
             }
         }
         if (api_is_session_admin() && !api_get_setting('sessionadmin_page_after_login') == '') {
             $redirect_url = html_entity_decode(api_get_setting('sessionadmin_page_after_login'));
             if ($redirect_url[0] == "/") {
-                $redirect_url = substr(api_get_path(WEB_PATH), 0, -1) . $redirect_url;
+                $redirect_url = substr(api_get_path(WEB_PATH), 0, -1).$redirect_url;
             }
         }
 
         if (!empty($redirect_url)) {
-            header('Location: ' . $redirect_url . $param);
+            header('Location: '.$redirect_url.$param);
             exit();
         }
 
@@ -49,7 +49,7 @@ 
         if (CustomPages::enabled()) {
             CustomPages::display(CustomPages::INDEX_LOGGED);
         }
-        header('location: ' . api_get_path(WEB_PATH) . api_get_setting('page_after_login') . $param);
+        header('location: '.api_get_path(WEB_PATH).api_get_setting('page_after_login').$param);
         exit();
     }
 }

main/inc/lib/sessionmanager.lib.php

Indentation +1 added lines, -1 removed lines

@@ -6022,7 +6022,7 @@
         ]);
     }
 
-	/**
+    /**
      * Get the count of user courses in session
      * @param int $sessionId The session id
      * @return array

Braces +14 added lines, -10 removed lines

@@ -1588,8 +1588,10 @@ 
         if (empty($session_visibility)) {
             $session_visibility = $session->getVisibility();
             //default status loaded if empty
-            if (empty($session_visibility))
-                $session_visibility = SESSION_VISIBLE_READ_ONLY; // by default readonly 1
+            if (empty($session_visibility)) {
+                            $session_visibility = SESSION_VISIBLE_READ_ONLY;
+            }
+            // by default readonly 1
         } else {
             if (!in_array($session_visibility, array(SESSION_VISIBLE_READ_ONLY, SESSION_VISIBLE, SESSION_INVISIBLE))) {
                 $session_visibility = SESSION_VISIBLE_READ_ONLY;
@@ -2792,10 +2794,11 @@ 
                                 c_id = $courseId AND
                                 user_id = $user_id ";
                     $result = Database::query($sql);
-                    if (Database::affected_rows($result) > 0)
-                        return true;
-                    else
-                        return false;
+                    if (Database::affected_rows($result) > 0) {
+                                            return true;
+                    } else {
+                                            return false;
+                    }
                 } else {
                     // The user is not subscribed to the session, so make sure
                     // he isn't subscribed to a course in this session either
@@ -2806,10 +2809,11 @@ 
                                 c_id = $courseId AND
                                 user_id = $user_id ";
                     $result = Database::query($sql);
-                    if (Database::affected_rows($result) > 0)
-                        return true;
-                    else
-                        return false;
+                    if (Database::affected_rows($result) > 0) {
+                                            return true;
+                    } else {
+                                            return false;
+                    }
                 }
             } else {
                 // Assign user as a coach to course

Doc Comments +24 added lines, -19 removed lines

@@ -1336,9 +1336,9 @@ 
      * @param integer   $sessionCategoryId
      * @param int       $visibility
      * @param string    $description
-     * @param bool      $showDescription
+     * @param integer      $showDescription
      * @param int       $duration
-     * @param array     $extraFields
+     * @param boolean|null     $extraFields
      * @param int       $sessionAdminId
      * @param boolean $sendSubscriptionNotification Optional.
      *          Whether send a mail notification to users being subscribed
@@ -1558,7 +1558,7 @@ 
      * @param array $user_list
      * @param int $session_visibility
      * @param bool $empty_users
-     * @return bool
+     * @return false|null
      */
     public static function suscribe_users_to_session(
         $id_session,
@@ -1830,7 +1830,7 @@ 
      * @param array $courseInfo
      * @param int $status
      * @param bool $updateTotal
-     * @return bool
+     * @return false|null
      */
     public static function removeUsersFromCourseSession(
         $userList,
@@ -1896,7 +1896,7 @@ 
      * @param string $course_code
      * @param int $session_visibility
      * @param bool $removeUsersNotInList
-     * @return bool
+     * @return false|null
      */
     public static function subscribe_users_to_session_course(
         $user_list,
@@ -2079,7 +2079,7 @@ 
      * @param	bool	$removeExistingCoursesWithUsers Whether to unsubscribe
      * existing courses and users (true, default) or not (false)
      * @param $copyEvaluation from base course to session course
-     * @return	void	Nothing, or false on error
+     * @return	false|null	Nothing, or false on error
      * */
     public static function add_courses_to_session(
         $sessionId,
@@ -2275,6 +2275,8 @@ 
      *
      * @param int Session id
      * @param int Course id
+     * @param integer $session_id
+     * @param integer $course_id
      * @return bool True in case of success, false otherwise
      */
     public static function unsubscribe_course_from_session($session_id, $course_id)
@@ -2330,7 +2332,7 @@ 
      * @param	string	$variable Field's internal variable name
      * @param	int		$fieldType Field's type
      * @param	string	$displayText Field's language var name
-     * @return int     new extra field id
+     * @return boolean     new extra field id
      */
     public static function create_session_extra_field($variable, $fieldType, $displayText)
     {
@@ -2349,7 +2351,7 @@ 
      * @param	integer	Course ID
      * @param	string	Field variable name
      * @param	string	Field value
-     * @return	boolean	true if field updated, false otherwise
+     * @return	boolean|null	true if field updated, false otherwise
      */
     public static function update_session_extra_field_value($sessionId, $variable, $value = '')
     {
@@ -2554,7 +2556,7 @@ 
      * @param	array	id_checked
      * @param	bool	include delete session
      * @param	bool	optional, true if the function is called by a webservice, false otherwise.
-     * @return	void	Nothing, or false on error
+     * @return	boolean	Nothing, or false on error
      * The parameters is a array to delete sessions
      * */
     public static function delete_session_category($id_checked, $delete_session = false, $from_ws = false)
@@ -3049,6 +3051,7 @@ 
      * @param string $orderCondition
      * @param string $keyword
      * @param string $description
+     * @param integer $status
      * @return array sessions
      */
     public static function getSessionsFollowedByUser(
@@ -3261,8 +3264,8 @@ 
     /**
      * Gets the list of courses by session filtered by access_url
      *
-     * @param $userId
-     * @param $sessionId
+     * @param integer $userId
+     * @param null|integer $sessionId
      * @param null $from
      * @param null $limit
      * @param null $column
@@ -3387,6 +3390,7 @@ 
     /**
      * Gets the count of courses by session filtered by access_url
      * @param int session id
+     * @param integer $session_id
      * @return array list of courses
      */
     public static function getCourseCountBySessionId($session_id, $keyword = null)
@@ -3638,6 +3642,7 @@ 
      * Updates a session status
      * @param	int 	session id
      * @param	int 	status
+     * @param integer $status
      */
     public static function set_session_status($session_id, $status)
     {
@@ -3949,7 +3954,7 @@ 
 
     /**
      * @param $id
-     * @return bool
+     * @return null|boolean
      */
     public static function protect_teacher_session_edit($id)
     {
@@ -4013,7 +4018,7 @@ 
      *  true: if the session exists it will be updated.
      *  false: if session exists a new session will be created adding a counter session1, session2, etc
      * @param int $defaultUserId
-     * @param mixed $logger
+     * @param Logger $logger
      * @param array $extraFields convert a file row to an extra field. Example in CSV file there's a SessionID then it will
      * converted to extra_external_session_id if you set this: array('SessionId' => 'extra_external_session_id')
      * @param string $extraFieldId
@@ -5255,7 +5260,6 @@ 
      * @param string $lastConnectionDate
      * @param array $sessionIdList
      * @param array $studentIdList
-     * @param int $userStatus STUDENT|COURSEMANAGER constants
      *
      * @return array|int
      */
@@ -5407,7 +5411,7 @@ 
     /**
      * Get the list of course tools that have to be dealt with in case of
      * registering any course to a session
-     * @return array The list of tools to be dealt with (literal names)
+     * @return string[] The list of tools to be dealt with (literal names)
      */
     public static function getCourseToolToBeManaged()
     {
@@ -5421,7 +5425,7 @@ 
      * Calls the methods bound to each tool when a course is registered into a session
      * @param int $sessionId
      * @param int $courseId
-     * @return void
+     * @return boolean|null
      */
     public static function installCourse($sessionId, $courseId)
     {
@@ -6061,6 +6065,7 @@ 
      * @param int $categoryId The internal ID of the session category
      * @param string $target Value to search for in the session field values
      * @param array $extraFields A list of fields to be scanned and returned
+     * @param DateTime $publicationDate
      * @return mixed
      */
     public static function getShortSessionListAndExtraByCategory($categoryId, $target, $extraFields = null, $publicationDate = null)
@@ -7390,7 +7395,7 @@ 
     /**
      * Get link to the admin page for this session
      * @param   int $id Session ID
-     * @return mixed    URL to the admin page to manage the session, or false on error
+     * @return false|string    URL to the admin page to manage the session, or false on error
      */
     public static function getAdminPath($id)
     {
@@ -7407,7 +7412,7 @@ 
      * If a course is provided, build the link to the course
      * @param   int $id Session ID
      * @param   int $courseId Course ID (optional) in case the link has to send straight to the course
-     * @return mixed    URL to the page to use the session, or false on error
+     * @return false|string    URL to the page to use the session, or false on error
      */
     public static function getPath($id, $courseId = 0)
     {
@@ -7505,7 +7510,7 @@ 
     /**
      * Return true if coach is allowed to access this session
      * @param int $sessionId
-     * @return bool
+     * @return integer
      */
     public static function isSessionDateOkForCoach($sessionId)
     {

Spacing +195 added lines, -195 removed lines

@@ -143,7 +143,7 @@ 
                     return $msg;
                 }
             } else {
-                $rs = Database::query("SELECT 1 FROM $tbl_session WHERE name='" . $name . "'");
+                $rs = Database::query("SELECT 1 FROM $tbl_session WHERE name='".$name."'");
                 if (Database::num_rows($rs)) {
                     $msg = get_lang('SessionNameAlreadyExists');
                     return $msg;
@@ -256,7 +256,7 @@ 
     public static function session_name_exists($name)
     {
         $name = Database::escape_string($name);
-        $sql = "SELECT COUNT(*) as count FROM " . Database::get_main_table(TABLE_MAIN_SESSION) . "
+        $sql = "SELECT COUNT(*) as count FROM ".Database::get_main_table(TABLE_MAIN_SESSION)."
                 WHERE name = '$name'";
         $result = Database::fetch_array(Database::query($sql));
 
@@ -287,7 +287,7 @@ 
             $where .= " AND (
                             s.session_admin_id = $user_id  OR
                             sru.user_id = '$user_id' AND
-                            sru.relation_type = '" . SESSION_RELATION_TYPE_RRHH . "'
+                            sru.relation_type = '".SESSION_RELATION_TYPE_RRHH."'
                             )
                       ";
 
@@ -305,7 +305,7 @@ 
             $where_condition = str_replace('category_name', 'sc.name', $where_condition);
             $where_condition = str_replace(
                 array("AND session_active = '1'  )", " AND (  session_active = '1'  )"),
-                array(') GROUP BY s.name HAVING session_active = 1 ', " GROUP BY s.name HAVING session_active = 1 " )
+                array(') GROUP BY s.name HAVING session_active = 1 ', " GROUP BY s.name HAVING session_active = 1 ")
                 , $where_condition
             );
             $where_condition = str_replace(
@@ -350,7 +350,7 @@ 
 
             $access_url_id = api_get_current_access_url_id();
             if ($access_url_id != -1) {
-                $where.= " AND ar.access_url_id = $access_url_id ";
+                $where .= " AND ar.access_url_id = $access_url_id ";
 
                 $sql = "SELECT count(id) as total_rows FROM (
                 SELECT DISTINCT
@@ -400,14 +400,14 @@ 
             if (api_is_session_admin() &&
                 api_get_setting('allow_session_admins_to_manage_all_sessions') == 'false'
             ) {
-                $where .=" AND s.session_admin_id = $user_id ";
+                $where .= " AND s.session_admin_id = $user_id ";
             }
         }
 
         if (!api_is_platform_admin() && api_is_teacher() &&
             api_get_setting('allow_teachers_to_create_sessions') == 'true'
         ) {
-            $where .=" AND s.id_coach = $user_id ";
+            $where .= " AND s.id_coach = $user_id ";
         }
 
         $extra_field = new ExtraField('session');
@@ -457,10 +457,10 @@ 
         $query = "$select FROM $tbl_session s $inject_joins $where $inject_where";
 
         if (api_is_multiple_url_enabled()) {
-            $table_access_url_rel_session= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
+            $table_access_url_rel_session = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
             $access_url_id = api_get_current_access_url_id();
             if ($access_url_id != -1) {
-                $where.= " AND ar.access_url_id = $access_url_id ";
+                $where .= " AND ar.access_url_id = $access_url_id ";
                 $query = "$select
                         FROM $tbl_session s $inject_joins
                         INNER JOIN $table_access_url_rel_session ar
@@ -564,7 +564,7 @@ 
                 INNER JOIN $tbl_lp l ON l.id = v.lp_id
                 INNER JOIN $tbl_user u ON u.user_id = v.user_id
                 INNER JOIN $tbl_course c
-                WHERE v.session_id = " . $sessionId;
+                WHERE v.session_id = ".$sessionId;
         $result_rows = Database::query($sql);
         $row = Database::fetch_array($result_rows);
         $num = $row['total_rows'];
@@ -616,7 +616,7 @@ 
 
         $limit = null;
         if (!empty($options['limit'])) {
-            $limit = " LIMIT " . $options['limit'];
+            $limit = " LIMIT ".$options['limit'];
         }
 
         if (!empty($options['where'])) {
@@ -625,7 +625,7 @@ 
 
         $order = null;
         if (!empty($options['order'])) {
-            $order = " ORDER BY " . $options['order'];
+            $order = " ORDER BY ".$options['order'];
         }
 
         $sql = "SELECT u.user_id, u.lastname, u.firstname, u.username, u.email, s.c_id
@@ -684,13 +684,13 @@ 
             foreach ($lessons as $lesson) {
                 $data[$lesson['id']] = (!empty($user_lessons[$lesson['id']]['progress'])) ? $user_lessons[$lesson['id']]['progress'] : 0;
                 $progress += $data[$lesson['id']];
-                $data[$lesson['id']] = $data[$lesson['id']] . '%';
+                $data[$lesson['id']] = $data[$lesson['id']].'%';
                 $count++;
             }
             if ($count == 0) {
                 $data['total'] = 0;
             } else {
-                $data['total'] = round($progress / $count, 2) . '%';
+                $data['total'] = round($progress / $count, 2).'%';
             }
             $table[] = $data;
         }
@@ -731,7 +731,7 @@ 
 
         $limit = null;
         if (!empty($options['limit'])) {
-            $limit = " LIMIT " . $options['limit'];
+            $limit = " LIMIT ".$options['limit'];
         }
 
         if (!empty($options['where'])) {
@@ -740,7 +740,7 @@ 
 
         $order = null;
         if (!empty($options['order'])) {
-            $order = " ORDER BY " . $options['order'];
+            $order = " ORDER BY ".$options['order'];
         }
 
         $sql = "SELECT u.user_id, u.lastname, u.firstname, u.username, u.email, s.c_id
@@ -842,7 +842,7 @@ 
 
         $limit = null;
         if (!empty($options['limit'])) {
-            $limit = " LIMIT " . $options['limit'];
+            $limit = " LIMIT ".$options['limit'];
         }
 
         if (!empty($options['where'])) {
@@ -851,7 +851,7 @@ 
 
         $order = null;
         if (!empty($options['order'])) {
-            $order = " ORDER BY " . $options['order'];
+            $order = " ORDER BY ".$options['order'];
         }
 
         //TODO, fix create report without session
@@ -884,7 +884,7 @@ 
         /**
          *  Lessons
          */
-        $sql = "SELECT * FROM $tbl_course_lp WHERE c_id = %s ";  //AND session_id = %s
+        $sql = "SELECT * FROM $tbl_course_lp WHERE c_id = %s "; //AND session_id = %s
         $sql_query = sprintf($sql, $course['real_id']);
         $result = Database::query($sql_query);
         $arrLesson = array(array());
@@ -892,7 +892,7 @@ 
             if (empty($arrLesson[$row['session_id']]['lessons_total'])) {
                 $arrLesson[$row['session_id']]['lessons_total'] = 1;
             } else {
-                $arrLesson[$row['session_id']]['lessons_total'] ++;
+                $arrLesson[$row['session_id']]['lessons_total']++;
             }
         }
 
@@ -959,7 +959,7 @@ 
                 $course['real_id']
             );
             foreach ($user_list as $user_id) {
-                isset($survey_user_list[$user_id]) ? $survey_user_list[$user_id] ++ : $survey_user_list[$user_id] = 1;
+                isset($survey_user_list[$user_id]) ? $survey_user_list[$user_id]++ : $survey_user_list[$user_id] = 1;
             }
         }
 
@@ -1013,7 +1013,7 @@ 
             $assignments_done = Tracking::count_student_assignments($user['user_id'], $course['code'], $user['id_session']);
             $assignments_left = $assignments_total - $assignments_done;
             if (!empty($assignments_total)) {
-                $assignments_progress = round((( $assignments_done * 100 ) / $assignments_total), 2);
+                $assignments_progress = round((($assignments_done * 100) / $assignments_total), 2);
             } else {
                 $assignments_progress = 0;
             }
@@ -1043,7 +1043,7 @@ 
             $wiki_read = $row['count'];
             $wiki_unread = $wiki_total - $wiki_read;
             if (!empty($wiki_total)) {
-                $wiki_progress = round((( $wiki_read * 100 ) / $wiki_total), 2);
+                $wiki_progress = round((($wiki_read * 100) / $wiki_total), 2);
             } else {
                 $wiki_progress = 0;
             }
@@ -1052,7 +1052,7 @@ 
             $surveys_done = (isset($survey_user_list[$user['user_id']]) ? $survey_user_list[$user['user_id']] : 0);
             $surveys_left = $surveys_total - $surveys_done;
             if (!empty($surveys_total)) {
-                $surveys_progress = round((( $surveys_done * 100 ) / $surveys_total), 2);
+                $surveys_progress = round((($surveys_done * 100) / $surveys_total), 2);
             } else {
                 $surveys_progress = 0;
             }
@@ -1065,7 +1065,7 @@ 
             );
             $forums_left = $forums_total - $forums_done;
             if (!empty($forums_total)) {
-                $forums_progress = round((( $forums_done * 100 ) / $forums_total), 2);
+                $forums_progress = round((($forums_done * 100) / $forums_total), 2);
             } else {
                 $forums_progress = 0;
             }
@@ -1073,58 +1073,58 @@ 
             //Overall Total
             $overall_total = ($course_description_progress + $exercises_progress + $forums_progress + $assignments_progress + $wiki_progress + $surveys_progress) / 6;
 
-            $link = '<a href="' . api_get_path(WEB_CODE_PATH) . 'mySpace/myStudents.php?student=' . $user[0] . '&details=true&course=' . $course['code'] . '&id_session=' . $user['id_session'] . '"> %s </a>';
-            $linkForum = '<a href="' . api_get_path(WEB_CODE_PATH) . 'forum/index.php?cidReq=' . $course['code'] . '&id_session=' . $user['id_session'] . '"> %s </a>';
-            $linkWork = '<a href="' . api_get_path(WEB_CODE_PATH) . 'work/work.php?cidReq=' . $course['code'] . '&id_session=' . $user['id_session'] . '"> %s </a>';
-            $linkWiki = '<a href="' . api_get_path(WEB_CODE_PATH) . 'wiki/index.php?cidReq=' . $course['code'] . '&session_id=' . $user['id_session'] . '&action=statistics"> %s </a>';
-            $linkSurvey = '<a href="' . api_get_path(WEB_CODE_PATH) . 'survey/survey_list.php?cidReq=' . $course['code'] . '&id_session=' . $user['id_session'] . '"> %s </a>';
+            $link = '<a href="'.api_get_path(WEB_CODE_PATH).'mySpace/myStudents.php?student='.$user[0].'&details=true&course='.$course['code'].'&id_session='.$user['id_session'].'"> %s </a>';
+            $linkForum = '<a href="'.api_get_path(WEB_CODE_PATH).'forum/index.php?cidReq='.$course['code'].'&id_session='.$user['id_session'].'"> %s </a>';
+            $linkWork = '<a href="'.api_get_path(WEB_CODE_PATH).'work/work.php?cidReq='.$course['code'].'&id_session='.$user['id_session'].'"> %s </a>';
+            $linkWiki = '<a href="'.api_get_path(WEB_CODE_PATH).'wiki/index.php?cidReq='.$course['code'].'&session_id='.$user['id_session'].'&action=statistics"> %s </a>';
+            $linkSurvey = '<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey_list.php?cidReq='.$course['code'].'&id_session='.$user['id_session'].'"> %s </a>';
 
             $table[] = array(
                 'lastname' => $user[1],
                 'firstname' => $user[2],
                 'username' => $user[3],
                 #'profile'   => '',
-                'total' => round($overall_total, 2) . '%',
-                'courses' => sprintf($link, $course_description_progress . '%'),
-                'lessons' => sprintf($link, $lessons_progress . '%'),
-                'exercises' => sprintf($link, $exercises_progress . '%'),
-                'forums' => sprintf($link, $forums_progress . '%'),
-                'homeworks' => sprintf($link, $assignments_progress . '%'),
-                'wikis' => sprintf($link, $wiki_progress . '%'),
-                'surveys' => sprintf($link, $surveys_progress . '%'),
+                'total' => round($overall_total, 2).'%',
+                'courses' => sprintf($link, $course_description_progress.'%'),
+                'lessons' => sprintf($link, $lessons_progress.'%'),
+                'exercises' => sprintf($link, $exercises_progress.'%'),
+                'forums' => sprintf($link, $forums_progress.'%'),
+                'homeworks' => sprintf($link, $assignments_progress.'%'),
+                'wikis' => sprintf($link, $wiki_progress.'%'),
+                'surveys' => sprintf($link, $surveys_progress.'%'),
                 //course description
-                'course_description_progress' => $course_description_progress . '%',
+                'course_description_progress' => $course_description_progress.'%',
                 //lessons
                 'lessons_total' => sprintf($link, $lessons_total),
                 'lessons_done' => sprintf($link, $lessons_done),
                 'lessons_left' => sprintf($link, $lessons_left),
-                'lessons_progress' => sprintf($link, $lessons_progress . '%'),
+                'lessons_progress' => sprintf($link, $lessons_progress.'%'),
                 //exercises
                 'exercises_total' => sprintf($link, $exercises_total),
                 'exercises_done' => sprintf($link, $exercises_done),
                 'exercises_left' => sprintf($link, $exercises_left),
-                'exercises_progress' => sprintf($link, $exercises_progress . '%'),
+                'exercises_progress' => sprintf($link, $exercises_progress.'%'),
                 //forums
                 'forums_total' => sprintf($linkForum, $forums_total),
                 'forums_done' => sprintf($linkForum, $forums_done),
                 'forums_left' => sprintf($linkForum, $forums_left),
-                'forums_progress' => sprintf($linkForum, $forums_progress . '%'),
+                'forums_progress' => sprintf($linkForum, $forums_progress.'%'),
                 //assignments
                 'assignments_total' => sprintf($linkWork, $assignments_total),
                 'assignments_done' => sprintf($linkWork, $assignments_done),
                 'assignments_left' => sprintf($linkWork, $assignments_left),
-                'assignments_progress' => sprintf($linkWork, $assignments_progress . '%'),
+                'assignments_progress' => sprintf($linkWork, $assignments_progress.'%'),
                 //wiki
                 'wiki_total' => sprintf($linkWiki, $wiki_total),
                 'wiki_revisions' => sprintf($linkWiki, $wiki_revisions),
                 'wiki_read' => sprintf($linkWiki, $wiki_read),
                 'wiki_unread' => sprintf($linkWiki, $wiki_unread),
-                'wiki_progress' => sprintf($linkWiki, $wiki_progress . '%'),
+                'wiki_progress' => sprintf($linkWiki, $wiki_progress.'%'),
                 //survey
                 'surveys_total' => sprintf($linkSurvey, $surveys_total),
                 'surveys_done' => sprintf($linkSurvey, $surveys_done),
                 'surveys_left' => sprintf($linkSurvey, $surveys_left),
-                'surveys_progress' => sprintf($linkSurvey, $surveys_progress . '%'),
+                'surveys_progress' => sprintf($linkSurvey, $surveys_progress.'%'),
             );
         }
 
@@ -1204,7 +1204,7 @@ 
 
         $limit = null;
         if (!empty($options['limit'])) {
-            $limit = " LIMIT " . $options['limit'];
+            $limit = " LIMIT ".$options['limit'];
         }
 
         if (!empty($options['where'])) {
@@ -1213,7 +1213,7 @@ 
 
         $order = null;
         if (!empty($options['order'])) {
-            $order = " ORDER BY " . $options['order'];
+            $order = " ORDER BY ".$options['order'];
         }
 
         //TODO add course name
@@ -1226,7 +1226,7 @@ 
                     " : "
                     u.lastname,
                     u.firstname,
-                ") . "
+                ")."
                 a.logout_course_date,
                 a.counter,
                 c.title,
@@ -1308,7 +1308,7 @@ 
             if (Database::num_rows($result) > 0) {
                 $row = Database::fetch_array($result);
                 $count = $row['count'] + 1;
-                $session_name = $session_name . '_' . $count;
+                $session_name = $session_name.'_'.$count;
                 $result = self::session_name_exists($session_name);
                 if (!$result) {
                     return $session_name;
@@ -1388,7 +1388,7 @@ 
 
             return false;
         } else {
-            $sql = "SELECT id FROM $tbl_session WHERE name='" . Database::escape_string($name) . "'";
+            $sql = "SELECT id FROM $tbl_session WHERE name='".Database::escape_string($name)."'";
             $rs = Database::query($sql);
             $exists = false;
             while ($row = Database::fetch_array($rs)) {
@@ -1754,7 +1754,7 @@ 
         // Delete users from the session
         if ($empty_users === true) {
             $sql = "DELETE FROM $tbl_session_rel_user
-                    WHERE session_id = $id_session AND relation_type<>" . SESSION_RELATION_TYPE_RRHH . "";
+                    WHERE session_id = $id_session AND relation_type<>".SESSION_RELATION_TYPE_RRHH."";
             Database::query($sql);
         }
 
@@ -1765,7 +1765,7 @@ 
             $enreg_user = Database::escape_string($enreg_user);
             $nbr_users++;
             $sql = "INSERT IGNORE INTO $tbl_session_rel_user (relation_type, session_id, user_id, registered_at)
-                    VALUES (0, $id_session, $enreg_user, '" . api_get_utc_datetime() . "')";
+                    VALUES (0, $id_session, $enreg_user, '".api_get_utc_datetime()."')";
             Database::query($sql);
         }
 
@@ -1855,9 +1855,9 @@ 
         is_array($courseInfo) ? $courseId = $courseInfo['real_id'] : $courseId = $courseInfo;
 
         $statusCondition = null;
-        if (isset($status) && !is_null($status))  {
+        if (isset($status) && !is_null($status)) {
             $status = intval($status);
-            $statusCondition  = " AND status = $status";
+            $statusCondition = " AND status = $status";
         }
 
         foreach ($userList as $userId) {
@@ -1989,7 +1989,7 @@ 
             if (empty($count)) {
                 // If user is not registered to a session then add it.
                 $sql = "INSERT IGNORE INTO $tbl_session_rel_user (session_id, user_id, registered_at)
-                        VALUES ($session_id, $enreg_user, '" . api_get_utc_datetime() . "')";
+                        VALUES ($session_id, $enreg_user, '".api_get_utc_datetime()."')";
                 Database::query($sql);
 
                 $sql = "UPDATE $tbl_session SET nbr_users = nbr_users + 1
@@ -2032,7 +2032,7 @@ 
 		               WHERE
                             session_id = $session_id AND
 		                    user_id = $user_id AND
-		                    relation_type <> " . SESSION_RELATION_TYPE_RRHH . "";
+		                    relation_type <> ".SESSION_RELATION_TYPE_RRHH."";
         $result = Database::query($delete_sql);
         $return = Database::affected_rows($result);
 
@@ -2116,7 +2116,7 @@ 
                 FROM $tbl_session_rel_user
                 WHERE
                     session_id = $sessionId AND
-                    relation_type<>" . SESSION_RELATION_TYPE_RRHH;
+                    relation_type<>".SESSION_RELATION_TYPE_RRHH;
         $result = Database::query($sql);
         $user_list = Database::store_result($result);
 
@@ -2128,7 +2128,7 @@ 
 
                     $sql = "DELETE FROM $tbl_session_rel_course
                             WHERE
-                                c_id = " . $existingCourse['c_id'] . " AND
+                                c_id = ".$existingCourse['c_id']." AND
                                 session_id = $sessionId";
                     Database::query($sql);
 
@@ -2191,7 +2191,7 @@ 
                             $links = $cat->get_links(null, false, $courseInfo['code'], 0);
 
                             $cat->set_session_id($sessionId);
-                            $oldCategoryId= $cat->get_id();
+                            $oldCategoryId = $cat->get_id();
                             $newId = $cat->add();
                             $newCategoryIdList[$oldCategoryId] = $newId;
 
@@ -2379,8 +2379,8 @@ 
         $return_value = false;
         $sql = "SELECT c_id FROM $tbl_session_course
                 WHERE
-                  session_id = " . intval($session_id) . " AND
-                  c_id = " . intval($courseId) . "";
+                  session_id = ".intval($session_id)." AND
+                  c_id = " . intval($courseId)."";
         $result = Database::query($sql);
         $num = Database::num_rows($result);
         if ($num > 0) {
@@ -2403,8 +2403,8 @@ 
         }
 
         $sql = 'SELECT *
-		        FROM ' . $tbl_session . '
-		        WHERE name = "' . Database::escape_string($session_name) . '"';
+		        FROM ' . $tbl_session.'
+		        WHERE name = "' . Database::escape_string($session_name).'"';
         $result = Database::query($sql);
         $num = Database::num_rows($result);
         if ($num > 0) {
@@ -2444,8 +2444,8 @@ 
         $month_end = intval($smonth_end);
         $day_end = intval($sday_end);
 
-        $date_start = "$year_start-" . (($month_start < 10) ? "0$month_start" : $month_start) . "-" . (($day_start < 10) ? "0$day_start" : $day_start);
-        $date_end = "$year_end-" . (($month_end < 10) ? "0$month_end" : $month_end) . "-" . (($day_end < 10) ? "0$day_end" : $day_end);
+        $date_start = "$year_start-".(($month_start < 10) ? "0$month_start" : $month_start)."-".(($day_start < 10) ? "0$day_start" : $day_start);
+        $date_end = "$year_end-".(($month_end < 10) ? "0$month_end" : $month_end)."-".(($day_end < 10) ? "0$day_end" : $day_end);
 
         if (empty($name)) {
             $msg = get_lang('SessionCategoryNameIsRequired');
@@ -2517,8 +2517,8 @@ 
         $month_end = intval($smonth_end);
         $day_end = intval($sday_end);
         $id = intval($id);
-        $date_start = "$year_start-" . (($month_start < 10) ? "0$month_start" : $month_start) . "-" . (($day_start < 10) ? "0$day_start" : $day_start);
-        $date_end = "$year_end-" . (($month_end < 10) ? "0$month_end" : $month_end) . "-" . (($day_end < 10) ? "0$day_end" : $day_end);
+        $date_start = "$year_start-".(($month_start < 10) ? "0$month_start" : $month_start)."-".(($day_start < 10) ? "0$day_start" : $day_start);
+        $date_end = "$year_end-".(($month_end < 10) ? "0$month_end" : $month_end)."-".(($day_end < 10) ? "0$day_end" : $day_end);
 
         if (empty($name)) {
             $msg = get_lang('SessionCategoryNameIsRequired');
@@ -2538,13 +2538,13 @@ 
         if ($date_end <> null) {
             $sql = "UPDATE $tbl_session_category
                     SET
-                        name = '" . Database::escape_string($name) . "',
+                        name = '".Database::escape_string($name)."',
                         date_start = '$date_start' ,
                         date_end = '$date_end'
                     WHERE id= $id";
         } else {
             $sql = "UPDATE $tbl_session_category SET
-                        name = '" . Database::escape_string($name) . "',
+                        name = '".Database::escape_string($name)."',
                         date_start = '$date_start',
                         date_end = NULL
                     WHERE id= $id";
@@ -2574,10 +2574,10 @@ 
 
         //Setting session_category_id to 0
         $sql = "UPDATE $tbl_session SET session_category_id = 0
-                WHERE session_category_id IN (" . $id_checked . ")";
+                WHERE session_category_id IN (".$id_checked.")";
         Database::query($sql);
 
-        $sql = "SELECT id FROM $tbl_session WHERE session_category_id IN (" . $id_checked . ")";
+        $sql = "SELECT id FROM $tbl_session WHERE session_category_id IN (".$id_checked.")";
         $result = Database::query($sql);
         while ($rows = Database::fetch_array($result)) {
             $session_id = $rows['id'];
@@ -2589,7 +2589,7 @@ 
                 }
             }
         }
-        $sql = "DELETE FROM $tbl_session_category WHERE id IN (" . $id_checked . ")";
+        $sql = "DELETE FROM $tbl_session_category WHERE id IN (".$id_checked.")";
         Database::query($sql);
 
         // Add event to system log
@@ -2662,7 +2662,7 @@ 
                 $value = Database::escape_string($options['value']);
                 $sql_query .= ' AND ';
                 if (in_array($field, $availableFields) && in_array($operator, $availableOperator)) {
-                    $sql_query .= $field . " $operator '" . $value . "'";
+                    $sql_query .= $field." $operator '".$value."'";
                 }
             }
         }
@@ -2729,8 +2729,8 @@ 
     {
         $tbl_session_category = Database::get_main_table(TABLE_MAIN_SESSION_CATEGORY);
         $id = api_get_current_access_url_id();
-        $sql = 'SELECT * FROM ' . $tbl_session_category . '
-                WHERE access_url_id = ' . $id . '
+        $sql = 'SELECT * FROM '.$tbl_session_category.'
+                WHERE access_url_id = ' . $id.'
                 ORDER BY name ASC';
         $result = Database::query($sql);
         if (Database::num_rows($result) > 0) {
@@ -2909,11 +2909,11 @@ 
                         INNER JOIN $tbl_session_rel_access_url a ON (a.session_id = s.session_id)
                         WHERE
                             s.user_id = $userId AND
-                            relation_type=" . SESSION_RELATION_TYPE_RRHH . " AND
-                            access_url_id = " . api_get_current_access_url_id() . "";
+                            relation_type=".SESSION_RELATION_TYPE_RRHH." AND
+                            access_url_id = " . api_get_current_access_url_id()."";
             } else {
                 $sql = "SELECT session_id FROM $tbl_session_rel_user s
-                        WHERE user_id = $userId AND relation_type=" . SESSION_RELATION_TYPE_RRHH . "";
+                        WHERE user_id = $userId AND relation_type=".SESSION_RELATION_TYPE_RRHH."";
             }
             $result = Database::query($sql);
 
@@ -2923,7 +2923,7 @@ 
                             WHERE
                                 session_id = {$row['session_id']} AND
                                 user_id = $userId AND
-                                relation_type=" . SESSION_RELATION_TYPE_RRHH . " ";
+                                relation_type=".SESSION_RELATION_TYPE_RRHH." ";
                     Database::query($sql);
                 }
             }
@@ -2937,8 +2937,8 @@ 
                         VALUES (
                             $session_id,
                             $userId,
-                            '" . SESSION_RELATION_TYPE_RRHH . "',
-                            '" . api_get_utc_datetime() . "'
+                            '".SESSION_RELATION_TYPE_RRHH."',
+                            '" . api_get_utc_datetime()."'
                         )";
 
                 Database::query($sql);
@@ -2980,8 +2980,8 @@ 
                     WHERE
                         sru.user_id = '$userId' AND
                         sru.session_id = '$sessionId' AND
-                        sru.relation_type = '" . SESSION_RELATION_TYPE_RRHH . "' AND
-                        access_url_id = " . api_get_current_access_url_id() . "
+                        sru.relation_type = '".SESSION_RELATION_TYPE_RRHH."' AND
+                        access_url_id = " . api_get_current_access_url_id()."
                         ";
         } else {
             $sql = "$select FROM $tbl_session s
@@ -2990,7 +2990,7 @@ 
                         sru.session_id = s.id AND
                         sru.user_id = '$userId' AND
                         sru.session_id = '$sessionId' AND
-                        sru.relation_type = '" . SESSION_RELATION_TYPE_RRHH . "'
+                        sru.relation_type = '".SESSION_RELATION_TYPE_RRHH."'
                     ";
         }
 
@@ -3088,7 +3088,7 @@ 
 
         $limitCondition = null;
         if (!empty($start) && !empty($limit)) {
-            $limitCondition = " LIMIT " . intval($start) . ", " . intval($limit);
+            $limitCondition = " LIMIT ".intval($start).", ".intval($limit);
         }
 
         if (empty($orderCondition)) {
@@ -3166,26 +3166,26 @@ 
 
         $sessions = array();
         if (Database::num_rows($result) > 0) {
-            $sysUploadPath = api_get_path(SYS_UPLOAD_PATH). 'sessions/';
-            $webUploadPath = api_get_path(WEB_UPLOAD_PATH). 'sessions/';
+            $sysUploadPath = api_get_path(SYS_UPLOAD_PATH).'sessions/';
+            $webUploadPath = api_get_path(WEB_UPLOAD_PATH).'sessions/';
             $imgPath = Display::returnIconPath('session_default_small.png');
 
             $tableExtraFields = Database::get_main_table(TABLE_EXTRA_FIELD);
-            $sql = "SELECT id FROM " . $tableExtraFields . "
+            $sql = "SELECT id FROM ".$tableExtraFields."
                     WHERE extra_field_type = 3 AND variable='image'";
             $resultField = Database::query($sql);
             $imageFieldId = Database::fetch_assoc($resultField);
 
             while ($row = Database::fetch_array($result)) {
 
-                $row['image'] =  null;
-                $sessionImage = $sysUploadPath . $imageFieldId['id'] . '_' . $row['id'] . '.png';
+                $row['image'] = null;
+                $sessionImage = $sysUploadPath.$imageFieldId['id'].'_'.$row['id'].'.png';
 
                 if (is_file($sessionImage)) {
-                    $sessionImage = $webUploadPath . $imageFieldId['id'] . '_' . $row['id'] . '.png';
+                    $sessionImage = $webUploadPath.$imageFieldId['id'].'_'.$row['id'].'.png';
                     $row['image'] = $sessionImage;
                 } else {
-                    $row['image'] =  $imgPath;
+                    $row['image'] = $imgPath;
                 }
 
                 $sessions[$row['id']] = $row;
@@ -3255,7 +3255,7 @@ 
                 return intval($count[0]);
             }
 
-            while ($row = Database::fetch_array($result,'ASSOC'))	{
+            while ($row = Database::fetch_array($result, 'ASSOC')) {
                 $courses[$row['real_id']] = $row;
             }
         }
@@ -3299,7 +3299,7 @@ 
         }
 
         $tbl_course = Database::get_main_table(TABLE_MAIN_COURSE);
-        $tbl_session_rel_course	= Database::get_main_table(TABLE_MAIN_SESSION_COURSE);
+        $tbl_session_rel_course = Database::get_main_table(TABLE_MAIN_SESSION_COURSE);
 
         if ($getCount) {
             $select = "SELECT COUNT(DISTINCT(c.code)) as count ";
@@ -3324,7 +3324,7 @@ 
 		        ";
         if ($getCount) {
             $result = Database::query($sql);
-            $row = Database::fetch_array($result,'ASSOC');
+            $row = Database::fetch_array($result, 'ASSOC');
             return $row['count'];
         }
 
@@ -3339,7 +3339,7 @@ 
         $courses = array();
 
         if ($num_rows > 0) {
-            while ($row = Database::fetch_array($result,'ASSOC'))	{
+            while ($row = Database::fetch_array($result, 'ASSOC')) {
                 $courses[$row['id']] = $row;
             }
         }
@@ -3417,7 +3417,7 @@ 
         $result = Database::query($sql);
         $num_rows = Database::num_rows($result);
         if ($num_rows > 0) {
-            $row = Database::fetch_array($result,'ASSOC');
+            $row = Database::fetch_array($result, 'ASSOC');
             return $row['count'];
         }
 
@@ -3529,9 +3529,9 @@ 
 
             if ($access_url_id != -1) {
                 $sql = 'SELECT DISTINCT session.*
-                    FROM ' . $session_table . ' session INNER JOIN ' . $tbl_session_rel_access_url . ' session_rel_url
+                    FROM ' . $session_table.' session INNER JOIN '.$tbl_session_rel_access_url.' session_rel_url
                     ON (session.id = session_rel_url.session_id)
-                    WHERE '.$sqlCoach.' access_url_id = ' . $access_url_id;
+                    WHERE '.$sqlCoach.' access_url_id = '.$access_url_id;
             }
         }
         $sql .= ' ORDER by name';
@@ -3565,8 +3565,8 @@ 
                 FROM $tbl_session_rel_course_rel_user session_rcru, $tbl_user user
                 WHERE
                     session_rcru.user_id = user.user_id AND
-                    session_rcru.session_id = '" . intval($session_id) . "' AND
-                    session_rcru.c_id ='" . intval($courseId) . "' AND
+                    session_rcru.session_id = '".intval($session_id)."' AND
+                    session_rcru.c_id ='" . intval($courseId)."' AND
                     user.user_id = " . intval($user_id);
 
         $result = Database::query($sql);
@@ -3597,8 +3597,8 @@ 
         $sql = "SELECT session_rcru.status
                 FROM $tbl_session_rel_course_rel_user session_rcru, $tbl_user user
                 WHERE session_rcru.user_id = user.user_id AND
-                    session_rcru.session_id = '" . intval($session_id) . "' AND
-                    session_rcru.c_id ='" . intval($courseId) . "' AND
+                    session_rcru.session_id = '".intval($session_id)."' AND
+                    session_rcru.c_id ='" . intval($courseId)."' AND
                     user.user_id = " . intval($user_id);
         $result = Database::query($sql);
         $status = false;
@@ -3675,7 +3675,7 @@ 
         // Get timestamp for now in UTC - see http://php.net/manual/es/function.time.php#117251
         $now = time() - date('Z');
         // Timestamp in one month
-        $inOneMonth = $now + (30*24*3600);
+        $inOneMonth = $now + (30 * 24 * 3600);
         $inOneMonth = api_get_local_time($inOneMonth);
         if (api_strtotime($s['access_start_date']) < $now) {
             $s['access_start_date'] = api_get_local_time($now);
@@ -3697,16 +3697,16 @@ 
         }
         // Now try to create the session
         $sid = self::create_session(
-            $s['name'] . ' ' . get_lang('CopyLabelSuffix'),
+            $s['name'].' '.get_lang('CopyLabelSuffix'),
             $s['access_start_date'],
             $s['access_end_date'],
             $s['display_start_date'],
             $s['display_end_date'],
             $s['coach_access_start_date'],
             $s['coach_access_end_date'],
-            (int)$s['id_coach'],
+            (int) $s['id_coach'],
             $s['session_category_id'],
-            (int)$s['visibility'],
+            (int) $s['visibility'],
             true
         );
 
@@ -3820,7 +3820,7 @@ 
         $session_table = Database::get_main_table(TABLE_MAIN_SESSION);
         $sql = "SELECT DISTINCT id
 	         	FROM $session_table
-	         	WHERE session.id_coach =  '" . $user_id . "' AND id = '$session_id'";
+	         	WHERE session.id_coach =  '".$user_id."' AND id = '$session_id'";
         $result = Database::query($sql);
         if ($result && Database::num_rows($result)) {
             return true;
@@ -3839,7 +3839,7 @@ 
         $access_url_rel_session_table = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
         $sql = "SELECT count(id) FROM $session_table s";
         if (!empty($access_url_id) && $access_url_id == intval($access_url_id)) {
-            $sql .= ", $access_url_rel_session_table u " .
+            $sql .= ", $access_url_rel_session_table u ".
                 " WHERE s.id = u.session_id AND u.access_url_id = $access_url_id";
         }
         $res = Database::query($sql);
@@ -4090,7 +4090,7 @@ 
 
         $tbl_session = Database::get_main_table(TABLE_MAIN_SESSION);
         $tbl_session_user = Database::get_main_table(TABLE_MAIN_SESSION_USER);
-        $tbl_session_course  = Database::get_main_table(TABLE_MAIN_SESSION_COURSE);
+        $tbl_session_course = Database::get_main_table(TABLE_MAIN_SESSION_COURSE);
         $tbl_session_course_user = Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
 
         $sessions = array();
@@ -4184,10 +4184,10 @@ 
                     $suffix = null;
                     while (!$unique_name) {
                         if ($i > 1) {
-                            $suffix = ' - ' . $i;
+                            $suffix = ' - '.$i;
                         }
-                        $sql = 'SELECT 1 FROM ' . $tbl_session . '
-                                WHERE name="' . $session_name . $suffix . '"';
+                        $sql = 'SELECT 1 FROM '.$tbl_session.'
+                                WHERE name="' . $session_name.$suffix.'"';
                         $rs = Database::query($sql);
 
                         if (Database::result($rs, 0, 0)) {
@@ -4205,13 +4205,13 @@ 
 
                     // Creating the session.
                     $sql = "INSERT IGNORE INTO $tbl_session SET
-                            name = '" . $session_name . "',
+                            name = '".$session_name."',
                             id_coach = '$coach_id',
                             access_start_date = '$date_start',
                             access_end_date = '$date_end',
                             visibility = '$visibilityAfterExpirationPerSession',
                             $sessionCondition
-                            session_admin_id = " . intval($defaultUserId) . $extraParameters . $extraSessionParameters;
+                            session_admin_id = ".intval($defaultUserId).$extraParameters.$extraSessionParameters;
                     Database::query($sql);
 
                     $session_id = Database::insert_id();
@@ -4251,7 +4251,7 @@ 
                                 access_start_date = '$date_start',
                                 access_end_date = '$date_end',
                                 visibility = '$visibilityAfterExpirationPerSession',
-                                session_category_id = '$session_category_id' " . $extraParameters . $extraSessionParameters;
+                                session_category_id = '$session_category_id' ".$extraParameters.$extraSessionParameters;
 
                         Database::query($sql);
 
@@ -4271,7 +4271,7 @@ 
 
                             // Delete session-user relation only for students
                             $sql = "DELETE FROM $tbl_session_user
-                                    WHERE session_id = '$session_id' AND relation_type <> " . SESSION_RELATION_TYPE_RRHH;
+                                    WHERE session_id = '$session_id' AND relation_type <> ".SESSION_RELATION_TYPE_RRHH;
                             Database::query($sql);
 
                             $sql = "DELETE FROM $tbl_session_course WHERE session_id = '$session_id'";
@@ -4359,7 +4359,7 @@ 
 
                             // Delete session-user relation only for students
                             $sql = "DELETE FROM $tbl_session_user
-                                    WHERE session_id = '$session_id' AND relation_type <> " . SESSION_RELATION_TYPE_RRHH;
+                                    WHERE session_id = '$session_id' AND relation_type <> ".SESSION_RELATION_TYPE_RRHH;
                             Database::query($sql);
 
                             $sql = "DELETE FROM $tbl_session_course WHERE session_id = '$session_id'";
@@ -4402,7 +4402,7 @@ 
                             $sql = "INSERT IGNORE INTO $tbl_session_user SET
                                     user_id = '$user_id',
                                     session_id = '$session_id',
-                                    registered_at = '" . api_get_utc_datetime() . "'";
+                                    registered_at = '".api_get_utc_datetime()."'";
                             Database::query($sql);
                             if ($debug) {
                                 $logger->addInfo("Sessions - Adding User #$user_id ($user) to session #$session_id");
@@ -5040,7 +5040,7 @@ 
 
         if (!empty($lastConnectionDate)) {
             $lastConnectionDate = Database::escape_string($lastConnectionDate);
-            $userConditions .=  " AND u.last_login <= '$lastConnectionDate' ";
+            $userConditions .= " AND u.last_login <= '$lastConnectionDate' ";
         }
 
         if (!empty($keyword)) {
@@ -5099,7 +5099,7 @@ 
         $result = Database::query($sql);
         $result = Database::store_result($result);
 
-        return $result ;
+        return $result;
     }
 
     /**
@@ -5159,7 +5159,7 @@ 
                     $userToString = null;
                     foreach ($userList as $userInfo) {
                         $newUserList[] = $userInfo['user_id'];
-                        $userToString .= $userInfo['firstname'] . ' ' . $userInfo['lastname'] . '<br />';
+                        $userToString .= $userInfo['firstname'].' '.$userInfo['lastname'].'<br />';
                     }
 
                     if (!empty($sessionsDestination)) {
@@ -5172,7 +5172,7 @@ 
                                 $messages[] = Display::return_message(sprintf(get_lang('SessionXSkipped'), $sessionDestinationId), 'warning', false);
                                 continue;
                             }
-                            $messages[] = Display::return_message(get_lang('StudentList') . '<br />' . $userToString, 'info', false);
+                            $messages[] = Display::return_message(get_lang('StudentList').'<br />'.$userToString, 'info', false);
                             SessionManager::suscribe_users_to_session(
                                 $sessionDestinationId,
                                 $newUserList,
@@ -5223,7 +5223,7 @@ 
                 }
             }
         }
-        $sessionUrl = api_get_path(WEB_CODE_PATH) . 'admin/resume_session.php?id_session=';
+        $sessionUrl = api_get_path(WEB_CODE_PATH).'admin/resume_session.php?id_session=';
 
         $htmlResult = null;
 
@@ -5238,7 +5238,7 @@ 
                     $sessionInfo = self::fetch($sessionId);
                     $htmlResult .= '<br />';
                     $htmlResult .= Display::url(
-                        get_lang('Session') . ': ' . $sessionInfo['name'] . ' <br />', $sessionUrl . $sessionId, array('target' => '_blank')
+                        get_lang('Session').': '.$sessionInfo['name'].' <br />', $sessionUrl.$sessionId, array('target' => '_blank')
                     );
                     $teacherList = array();
                     foreach ($coachList as $coachId) {
@@ -5351,7 +5351,7 @@ 
                 }
 
                 $sessionIdList = array_map('intval', $sessionIdList);
-                $sessionToString = implode("', '",  $sessionIdList);
+                $sessionToString = implode("', '", $sessionIdList);
 
                 $course = Database::get_main_table(TABLE_MAIN_COURSE);
                 $sessionCourse = Database::get_main_table(TABLE_MAIN_SESSION_COURSE);
@@ -5363,7 +5363,7 @@ 
                         INNER JOIN $courseUser cu ON (cu.c_id = c.id)
 		                WHERE src.session_id IN ('$sessionToString') AND cu.status = 1";
                 $result = Database::query($sql);
-                while($row = Database::fetch_array($result, 'ASSOC')) {
+                while ($row = Database::fetch_array($result, 'ASSOC')) {
                     $teacherListId[$row['user_id']] = $row['user_id'];
                 }
             } else {
@@ -5438,7 +5438,7 @@ 
         $toolList = self::getCourseToolToBeManaged();
 
         foreach ($toolList as $tool) {
-            $method = 'add' . $tool;
+            $method = 'add'.$tool;
             if (method_exists(get_class(), $method)) {
                 self::$method($sessionId, $courseId);
             }
@@ -5457,7 +5457,7 @@ 
         $toolList = self::getCourseToolToBeManaged();
 
         foreach ($toolList as $tool) {
-            $method = 'remove' . $tool;
+            $method = 'remove'.$tool;
             if (method_exists(get_class(), $method)) {
                 self::$method($sessionId, $courseId);
             }
@@ -5575,18 +5575,18 @@ 
                         }
                     }
 
-                    $message .= '<strong>' . get_lang('User') . '</strong> ' . $userInfo['complete_name'] . ' <br />';
+                    $message .= '<strong>'.get_lang('User').'</strong> '.$userInfo['complete_name'].' <br />';
 
                     if (!in_array($userInfo['status'], array(DRH)) && !api_is_platform_admin_by_id($userInfo['user_id'])) {
-                        $message .= get_lang('UserMustHaveTheDrhRole') . '<br />';
+                        $message .= get_lang('UserMustHaveTheDrhRole').'<br />';
                         continue;
                     }
 
                     if (!empty($sessionList)) {
-                        $message .= '<strong>' . get_lang('Sessions') . ':</strong> <br />';
-                        $message .= implode(', ', $sessionList) . '<br /><br />';
+                        $message .= '<strong>'.get_lang('Sessions').':</strong> <br />';
+                        $message .= implode(', ', $sessionList).'<br /><br />';
                     } else {
-                        $message .= get_lang('NoSessionProvided') . ' <br /><br />';
+                        $message .= get_lang('NoSessionProvided').' <br /><br />';
                     }
                 }
             }
@@ -5766,8 +5766,8 @@ 
 
         $firstAccess = api_strtotime($courseAccess['login_course_date'], 'UTC');
 
-        $endDateInSeconds = $firstAccess + $duration*24*60*60;
-        $leftDays = round(($endDateInSeconds- $currentTime) / 60 / 60 / 24);
+        $endDateInSeconds = $firstAccess + $duration * 24 * 60 * 60;
+        $leftDays = round(($endDateInSeconds - $currentTime) / 60 / 60 / 24);
 
         return $leftDays;
     }
@@ -6049,7 +6049,7 @@ 
         $sql = "SELECT COUNT(1) as count, u.id, scu.status status_in_session, u.status user_status
                 FROM $tableSessionRelCourseRelUser scu
                 INNER JOIN $tableUser u ON scu.user_id = u.id
-                WHERE scu.session_id = " . intval($sessionId) ."
+                WHERE scu.session_id = ".intval($sessionId)."
                 GROUP BY u.id";
 
         $result = Database::query($sql);
@@ -6084,7 +6084,7 @@ 
             $sfTable = Database::get_main_table(TABLE_EXTRA_FIELD);
             $sfvTable = Database::get_main_table(TABLE_EXTRA_FIELD_VALUES);
             // Join session field and session field values tables
-            $joinTable = $sfTable . ' sf INNER JOIN ' . $sfvTable . ' sfv ON sf.id = sfv.field_id';
+            $joinTable = $sfTable.' sf INNER JOIN '.$sfvTable.' sfv ON sf.id = sfv.field_id';
             $fieldsArray = array();
             foreach ($extraFields as $field) {
                 $fieldsArray[] = Database::escape_string($field);
@@ -6127,14 +6127,14 @@ 
                 for ($i = 1; $i < count($fieldsArray); $i++) {
                     $whereParams .= ', ?';
                 }
-                $whereFieldVariables = ' variable IN ( ' . $whereParams .' )';
-                $whereFieldIds = 'field_id IN ( ' . $whereParams .  ' )';
+                $whereFieldVariables = ' variable IN ( '.$whereParams.' )';
+                $whereFieldIds = 'field_id IN ( '.$whereParams.' )';
             }
             // Get session fields
             $extraField = new ExtraField('session');
             $questionMarks = substr(str_repeat('?, ', count($fieldsArray)), 0, -2);
             $fieldsList = $extraField->get_all(array(
-                ' variable IN ( ' . $questionMarks . ' )' => $fieldsArray,
+                ' variable IN ( '.$questionMarks.' )' => $fieldsArray,
             ));
             // Index session fields
             foreach ($fieldsList as $field) {
@@ -6143,7 +6143,7 @@ 
             // Get session field values
             $extra = new ExtraFieldValue('session');
             $questionMarksFields = substr(str_repeat('?, ', count($fields)), 0, -2);
-            $sessionFieldValueList = $extra->get_all(array ('where' => array('field_id IN ( ' . $questionMarksFields . ' )' => array_keys($fields))));
+            $sessionFieldValueList = $extra->get_all(array('where' => array('field_id IN ( '.$questionMarksFields.' )' => array_keys($fields))));
             // Add session fields values to session list
             foreach ($sessionList as $id => &$session) {
                 foreach ($sessionFieldValueList as $sessionFieldValue) {
@@ -6196,7 +6196,7 @@ 
             // Check the result
             if ($result < 1) {
                 // If not found any result, update error message
-                $errorResult['errorMessage'] = 'Not found any session category name ' . $categoryName;
+                $errorResult['errorMessage'] = 'Not found any session category name '.$categoryName;
             } elseif (count($result) > 1 && !$force) {
                 // If found more than one result and force is disabled, update error message
                 $errorResult['errorMessage'] = 'Found many session categories';
@@ -6255,7 +6255,7 @@ 
             // Check if session list query had result
             if (!empty($sessionList)) {
                 // implode all session id
-                $sessionIdsString = '(' . implode(', ', array_keys($sessionList)) . ')';
+                $sessionIdsString = '('.implode(', ', array_keys($sessionList)).')';
                 // Get all field variables
                 $sessionFieldList = Database::select(
                     'id, variable',
@@ -6342,7 +6342,7 @@ 
                 return $sessionList;
             } else {
                 // Not found result, update error message
-                $errorResult['errorMessage'] = 'Not found any session for session category id ' . $sessionCategoryId;
+                $errorResult['errorMessage'] = 'Not found any session for session category id '.$sessionCategoryId;
             }
         }
 
@@ -6446,7 +6446,7 @@ 
 
         $sessionExtraField = new ExtraField('session');
         $fieldList = $sessionExtraField->get_all(array(
-            "variable IN ( " . implode(", ", $variablePlaceHolders) . " ) " => $variables,
+            "variable IN ( ".implode(", ", $variablePlaceHolders)." ) " => $variables,
         ));
 
         $fields = array();
@@ -6460,7 +6460,7 @@ 
         $extra = new ExtraFieldValue('session');
         $sessionFieldValueList = $extra->get_all(
             array(
-                "field_id IN ( " . implode(", ", $variablePlaceHolders) . " )" => array_keys($fields),
+                "field_id IN ( ".implode(", ", $variablePlaceHolders)." )" => array_keys($fields),
             )
         );
 
@@ -6531,7 +6531,7 @@ 
                 FROM $sessionTable s
                 INNER JOIN $sessionUserTable sru ON s.id = sru.id_session
                 WHERE
-                    (sru.id_user IN (" . implode(', ', $userIdList) . ")
+                    (sru.id_user IN (".implode(', ', $userIdList).")
                     AND sru.relation_type = 0
                 )";
 
@@ -6547,7 +6547,7 @@ 
                         WHERE
                             srau.access_url_id = $accessUrlId
                             AND (
-                                sru.id_user IN (" . implode(', ', $userIdList) . ")
+                                sru.id_user IN (".implode(', ', $userIdList).")
                                 AND sru.relation_type = 0
                             )";
             }
@@ -6568,7 +6568,7 @@ 
      */
     public static function getSessionVisibility($sessionInfo)
     {
-        switch($sessionInfo['visibility']) {
+        switch ($sessionInfo['visibility']) {
             case 1:
                 return get_lang('ReadOnly');
             case 2:
@@ -6599,7 +6599,7 @@ 
 
         $result = '';
         if (!empty($startDateToLocal) && !empty($endDateToLocal)) {
-            $result =  sprintf(get_lang('FromDateXToDateY'), $startDateToLocal, $endDateToLocal);
+            $result = sprintf(get_lang('FromDateXToDateY'), $startDateToLocal, $endDateToLocal);
         } else {
             if (!empty($startDateToLocal)) {
                 $result = get_lang('From').' '.$startDateToLocal;
@@ -6742,7 +6742,7 @@ 
                     get_lang('CoachName'),
                     null,
                     [
-                        'url' => api_get_path(WEB_AJAX_PATH) . 'session.ajax.php?a=search_general_coach',
+                        'url' => api_get_path(WEB_AJAX_PATH).'session.ajax.php?a=search_general_coach',
                         'width' => '100%',
                     ]
                 );
@@ -6753,7 +6753,7 @@ 
         $form->addHtml('<div id="ajax_list_coachs"></div>');
 
         $form->addButtonAdvancedSettings('advanced_params');
-        $form->addElement('html','<div id="advanced_params_options" style="display:none">');
+        $form->addElement('html', '<div id="advanced_params_options" style="display:none">');
 
         $form->addSelect('session_category', get_lang('SessionCategory'), $categoriesOptions, array(
             'id' => 'session_category'
@@ -6891,7 +6891,7 @@ 
         $extra_field = new ExtraField('session');
         $extra = $extra_field->addElements($form, $sessionId);
 
-        $form->addElement('html','</div>');
+        $form->addElement('html', '</div>');
 
         $js = $extra['jquery_ready_content'];
 
@@ -6922,16 +6922,16 @@ 
         if (api_is_session_admin() &&
             api_get_setting('allow_session_admins_to_see_all_sessions') == 'false'
         ) {
-            $where.=" WHERE s.session_admin_id = $user_id ";
+            $where .= " WHERE s.session_admin_id = $user_id ";
         }
 
         if (!empty($options['where'])) {
             $options['where'] = str_replace('course_title', 'c.title', $options['where']);
-            $options['where'] = str_replace("( session_active = '0' )", '1=1',  $options['where']);
+            $options['where'] = str_replace("( session_active = '0' )", '1=1', $options['where']);
 
             $options['where'] = str_replace(
                 array("AND session_active = '1'  )", " AND (  session_active = '1'  )"),
-                array(') GROUP BY s.name HAVING session_active = 1 ', " GROUP BY s.name HAVING session_active = 1 " )
+                array(') GROUP BY s.name HAVING session_active = 1 ', " GROUP BY s.name HAVING session_active = 1 ")
                 , $options['where']
             );
 
@@ -6973,10 +6973,10 @@ 
                        $where ";
 
         if (api_is_multiple_url_enabled()) {
-            $table_access_url_rel_session= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
+            $table_access_url_rel_session = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
             $access_url_id = api_get_current_access_url_id();
             if ($access_url_id != -1) {
-                $where.= " AND ar.access_url_id = $access_url_id ";
+                $where .= " AND ar.access_url_id = $access_url_id ";
 
                 $query_rows = "SELECT count(*) as total_rows
                                FROM $tbl_session s
@@ -7021,12 +7021,12 @@ 
                     //get_lang('CourseTitle'),
                     get_lang('Visibility'),
                 );
-                $column_model = array (
-                    array('name'=>'name', 'index'=>'s.name', 'width'=>'160',  'align'=>'left', 'search' => 'true', 'searchoptions' => array('sopt' => $operators)),
-                    array('name'=>'category_name', 'index'=>'category_name', 'width'=>'40',  'align'=>'left', 'search' => 'true', 'searchoptions' => array('sopt' => $operators)),
-                    array('name'=>'display_start_date', 'index'=>'display_start_date', 'width'=>'50',   'align'=>'left', 'search' => 'true', 'searchoptions' => array('dataInit' => 'date_pick_today', 'sopt' => $date_operators)),
-                    array('name'=>'display_end_date', 'index'=>'display_end_date', 'width'=>'50',   'align'=>'left', 'search' => 'true', 'searchoptions' => array('dataInit' => 'date_pick_one_month', 'sopt' => $date_operators)),
-                    array('name'=>'visibility', 'index'=>'visibility',      'width'=>'40',   'align'=>'left', 'search' => 'false'),
+                $column_model = array(
+                    array('name'=>'name', 'index'=>'s.name', 'width'=>'160', 'align'=>'left', 'search' => 'true', 'searchoptions' => array('sopt' => $operators)),
+                    array('name'=>'category_name', 'index'=>'category_name', 'width'=>'40', 'align'=>'left', 'search' => 'true', 'searchoptions' => array('sopt' => $operators)),
+                    array('name'=>'display_start_date', 'index'=>'display_start_date', 'width'=>'50', 'align'=>'left', 'search' => 'true', 'searchoptions' => array('dataInit' => 'date_pick_today', 'sopt' => $date_operators)),
+                    array('name'=>'display_end_date', 'index'=>'display_end_date', 'width'=>'50', 'align'=>'left', 'search' => 'true', 'searchoptions' => array('dataInit' => 'date_pick_one_month', 'sopt' => $date_operators)),
+                    array('name'=>'visibility', 'index'=>'visibility', 'width'=>'40', 'align'=>'left', 'search' => 'false'),
                 );
                 break;
             case 'complete':
@@ -7039,12 +7039,12 @@ 
                     get_lang('Visibility'),
                     get_lang('CourseTitle'),
                 );
-                $column_model = array (
-                    array('name'=>'name', 'index'=>'s.name', 'width'=>'200',  'align'=>'left', 'search' => 'true', 'searchoptions' => array('sopt' => $operators)),
-                    array('name'=>'display_start_date', 'index'=>'display_start_date', 'width'=>'70',   'align'=>'left', 'search' => 'true', 'searchoptions' => array('dataInit' => 'date_pick_today', 'sopt' => $date_operators)),
-                    array('name'=>'display_end_date', 'index'=>'display_end_date', 'width'=>'70',   'align'=>'left', 'search' => 'true', 'searchoptions' => array('dataInit' => 'date_pick_one_month', 'sopt' => $date_operators)),
-                    array('name'=>'coach_name', 'index'=>'coach_name',     'width'=>'70',   'align'=>'left', 'search' => 'false', 'searchoptions' => array('sopt' => $operators)),
-                    array('name'=>'session_active', 'index'=>'session_active', 'width'=>'25',   'align'=>'left', 'search' => 'true', 'stype'=>'select',
+                $column_model = array(
+                    array('name'=>'name', 'index'=>'s.name', 'width'=>'200', 'align'=>'left', 'search' => 'true', 'searchoptions' => array('sopt' => $operators)),
+                    array('name'=>'display_start_date', 'index'=>'display_start_date', 'width'=>'70', 'align'=>'left', 'search' => 'true', 'searchoptions' => array('dataInit' => 'date_pick_today', 'sopt' => $date_operators)),
+                    array('name'=>'display_end_date', 'index'=>'display_end_date', 'width'=>'70', 'align'=>'left', 'search' => 'true', 'searchoptions' => array('dataInit' => 'date_pick_one_month', 'sopt' => $date_operators)),
+                    array('name'=>'coach_name', 'index'=>'coach_name', 'width'=>'70', 'align'=>'left', 'search' => 'false', 'searchoptions' => array('sopt' => $operators)),
+                    array('name'=>'session_active', 'index'=>'session_active', 'width'=>'25', 'align'=>'left', 'search' => 'true', 'stype'=>'select',
                         // for the bottom bar
                         'searchoptions' => array(
                             'defaultValue'  => '1',
@@ -7052,8 +7052,8 @@ 
                         // for the top bar
                         'editoptions' => array('value' => '" ":'.get_lang('All').';1:'.get_lang('Active').';0:'.get_lang('Inactive')),
                     ),
-                    array('name'=>'visibility',     'index'=>'visibility',      'width'=>'40',   'align'=>'left', 'search' => 'false'),
-                    array('name'=>'course_title',    'index'=>'course_title',   'width'=>'50',   'hidden' => 'true', 'search' => 'true', 'searchoptions' => array('searchhidden' =>'true','sopt' => $operators)),
+                    array('name'=>'visibility', 'index'=>'visibility', 'width'=>'40', 'align'=>'left', 'search' => 'false'),
+                    array('name'=>'course_title', 'index'=>'course_title', 'width'=>'50', 'hidden' => 'true', 'search' => 'true', 'searchoptions' => array('searchhidden' =>'true', 'sopt' => $operators)),
                 );
                 break;
         }
@@ -7062,14 +7062,14 @@ 
         $session_field = new ExtraField('session');
         $rules = $session_field->getRules($columns, $column_model);
 
-        $column_model[] = array('name'=>'actions', 'index'=>'actions', 'width'=>'80',  'align'=>'left','formatter'=>'action_formatter','sortable'=>'false', 'search' => 'false');
+        $column_model[] = array('name'=>'actions', 'index'=>'actions', 'width'=>'80', 'align'=>'left', 'formatter'=>'action_formatter', 'sortable'=>'false', 'search' => 'false');
         $columns[] = get_lang('Actions');
 
         foreach ($column_model as $col_model) {
             $simple_column_name[] = $col_model['name'];
         }
 
-        $return_array =  array(
+        $return_array = array(
             'columns' => $columns,
             'column_model' => $column_model,
             'rules' => $rules,
@@ -7158,7 +7158,7 @@ 
             if (api_is_session_admin() &&
                 api_get_setting('allow_session_admins_to_manage_all_sessions') == 'false'
             ) {
-                $where.=" AND s.session_admin_id = $user_id ";
+                $where .= " AND s.session_admin_id = $user_id ";
             }
         }
 
@@ -7241,11 +7241,11 @@ 
             }
             $options['where'] = str_replace('course_title', 'c.title', $options['where']);
 
-            $options['where'] = str_replace("( session_active = '0' )", '1=1',  $options['where']);
+            $options['where'] = str_replace("( session_active = '0' )", '1=1', $options['where']);
 
             $options['where'] = str_replace(
                 array("AND session_active = '1'  )", " AND (  session_active = '1'  )"),
-                array(') GROUP BY s.name HAVING session_active = 1 ', " GROUP BY s.name HAVING session_active = 1 " )
+                array(') GROUP BY s.name HAVING session_active = 1 ', " GROUP BY s.name HAVING session_active = 1 ")
                 , $options['where']
             );
 
@@ -7280,10 +7280,10 @@ 
             $where;
 
         if (api_is_multiple_url_enabled()) {
-            $table_access_url_rel_session= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
+            $table_access_url_rel_session = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
             $access_url_id = api_get_current_access_url_id();
             if ($access_url_id != -1) {
-                $where.= " AND ar.access_url_id = $access_url_id ";
+                $where .= " AND ar.access_url_id = $access_url_id ";
                 $query = "$select
                     FROM $tbl_session s
                     LEFT JOIN $tbl_session_field_values fv ON (fv.session_id = s.id)
@@ -7310,7 +7310,7 @@ 
         $formatted_sessions = array();
 
         if (Database::num_rows($result)) {
-            $sessions   = Database::store_result($result, 'ASSOC');
+            $sessions = Database::store_result($result, 'ASSOC');
             foreach ($sessions as $session) {
                 $session_id = $session['id'];
                 $session['name'] = Display::url($session['name'], "resume_session.php?id_session=".$session['id']);
@@ -7325,14 +7325,14 @@ 
 
                 switch ($session['visibility']) {
                     case SESSION_VISIBLE_READ_ONLY: //1
-                        $session['visibility'] =  get_lang('ReadOnly');
+                        $session['visibility'] = get_lang('ReadOnly');
                         break;
                     case SESSION_VISIBLE:           //2
                     case SESSION_AVAILABLE:         //4
-                        $session['visibility'] =  get_lang('Visible');
+                        $session['visibility'] = get_lang('Visible');
                         break;
                     case SESSION_INVISIBLE:         //3
-                        $session['visibility'] =  api_ucfirst(get_lang('Invisible'));
+                        $session['visibility'] = api_ucfirst(get_lang('Invisible'));
                         break;
                 }
 
@@ -7408,7 +7408,7 @@ 
         if (empty($session)) {
             return false;
         }
-        return api_get_path(WEB_CODE_PATH) . 'session/resume_session.php?id_session=' . $id;
+        return api_get_path(WEB_CODE_PATH).'session/resume_session.php?id_session='.$id;
     }
 
     /**
@@ -7426,7 +7426,7 @@ 
             return false;
         }
         if (empty($courseId)) {
-            return api_get_path(WEB_CODE_PATH) . 'session/index.php?session_id=' . $id;
+            return api_get_path(WEB_CODE_PATH).'session/index.php?session_id='.$id;
         } else {
             $courseInfo = api_get_course_info_by_id($courseId);
             if ($courseInfo) {
@@ -7672,7 +7672,7 @@ 
             // sort $listCat by catSessionName
             usort($listCat, 'self::compareBySessionName');
             // in each catSession sort sessionList by sessionName
-            foreach($listCat as $i => $listCatSessionInfo) {
+            foreach ($listCat as $i => $listCatSessionInfo) {
                 $listSessionList = $listCatSessionInfo['sessionList'];
                 usort($listSessionList, 'self::compareCatSessionInfo');
                 $listCat[$i]['sessionList'] = $listSessionList;
@@ -7687,8 +7687,8 @@ 
             );
 
             $userCatId = intval($userCatId);
-            $listResults[$userCatId]['courseInUserCategoryId'] =  $userCatId;
-            $listResults[$userCatId]['courseInUserCategoryTitle'] =  $userCatTitle;
+            $listResults[$userCatId]['courseInUserCategoryId'] = $userCatId;
+            $listResults[$userCatId]['courseInUserCategoryTitle'] = $userCatTitle;
             $listResults[$userCatId]['courseInUserCatList'][] = $listOneCourse;
         }
 
@@ -7714,7 +7714,7 @@ 
     {
         if ($listA['sessionName'] == $listB['sessionName']) {
             return 0;
-        } else if($listA['sessionName'] > $listB['sessionName']) {
+        } else if ($listA['sessionName'] > $listB['sessionName']) {
             return 1;
         } else {
             return -1;
@@ -7734,7 +7734,7 @@ 
             return 1;
         } else if ($listA['catSessionName'] == $listB['catSessionName']) {
             return 0;
-        } else if($listA['catSessionName'] > $listB['catSessionName']) {
+        } else if ($listA['catSessionName'] > $listB['catSessionName']) {
             return 1;
         } else {
             return -1;
@@ -7750,7 +7750,7 @@ 
     {
         if ($listA['courseInUserCategoryTitle'] == $listB['courseInUserCategoryTitle']) {
             return 0;
-        } else if($listA['courseInUserCategoryTitle'] > $listB['courseInUserCategoryTitle']) {
+        } else if ($listA['courseInUserCategoryTitle'] > $listB['courseInUserCategoryTitle']) {
             return 1;
         } else {
             return -1;
@@ -7766,7 +7766,7 @@ 
     {
         if ($listA['title'] == $listB['title']) {
             return 0;
-        } else if($listA['title'] > $listB['title']) {
+        } else if ($listA['title'] > $listB['title']) {
             return 1;
         } else {
             return -1;
@@ -7812,8 +7812,8 @@ 
 
                 $marginShift = 20;
                 if ($catSessionName != '') {
-                    $htmlCatSessions .= '<div style="margin-left:'.$marginShift.'px;">' .
-                        CourseManager::course_item_html($listParamsCatSession, true) . '</div>';
+                    $htmlCatSessions .= '<div style="margin-left:'.$marginShift.'px;">'.
+                        CourseManager::course_item_html($listParamsCatSession, true).'</div>';
                     $marginShift = 40;
                 }
 

main/inc/lib/attendance.lib.php

Spacing +63 added lines, -63 removed lines

@@ -73,7 +73,7 @@ 
             $course_id = intval($course_id);
         }
 
-        $session_id = isset($session_id)?intval($session_id):api_get_session_id();
+        $session_id = isset($session_id) ? intval($session_id) : api_get_session_id();
         $condition_session = api_get_session_condition($session_id);
 
         // Get attendance data
@@ -82,7 +82,7 @@ 
                 WHERE c_id = $course_id AND active = 1 $condition_session ";
         $rs  = Database::query($sql);
         if (Database::num_rows($rs) > 0) {
-            while ($row = Database::fetch_array($rs,'ASSOC')) {
+            while ($row = Database::fetch_array($rs, 'ASSOC')) {
                 $data[$row['id']] = $row;
             }
         }
@@ -108,7 +108,7 @@ 
 		$from = intval($from);
 		$number_of_items = intval($number_of_items);
 
-		if (!in_array($direction, array('ASC','DESC'))) {
+		if (!in_array($direction, array('ASC', 'DESC'))) {
 			$direction = 'ASC';
 		}
 
@@ -135,7 +135,7 @@ 
 				LIMIT $from,$number_of_items ";
 
 		$res = Database::query($sql);
-		$attendances = array ();
+		$attendances = array();
 		$user_info = api_get_user_info();
 		$allowDelete = api_get_setting('allow_delete_attendance');
 
@@ -194,8 +194,8 @@ 
 						$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>';
+						$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]);
@@ -215,8 +215,8 @@ 
 							$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>';
+							$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>';
 						}
 					}
 				}
@@ -225,7 +225,7 @@ 
 				$is_done_all_calendar = self::is_all_attendance_calendar_done($attendance[0]);
 
 				if ($is_done_all_calendar) {
-					$locked   = $attendance[4];
+					$locked = $attendance[4];
 					if ($locked == 0) {
 						if (api_is_platform_admin()) {
 							$message_alert = get_lang('AreYouSureToLockTheAttendance');
@@ -245,7 +245,7 @@ 
 				}
 				$actions .= '</center>';
 
-				$attendances[] = array($attendance[0], $attendance[1], $attendance[2], $attendance[3],$actions);
+				$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]);
@@ -285,13 +285,13 @@ 
 	public function attendance_add($link_to_gradebook = false)
 	{
 		$_course = api_get_course_info();
-		$tbl_attendance	= Database :: get_course_table(TABLE_ATTENDANCE);
+		$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;
+		$title_gradebook = $this->attendance_qualify_title;
 		$value_calification = 0;
 		$weight_calification = floatval($this->attendance_weight);
 
@@ -434,12 +434,12 @@ 
 	public function attendance_restore($attendance_id)
 	{
 		$_course = api_get_course_info();
-		$tbl_attendance	= Database :: get_course_table(TABLE_ATTENDANCE);
+		$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);
+				$id = intval($id);
 				$sql = "UPDATE $tbl_attendance SET active = 1
 						WHERE c_id = $course_id AND id = '$id'";
 				$result = Database::query($sql);
@@ -455,8 +455,8 @@ 
                     );
 				}
 			}
-		} else  {
-			$attendance_id	= intval($attendance_id);
+		} 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);
@@ -484,13 +484,13 @@ 
 	public function attendance_delete($attendance_id)
 	{
 		$_course = api_get_course_info();
-		$tbl_attendance	= Database :: get_course_table(TABLE_ATTENDANCE);
+		$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);
+				$id = intval($id);
 				$sql = "UPDATE $tbl_attendance SET active = 2
 						WHERE c_id = $course_id AND id = '$id'";
 				$result = Database::query($sql);
@@ -506,8 +506,8 @@ 
                     );
 				}
 			}
-		} else  {
-			$attendance_id= intval($attendance_id);
+		} else {
+			$attendance_id = intval($attendance_id);
 			$sql = "UPDATE $tbl_attendance SET active = 2
 					WHERE c_id = $course_id AND id = '$attendance_id'";
 
@@ -538,7 +538,7 @@ 
 	public function changeVisibility($attendanceId, $status = 1)
 	{
 		$_course = api_get_course_info();
-		$tbl_attendance	= Database :: get_course_table(TABLE_ATTENDANCE);
+		$tbl_attendance = Database :: get_course_table(TABLE_ATTENDANCE);
 		$user_id = api_get_user_id();
 		$course_id = $_course['real_id'];
 		$status = intval($status);
@@ -550,7 +550,7 @@ 
 
 		if (is_array($attendanceId)) {
 			foreach ($attendanceId as $id) {
-				$id	= intval($id);
+				$id = intval($id);
 				$sql = "UPDATE $tbl_attendance SET active = $status
 						WHERE c_id = $course_id AND id = '$id'";
 				$result = Database::query($sql);
@@ -560,8 +560,8 @@ 
 					api_item_property_update($_course, TOOL_ATTENDANCE, $id, $action, $user_id);
 				}
 			}
-		} else  {
-			$attendanceId	= intval($attendanceId);
+		} else {
+			$attendanceId = intval($attendanceId);
 			$sql = "UPDATE $tbl_attendance SET active = $status
 					WHERE c_id = $course_id AND id = '$attendanceId'";
 			$result = Database::query($sql);
@@ -591,7 +591,7 @@ 
 		$tbl_attendance = Database::get_course_table(TABLE_ATTENDANCE);
 		$course_id = api_get_course_int_id();
 		$attendance_id = intval($attendance_id);
-		$locked = ($lock)?1:0;
+		$locked = ($lock) ? 1 : 0;
 		$upd = "UPDATE $tbl_attendance SET locked = $locked
 				WHERE c_id = $course_id AND id = $attendance_id";
 		$result = Database::query($upd);
@@ -720,8 +720,8 @@ 
 	 */
 	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);
+		$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);
@@ -729,7 +729,7 @@ 
 		$course_id = api_get_course_int_id();
 
 		$user_ids = array_keys($users);
-		$users_absent = array_diff($user_ids,$users_present);
+		$users_absent = array_diff($user_ids, $users_present);
 		$affected_rows = 0;
 
 		// get last edit type
@@ -993,13 +993,13 @@ 
 	public function get_faults_of_user($user_id, $attendance_id, $groupId = null)
 	{
 		// initializing database table and variables
-		$user_id 		= intval($user_id);
+		$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);
+        $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);
 
 		//This is the main change of the BT#1381
 		//$total_done_attendance = $calendar_count;
@@ -1012,7 +1012,7 @@ 
         }
 
         $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;
@@ -1046,13 +1046,13 @@ 
 			//$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);
+			$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'];
+				$total_done_attendance = $attendance['attendance_qualify_max'];
 				$sql = "SELECT score
 						FROM $tbl_attendance_result
                         WHERE
@@ -1065,16 +1065,16 @@ 
 					$row = Database::fetch_array($rs);
 					$score = $row['score'];
 				}
-				$faults = $total_done_attendance-$score;
-				$faults = $faults > 0 ? $faults:0;
+				$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;
+		$porcent = $total_weight > 0 ? round(($total_faults * 100) / $total_weight, 0) : 0;
 		$results['faults'] 	= $total_faults;
-		$results['total']	= $total_weight;
+		$results['total'] = $total_weight;
 		$results['porcent'] = $porcent;
 
 		return $results;
@@ -1092,7 +1092,7 @@ 
 	{
 		// Database tables and variables
 		$course_info = api_get_course_info($course_code);
-		$tbl_attendance_result 	= Database::get_course_table(TABLE_ATTENDANCE_RESULT);
+		$tbl_attendance_result = Database::get_course_table(TABLE_ATTENDANCE_RESULT);
 		$user_id = intval($user_id);
 		$results = array();
 		$total_faults = $total_weight = $porcent = 0;
@@ -1100,7 +1100,7 @@ 
 
 		foreach ($attendances_by_course as $attendance) {
 			// Get total faults and total weight
-			$total_done_attendance 	= $attendance['attendance_qualify_max'];
+			$total_done_attendance = $attendance['attendance_qualify_max'];
 			$sql = "SELECT score FROM $tbl_attendance_result
 					WHERE
 						c_id = {$course_info['real_id']} AND
@@ -1112,15 +1112,15 @@ 
 				$row = Database::fetch_array($rs);
 				$score = $row['score'];
 			}
-			$faults = $total_done_attendance-$score;
-			$faults = $faults > 0 ? $faults:0;
+			$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;
+		$porcent = $total_weight > 0 ? round(($total_faults * 100) / $total_weight, 0) : 0;
 		$results['faults'] 	= $total_faults;
-		$results['total']	= $total_weight;
+		$results['total'] = $total_weight;
 		$results['porcent'] = $porcent;
 
 		return $results;
@@ -1134,8 +1134,8 @@ 
 	 */
 	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);
+		$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();
@@ -1157,7 +1157,7 @@ 
 					        WHERE
 					        	c_id = $course_id AND
 					        	user_id = '$uid' AND
-					        	attendance_calendar_id IN(".implode(',',$calendar_ids).")
+					        	attendance_calendar_id IN(".implode(',', $calendar_ids).")
 							";
 					$res = Database::query($sql);
 					if (Database::num_rows($res) > 0) {
@@ -1179,7 +1179,7 @@ 
 							att.c_id = $course_id AND
 							cal.c_id =  $course_id AND
 							att.user_id = '$user_id' AND
-							att.attendance_calendar_id IN (".implode(',',$calendar_ids).")
+							att.attendance_calendar_id IN (".implode(',', $calendar_ids).")
                         ORDER BY date_time";
 				$res = Database::query($sql);
 				if (Database::num_rows($res) > 0) {
@@ -1255,7 +1255,7 @@ 
 	 */
 	public function get_user_score($user_id, $attendance_id, $groupId = null)
 	{
-		$tbl_attendance_result 	= Database::get_course_table(TABLE_ATTENDANCE_RESULT);
+		$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);
@@ -1369,7 +1369,7 @@ 
                    ";
 		}
 
-		if (!in_array($type, array('today', 'all', 'all_done', 'all_not_done','calendar_id'))) {
+		if (!in_array($type, array('today', 'all', 'all_done', 'all_not_done', 'calendar_id'))) {
 			$type = 'all';
 		}
 
@@ -1377,7 +1377,7 @@ 
 			case 'calendar_id':
 				$calendar_id = intval($calendar_id);
 				if (!empty($calendar_id)) {
-					$sql.= " AND c.id = $calendar_id";
+					$sql .= " AND c.id = $calendar_id";
 				}
 				break;
 			case 'today':
@@ -1398,7 +1398,7 @@ 
 		$rs = Database::query($sql);
 		$data = array();
 		if (Database::num_rows($rs) > 0) {
-			while ($row = Database::fetch_array($rs,'ASSOC')) {
+			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);
@@ -1762,14 +1762,14 @@ 
 	 * @param   int     The number of years to add
 	 * @return  int     The new timestamp
 	 */
-	private function add_month($timestamp, $num=1)
+	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;
+		$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;
 		}
@@ -1827,7 +1827,7 @@ 
 	 * @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)
+	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);
@@ -1963,7 +1963,7 @@ 
 		}
 
 		$sessionId = api_get_session_id();
-		$courseCode  = api_get_course_id();
+		$courseCode = api_get_course_id();
 		if (!empty($sessionId)) {
 			$users = CourseManager:: get_user_list_from_course_code(
 				$courseCode,
@@ -1984,7 +1984,7 @@ 
 
 		$dateTimeStartOriginal = new DateTime($startDate);
 		$dateTimeStart = new DateTime($startDate);
-		$dateTimeEnd= new DateTime($endDate);
+		$dateTimeEnd = new DateTime($endDate);
 		$interval = $dateTimeStart->diff($dateTimeEnd);
 		$days = intval($interval->format('%a'));
 
@@ -2057,7 +2057,7 @@ 
 				0,
 				$user['lastname'].' '.$user['firstname'].' ('.$user['username'].')'
 			);
-			$row ++;
+			$row++;
 		}
 
 		$column = 1;
@@ -2134,7 +2134,7 @@ 
 		$tableToString = $table->toHtml();
 
 		$params = array(
-			'filename' => get_lang('Attendance') . '_' . api_get_utc_datetime(),
+			'filename' => get_lang('Attendance').'_'.api_get_utc_datetime(),
 			'pdf_title' => get_lang('Attendance'),
 			'course_code' => api_get_course_id(),
 			'show_real_course_teachers' => true

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/magpierss/rss_fetch.inc

Spacing +77 added lines, -77 removed lines

@@ -26,15 +26,15 @@ 
 }
 
 if (!defined('MAGPIE_DIR')) {
-    define('MAGPIE_DIR', dirname(__FILE__) . DIR_SEP);
+    define('MAGPIE_DIR', dirname(__FILE__).DIR_SEP);
 }
 
-require_once( MAGPIE_DIR . 'rss_parse.inc' );
-require_once( MAGPIE_DIR . 'rss_cache.inc' );
+require_once(MAGPIE_DIR.'rss_parse.inc');
+require_once(MAGPIE_DIR.'rss_cache.inc');
 
 // for including 3rd party libraries
-define('MAGPIE_EXTLIB', MAGPIE_DIR . 'extlib' . DIR_SEP);
-require_once( MAGPIE_EXTLIB . 'Snoopy.class.inc');
+define('MAGPIE_EXTLIB', MAGPIE_DIR.'extlib'.DIR_SEP);
+require_once(MAGPIE_EXTLIB.'Snoopy.class.inc');
 define('MAGPIE_CACHE_DIR', api_get_path(SYS_ARCHIVE_PATH));
 
 /* 
@@ -87,21 +87,21 @@ 
 
 $MAGPIE_ERROR = "";
 
-function fetch_rss ($url) {
+function fetch_rss($url) {
     // initialize constants
     init();
     
-    if ( !isset($url) ) {
+    if (!isset($url)) {
         error("fetch_rss called without a url");
         return false;
     }
     
     // if cache is disabled
-    if ( !MAGPIE_CACHE_ON ) {
+    if (!MAGPIE_CACHE_ON) {
         // fetch file, and parse it
-        $resp = _fetch_remote_file( $url );
-        if ( is_success( $resp->status ) ) {
-            return _response_to_rss( $resp );
+        $resp = _fetch_remote_file($url);
+        if (is_success($resp->status)) {
+            return _response_to_rss($resp);
         }
         else {
             error("Failed to fetch $url and cache is off");
@@ -116,34 +116,34 @@ 
         // 3. if cached obj fails freshness check, fetch remote
         // 4. if remote fails, return stale object, or error
         
-        $cache = new RSSCache( MAGPIE_CACHE_DIR, MAGPIE_CACHE_AGE );
+        $cache = new RSSCache(MAGPIE_CACHE_DIR, MAGPIE_CACHE_AGE);
         
         if (MAGPIE_DEBUG and $cache->ERROR) {
             debug($cache->ERROR, E_USER_WARNING);
         }
         
         
-        $cache_status    = 0;       // response of check_cache
+        $cache_status    = 0; // response of check_cache
         $request_headers = array(); // HTTP headers to send with fetch
-        $rss             = 0;       // parsed RSS object
-        $errormsg        = 0;       // errors, if any
+        $rss             = 0; // parsed RSS object
+        $errormsg        = 0; // errors, if any
         
         // store parsed XML by desired output encoding
         // as character munging happens at parse time
-        $cache_key       = $url . MAGPIE_OUTPUT_ENCODING;
+        $cache_key = $url.MAGPIE_OUTPUT_ENCODING;
         
         if (!$cache->ERROR) {
             // return cache HIT, MISS, or STALE
-            $cache_status = $cache->check_cache( $cache_key);
+            $cache_status = $cache->check_cache($cache_key);
         }
                 
         // if object cached, and cache is fresh, return cached obj
-        if ( $cache_status == 'HIT' ) {
-            $rss = $cache->get( $cache_key );
-            if ( isset($rss) and $rss ) {
+        if ($cache_status == 'HIT') {
+            $rss = $cache->get($cache_key);
+            if (isset($rss) and $rss) {
                 // should be cache age
                 $rss->from_cache = 1;
-                if ( MAGPIE_DEBUG > 1) {
+                if (MAGPIE_DEBUG > 1) {
                     debug("MagpieRSS: Cache HIT", E_USER_NOTICE);
                 }
                 return $rss;
@@ -153,50 +153,50 @@ 
         // else attempt a conditional get
         
         // setup headers
-        if ( $cache_status == 'STALE' ) {
-            $rss = $cache->get( $cache_key );
-            if ( $rss and $rss->etag and $rss->last_modified ) {
+        if ($cache_status == 'STALE') {
+            $rss = $cache->get($cache_key);
+            if ($rss and $rss->etag and $rss->last_modified) {
                 $request_headers['If-None-Match'] = $rss->etag;
                 $request_headers['If-Last-Modified'] = $rss->last_modified;
             }
         }
         
-        $resp = _fetch_remote_file( $url, $request_headers );
+        $resp = _fetch_remote_file($url, $request_headers);
         
         if (isset($resp) and $resp) {
-          if ($resp->status == '304' ) {
+          if ($resp->status == '304') {
                 // we have the most current copy
-                if ( MAGPIE_DEBUG > 1) {
+                if (MAGPIE_DEBUG > 1) {
                     debug("Got 304 for $url");
                 }
                 // reset cache on 304 (at minutillo insistent prodding)
                 $cache->set($cache_key, $rss);
                 return $rss;
             }
-            elseif ( is_success( $resp->status ) ) {
-                $rss = _response_to_rss( $resp );
-                if ( $rss ) {
+            elseif (is_success($resp->status)) {
+                $rss = _response_to_rss($resp);
+                if ($rss) {
                     if (MAGPIE_DEBUG > 1) {
                         debug("Fetch successful");
                     }
                     // add object to cache
-                    $cache->set( $cache_key, $rss );
+                    $cache->set($cache_key, $rss);
                     return $rss;
                 }
             }
             else {
                 $errormsg = "Failed to fetch $url ";
-                if ( $resp->status == '-100' ) {
-                    $errormsg .= "(Request timed out after " . MAGPIE_FETCH_TIME_OUT . " seconds)";
+                if ($resp->status == '-100') {
+                    $errormsg .= "(Request timed out after ".MAGPIE_FETCH_TIME_OUT." seconds)";
                 }
-                elseif ( $resp->error ) {
+                elseif ($resp->error) {
                     # compensate for Snoopy's annoying habbit to tacking
                     # on '\n'
                     $http_error = substr($resp->error, 0, -2); 
                     $errormsg .= "(HTTP Error: $http_error)";
                 }
                 else {
-                    $errormsg .=  "(HTTP Response: " . $resp->response_code .')';
+                    $errormsg .= "(HTTP Response: ".$resp->response_code.')';
                 }
             }
         }
@@ -208,7 +208,7 @@ 
         
         // attempt to return cached object
         if ($rss) {
-            if ( MAGPIE_DEBUG ) {
+            if (MAGPIE_DEBUG) {
                 debug("Returning STALE object for $url");
             }
             return $rss;
@@ -228,21 +228,21 @@ 
     Purpose:    set MAGPIE_ERROR, and trigger error
 \*=======================================================================*/
 
-function error ($errormsg, $lvl=E_USER_WARNING) {
+function error($errormsg, $lvl = E_USER_WARNING) {
         global $MAGPIE_ERROR;
         
         // append PHP's error message if track_errors enabled
-        if ( isset($php_errormsg) ) { 
+        if (isset($php_errormsg)) { 
             $errormsg .= " ($php_errormsg)";
         }
-        if ( $errormsg ) {
+        if ($errormsg) {
             $errormsg = "MagpieRSS: $errormsg";
             $MAGPIE_ERROR = $errormsg;
-            trigger_error( $errormsg, $lvl);                
+            trigger_error($errormsg, $lvl);                
         }
 }
 
-function debug ($debugmsg, $lvl=E_USER_NOTICE) {
+function debug($debugmsg, $lvl = E_USER_NOTICE) {
     trigger_error("MagpieRSS [debug] $debugmsg", $lvl);
 }
             
@@ -250,10 +250,10 @@ 
     Function:   magpie_error
     Purpose:    accessor for the magpie error variable
 \*=======================================================================*/
-function magpie_error ($errormsg="") {
+function magpie_error($errormsg = "") {
     global $MAGPIE_ERROR;
     
-    if ( isset($errormsg) and $errormsg ) { 
+    if (isset($errormsg) and $errormsg) { 
         $MAGPIE_ERROR = $errormsg;
     }
     
@@ -267,13 +267,13 @@ 
                 headers to send along with the request (optional)
     Output:     an HTTP response object (see Snoopy.class.inc)  
 \*=======================================================================*/
-function _fetch_remote_file ($url, $headers = "" ) {
+function _fetch_remote_file($url, $headers = "") {
     // Snoopy is an HTTP client in PHP
     $client = new Snoopy();
     $client->agent = MAGPIE_USER_AGENT;
     $client->read_timeout = MAGPIE_FETCH_TIME_OUT;
     $client->use_gzip = MAGPIE_USE_GZIP;
-    if (is_array($headers) ) {
+    if (is_array($headers)) {
         $client->rawheaders = $headers;
     }
     
@@ -288,14 +288,14 @@ 
     Input:      an HTTP response object (see Snoopy)
     Output:     parsed RSS object (see rss_parse)
 \*=======================================================================*/
-function _response_to_rss ($resp) {
-    $rss = new MagpieRSS( $resp->results, MAGPIE_OUTPUT_ENCODING, MAGPIE_INPUT_ENCODING, MAGPIE_DETECT_ENCODING );
+function _response_to_rss($resp) {
+    $rss = new MagpieRSS($resp->results, MAGPIE_OUTPUT_ENCODING, MAGPIE_INPUT_ENCODING, MAGPIE_DETECT_ENCODING);
     
     // if RSS parsed successfully       
-    if ( $rss and !$rss->ERROR) {
+    if ($rss and !$rss->ERROR) {
         
         // find Etag, and Last-Modified
-        foreach($resp->headers as $h) {
+        foreach ($resp->headers as $h) {
             // 2003-03-02 - Nicola Asuni (www.tecnick.com) - fixed bug "Undefined offset: 1"
             if (strpos($h, ": ")) {
                 list($field, $val) = explode(": ", $h, 2);
@@ -305,11 +305,11 @@ 
                 $val = "";
             }
             
-            if ( $field == 'ETag' ) {
+            if ($field == 'ETag') {
                 $rss->etag = $val;
             }
             
-            if ( $field == 'Last-Modified' ) {
+            if ($field == 'Last-Modified') {
                 $rss->last_modified = $val;
             }
         }
@@ -320,9 +320,9 @@ 
         $errormsg = "Failed to parse RSS file.";
         
         if ($rss) {
-            $errormsg .= " (" . $rss->ERROR . ")";
+            $errormsg .= " (".$rss->ERROR.")";
         }
-        error($errormsg,E_USER_NOTICE);
+        error($errormsg, E_USER_NOTICE);
         
         return false;
     } // end if ($rss and !$rss->error)
@@ -333,65 +333,65 @@ 
     Purpose:    setup constants with default values
                 check for user overrides
 \*=======================================================================*/
-function init () {
-    if ( defined('MAGPIE_INITALIZED') ) {
+function init() {
+    if (defined('MAGPIE_INITALIZED')) {
         return;
     }
     else {
         define('MAGPIE_INITALIZED', true);
     }
     
-    if ( !defined('MAGPIE_CACHE_ON') ) {
+    if (!defined('MAGPIE_CACHE_ON')) {
         define('MAGPIE_CACHE_ON', true);
     }
 
-    if ( !defined('MAGPIE_CACHE_DIR') ) {
+    if (!defined('MAGPIE_CACHE_DIR')) {
         define('MAGPIE_CACHE_DIR', './cache');
     }
 
-    if ( !defined('MAGPIE_CACHE_AGE') ) {
-        define('MAGPIE_CACHE_AGE', 60*60); // one hour
+    if (!defined('MAGPIE_CACHE_AGE')) {
+        define('MAGPIE_CACHE_AGE', 60 * 60); // one hour
     }
 
-    if ( !defined('MAGPIE_CACHE_FRESH_ONLY') ) {
+    if (!defined('MAGPIE_CACHE_FRESH_ONLY')) {
         define('MAGPIE_CACHE_FRESH_ONLY', false);
     }
 
-    if ( !defined('MAGPIE_OUTPUT_ENCODING') ) {
+    if (!defined('MAGPIE_OUTPUT_ENCODING')) {
         define('MAGPIE_OUTPUT_ENCODING', 'UTF-8');
     }
     
-    if ( !defined('MAGPIE_INPUT_ENCODING') ) {
+    if (!defined('MAGPIE_INPUT_ENCODING')) {
         define('MAGPIE_INPUT_ENCODING', null);
     }
     
-    if ( !defined('MAGPIE_DETECT_ENCODING') ) {
+    if (!defined('MAGPIE_DETECT_ENCODING')) {
         define('MAGPIE_DETECT_ENCODING', true);
     }
     
-    if ( !defined('MAGPIE_DEBUG') ) {
+    if (!defined('MAGPIE_DEBUG')) {
         define('MAGPIE_DEBUG', 0);
     }
     
-    if ( !defined('MAGPIE_USER_AGENT') ) {
-        $ua = 'MagpieRSS/'. MAGPIE_VERSION . ' (+http://magpierss.sf.net';
+    if (!defined('MAGPIE_USER_AGENT')) {
+        $ua = 'MagpieRSS/'.MAGPIE_VERSION.' (+http://magpierss.sf.net';
         
-        if ( MAGPIE_CACHE_ON ) {
-            $ua = $ua . ')';
+        if (MAGPIE_CACHE_ON) {
+            $ua = $ua.')';
         }
         else {
-            $ua = $ua . '; No cache)';
+            $ua = $ua.'; No cache)';
         }
         
         define('MAGPIE_USER_AGENT', $ua);
     }
     
-    if ( !defined('MAGPIE_FETCH_TIME_OUT') ) {
+    if (!defined('MAGPIE_FETCH_TIME_OUT')) {
         define('MAGPIE_FETCH_TIME_OUT', 5); // 5 second timeout
     }
     
     // use gzip encoding to fetch rss files if supported?
-    if ( !defined('MAGPIE_USE_GZIP') ) {
+    if (!defined('MAGPIE_USE_GZIP')) {
         define('MAGPIE_USE_GZIP', true);    
     }
 }
@@ -414,7 +414,7 @@ 
     Function:   is_info
     Purpose:    return true if Informational status code
 \*=======================================================================*/
-function is_info ($sc) { 
+function is_info($sc) { 
     return $sc >= 100 && $sc < 200; 
 }
 
@@ -422,7 +422,7 @@ 
     Function:   is_success
     Purpose:    return true if Successful status code
 \*=======================================================================*/
-function is_success ($sc) { 
+function is_success($sc) { 
     return $sc >= 200 && $sc < 300; 
 }
 
@@ -430,7 +430,7 @@ 
     Function:   is_redirect
     Purpose:    return true if Redirection status code
 \*=======================================================================*/
-function is_redirect ($sc) { 
+function is_redirect($sc) { 
     return $sc >= 300 && $sc < 400; 
 }
 
@@ -438,7 +438,7 @@ 
     Function:   is_error
     Purpose:    return true if Error status code
 \*=======================================================================*/
-function is_error ($sc) { 
+function is_error($sc) { 
     return $sc >= 400 && $sc < 600; 
 }
 
@@ -446,7 +446,7 @@ 
     Function:   is_client_error
     Purpose:    return true if Error status code, and its a client error
 \*=======================================================================*/
-function is_client_error ($sc) { 
+function is_client_error($sc) { 
     return $sc >= 400 && $sc < 500; 
 }
 
@@ -454,6 +454,6 @@ 
     Function:   is_client_error
     Purpose:    return true if Error status code, and its a server error
 \*=======================================================================*/
-function is_server_error ($sc) { 
+function is_server_error($sc) { 
     return $sc >= 500 && $sc < 600; 
 }

Braces +9 added lines, -18 removed lines

@@ -102,8 +102,7 @@ 
         $resp = _fetch_remote_file( $url );
         if ( is_success( $resp->status ) ) {
             return _response_to_rss( $resp );
-        }
-        else {
+        } else {
             error("Failed to fetch $url and cache is off");
             return false;
         }
@@ -172,8 +171,7 @@ 
                 // reset cache on 304 (at minutillo insistent prodding)
                 $cache->set($cache_key, $rss);
                 return $rss;
-            }
-            elseif ( is_success( $resp->status ) ) {
+            } elseif ( is_success( $resp->status ) ) {
                 $rss = _response_to_rss( $resp );
                 if ( $rss ) {
                     if (MAGPIE_DEBUG > 1) {
@@ -183,24 +181,20 @@ 
                     $cache->set( $cache_key, $rss );
                     return $rss;
                 }
-            }
-            else {
+            } else {
                 $errormsg = "Failed to fetch $url ";
                 if ( $resp->status == '-100' ) {
                     $errormsg .= "(Request timed out after " . MAGPIE_FETCH_TIME_OUT . " seconds)";
-                }
-                elseif ( $resp->error ) {
+                } elseif ( $resp->error ) {
                     # compensate for Snoopy's annoying habbit to tacking
                     # on '\n'
                     $http_error = substr($resp->error, 0, -2); 
                     $errormsg .= "(HTTP Error: $http_error)";
-                }
-                else {
+                } else {
                     $errormsg .=  "(HTTP Response: " . $resp->response_code .')';
                 }
             }
-        }
-        else {
+        } else {
             $errormsg = "Unable to retrieve RSS file for unknown reasons.";
         }
         
@@ -299,8 +293,7 @@ 
             // 2003-03-02 - Nicola Asuni (www.tecnick.com) - fixed bug "Undefined offset: 1"
             if (strpos($h, ": ")) {
                 list($field, $val) = explode(": ", $h, 2);
-            }
-            else {
+            } else {
                 $field = $h;
                 $val = "";
             }
@@ -336,8 +329,7 @@ 
 function init () {
     if ( defined('MAGPIE_INITALIZED') ) {
         return;
-    }
-    else {
+    } else {
         define('MAGPIE_INITALIZED', true);
     }
     
@@ -378,8 +370,7 @@ 
         
         if ( MAGPIE_CACHE_ON ) {
             $ua = $ua . ')';
-        }
-        else {
+        } else {
             $ua = $ua . '; No cache)';
         }
         

Indentation +1 added lines, -1 removed lines

@@ -164,7 +164,7 @@
         $resp = _fetch_remote_file( $url, $request_headers );
         
         if (isset($resp) and $resp) {
-          if ($resp->status == '304' ) {
+            if ($resp->status == '304' ) {
                 // we have the most current copy
                 if ( MAGPIE_DEBUG > 1) {
                     debug("Got 304 for $url");

Doc Comments +9 added lines

@@ -228,6 +228,9 @@ 
     Purpose:    set MAGPIE_ERROR, and trigger error
 \*=======================================================================*/
 
+/**
+ * @param integer $lvl
+ */
 function error ($errormsg, $lvl=E_USER_WARNING) {
         global $MAGPIE_ERROR;
         
@@ -242,6 +245,9 @@ 
         }
 }
 
+/**
+ * @param integer $lvl
+ */
 function debug ($debugmsg, $lvl=E_USER_NOTICE) {
     trigger_error("MagpieRSS [debug] $debugmsg", $lvl);
 }
@@ -288,6 +294,9 @@ 
     Input:      an HTTP response object (see Snoopy)
     Output:     parsed RSS object (see rss_parse)
 \*=======================================================================*/
+/**
+ * @param Snoopy $resp
+ */
 function _response_to_rss ($resp) {
     $rss = new MagpieRSS( $resp->results, MAGPIE_OUTPUT_ENCODING, MAGPIE_INPUT_ENCODING, MAGPIE_DETECT_ENCODING );
     

main/inc/lib/magpierss/rss_cache.inc

Spacing +47 added lines, -47 removed lines

@@ -19,26 +19,26 @@ 
  * @package chamilo.include.rss
  */
 class RSSCache {
-    public $BASE_CACHE = './cache';    // where the cache files are stored
-    public $MAX_AGE    = 3600;         // when are files stale, default one hour
-    public $ERROR      = "";           // accumulate error messages
+    public $BASE_CACHE = './cache'; // where the cache files are stored
+    public $MAX_AGE    = 3600; // when are files stale, default one hour
+    public $ERROR      = ""; // accumulate error messages
     
-    public function RSSCache ($base='', $age='') {
-        if ( $base ) {
+    public function RSSCache($base = '', $age = '') {
+        if ($base) {
             $this->BASE_CACHE = $base;
         }
-        if ( $age ) {
+        if ($age) {
             $this->MAX_AGE = $age;
         }
         
         // attempt to make the cache directory
-        if ( ! file_exists( $this->BASE_CACHE ) ) {
-            $status = @mkdir( $this->BASE_CACHE, 0755 );
+        if (!file_exists($this->BASE_CACHE)) {
+            $status = @mkdir($this->BASE_CACHE, 0755);
             
             // if make failed 
-            if ( ! $status ) {
+            if (!$status) {
                 $this->error(
-                    "Cache couldn't make dir '" . $this->BASE_CACHE . "'."
+                    "Cache couldn't make dir '".$this->BASE_CACHE."'."
                 );
             }
         }
@@ -50,12 +50,12 @@ 
     Input:      url from wich the rss file was fetched
     Output:     true on sucess  
 \*=======================================================================*/
-    public function set ($url, $rss) {
+    public function set($url, $rss) {
         $this->ERROR = "";
-        $cache_file = $this->file_name( $url );
-        $fp = @fopen( $cache_file, 'w' );
+        $cache_file = $this->file_name($url);
+        $fp = @fopen($cache_file, 'w');
         
-        if ( ! $fp ) {
+        if (!$fp) {
             $this->error(
                 "Cache unable to open file for writing: $cache_file"
             );
@@ -63,9 +63,9 @@ 
         }
         
         
-        $data = $this->serialize( $rss );
-        fwrite( $fp, $data );
-        fclose( $fp );
+        $data = $this->serialize($rss);
+        fwrite($fp, $data);
+        fclose($fp);
         
         return $cache_file;
     }
@@ -76,11 +76,11 @@ 
     Input:      url from wich the rss file was fetched
     Output:     cached object on HIT, false on MISS 
 \*=======================================================================*/ 
-    public function get ($url) {
+    public function get($url) {
         $this->ERROR = "";
-        $cache_file = $this->file_name( $url );
+        $cache_file = $this->file_name($url);
         
-        if ( ! file_exists( $cache_file ) ) {
+        if (!file_exists($cache_file)) {
             $this->debug( 
                 "Cache doesn't contain: $url (cache file: $cache_file)"
             );
@@ -88,16 +88,16 @@ 
         }
         
         $fp = @fopen($cache_file, 'r');
-        if ( ! $fp ) {
+        if (!$fp) {
             $this->error(
                 "Failed to open cache file for reading: $cache_file"
             );
             return 0;
         }
         
-        if ($filesize = filesize($cache_file) ) {
-        	$data = fread( $fp, filesize($cache_file) );
-        	$rss = $this->unserialize( $data );
+        if ($filesize = filesize($cache_file)) {
+        	$data = fread($fp, filesize($cache_file));
+        	$rss = $this->unserialize($data);
         
         	return $rss;
     	}
@@ -112,16 +112,16 @@ 
     Input:      url from wich the rss file was fetched
     Output:     cached object on HIT, false on MISS 
 \*=======================================================================*/     
-    public function check_cache ( $url ) {
+    public function check_cache($url) {
         $this->ERROR = "";
-        $filename = $this->file_name( $url );
+        $filename = $this->file_name($url);
         
-        if ( file_exists( $filename ) ) {
+        if (file_exists($filename)) {
             // find how long ago the file was added to the cache
             // and whether that is longer then MAX_AGE
-            $mtime = filemtime( $filename );
+            $mtime = filemtime($filename);
             $age = time() - $mtime;
-            if ( $this->MAX_AGE > $age ) {
+            if ($this->MAX_AGE > $age) {
                 // object exists and is current
                 return 'HIT';
             }
@@ -136,10 +136,10 @@ 
         }
     }
 
-	public function cache_age( $url ) {
-		$filename = $this->file_name( $url);
-		if ( file_exists( $filename ) ) {
-			$mtime = filemtime( $filename );
+	public function cache_age($url) {
+		$filename = $this->file_name($url);
+		if (file_exists($filename)) {
+			$mtime = filemtime($filename);
             $age = time() - $mtime;
 			return $age;
 		}
@@ -151,15 +151,15 @@ 
 /*=======================================================================*\
     Function:   serialize
 \*=======================================================================*/     
-    public function serialize ( $rss ) {
-        return serialize( $rss );
+    public function serialize($rss) {
+        return serialize($rss);
     }
 
 /*=======================================================================*\
     Function:   unserialize
 \*=======================================================================*/     
-    public function unserialize ( $data ) {
-        return unserialize( $data );
+    public function unserialize($data) {
+        return unserialize($data);
     }
     
 /*=======================================================================*\
@@ -168,31 +168,31 @@ 
     Input:      url from wich the rss file was fetched
     Output:     a file name
 \*=======================================================================*/     
-    public function file_name ($url) {
-        $filename = md5( $url );
-        return join( DIRECTORY_SEPARATOR, array( $this->BASE_CACHE, $filename ) );
+    public function file_name($url) {
+        $filename = md5($url);
+        return join(DIRECTORY_SEPARATOR, array($this->BASE_CACHE, $filename));
     }
 
 /*=======================================================================*\
     Function:   error
     Purpose:    register error
 \*=======================================================================*/         
-    public function error ($errormsg, $lvl=E_USER_WARNING) {
+    public function error($errormsg, $lvl = E_USER_WARNING) {
         // append PHP's error message if track_errors enabled
-        if ( isset($php_errormsg) ) { 
+        if (isset($php_errormsg)) { 
             $errormsg .= " ($php_errormsg)";
         }
         $this->ERROR = $errormsg;
-        if ( MAGPIE_DEBUG ) {
-            trigger_error( $errormsg, $lvl);
+        if (MAGPIE_DEBUG) {
+            trigger_error($errormsg, $lvl);
         }
         else {
-            error_log( $errormsg, 0);
+            error_log($errormsg, 0);
         }
     }
     
-    public function debug ($debugmsg, $lvl=E_USER_NOTICE) {
-        if ( MAGPIE_DEBUG ) {
+    public function debug($debugmsg, $lvl = E_USER_NOTICE) {
+        if (MAGPIE_DEBUG) {
             $this->error("MagpieRSS [debug] $debugmsg", $lvl);
         }
     }

Braces +4 added lines, -8 removed lines

@@ -124,13 +124,11 @@ 
             if ( $this->MAX_AGE > $age ) {
                 // object exists and is current
                 return 'HIT';
-            }
-            else {
+            } else {
                 // object exists but is old
                 return 'STALE';
             }
-        }
-        else {
+        } else {
             // object does not exist
             return 'MISS';
         }
@@ -142,8 +140,7 @@ 
 			$mtime = filemtime( $filename );
             $age = time() - $mtime;
 			return $age;
-		}
-		else {
+		} else {
 			return -1;	
 		}
 	}
@@ -185,8 +182,7 @@ 
         $this->ERROR = $errormsg;
         if ( MAGPIE_DEBUG ) {
             trigger_error( $errormsg, $lvl);
-        }
-        else {
+        } else {
             error_log( $errormsg, 0);
         }
     }

Indentation +15 added lines, -15 removed lines

@@ -96,13 +96,13 @@ 
         }
         
         if ($filesize = filesize($cache_file) ) {
-        	$data = fread( $fp, filesize($cache_file) );
-        	$rss = $this->unserialize( $data );
+            $data = fread( $fp, filesize($cache_file) );
+            $rss = $this->unserialize( $data );
         
-        	return $rss;
-    	}
+            return $rss;
+        }
     	
-    	return 0;
+        return 0;
     }
 
 /*=======================================================================*\
@@ -136,17 +136,17 @@ 
         }
     }
 
-	public function cache_age( $url ) {
-		$filename = $this->file_name( $url);
-		if ( file_exists( $filename ) ) {
-			$mtime = filemtime( $filename );
+    public function cache_age( $url ) {
+        $filename = $this->file_name( $url);
+        if ( file_exists( $filename ) ) {
+            $mtime = filemtime( $filename );
             $age = time() - $mtime;
-			return $age;
-		}
-		else {
-			return -1;	
-		}
-	}
+            return $age;
+        }
+        else {
+            return -1;	
+        }
+    }
 	
 /*=======================================================================*\
     Function:   serialize

Doc Comments +12 added lines

@@ -50,6 +50,9 @@ 
     Input:      url from wich the rss file was fetched
     Output:     true on sucess  
 \*=======================================================================*/
+    /**
+     * @param string $url
+     */
     public function set ($url, $rss) {
         $this->ERROR = "";
         $cache_file = $this->file_name( $url );
@@ -76,6 +79,9 @@ 
     Input:      url from wich the rss file was fetched
     Output:     cached object on HIT, false on MISS 
 \*=======================================================================*/ 
+    /**
+     * @param string $url
+     */
     public function get ($url) {
         $this->ERROR = "";
         $cache_file = $this->file_name( $url );
@@ -112,6 +118,9 @@ 
     Input:      url from wich the rss file was fetched
     Output:     cached object on HIT, false on MISS 
 \*=======================================================================*/     
+    /**
+     * @param string $url
+     */
     public function check_cache ( $url ) {
         $this->ERROR = "";
         $filename = $this->file_name( $url );
@@ -158,6 +167,9 @@ 
 /*=======================================================================*\
     Function:   unserialize
 \*=======================================================================*/     
+    /**
+     * @param string $data
+     */
     public function unserialize ( $data ) {
         return unserialize( $data );
     }

main/inc/lib/magpierss/rss_utils.inc

Spacing +12 added lines, -12 removed lines

@@ -22,35 +22,35 @@
  *
  * NOTE: http://www.w3.org/TR/NOTE-datetime
  */
-function parse_w3cdtf ( $date_str ) {
+function parse_w3cdtf($date_str) {
     
     # regex to match wc3dtf
     $pat = "/(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2})(:(\d{2}))?(?:([-+])(\d{2}):?(\d{2})|(Z))?/";
     
-    if ( preg_match( $pat, $date_str, $match ) ) {
-        list( $year, $month, $day, $hours, $minutes, $seconds) = 
-            array( $match[1], $match[2], $match[3], $match[4], $match[5], $match[6]);
+    if (preg_match($pat, $date_str, $match)) {
+        list($year, $month, $day, $hours, $minutes, $seconds) = 
+            array($match[1], $match[2], $match[3], $match[4], $match[5], $match[6]);
         
         # calc epoch for current date assuming GMT
-        $epoch = gmmktime( $hours, $minutes, $seconds, $month, $day, $year);
+        $epoch = gmmktime($hours, $minutes, $seconds, $month, $day, $year);
         
         $offset = 0;
-        if ( $match[10] == 'Z' ) {
+        if ($match[10] == 'Z') {
             # zulu time, aka GMT
         }
         else {
-            list( $tz_mod, $tz_hour, $tz_min ) =
-                array( $match[8], $match[9], $match[10]);
+            list($tz_mod, $tz_hour, $tz_min) =
+                array($match[8], $match[9], $match[10]);
             
             # zero out the variables
-            if ( ! $tz_hour ) { $tz_hour = 0; }
-            if ( ! $tz_min ) { $tz_min = 0; }
+            if (!$tz_hour) { $tz_hour = 0; }
+            if (!$tz_min) { $tz_min = 0; }
         
-            $offset_secs = (($tz_hour*60)+$tz_min)*60;
+            $offset_secs = (($tz_hour * 60) + $tz_min) * 60;
             
             # is timezone ahead of GMT?  then subtract offset
             #
-            if ( $tz_mod == '+' ) {
+            if ($tz_mod == '+') {
                 $offset_secs = $offset_secs * -1;
             }
             

Braces +2 added lines, -4 removed lines

@@ -37,8 +37,7 @@ 
         $offset = 0;
         if ( $match[10] == 'Z' ) {
             # zulu time, aka GMT
-        }
-        else {
+        } else {
             list( $tz_mod, $tz_hour, $tz_min ) =
                 array( $match[8], $match[9], $match[10]);
             
@@ -58,8 +57,7 @@ 
         }
         $epoch = $epoch + $offset;
         return $epoch;
-    }
-    else {
+    } else {
         return -1;
     }
 }

main/inc/lib/magpierss/extlib/Snoopy.class.inc

Indentation +666 added lines, -666 removed lines

@@ -36,81 +36,81 @@ 
 *************************************************/
 
 class Snoopy {
-	/**** Public variables ****/
+    /**** Public variables ****/
 	
-	/* user definable vars */
-
-	public $host			=	"www.php.net";		// host name we are connecting to
-	public $port			=	80;					// port we are connecting to
-	public $proxy_host		=	"";					// proxy host to use
-	public $proxy_port		=	"";					// proxy port to use
-	public $agent			=	"Snoopy v1.0";		// agent we masquerade as
-	public $referer		=	"";					// referer info to pass
-	public $cookies		=	array();			// array of cookies to pass
-												// $cookies["username"]="joe";
-	public	$rawheaders		=	array();			// array of raw headers to send
-												// $rawheaders["Content-type"]="text/html";
-
-	public $maxredirs		=	5;					// http redirection depth maximum. 0 = disallow
-	public $lastredirectaddr	=	"";				// contains address of last redirected address
-	public	$offsiteok		=	true;				// allows redirection off-site
-	public $maxframes		=	0;					// frame content depth maximum. 0 = disallow
-	public $expandlinks	=	true;				// expand links to fully qualified URLs.
-												// this only applies to fetchlinks()
-												// or submitlinks()
-	public $passcookies	=	true;				// pass set cookies back through redirects
-												// NOTE: this currently does not respect
-												// dates, domains or paths.
+    /* user definable vars */
+
+    public $host			=	"www.php.net";		// host name we are connecting to
+    public $port			=	80;					// port we are connecting to
+    public $proxy_host		=	"";					// proxy host to use
+    public $proxy_port		=	"";					// proxy port to use
+    public $agent			=	"Snoopy v1.0";		// agent we masquerade as
+    public $referer		=	"";					// referer info to pass
+    public $cookies		=	array();			// array of cookies to pass
+                                                // $cookies["username"]="joe";
+    public	$rawheaders		=	array();			// array of raw headers to send
+                                                // $rawheaders["Content-type"]="text/html";
+
+    public $maxredirs		=	5;					// http redirection depth maximum. 0 = disallow
+    public $lastredirectaddr	=	"";				// contains address of last redirected address
+    public	$offsiteok		=	true;				// allows redirection off-site
+    public $maxframes		=	0;					// frame content depth maximum. 0 = disallow
+    public $expandlinks	=	true;				// expand links to fully qualified URLs.
+                                                // this only applies to fetchlinks()
+                                                // or submitlinks()
+    public $passcookies	=	true;				// pass set cookies back through redirects
+                                                // NOTE: this currently does not respect
+                                                // dates, domains or paths.
 	
-	public	$user			=	"";					// user for http authentication
-	public	$pass			=	"";					// password for http authentication
+    public	$user			=	"";					// user for http authentication
+    public	$pass			=	"";					// password for http authentication
 	
-	// http accept types
-	public $accept			=	"image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*";
+    // http accept types
+    public $accept			=	"image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*";
 	
-	public $results		=	"";					// where the content is put
+    public $results		=	"";					// where the content is put
 		
-	public $error			=	"";					// error messages sent here
-	public	$response_code	=	"";					// response code returned from server
-	public	$headers		=	array();			// headers returned from server sent here
-	public	$maxlength		=	500000;				// max return data length (body)
-	public $read_timeout	=	0;					// timeout on read operations, in seconds
-												// supported only since PHP 4 Beta 4
-												// set to 0 to disallow timeouts
-	public $timed_out		=	false;				// if a read operation timed out
-	public	$status			=	0;					// http request status
+    public $error			=	"";					// error messages sent here
+    public	$response_code	=	"";					// response code returned from server
+    public	$headers		=	array();			// headers returned from server sent here
+    public	$maxlength		=	500000;				// max return data length (body)
+    public $read_timeout	=	0;					// timeout on read operations, in seconds
+                                                // supported only since PHP 4 Beta 4
+                                                // set to 0 to disallow timeouts
+    public $timed_out		=	false;				// if a read operation timed out
+    public	$status			=	0;					// http request status
 	
-	public	$curl_path		=	"/usr/bin/curl";
-												// Snoopy will use cURL for fetching
-												// SSL content if a full system path to
-												// the cURL binary is supplied here.
-												// set to false if you do not have
-												// cURL installed. See http://curl.haxx.se
-												// for details on installing cURL.
-												// Snoopy does *not* use the cURL
-												// library functions built into php,
-												// as these functions are not stable
-												// as of this Snoopy release.
+    public	$curl_path		=	"/usr/bin/curl";
+                                                // Snoopy will use cURL for fetching
+                                                // SSL content if a full system path to
+                                                // the cURL binary is supplied here.
+                                                // set to false if you do not have
+                                                // cURL installed. See http://curl.haxx.se
+                                                // for details on installing cURL.
+                                                // Snoopy does *not* use the cURL
+                                                // library functions built into php,
+                                                // as these functions are not stable
+                                                // as of this Snoopy release.
 	
-	// send Accept-encoding: gzip?
-	public $use_gzip		= true;	
+    // send Accept-encoding: gzip?
+    public $use_gzip		= true;	
 	
-	/**** Private variables ****/	
+    /**** Private variables ****/	
 	
-	private	$_maxlinelen	=	4096;				// max line length (headers)
+    private	$_maxlinelen	=	4096;				// max line length (headers)
 	
-	private $_httpmethod	=	"GET";				// default http request method
-	private $_httpversion	=	"HTTP/1.0";			// default http request version
-	private $_submit_method	=	"POST";				// default submit method
-	private $_submit_type	=	"application/x-www-form-urlencoded";	// default submit type
-	private $_mime_boundary	=   "";					// MIME boundary for multipart/form-data submit type
-	private $_redirectaddr	=	false;				// will be set if page fetched is a redirect
-	private $_redirectdepth	=	0;					// increments on an http redirect
-	private $_frameurls		= 	array();			// frame src urls
-	private $_framedepth	=	0;					// increments on frame depth
+    private $_httpmethod	=	"GET";				// default http request method
+    private $_httpversion	=	"HTTP/1.0";			// default http request version
+    private $_submit_method	=	"POST";				// default submit method
+    private $_submit_type	=	"application/x-www-form-urlencoded";	// default submit type
+    private $_mime_boundary	=   "";					// MIME boundary for multipart/form-data submit type
+    private $_redirectaddr	=	false;				// will be set if page fetched is a redirect
+    private $_redirectdepth	=	0;					// increments on an http redirect
+    private $_frameurls		= 	array();			// frame src urls
+    private $_framedepth	=	0;					// increments on frame depth
 	
-	private $_isproxy		=	false;				// set if using a proxy server
-	private $_fp_timeout	=	30;					// timeout for socket connection
+    private $_isproxy		=	false;				// set if using a proxy server
+    private $_fp_timeout	=	30;					// timeout for socket connection
 
 /*======================================================================*\
 	Function:	fetch
@@ -121,136 +121,136 @@ 
 	Output:		$this->results	the output text from the fetch
 \*======================================================================*/
 
-	public function fetch($URI) {
-		//preg_match("|^([^:]+)://([^:/]+)(:[\d]+)*(.*)|",$URI,$URI_PARTS);
-		$URI_PARTS = parse_url($URI);
-		if (!empty($URI_PARTS["user"]))
-			$this->user = $URI_PARTS["user"];
-		if (!empty($URI_PARTS["pass"]))
-			$this->pass = $URI_PARTS["pass"];
-		if (!isset($fp)) { $fp = false; }
-		switch ($URI_PARTS["scheme"]) {
-			case "http":
-				$this->host = $URI_PARTS["host"];
-				if(!empty($URI_PARTS["port"]))
-					$this->port = $URI_PARTS["port"];
-				if($this->_connect($fp))
-				{
-					if($this->_isproxy)
-					{
-						// using proxy, send entire URI
-						$this->_httprequest($URI,$fp,$URI,$this->_httpmethod);
-					}
-					else
-					{
-						$path = $URI_PARTS["path"].(isset($URI_PARTS["query"]) ? "?".$URI_PARTS["query"] : "");
-						// no proxy, send only the path
-						$this->_httprequest($path, $fp, $URI, $this->_httpmethod);
-					}
+    public function fetch($URI) {
+        //preg_match("|^([^:]+)://([^:/]+)(:[\d]+)*(.*)|",$URI,$URI_PARTS);
+        $URI_PARTS = parse_url($URI);
+        if (!empty($URI_PARTS["user"]))
+            $this->user = $URI_PARTS["user"];
+        if (!empty($URI_PARTS["pass"]))
+            $this->pass = $URI_PARTS["pass"];
+        if (!isset($fp)) { $fp = false; }
+        switch ($URI_PARTS["scheme"]) {
+            case "http":
+                $this->host = $URI_PARTS["host"];
+                if(!empty($URI_PARTS["port"]))
+                    $this->port = $URI_PARTS["port"];
+                if($this->_connect($fp))
+                {
+                    if($this->_isproxy)
+                    {
+                        // using proxy, send entire URI
+                        $this->_httprequest($URI,$fp,$URI,$this->_httpmethod);
+                    }
+                    else
+                    {
+                        $path = $URI_PARTS["path"].(isset($URI_PARTS["query"]) ? "?".$URI_PARTS["query"] : "");
+                        // no proxy, send only the path
+                        $this->_httprequest($path, $fp, $URI, $this->_httpmethod);
+                    }
 					
-					$this->_disconnect($fp);
-
-					if($this->_redirectaddr)
-					{
-						/* url was redirected, check if we've hit the max depth */
-						if($this->maxredirs > $this->_redirectdepth)
-						{
-							// only follow redirect if it's on this site, or offsiteok is true
-							if(preg_match("|^http://".preg_quote($this->host)."|i",$this->_redirectaddr) || $this->offsiteok)
-							{
-								/* follow the redirect */
-								$this->_redirectdepth++;
-								$this->lastredirectaddr=$this->_redirectaddr;
-								$this->fetch($this->_redirectaddr);
-							}
-						}
-					}
-
-					if($this->_framedepth < $this->maxframes && count($this->_frameurls) > 0)
-					{
-						$frameurls = $this->_frameurls;
-						$this->_frameurls = array();
+                    $this->_disconnect($fp);
+
+                    if($this->_redirectaddr)
+                    {
+                        /* url was redirected, check if we've hit the max depth */
+                        if($this->maxredirs > $this->_redirectdepth)
+                        {
+                            // only follow redirect if it's on this site, or offsiteok is true
+                            if(preg_match("|^http://".preg_quote($this->host)."|i",$this->_redirectaddr) || $this->offsiteok)
+                            {
+                                /* follow the redirect */
+                                $this->_redirectdepth++;
+                                $this->lastredirectaddr=$this->_redirectaddr;
+                                $this->fetch($this->_redirectaddr);
+                            }
+                        }
+                    }
+
+                    if($this->_framedepth < $this->maxframes && count($this->_frameurls) > 0)
+                    {
+                        $frameurls = $this->_frameurls;
+                        $this->_frameurls = array();
 						
-						while(list(,$frameurl) = each($frameurls))
-						{
-							if($this->_framedepth < $this->maxframes)
-							{
-								$this->fetch($frameurl);
-								$this->_framedepth++;
-							}
-							else
-								break;
-						}
-					}					
-				}
-				else
-				{
-					return false;
-				}
-				return true;					
-				break;
-			case "https":
-				if(!$this->curl_path || (!is_executable($this->curl_path))) {
-					$this->error = "Bad curl ($this->curl_path), can't fetch HTTPS \n";
-					return false;
-				}
-				$this->host = $URI_PARTS["host"];
-				if(!empty($URI_PARTS["port"]))
-					$this->port = $URI_PARTS["port"];
-				if($this->_isproxy)
-				{
-					// using proxy, send entire URI
-					$this->_httpsrequest($URI,$URI,$this->_httpmethod);
-				}
-				else
-				{
-					$path = $URI_PARTS["path"].($URI_PARTS["query"] ? "?".$URI_PARTS["query"] : "");
-					// no proxy, send only the path
-					$this->_httpsrequest($path, $URI, $this->_httpmethod);
-				}
-
-				if($this->_redirectaddr)
-				{
-					/* url was redirected, check if we've hit the max depth */
-					if($this->maxredirs > $this->_redirectdepth)
-					{
-						// only follow redirect if it's on this site, or offsiteok is true
-						if(preg_match("|^http://".preg_quote($this->host)."|i",$this->_redirectaddr) || $this->offsiteok)
-						{
-							/* follow the redirect */
-							$this->_redirectdepth++;
-							$this->lastredirectaddr=$this->_redirectaddr;
-							$this->fetch($this->_redirectaddr);
-						}
-					}
-				}
-
-				if($this->_framedepth < $this->maxframes && count($this->_frameurls) > 0)
-				{
-					$frameurls = $this->_frameurls;
-					$this->_frameurls = array();
-
-					while(list(,$frameurl) = each($frameurls))
-					{
-						if($this->_framedepth < $this->maxframes)
-						{
-							$this->fetch($frameurl);
-							$this->_framedepth++;
-						}
-						else
-							break;
-					}
-				}					
-				return true;					
-				break;
-			default:
-				// not a valid protocol
-				$this->error	=	'Invalid protocol "'.$URI_PARTS["scheme"].'"\n';
-				return false;
-				break;
-		}		
-		return true;
-	}
+                        while(list(,$frameurl) = each($frameurls))
+                        {
+                            if($this->_framedepth < $this->maxframes)
+                            {
+                                $this->fetch($frameurl);
+                                $this->_framedepth++;
+                            }
+                            else
+                                break;
+                        }
+                    }					
+                }
+                else
+                {
+                    return false;
+                }
+                return true;					
+                break;
+            case "https":
+                if(!$this->curl_path || (!is_executable($this->curl_path))) {
+                    $this->error = "Bad curl ($this->curl_path), can't fetch HTTPS \n";
+                    return false;
+                }
+                $this->host = $URI_PARTS["host"];
+                if(!empty($URI_PARTS["port"]))
+                    $this->port = $URI_PARTS["port"];
+                if($this->_isproxy)
+                {
+                    // using proxy, send entire URI
+                    $this->_httpsrequest($URI,$URI,$this->_httpmethod);
+                }
+                else
+                {
+                    $path = $URI_PARTS["path"].($URI_PARTS["query"] ? "?".$URI_PARTS["query"] : "");
+                    // no proxy, send only the path
+                    $this->_httpsrequest($path, $URI, $this->_httpmethod);
+                }
+
+                if($this->_redirectaddr)
+                {
+                    /* url was redirected, check if we've hit the max depth */
+                    if($this->maxredirs > $this->_redirectdepth)
+                    {
+                        // only follow redirect if it's on this site, or offsiteok is true
+                        if(preg_match("|^http://".preg_quote($this->host)."|i",$this->_redirectaddr) || $this->offsiteok)
+                        {
+                            /* follow the redirect */
+                            $this->_redirectdepth++;
+                            $this->lastredirectaddr=$this->_redirectaddr;
+                            $this->fetch($this->_redirectaddr);
+                        }
+                    }
+                }
+
+                if($this->_framedepth < $this->maxframes && count($this->_frameurls) > 0)
+                {
+                    $frameurls = $this->_frameurls;
+                    $this->_frameurls = array();
+
+                    while(list(,$frameurl) = each($frameurls))
+                    {
+                        if($this->_framedepth < $this->maxframes)
+                        {
+                            $this->fetch($frameurl);
+                            $this->_framedepth++;
+                        }
+                        else
+                            break;
+                    }
+                }					
+                return true;					
+                break;
+            default:
+                // not a valid protocol
+                $this->error	=	'Invalid protocol "'.$URI_PARTS["scheme"].'"\n';
+                return false;
+                break;
+        }		
+        return true;
+    }
 
 
 
@@ -266,32 +266,32 @@ 
 	Output:		$match		an array of the links
 \*======================================================================*/
 
-	private function _striplinks($document)
-	{	
-		preg_match_all("'<\s*a\s+.*href\s*=\s*			# find <a href=
+    private function _striplinks($document)
+    {	
+        preg_match_all("'<\s*a\s+.*href\s*=\s*			# find <a href=
 						([\"\'])?					# find single or double quote
 						(?(1) (.*?)\\1 | ([^\s\>]+))		# if quote found, match up to next matching
 													# quote, otherwise match up to next space
 						'isx",$document,$links);
 						
 
-		// catenate the non-empty matches from the conditional subpattern
+        // catenate the non-empty matches from the conditional subpattern
 
-		while(list($key,$val) = each($links[2]))
-		{
-			if(!empty($val))
-				$match[] = $val;
-		}				
+        while(list($key,$val) = each($links[2]))
+        {
+            if(!empty($val))
+                $match[] = $val;
+        }				
 		
-		while(list($key,$val) = each($links[3]))
-		{
-			if(!empty($val))
-				$match[] = $val;
-		}		
+        while(list($key,$val) = each($links[3]))
+        {
+            if(!empty($val))
+                $match[] = $val;
+        }		
 		
-		// return the links
-		return $match;
-	}
+        // return the links
+        return $match;
+    }
 
 /*======================================================================*\
 	Function:	_stripform
@@ -300,16 +300,16 @@ 
 	Output:		$match		an array of the links
 \*======================================================================*/
 
-	private function _stripform($document)
-	{	
-		preg_match_all("'<\/?(FORM|INPUT|SELECT|TEXTAREA|(OPTION))[^<>]*>(?(2)(.*(?=<\/?(option|select)[^<>]*>[\r\n]*)|(?=[\r\n]*))|(?=[\r\n]*))'Usi",$document,$elements);
+    private function _stripform($document)
+    {	
+        preg_match_all("'<\/?(FORM|INPUT|SELECT|TEXTAREA|(OPTION))[^<>]*>(?(2)(.*(?=<\/?(option|select)[^<>]*>[\r\n]*)|(?=[\r\n]*))|(?=[\r\n]*))'Usi",$document,$elements);
 		
-		// catenate the matches
-		$match = implode("\r\n",$elements[0]);
+        // catenate the matches
+        $match = implode("\r\n",$elements[0]);
 				
-		// return the links
-		return $match;
-	}
+        // return the links
+        return $match;
+    }
 
 	
 	
@@ -320,43 +320,43 @@ 
 	Output:		$text		the resulting text
 \*======================================================================*/
 
-	private function _striptext($document)
-	{
+    private function _striptext($document)
+    {
 		
-		// I didn't use preg eval (//e) since that is only available in PHP 4.0.
-		// so, list your entities one by one here. I included some of the
-		// more common ones.
+        // I didn't use preg eval (//e) since that is only available in PHP 4.0.
+        // so, list your entities one by one here. I included some of the
+        // more common ones.
 								
-		$search = array("'<script[^>]*?>.*?</script>'si",	// strip out javascript
-						"'<[\/\!]*?[^<>]*?>'si",			// strip out html tags
-						"'([\r\n])[\s]+'",					// strip out white space
-						"'&(quote|#34);'i",					// replace html entities
-						"'&(amp|#38);'i",
-						"'&(lt|#60);'i",
-						"'&(gt|#62);'i",
-						"'&(nbsp|#160);'i",
-						"'&(iexcl|#161);'i",
-						"'&(cent|#162);'i",
-						"'&(pound|#163);'i",
-						"'&(copy|#169);'i"
-						);				
-		$replace = array(	"",
-							"",
-							"\\1",
-							"\"",
-							"&",
-							"<",
-							">",
-							" ",
-							chr(161),
-							chr(162),
-							chr(163),
-							chr(169));
+        $search = array("'<script[^>]*?>.*?</script>'si",	// strip out javascript
+                        "'<[\/\!]*?[^<>]*?>'si",			// strip out html tags
+                        "'([\r\n])[\s]+'",					// strip out white space
+                        "'&(quote|#34);'i",					// replace html entities
+                        "'&(amp|#38);'i",
+                        "'&(lt|#60);'i",
+                        "'&(gt|#62);'i",
+                        "'&(nbsp|#160);'i",
+                        "'&(iexcl|#161);'i",
+                        "'&(cent|#162);'i",
+                        "'&(pound|#163);'i",
+                        "'&(copy|#169);'i"
+                        );				
+        $replace = array(	"",
+                            "",
+                            "\\1",
+                            "\"",
+                            "&",
+                            "<",
+                            ">",
+                            " ",
+                            chr(161),
+                            chr(162),
+                            chr(163),
+                            chr(169));
 					
-		$text = preg_replace($search,$replace,$document);
+        $text = preg_replace($search,$replace,$document);
 								
-		return $text;
-	}
+        return $text;
+    }
 
 /*======================================================================*\
 	Function:	_expandlinks
@@ -366,29 +366,29 @@ 
 	Output:		$expandedLinks	the expanded links
 \*======================================================================*/
 
-	private function _expandlinks($links,$URI)
-	{
+    private function _expandlinks($links,$URI)
+    {
 		
-		preg_match("/^[^\?]+/",$URI,$match);
+        preg_match("/^[^\?]+/",$URI,$match);
 
-		$match = preg_replace("|/[^\/\.]+\.[^\/\.]+$|","",$match[0]);
+        $match = preg_replace("|/[^\/\.]+\.[^\/\.]+$|","",$match[0]);
 				
-		$search = array( 	"|^http://".preg_quote($this->host)."|i",
-							"|^(?!http://)(\/)?(?!mailto:)|i",
-							"|/\./|",
-							"|/[^\/]+/\.\./|"
-						);
+        $search = array( 	"|^http://".preg_quote($this->host)."|i",
+                            "|^(?!http://)(\/)?(?!mailto:)|i",
+                            "|/\./|",
+                            "|/[^\/]+/\.\./|"
+                        );
 						
-		$replace = array(	"",
-							$match."/",
-							"/",
-							"/"
-						);			
+        $replace = array(	"",
+                            $match."/",
+                            "/",
+                            "/"
+                        );			
 				
-		$expandedLinks = preg_replace($search,$replace,$links);
+        $expandedLinks = preg_replace($search,$replace,$links);
 
-		return $expandedLinks;
-	}
+        return $expandedLinks;
+    }
 
 /*======================================================================*\
 	Function:	_httprequest
@@ -400,179 +400,179 @@ 
 	Output:		
 \*======================================================================*/
 	
-	private function _httprequest($url,$fp,$URI,$http_method,$content_type="",$body="")
-	{
-		if($this->passcookies && $this->_redirectaddr)
-			$this->setcookies();
+    private function _httprequest($url,$fp,$URI,$http_method,$content_type="",$body="")
+    {
+        if($this->passcookies && $this->_redirectaddr)
+            $this->setcookies();
 			
-		$URI_PARTS = parse_url($URI);
-		if(empty($url))
-			$url = "/";
-		$headers = $http_method." ".$url." ".$this->_httpversion."\r\n";		
-		if(!empty($this->agent))
-			$headers .= "User-Agent: ".$this->agent."\r\n";
-		if(!empty($this->host) && !isset($this->rawheaders['Host']))
-			$headers .= "Host: ".$this->host."\r\n";
-		if(!empty($this->accept))
-			$headers .= "Accept: ".$this->accept."\r\n";
+        $URI_PARTS = parse_url($URI);
+        if(empty($url))
+            $url = "/";
+        $headers = $http_method." ".$url." ".$this->_httpversion."\r\n";		
+        if(!empty($this->agent))
+            $headers .= "User-Agent: ".$this->agent."\r\n";
+        if(!empty($this->host) && !isset($this->rawheaders['Host']))
+            $headers .= "Host: ".$this->host."\r\n";
+        if(!empty($this->accept))
+            $headers .= "Accept: ".$this->accept."\r\n";
 		
-		if($this->use_gzip) {
-			// make sure PHP was built with --with-zlib
-			// and we can handle gzipp'ed data
-			if ( function_exists(gzinflate) ) {
-			   $headers .= "Accept-encoding: gzip\r\n";
-			}
-			else {
-			   trigger_error(
-			   	"use_gzip is on, but PHP was built without zlib support.".
-				"  Requesting file(s) without gzip encoding.", 
-				E_USER_NOTICE);
-			}
-		}
+        if($this->use_gzip) {
+            // make sure PHP was built with --with-zlib
+            // and we can handle gzipp'ed data
+            if ( function_exists(gzinflate) ) {
+                $headers .= "Accept-encoding: gzip\r\n";
+            }
+            else {
+                trigger_error(
+                    "use_gzip is on, but PHP was built without zlib support.".
+                "  Requesting file(s) without gzip encoding.", 
+                E_USER_NOTICE);
+            }
+        }
 		
-		if(!empty($this->referer))
-			$headers .= "Referer: ".$this->referer."\r\n";
-		if(!empty($this->cookies))
-		{			
-			if(!is_array($this->cookies))
-				$this->cookies = (array)$this->cookies;
+        if(!empty($this->referer))
+            $headers .= "Referer: ".$this->referer."\r\n";
+        if(!empty($this->cookies))
+        {			
+            if(!is_array($this->cookies))
+                $this->cookies = (array)$this->cookies;
 	
-			reset($this->cookies);
-			if ( count($this->cookies) > 0 ) {
-				$cookie_headers .= 'Cookie: ';
-				foreach ( $this->cookies as $cookieKey => $cookieVal ) {
-				$cookie_headers .= $cookieKey."=".urlencode($cookieVal)."; ";
-				}
-				$headers .= substr($cookie_headers,0,-2) . "\r\n";
-			} 
-		}
-		if(!empty($this->rawheaders))
-		{
-			if(!is_array($this->rawheaders))
-				$this->rawheaders = (array)$this->rawheaders;
-			while(list($headerKey,$headerVal) = each($this->rawheaders))
-				$headers .= $headerKey.": ".$headerVal."\r\n";
-		}
-		if(!empty($content_type)) {
-			$headers .= "Content-type: $content_type";
-			if ($content_type == "multipart/form-data")
-				$headers .= "; boundary=".$this->_mime_boundary;
-			$headers .= "\r\n";
-		}
-		if(!empty($body))	
-			$headers .= "Content-length: ".strlen($body)."\r\n";
-		if(!empty($this->user) || !empty($this->pass))	
-			$headers .= "Authorization: BASIC ".base64_encode($this->user.":".$this->pass)."\r\n";
-
-		$headers .= "\r\n";
+            reset($this->cookies);
+            if ( count($this->cookies) > 0 ) {
+                $cookie_headers .= 'Cookie: ';
+                foreach ( $this->cookies as $cookieKey => $cookieVal ) {
+                $cookie_headers .= $cookieKey."=".urlencode($cookieVal)."; ";
+                }
+                $headers .= substr($cookie_headers,0,-2) . "\r\n";
+            } 
+        }
+        if(!empty($this->rawheaders))
+        {
+            if(!is_array($this->rawheaders))
+                $this->rawheaders = (array)$this->rawheaders;
+            while(list($headerKey,$headerVal) = each($this->rawheaders))
+                $headers .= $headerKey.": ".$headerVal."\r\n";
+        }
+        if(!empty($content_type)) {
+            $headers .= "Content-type: $content_type";
+            if ($content_type == "multipart/form-data")
+                $headers .= "; boundary=".$this->_mime_boundary;
+            $headers .= "\r\n";
+        }
+        if(!empty($body))	
+            $headers .= "Content-length: ".strlen($body)."\r\n";
+        if(!empty($this->user) || !empty($this->pass))	
+            $headers .= "Authorization: BASIC ".base64_encode($this->user.":".$this->pass)."\r\n";
+
+        $headers .= "\r\n";
 		
-		// set the read timeout if needed
-		if ($this->read_timeout > 0)
-			socket_set_timeout($fp, $this->read_timeout);
-		$this->timed_out = false;
+        // set the read timeout if needed
+        if ($this->read_timeout > 0)
+            socket_set_timeout($fp, $this->read_timeout);
+        $this->timed_out = false;
 		
-		fwrite($fp,$headers.$body,strlen($headers.$body));
+        fwrite($fp,$headers.$body,strlen($headers.$body));
 		
-		$this->_redirectaddr = false;
-		unset($this->headers);
+        $this->_redirectaddr = false;
+        unset($this->headers);
 		
-		// content was returned gzip encoded?
-		$is_gzipped = false;
+        // content was returned gzip encoded?
+        $is_gzipped = false;
 						
-		while($currentHeader = fgets($fp,$this->_maxlinelen))
-		{
-			if ($this->read_timeout > 0 && $this->_check_timeout($fp))
-			{
-				$this->status=-100;
-				return false;
-			}
+        while($currentHeader = fgets($fp,$this->_maxlinelen))
+        {
+            if ($this->read_timeout > 0 && $this->_check_timeout($fp))
+            {
+                $this->status=-100;
+                return false;
+            }
 				
-		//	if($currentHeader == "\r\n")
-			if(preg_match("/^\r?\n$/", $currentHeader) )
-			      break;
+        //	if($currentHeader == "\r\n")
+            if(preg_match("/^\r?\n$/", $currentHeader) )
+                    break;
 						
-			// if a header begins with Location: or URI:, set the redirect
-			if(preg_match("/^(Location:|URI:)/i",$currentHeader))
-			{
-				// get URL portion of the redirect
-				preg_match("/^(Location:|URI:)\s+(.*)/",chop($currentHeader),$matches);
-				// look for :// in the Location header to see if hostname is included
-				if(!preg_match("|\:\/\/|",$matches[2]))
-				{
-					// no host in the path, so prepend
-					$this->_redirectaddr = $URI_PARTS["scheme"]."://".$this->host.":".$this->port;
-					// eliminate double slash
-					if(!preg_match("|^/|",$matches[2]))
-							$this->_redirectaddr .= "/".$matches[2];
-					else
-							$this->_redirectaddr .= $matches[2];
-				}
-				else
-					$this->_redirectaddr = $matches[2];
-			}
+            // if a header begins with Location: or URI:, set the redirect
+            if(preg_match("/^(Location:|URI:)/i",$currentHeader))
+            {
+                // get URL portion of the redirect
+                preg_match("/^(Location:|URI:)\s+(.*)/",chop($currentHeader),$matches);
+                // look for :// in the Location header to see if hostname is included
+                if(!preg_match("|\:\/\/|",$matches[2]))
+                {
+                    // no host in the path, so prepend
+                    $this->_redirectaddr = $URI_PARTS["scheme"]."://".$this->host.":".$this->port;
+                    // eliminate double slash
+                    if(!preg_match("|^/|",$matches[2]))
+                            $this->_redirectaddr .= "/".$matches[2];
+                    else
+                            $this->_redirectaddr .= $matches[2];
+                }
+                else
+                    $this->_redirectaddr = $matches[2];
+            }
 		
-			if(preg_match("|^HTTP/|",$currentHeader))
-			{
+            if(preg_match("|^HTTP/|",$currentHeader))
+            {
                 if(preg_match("|^HTTP/[^\s]*\s(.*?)\s|",$currentHeader, $status))
-				{
-					$this->status= $status[1];
+                {
+                    $this->status= $status[1];
                 }				
-				$this->response_code = $currentHeader;
-			}
+                $this->response_code = $currentHeader;
+            }
 			
-			if (preg_match("/Content-Encoding: gzip/", $currentHeader) ) {
-				$is_gzipped = true;
-			}
+            if (preg_match("/Content-Encoding: gzip/", $currentHeader) ) {
+                $is_gzipped = true;
+            }
 			
-			$this->headers[] = $currentHeader;
-		}
-
-		# $results = fread($fp, $this->maxlength);
-		$results = "";
-		while ( $data = fread($fp, $this->maxlength) ) {
-		    $results .= $data;
-		    if (
-		        strlen($results) > $this->maxlength ) {
-		        break;
-		    }
-		}
+            $this->headers[] = $currentHeader;
+        }
+
+        # $results = fread($fp, $this->maxlength);
+        $results = "";
+        while ( $data = fread($fp, $this->maxlength) ) {
+            $results .= $data;
+            if (
+                strlen($results) > $this->maxlength ) {
+                break;
+            }
+        }
 		
-		// gunzip
-		if ( $is_gzipped ) {
-			// per http://www.php.net/manual/en/function.gzencode.php
-			$results = substr($results, 10);
-			$results = gzinflate($results);
-		}
+        // gunzip
+        if ( $is_gzipped ) {
+            // per http://www.php.net/manual/en/function.gzencode.php
+            $results = substr($results, 10);
+            $results = gzinflate($results);
+        }
 		
-		if ($this->read_timeout > 0 && $this->_check_timeout($fp))
-		{
-			$this->status=-100;
-			return false;
-		}
+        if ($this->read_timeout > 0 && $this->_check_timeout($fp))
+        {
+            $this->status=-100;
+            return false;
+        }
 		
-		// check if there is a a redirect meta tag
+        // check if there is a a redirect meta tag
 		
-		if(preg_match("'<meta[\s]*http-equiv[^>]*?content[\s]*=[\s]*[\"\']?\d+;[\s]+URL[\s]*=[\s]*([^\"\']*?)[\"\']?>'i",$results,$match))
-		{
-			$this->_redirectaddr = $this->_expandlinks($match[1],$URI);	
-		}
-
-		// have we hit our frame depth and is there frame src to fetch?
-		if(($this->_framedepth < $this->maxframes) && preg_match_all("'<frame\s+.*src[\s]*=[\'\"]?([^\'\"\>]+)'i",$results,$match))
-		{
-			$this->results[] = $results;
-			for($x=0; $x<count($match[1]); $x++)
-				$this->_frameurls[] = $this->_expandlinks($match[1][$x],$URI_PARTS["scheme"]."://".$this->host);
-		}
-		// have we already fetched framed content?
-		elseif(is_array($this->results))
-			$this->results[] = $results;
-		// no framed content
-		else
-			$this->results = $results;
+        if(preg_match("'<meta[\s]*http-equiv[^>]*?content[\s]*=[\s]*[\"\']?\d+;[\s]+URL[\s]*=[\s]*([^\"\']*?)[\"\']?>'i",$results,$match))
+        {
+            $this->_redirectaddr = $this->_expandlinks($match[1],$URI);	
+        }
+
+        // have we hit our frame depth and is there frame src to fetch?
+        if(($this->_framedepth < $this->maxframes) && preg_match_all("'<frame\s+.*src[\s]*=[\'\"]?([^\'\"\>]+)'i",$results,$match))
+        {
+            $this->results[] = $results;
+            for($x=0; $x<count($match[1]); $x++)
+                $this->_frameurls[] = $this->_expandlinks($match[1][$x],$URI_PARTS["scheme"]."://".$this->host);
+        }
+        // have we already fetched framed content?
+        elseif(is_array($this->results))
+            $this->results[] = $results;
+        // no framed content
+        else
+            $this->results = $results;
 		
-		return true;
-	}
+        return true;
+    }
 
 /*======================================================================*\
 	Function:	_httpsrequest
@@ -583,163 +583,163 @@ 
 	Output:		
 \*======================================================================*/
 	
-	private function _httpsrequest($url,$URI,$http_method,$content_type="",$body="")
-	{
-		if($this->passcookies && $this->_redirectaddr)
-			$this->setcookies();
+    private function _httpsrequest($url,$URI,$http_method,$content_type="",$body="")
+    {
+        if($this->passcookies && $this->_redirectaddr)
+            $this->setcookies();
 
-		$headers = array();		
+        $headers = array();		
 					
-		$URI_PARTS = parse_url($URI);
-		if(empty($url))
-			$url = "/";
-		// GET ... header not needed for curl
-		//$headers[] = $http_method." ".$url." ".$this->_httpversion;		
-		if(!empty($this->agent))
-			$headers[] = "User-Agent: ".$this->agent;
-		if(!empty($this->host))
-			$headers[] = "Host: ".$this->host;
-		if(!empty($this->accept))
-			$headers[] = "Accept: ".$this->accept;
-		if(!empty($this->referer))
-			$headers[] = "Referer: ".$this->referer;
-		if(!empty($this->cookies))
-		{			
-			if(!is_array($this->cookies))
-				$this->cookies = (array)$this->cookies;
+        $URI_PARTS = parse_url($URI);
+        if(empty($url))
+            $url = "/";
+        // GET ... header not needed for curl
+        //$headers[] = $http_method." ".$url." ".$this->_httpversion;		
+        if(!empty($this->agent))
+            $headers[] = "User-Agent: ".$this->agent;
+        if(!empty($this->host))
+            $headers[] = "Host: ".$this->host;
+        if(!empty($this->accept))
+            $headers[] = "Accept: ".$this->accept;
+        if(!empty($this->referer))
+            $headers[] = "Referer: ".$this->referer;
+        if(!empty($this->cookies))
+        {			
+            if(!is_array($this->cookies))
+                $this->cookies = (array)$this->cookies;
 	
-			reset($this->cookies);
-			if ( count($this->cookies) > 0 ) {
-				$cookie_str = 'Cookie: ';
-				foreach ( $this->cookies as $cookieKey => $cookieVal ) {
-				$cookie_str .= $cookieKey."=".urlencode($cookieVal)."; ";
-				}
-				$headers[] = substr($cookie_str,0,-2);
-			}
-		}
-		if(!empty($this->rawheaders))
-		{
-			if(!is_array($this->rawheaders))
-				$this->rawheaders = (array)$this->rawheaders;
-			while(list($headerKey,$headerVal) = each($this->rawheaders))
-				$headers[] = $headerKey.": ".$headerVal;
-		}
-		if(!empty($content_type)) {
-			if ($content_type == "multipart/form-data")
-				$headers[] = "Content-type: $content_type; boundary=".$this->_mime_boundary;
-			else
-				$headers[] = "Content-type: $content_type";
-		}
-		if(!empty($body))	
-			$headers[] = "Content-length: ".strlen($body);
-		if(!empty($this->user) || !empty($this->pass))	
-			$headers[] = "Authorization: BASIC ".base64_encode($this->user.":".$this->pass);
+            reset($this->cookies);
+            if ( count($this->cookies) > 0 ) {
+                $cookie_str = 'Cookie: ';
+                foreach ( $this->cookies as $cookieKey => $cookieVal ) {
+                $cookie_str .= $cookieKey."=".urlencode($cookieVal)."; ";
+                }
+                $headers[] = substr($cookie_str,0,-2);
+            }
+        }
+        if(!empty($this->rawheaders))
+        {
+            if(!is_array($this->rawheaders))
+                $this->rawheaders = (array)$this->rawheaders;
+            while(list($headerKey,$headerVal) = each($this->rawheaders))
+                $headers[] = $headerKey.": ".$headerVal;
+        }
+        if(!empty($content_type)) {
+            if ($content_type == "multipart/form-data")
+                $headers[] = "Content-type: $content_type; boundary=".$this->_mime_boundary;
+            else
+                $headers[] = "Content-type: $content_type";
+        }
+        if(!empty($body))	
+            $headers[] = "Content-length: ".strlen($body);
+        if(!empty($this->user) || !empty($this->pass))	
+            $headers[] = "Authorization: BASIC ".base64_encode($this->user.":".$this->pass);
 			
-		for($curr_header = 0; $curr_header < count($headers); $curr_header++) {
-			$cmdline_params .= " -H \"".$headers[$curr_header]."\"";
-		}
+        for($curr_header = 0; $curr_header < count($headers); $curr_header++) {
+            $cmdline_params .= " -H \"".$headers[$curr_header]."\"";
+        }
 			  	                         
-		if(!empty($body))
-			$cmdline_params .= " -d \"$body\"";
+        if(!empty($body))
+            $cmdline_params .= " -d \"$body\"";
 		
-		if($this->read_timeout > 0)
-			$cmdline_params .= " -m ".$this->read_timeout;
+        if($this->read_timeout > 0)
+            $cmdline_params .= " -m ".$this->read_timeout;
 		
-		$headerfile = uniqid(time());
+        $headerfile = uniqid(time());
 		
-		# accept self-signed certs
-		$cmdline_params .= " -k";
+        # accept self-signed certs
+        $cmdline_params .= " -k";
         $results = array();
         $return = 0;
-		exec($this->curl_path." -D \"/tmp/$headerfile\"".escapeshellcmd($cmdline_params)." ".escapeshellcmd($URI),$results,$return);
+        exec($this->curl_path." -D \"/tmp/$headerfile\"".escapeshellcmd($cmdline_params)." ".escapeshellcmd($URI),$results,$return);
 		
-		if($return)
-		{
-			$this->error = "Error: cURL could not retrieve the document, error $return.";
-			return false;
-		}
+        if($return)
+        {
+            $this->error = "Error: cURL could not retrieve the document, error $return.";
+            return false;
+        }
 			
 			
-		$results = implode("\r\n",$results);
+        $results = implode("\r\n",$results);
 		
-		$result_headers = file("/tmp/$headerfile");
+        $result_headers = file("/tmp/$headerfile");
 						
-		$this->_redirectaddr = false;
-		unset($this->headers);
+        $this->_redirectaddr = false;
+        unset($this->headers);
 						
-		for($currentHeader = 0; $currentHeader < count($result_headers); $currentHeader++)
-		{
+        for($currentHeader = 0; $currentHeader < count($result_headers); $currentHeader++)
+        {
 			
-			// if a header begins with Location: or URI:, set the redirect
-			if(preg_match("/^(Location: |URI: )/i",$result_headers[$currentHeader]))
-			{
-				// get URL portion of the redirect
-				preg_match("/^(Location: |URI:)(.*)/",chop($result_headers[$currentHeader]),$matches);
-				// look for :// in the Location header to see if hostname is included
-				if(!preg_match("|\:\/\/|",$matches[2]))
-				{
-					// no host in the path, so prepend
-					$this->_redirectaddr = $URI_PARTS["scheme"]."://".$this->host.":".$this->port;
-					// eliminate double slash
-					if(!preg_match("|^/|",$matches[2]))
-							$this->_redirectaddr .= "/".$matches[2];
-					else
-							$this->_redirectaddr .= $matches[2];
-				}
-				else
-					$this->_redirectaddr = $matches[2];
-			}
+            // if a header begins with Location: or URI:, set the redirect
+            if(preg_match("/^(Location: |URI: )/i",$result_headers[$currentHeader]))
+            {
+                // get URL portion of the redirect
+                preg_match("/^(Location: |URI:)(.*)/",chop($result_headers[$currentHeader]),$matches);
+                // look for :// in the Location header to see if hostname is included
+                if(!preg_match("|\:\/\/|",$matches[2]))
+                {
+                    // no host in the path, so prepend
+                    $this->_redirectaddr = $URI_PARTS["scheme"]."://".$this->host.":".$this->port;
+                    // eliminate double slash
+                    if(!preg_match("|^/|",$matches[2]))
+                            $this->_redirectaddr .= "/".$matches[2];
+                    else
+                            $this->_redirectaddr .= $matches[2];
+                }
+                else
+                    $this->_redirectaddr = $matches[2];
+            }
 		
-			if(preg_match("|^HTTP/|",$result_headers[$currentHeader]))
-			{
-			    $this->response_code = $result_headers[$currentHeader];
-			    if(preg_match("|^HTTP/[^\s]*\s(.*?)\s|",$this->response_code, $match))
-			    {
-				$this->status= $match[1];
-                	    }
-			}
-			$this->headers[] = $result_headers[$currentHeader];
-		}
-
-		// check if there is a a redirect meta tag
+            if(preg_match("|^HTTP/|",$result_headers[$currentHeader]))
+            {
+                $this->response_code = $result_headers[$currentHeader];
+                if(preg_match("|^HTTP/[^\s]*\s(.*?)\s|",$this->response_code, $match))
+                {
+                $this->status= $match[1];
+                        }
+            }
+            $this->headers[] = $result_headers[$currentHeader];
+        }
+
+        // check if there is a a redirect meta tag
 		
-		if(preg_match("'<meta[\s]*http-equiv[^>]*?content[\s]*=[\s]*[\"\']?\d+;[\s]+URL[\s]*=[\s]*([^\"\']*?)[\"\']?>'i",$results,$match))
-		{
-			$this->_redirectaddr = $this->_expandlinks($match[1],$URI);	
-		}
-
-		// have we hit our frame depth and is there frame src to fetch?
-		if(($this->_framedepth < $this->maxframes) && preg_match_all("'<frame\s+.*src[\s]*=[\'\"]?([^\'\"\>]+)'i",$results,$match))
-		{
-			$this->results[] = $results;
-			for($x=0; $x<count($match[1]); $x++)
-				$this->_frameurls[] = $this->_expandlinks($match[1][$x],$URI_PARTS["scheme"]."://".$this->host);
-		}
-		// have we already fetched framed content?
-		elseif(is_array($this->results))
-			$this->results[] = $results;
-		// no framed content
-		else
-			$this->results = $results;
-
-		unlink("/tmp/$headerfile");
+        if(preg_match("'<meta[\s]*http-equiv[^>]*?content[\s]*=[\s]*[\"\']?\d+;[\s]+URL[\s]*=[\s]*([^\"\']*?)[\"\']?>'i",$results,$match))
+        {
+            $this->_redirectaddr = $this->_expandlinks($match[1],$URI);	
+        }
+
+        // have we hit our frame depth and is there frame src to fetch?
+        if(($this->_framedepth < $this->maxframes) && preg_match_all("'<frame\s+.*src[\s]*=[\'\"]?([^\'\"\>]+)'i",$results,$match))
+        {
+            $this->results[] = $results;
+            for($x=0; $x<count($match[1]); $x++)
+                $this->_frameurls[] = $this->_expandlinks($match[1][$x],$URI_PARTS["scheme"]."://".$this->host);
+        }
+        // have we already fetched framed content?
+        elseif(is_array($this->results))
+            $this->results[] = $results;
+        // no framed content
+        else
+            $this->results = $results;
+
+        unlink("/tmp/$headerfile");
 		
-		return true;
-	}
+        return true;
+    }
 
 /*======================================================================*\
 	Function:	setcookies()
 	Purpose:	set cookies for a redirection
 \*======================================================================*/
 	
-	public function setcookies()
-	{
-		for($x=0; $x<count($this->headers); $x++)
-		{
-		if(preg_match("/^set-cookie:[\s]+([^=]+)=([^;]+)/i", $this->headers[$x],$match))
-			$this->cookies[$match[1]] = $match[2];
-		}
-	}
+    public function setcookies()
+    {
+        for($x=0; $x<count($this->headers); $x++)
+        {
+        if(preg_match("/^set-cookie:[\s]+([^=]+)=([^;]+)/i", $this->headers[$x],$match))
+            $this->cookies[$match[1]] = $match[2];
+        }
+    }
 
 	
 /*======================================================================*\
@@ -748,17 +748,17 @@ 
 	Input:		$fp	file pointer
 \*======================================================================*/
 
-	private function _check_timeout($fp)
-	{
-		if ($this->read_timeout > 0) {
-			$fp_status = socket_get_status($fp);
-			if ($fp_status["timed_out"]) {
-				$this->timed_out = true;
-				return true;
-			}
-		}
-		return false;
-	}
+    private function _check_timeout($fp)
+    {
+        if ($this->read_timeout > 0) {
+            $fp_status = socket_get_status($fp);
+            if ($fp_status["timed_out"]) {
+                $this->timed_out = true;
+                return true;
+            }
+        }
+        return false;
+    }
 
 /*======================================================================*\
 	Function:	_connect
@@ -766,62 +766,62 @@ 
 	Input:		$fp	file pointer
 \*======================================================================*/
 	
-	private function _connect(&$fp)
-	{
-		if(!empty($this->proxy_host) && !empty($this->proxy_port))
-			{
-				$this->_isproxy = true;
-				$host = $this->proxy_host;
-				$port = $this->proxy_port;
-			}
-		else
-		{
-			$host = $this->host;
-			$port = $this->port;
-		}
+    private function _connect(&$fp)
+    {
+        if(!empty($this->proxy_host) && !empty($this->proxy_port))
+            {
+                $this->_isproxy = true;
+                $host = $this->proxy_host;
+                $port = $this->proxy_port;
+            }
+        else
+        {
+            $host = $this->host;
+            $port = $this->port;
+        }
 	
-		$this->status = 0;
+        $this->status = 0;
 		
-		if($fp = fsockopen(
-					$host,
-					$port,
-					$errno,
-					$errstr,
-					$this->_fp_timeout
-					))
-		{
-			// socket connection succeeded
-
-			return true;
-		}
-		else
-		{
-			// socket connection failed
-			$this->status = $errno;
-			switch($errno)
-			{
-				case -3:
-					$this->error="socket creation failed (-3)";
-				case -4:
-					$this->error="dns lookup failure (-4)";
-				case -5:
-					$this->error="connection refused or timed out (-5)";
-				default:
-					$this->error="connection failed (".$errno.")";
-			}
-			return false;
-		}
-	}
+        if($fp = fsockopen(
+                    $host,
+                    $port,
+                    $errno,
+                    $errstr,
+                    $this->_fp_timeout
+                    ))
+        {
+            // socket connection succeeded
+
+            return true;
+        }
+        else
+        {
+            // socket connection failed
+            $this->status = $errno;
+            switch($errno)
+            {
+                case -3:
+                    $this->error="socket creation failed (-3)";
+                case -4:
+                    $this->error="dns lookup failure (-4)";
+                case -5:
+                    $this->error="connection refused or timed out (-5)";
+                default:
+                    $this->error="connection failed (".$errno.")";
+            }
+            return false;
+        }
+    }
 /*======================================================================*\
 	Function:	_disconnect
 	Purpose:	disconnect a socket connection
 	Input:		$fp	file pointer
 \*======================================================================*/
 	
-	private function _disconnect($fp)
-	{
-		return(fclose($fp));
-	}
+    private function _disconnect($fp)
+    {
+        return(fclose($fp));
+    }
 
 	
 /*======================================================================*\
@@ -832,65 +832,65 @@ 
 	Output:		post body
 \*======================================================================*/
 	
-	private function _prepare_post_body($formvars, $formfiles)
-	{
-		settype($formvars, "array");
-		settype($formfiles, "array");
+    private function _prepare_post_body($formvars, $formfiles)
+    {
+        settype($formvars, "array");
+        settype($formfiles, "array");
 
-		if (count($formvars) == 0 && count($formfiles) == 0)
-			return;
+        if (count($formvars) == 0 && count($formfiles) == 0)
+            return;
 		
-		switch ($this->_submit_type) {
-			case "application/x-www-form-urlencoded":
-				reset($formvars);
-				while(list($key,$val) = each($formvars)) {
-					if (is_array($val) || is_object($val)) {
-						while (list($cur_key, $cur_val) = each($val)) {
-							$postdata .= urlencode($key)."[]=".urlencode($cur_val)."&";
-						}
-					} else
-						$postdata .= urlencode($key)."=".urlencode($val)."&";
-				}
-				break;
-
-			case "multipart/form-data":
-				$this->_mime_boundary = "Snoopy".md5(uniqid(microtime()));
+        switch ($this->_submit_type) {
+            case "application/x-www-form-urlencoded":
+                reset($formvars);
+                while(list($key,$val) = each($formvars)) {
+                    if (is_array($val) || is_object($val)) {
+                        while (list($cur_key, $cur_val) = each($val)) {
+                            $postdata .= urlencode($key)."[]=".urlencode($cur_val)."&";
+                        }
+                    } else
+                        $postdata .= urlencode($key)."=".urlencode($val)."&";
+                }
+                break;
+
+            case "multipart/form-data":
+                $this->_mime_boundary = "Snoopy".md5(uniqid(microtime()));
 				
-				reset($formvars);
-				while(list($key,$val) = each($formvars)) {
-					if (is_array($val) || is_object($val)) {
-						while (list($cur_key, $cur_val) = each($val)) {
-							$postdata .= "--".$this->_mime_boundary."\r\n";
-							$postdata .= "Content-Disposition: form-data; name=\"$key\[\]\"\r\n\r\n";
-							$postdata .= "$cur_val\r\n";
-						}
-					} else {
-						$postdata .= "--".$this->_mime_boundary."\r\n";
-						$postdata .= "Content-Disposition: form-data; name=\"$key\"\r\n\r\n";
-						$postdata .= "$val\r\n";
-					}
-				}
+                reset($formvars);
+                while(list($key,$val) = each($formvars)) {
+                    if (is_array($val) || is_object($val)) {
+                        while (list($cur_key, $cur_val) = each($val)) {
+                            $postdata .= "--".$this->_mime_boundary."\r\n";
+                            $postdata .= "Content-Disposition: form-data; name=\"$key\[\]\"\r\n\r\n";
+                            $postdata .= "$cur_val\r\n";
+                        }
+                    } else {
+                        $postdata .= "--".$this->_mime_boundary."\r\n";
+                        $postdata .= "Content-Disposition: form-data; name=\"$key\"\r\n\r\n";
+                        $postdata .= "$val\r\n";
+                    }
+                }
 				
-				reset($formfiles);
-				while (list($field_name, $file_names) = each($formfiles)) {
-					settype($file_names, "array");
-					while (list(, $file_name) = each($file_names)) {
-						if (!is_readable($file_name)) continue;
-
-						$fp = fopen($file_name, "r");
-						$file_content = fread($fp, filesize($file_name));
-						fclose($fp);
-						$base_name = basename($file_name);
-
-						$postdata .= "--".$this->_mime_boundary."\r\n";
-						$postdata .= "Content-Disposition: form-data; name=\"$field_name\"; filename=\"$base_name\"\r\n\r\n";
-						$postdata .= "$file_content\r\n";
-					}
-				}
-				$postdata .= "--".$this->_mime_boundary."--\r\n";
-				break;
-		}
-
-		return $postdata;
-	}
+                reset($formfiles);
+                while (list($field_name, $file_names) = each($formfiles)) {
+                    settype($file_names, "array");
+                    while (list(, $file_name) = each($file_names)) {
+                        if (!is_readable($file_name)) continue;
+
+                        $fp = fopen($file_name, "r");
+                        $file_content = fread($fp, filesize($file_name));
+                        fclose($fp);
+                        $base_name = basename($file_name);
+
+                        $postdata .= "--".$this->_mime_boundary."\r\n";
+                        $postdata .= "Content-Disposition: form-data; name=\"$field_name\"; filename=\"$base_name\"\r\n\r\n";
+                        $postdata .= "$file_content\r\n";
+                    }
+                }
+                $postdata .= "--".$this->_mime_boundary."--\r\n";
+                break;
+        }
+
+        return $postdata;
+    }
 }
\ No newline at end of file

Spacing +175 added lines, -175 removed lines

@@ -40,47 +40,47 @@ 
 	
 	/* user definable vars */
 
-	public $host			=	"www.php.net";		// host name we are connecting to
-	public $port			=	80;					// port we are connecting to
-	public $proxy_host		=	"";					// proxy host to use
-	public $proxy_port		=	"";					// proxy port to use
-	public $agent			=	"Snoopy v1.0";		// agent we masquerade as
-	public $referer		=	"";					// referer info to pass
-	public $cookies		=	array();			// array of cookies to pass
+	public $host			= "www.php.net"; // host name we are connecting to
+	public $port			= 80; // port we are connecting to
+	public $proxy_host		= ""; // proxy host to use
+	public $proxy_port		= ""; // proxy port to use
+	public $agent = "Snoopy v1.0"; // agent we masquerade as
+	public $referer		= ""; // referer info to pass
+	public $cookies		= array(); // array of cookies to pass
 												// $cookies["username"]="joe";
-	public	$rawheaders		=	array();			// array of raw headers to send
+	public	$rawheaders = array(); // array of raw headers to send
 												// $rawheaders["Content-type"]="text/html";
 
-	public $maxredirs		=	5;					// http redirection depth maximum. 0 = disallow
-	public $lastredirectaddr	=	"";				// contains address of last redirected address
-	public	$offsiteok		=	true;				// allows redirection off-site
-	public $maxframes		=	0;					// frame content depth maximum. 0 = disallow
-	public $expandlinks	=	true;				// expand links to fully qualified URLs.
+	public $maxredirs		= 5; // http redirection depth maximum. 0 = disallow
+	public $lastredirectaddr = ""; // contains address of last redirected address
+	public	$offsiteok		= true; // allows redirection off-site
+	public $maxframes		= 0; // frame content depth maximum. 0 = disallow
+	public $expandlinks	= true; // expand links to fully qualified URLs.
 												// this only applies to fetchlinks()
 												// or submitlinks()
-	public $passcookies	=	true;				// pass set cookies back through redirects
+	public $passcookies	= true; // pass set cookies back through redirects
 												// NOTE: this currently does not respect
 												// dates, domains or paths.
 	
-	public	$user			=	"";					// user for http authentication
-	public	$pass			=	"";					// password for http authentication
+	public	$user			= ""; // user for http authentication
+	public	$pass			= ""; // password for http authentication
 	
 	// http accept types
-	public $accept			=	"image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*";
+	public $accept			= "image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*";
 	
-	public $results		=	"";					// where the content is put
+	public $results		= ""; // where the content is put
 		
-	public $error			=	"";					// error messages sent here
-	public	$response_code	=	"";					// response code returned from server
-	public	$headers		=	array();			// headers returned from server sent here
-	public	$maxlength		=	500000;				// max return data length (body)
-	public $read_timeout	=	0;					// timeout on read operations, in seconds
+	public $error = ""; // error messages sent here
+	public	$response_code = ""; // response code returned from server
+	public	$headers = array(); // headers returned from server sent here
+	public	$maxlength = 500000; // max return data length (body)
+	public $read_timeout = 0; // timeout on read operations, in seconds
 												// supported only since PHP 4 Beta 4
 												// set to 0 to disallow timeouts
-	public $timed_out		=	false;				// if a read operation timed out
-	public	$status			=	0;					// http request status
+	public $timed_out		= false; // if a read operation timed out
+	public	$status = 0; // http request status
 	
-	public	$curl_path		=	"/usr/bin/curl";
+	public	$curl_path		= "/usr/bin/curl";
 												// Snoopy will use cURL for fetching
 												// SSL content if a full system path to
 												// the cURL binary is supplied here.
@@ -93,24 +93,24 @@ 
 												// as of this Snoopy release.
 	
 	// send Accept-encoding: gzip?
-	public $use_gzip		= true;	
+	public $use_gzip = true;	
 	
 	/**** Private variables ****/	
 	
-	private	$_maxlinelen	=	4096;				// max line length (headers)
+	private	$_maxlinelen	= 4096; // max line length (headers)
 	
-	private $_httpmethod	=	"GET";				// default http request method
-	private $_httpversion	=	"HTTP/1.0";			// default http request version
-	private $_submit_method	=	"POST";				// default submit method
-	private $_submit_type	=	"application/x-www-form-urlencoded";	// default submit type
-	private $_mime_boundary	=   "";					// MIME boundary for multipart/form-data submit type
-	private $_redirectaddr	=	false;				// will be set if page fetched is a redirect
-	private $_redirectdepth	=	0;					// increments on an http redirect
-	private $_frameurls		= 	array();			// frame src urls
-	private $_framedepth	=	0;					// increments on frame depth
+	private $_httpmethod	= "GET"; // default http request method
+	private $_httpversion	= "HTTP/1.0"; // default http request version
+	private $_submit_method	= "POST"; // default submit method
+	private $_submit_type	= "application/x-www-form-urlencoded"; // default submit type
+	private $_mime_boundary	= ""; // MIME boundary for multipart/form-data submit type
+	private $_redirectaddr = false; // will be set if page fetched is a redirect
+	private $_redirectdepth	= 0; // increments on an http redirect
+	private $_frameurls		= array(); // frame src urls
+	private $_framedepth	= 0; // increments on frame depth
 	
-	private $_isproxy		=	false;				// set if using a proxy server
-	private $_fp_timeout	=	30;					// timeout for socket connection
+	private $_isproxy = false; // set if using a proxy server
+	private $_fp_timeout	= 30; // timeout for socket connection
 
 /*======================================================================*\
 	Function:	fetch
@@ -132,14 +132,14 @@ 
 		switch ($URI_PARTS["scheme"]) {
 			case "http":
 				$this->host = $URI_PARTS["host"];
-				if(!empty($URI_PARTS["port"]))
+				if (!empty($URI_PARTS["port"]))
 					$this->port = $URI_PARTS["port"];
-				if($this->_connect($fp))
+				if ($this->_connect($fp))
 				{
-					if($this->_isproxy)
+					if ($this->_isproxy)
 					{
 						// using proxy, send entire URI
-						$this->_httprequest($URI,$fp,$URI,$this->_httpmethod);
+						$this->_httprequest($URI, $fp, $URI, $this->_httpmethod);
 					}
 					else
 					{
@@ -150,30 +150,30 @@ 
 					
 					$this->_disconnect($fp);
 
-					if($this->_redirectaddr)
+					if ($this->_redirectaddr)
 					{
 						/* url was redirected, check if we've hit the max depth */
-						if($this->maxredirs > $this->_redirectdepth)
+						if ($this->maxredirs > $this->_redirectdepth)
 						{
 							// only follow redirect if it's on this site, or offsiteok is true
-							if(preg_match("|^http://".preg_quote($this->host)."|i",$this->_redirectaddr) || $this->offsiteok)
+							if (preg_match("|^http://".preg_quote($this->host)."|i", $this->_redirectaddr) || $this->offsiteok)
 							{
 								/* follow the redirect */
 								$this->_redirectdepth++;
-								$this->lastredirectaddr=$this->_redirectaddr;
+								$this->lastredirectaddr = $this->_redirectaddr;
 								$this->fetch($this->_redirectaddr);
 							}
 						}
 					}
 
-					if($this->_framedepth < $this->maxframes && count($this->_frameurls) > 0)
+					if ($this->_framedepth < $this->maxframes && count($this->_frameurls) > 0)
 					{
 						$frameurls = $this->_frameurls;
 						$this->_frameurls = array();
 						
-						while(list(,$frameurl) = each($frameurls))
+						while (list(,$frameurl) = each($frameurls))
 						{
-							if($this->_framedepth < $this->maxframes)
+							if ($this->_framedepth < $this->maxframes)
 							{
 								$this->fetch($frameurl);
 								$this->_framedepth++;
@@ -190,17 +190,17 @@ 
 				return true;					
 				break;
 			case "https":
-				if(!$this->curl_path || (!is_executable($this->curl_path))) {
+				if (!$this->curl_path || (!is_executable($this->curl_path))) {
 					$this->error = "Bad curl ($this->curl_path), can't fetch HTTPS \n";
 					return false;
 				}
 				$this->host = $URI_PARTS["host"];
-				if(!empty($URI_PARTS["port"]))
+				if (!empty($URI_PARTS["port"]))
 					$this->port = $URI_PARTS["port"];
-				if($this->_isproxy)
+				if ($this->_isproxy)
 				{
 					// using proxy, send entire URI
-					$this->_httpsrequest($URI,$URI,$this->_httpmethod);
+					$this->_httpsrequest($URI, $URI, $this->_httpmethod);
 				}
 				else
 				{
@@ -209,30 +209,30 @@ 
 					$this->_httpsrequest($path, $URI, $this->_httpmethod);
 				}
 
-				if($this->_redirectaddr)
+				if ($this->_redirectaddr)
 				{
 					/* url was redirected, check if we've hit the max depth */
-					if($this->maxredirs > $this->_redirectdepth)
+					if ($this->maxredirs > $this->_redirectdepth)
 					{
 						// only follow redirect if it's on this site, or offsiteok is true
-						if(preg_match("|^http://".preg_quote($this->host)."|i",$this->_redirectaddr) || $this->offsiteok)
+						if (preg_match("|^http://".preg_quote($this->host)."|i", $this->_redirectaddr) || $this->offsiteok)
 						{
 							/* follow the redirect */
 							$this->_redirectdepth++;
-							$this->lastredirectaddr=$this->_redirectaddr;
+							$this->lastredirectaddr = $this->_redirectaddr;
 							$this->fetch($this->_redirectaddr);
 						}
 					}
 				}
 
-				if($this->_framedepth < $this->maxframes && count($this->_frameurls) > 0)
+				if ($this->_framedepth < $this->maxframes && count($this->_frameurls) > 0)
 				{
 					$frameurls = $this->_frameurls;
 					$this->_frameurls = array();
 
-					while(list(,$frameurl) = each($frameurls))
+					while (list(,$frameurl) = each($frameurls))
 					{
-						if($this->_framedepth < $this->maxframes)
+						if ($this->_framedepth < $this->maxframes)
 						{
 							$this->fetch($frameurl);
 							$this->_framedepth++;
@@ -245,7 +245,7 @@ 
 				break;
 			default:
 				// not a valid protocol
-				$this->error	=	'Invalid protocol "'.$URI_PARTS["scheme"].'"\n';
+				$this->error = 'Invalid protocol "'.$URI_PARTS["scheme"].'"\n';
 				return false;
 				break;
 		}		
@@ -272,20 +272,20 @@ 
 						([\"\'])?					# find single or double quote
 						(?(1) (.*?)\\1 | ([^\s\>]+))		# if quote found, match up to next matching
 													# quote, otherwise match up to next space
-						'isx",$document,$links);
+						'isx",$document, $links);
 						
 
 		// catenate the non-empty matches from the conditional subpattern
 
-		while(list($key,$val) = each($links[2]))
+		while (list($key, $val) = each($links[2]))
 		{
-			if(!empty($val))
+			if (!empty($val))
 				$match[] = $val;
 		}				
 		
-		while(list($key,$val) = each($links[3]))
+		while (list($key, $val) = each($links[3]))
 		{
-			if(!empty($val))
+			if (!empty($val))
 				$match[] = $val;
 		}		
 		
@@ -302,10 +302,10 @@ 
 
 	private function _stripform($document)
 	{	
-		preg_match_all("'<\/?(FORM|INPUT|SELECT|TEXTAREA|(OPTION))[^<>]*>(?(2)(.*(?=<\/?(option|select)[^<>]*>[\r\n]*)|(?=[\r\n]*))|(?=[\r\n]*))'Usi",$document,$elements);
+		preg_match_all("'<\/?(FORM|INPUT|SELECT|TEXTAREA|(OPTION))[^<>]*>(?(2)(.*(?=<\/?(option|select)[^<>]*>[\r\n]*)|(?=[\r\n]*))|(?=[\r\n]*))'Usi", $document, $elements);
 		
 		// catenate the matches
-		$match = implode("\r\n",$elements[0]);
+		$match = implode("\r\n", $elements[0]);
 				
 		// return the links
 		return $match;
@@ -327,10 +327,10 @@ 
 		// so, list your entities one by one here. I included some of the
 		// more common ones.
 								
-		$search = array("'<script[^>]*?>.*?</script>'si",	// strip out javascript
-						"'<[\/\!]*?[^<>]*?>'si",			// strip out html tags
-						"'([\r\n])[\s]+'",					// strip out white space
-						"'&(quote|#34);'i",					// replace html entities
+		$search = array("'<script[^>]*?>.*?</script>'si", // strip out javascript
+						"'<[\/\!]*?[^<>]*?>'si", // strip out html tags
+						"'([\r\n])[\s]+'", // strip out white space
+						"'&(quote|#34);'i", // replace html entities
 						"'&(amp|#38);'i",
 						"'&(lt|#60);'i",
 						"'&(gt|#62);'i",
@@ -340,7 +340,7 @@ 
 						"'&(pound|#163);'i",
 						"'&(copy|#169);'i"
 						);				
-		$replace = array(	"",
+		$replace = array("",
 							"",
 							"\\1",
 							"\"",
@@ -353,7 +353,7 @@ 
 							chr(163),
 							chr(169));
 					
-		$text = preg_replace($search,$replace,$document);
+		$text = preg_replace($search, $replace, $document);
 								
 		return $text;
 	}
@@ -366,26 +366,26 @@ 
 	Output:		$expandedLinks	the expanded links
 \*======================================================================*/
 
-	private function _expandlinks($links,$URI)
+	private function _expandlinks($links, $URI)
 	{
 		
-		preg_match("/^[^\?]+/",$URI,$match);
+		preg_match("/^[^\?]+/", $URI, $match);
 
-		$match = preg_replace("|/[^\/\.]+\.[^\/\.]+$|","",$match[0]);
+		$match = preg_replace("|/[^\/\.]+\.[^\/\.]+$|", "", $match[0]);
 				
-		$search = array( 	"|^http://".preg_quote($this->host)."|i",
+		$search = array("|^http://".preg_quote($this->host)."|i",
 							"|^(?!http://)(\/)?(?!mailto:)|i",
 							"|/\./|",
 							"|/[^\/]+/\.\./|"
 						);
 						
-		$replace = array(	"",
+		$replace = array("",
 							$match."/",
 							"/",
 							"/"
 						);			
 				
-		$expandedLinks = preg_replace($search,$replace,$links);
+		$expandedLinks = preg_replace($search, $replace, $links);
 
 		return $expandedLinks;
 	}
@@ -400,26 +400,26 @@ 
 	Output:		
 \*======================================================================*/
 	
-	private function _httprequest($url,$fp,$URI,$http_method,$content_type="",$body="")
+	private function _httprequest($url, $fp, $URI, $http_method, $content_type = "", $body = "")
 	{
-		if($this->passcookies && $this->_redirectaddr)
+		if ($this->passcookies && $this->_redirectaddr)
 			$this->setcookies();
 			
 		$URI_PARTS = parse_url($URI);
-		if(empty($url))
+		if (empty($url))
 			$url = "/";
 		$headers = $http_method." ".$url." ".$this->_httpversion."\r\n";		
-		if(!empty($this->agent))
+		if (!empty($this->agent))
 			$headers .= "User-Agent: ".$this->agent."\r\n";
-		if(!empty($this->host) && !isset($this->rawheaders['Host']))
+		if (!empty($this->host) && !isset($this->rawheaders['Host']))
 			$headers .= "Host: ".$this->host."\r\n";
-		if(!empty($this->accept))
+		if (!empty($this->accept))
 			$headers .= "Accept: ".$this->accept."\r\n";
 		
-		if($this->use_gzip) {
+		if ($this->use_gzip) {
 			// make sure PHP was built with --with-zlib
 			// and we can handle gzipp'ed data
-			if ( function_exists(gzinflate) ) {
+			if (function_exists(gzinflate)) {
 			   $headers .= "Accept-encoding: gzip\r\n";
 			}
 			else {
@@ -430,38 +430,38 @@ 
 			}
 		}
 		
-		if(!empty($this->referer))
+		if (!empty($this->referer))
 			$headers .= "Referer: ".$this->referer."\r\n";
-		if(!empty($this->cookies))
+		if (!empty($this->cookies))
 		{			
-			if(!is_array($this->cookies))
-				$this->cookies = (array)$this->cookies;
+			if (!is_array($this->cookies))
+				$this->cookies = (array) $this->cookies;
 	
 			reset($this->cookies);
-			if ( count($this->cookies) > 0 ) {
+			if (count($this->cookies) > 0) {
 				$cookie_headers .= 'Cookie: ';
-				foreach ( $this->cookies as $cookieKey => $cookieVal ) {
+				foreach ($this->cookies as $cookieKey => $cookieVal) {
 				$cookie_headers .= $cookieKey."=".urlencode($cookieVal)."; ";
 				}
-				$headers .= substr($cookie_headers,0,-2) . "\r\n";
+				$headers .= substr($cookie_headers, 0, -2)."\r\n";
 			} 
 		}
-		if(!empty($this->rawheaders))
+		if (!empty($this->rawheaders))
 		{
-			if(!is_array($this->rawheaders))
-				$this->rawheaders = (array)$this->rawheaders;
-			while(list($headerKey,$headerVal) = each($this->rawheaders))
+			if (!is_array($this->rawheaders))
+				$this->rawheaders = (array) $this->rawheaders;
+			while (list($headerKey, $headerVal) = each($this->rawheaders))
 				$headers .= $headerKey.": ".$headerVal."\r\n";
 		}
-		if(!empty($content_type)) {
+		if (!empty($content_type)) {
 			$headers .= "Content-type: $content_type";
 			if ($content_type == "multipart/form-data")
 				$headers .= "; boundary=".$this->_mime_boundary;
 			$headers .= "\r\n";
 		}
-		if(!empty($body))	
+		if (!empty($body))	
 			$headers .= "Content-length: ".strlen($body)."\r\n";
-		if(!empty($this->user) || !empty($this->pass))	
+		if (!empty($this->user) || !empty($this->pass))	
 			$headers .= "Authorization: BASIC ".base64_encode($this->user.":".$this->pass)."\r\n";
 
 		$headers .= "\r\n";
@@ -471,7 +471,7 @@ 
 			socket_set_timeout($fp, $this->read_timeout);
 		$this->timed_out = false;
 		
-		fwrite($fp,$headers.$body,strlen($headers.$body));
+		fwrite($fp, $headers.$body, strlen($headers.$body));
 		
 		$this->_redirectaddr = false;
 		unset($this->headers);
@@ -479,30 +479,30 @@ 
 		// content was returned gzip encoded?
 		$is_gzipped = false;
 						
-		while($currentHeader = fgets($fp,$this->_maxlinelen))
+		while ($currentHeader = fgets($fp, $this->_maxlinelen))
 		{
 			if ($this->read_timeout > 0 && $this->_check_timeout($fp))
 			{
-				$this->status=-100;
+				$this->status = -100;
 				return false;
 			}
 				
 		//	if($currentHeader == "\r\n")
-			if(preg_match("/^\r?\n$/", $currentHeader) )
+			if (preg_match("/^\r?\n$/", $currentHeader))
 			      break;
 						
 			// if a header begins with Location: or URI:, set the redirect
-			if(preg_match("/^(Location:|URI:)/i",$currentHeader))
+			if (preg_match("/^(Location:|URI:)/i", $currentHeader))
 			{
 				// get URL portion of the redirect
-				preg_match("/^(Location:|URI:)\s+(.*)/",chop($currentHeader),$matches);
+				preg_match("/^(Location:|URI:)\s+(.*)/", chop($currentHeader), $matches);
 				// look for :// in the Location header to see if hostname is included
-				if(!preg_match("|\:\/\/|",$matches[2]))
+				if (!preg_match("|\:\/\/|", $matches[2]))
 				{
 					// no host in the path, so prepend
 					$this->_redirectaddr = $URI_PARTS["scheme"]."://".$this->host.":".$this->port;
 					// eliminate double slash
-					if(!preg_match("|^/|",$matches[2]))
+					if (!preg_match("|^/|", $matches[2]))
 							$this->_redirectaddr .= "/".$matches[2];
 					else
 							$this->_redirectaddr .= $matches[2];
@@ -511,16 +511,16 @@ 
 					$this->_redirectaddr = $matches[2];
 			}
 		
-			if(preg_match("|^HTTP/|",$currentHeader))
+			if (preg_match("|^HTTP/|", $currentHeader))
 			{
-                if(preg_match("|^HTTP/[^\s]*\s(.*?)\s|",$currentHeader, $status))
+                if (preg_match("|^HTTP/[^\s]*\s(.*?)\s|", $currentHeader, $status))
 				{
-					$this->status= $status[1];
+					$this->status = $status[1];
                 }				
 				$this->response_code = $currentHeader;
 			}
 			
-			if (preg_match("/Content-Encoding: gzip/", $currentHeader) ) {
+			if (preg_match("/Content-Encoding: gzip/", $currentHeader)) {
 				$is_gzipped = true;
 			}
 			
@@ -529,7 +529,7 @@ 
 
 		# $results = fread($fp, $this->maxlength);
 		$results = "";
-		while ( $data = fread($fp, $this->maxlength) ) {
+		while ($data = fread($fp, $this->maxlength)) {
 		    $results .= $data;
 		    if (
 		        strlen($results) > $this->maxlength ) {
@@ -538,7 +538,7 @@ 
 		}
 		
 		// gunzip
-		if ( $is_gzipped ) {
+		if ($is_gzipped) {
 			// per http://www.php.net/manual/en/function.gzencode.php
 			$results = substr($results, 10);
 			$results = gzinflate($results);
@@ -546,26 +546,26 @@ 
 		
 		if ($this->read_timeout > 0 && $this->_check_timeout($fp))
 		{
-			$this->status=-100;
+			$this->status = -100;
 			return false;
 		}
 		
 		// check if there is a a redirect meta tag
 		
-		if(preg_match("'<meta[\s]*http-equiv[^>]*?content[\s]*=[\s]*[\"\']?\d+;[\s]+URL[\s]*=[\s]*([^\"\']*?)[\"\']?>'i",$results,$match))
+		if (preg_match("'<meta[\s]*http-equiv[^>]*?content[\s]*=[\s]*[\"\']?\d+;[\s]+URL[\s]*=[\s]*([^\"\']*?)[\"\']?>'i", $results, $match))
 		{
-			$this->_redirectaddr = $this->_expandlinks($match[1],$URI);	
+			$this->_redirectaddr = $this->_expandlinks($match[1], $URI);	
 		}
 
 		// have we hit our frame depth and is there frame src to fetch?
-		if(($this->_framedepth < $this->maxframes) && preg_match_all("'<frame\s+.*src[\s]*=[\'\"]?([^\'\"\>]+)'i",$results,$match))
+		if (($this->_framedepth < $this->maxframes) && preg_match_all("'<frame\s+.*src[\s]*=[\'\"]?([^\'\"\>]+)'i", $results, $match))
 		{
 			$this->results[] = $results;
-			for($x=0; $x<count($match[1]); $x++)
-				$this->_frameurls[] = $this->_expandlinks($match[1][$x],$URI_PARTS["scheme"]."://".$this->host);
+			for ($x = 0; $x < count($match[1]); $x++)
+				$this->_frameurls[] = $this->_expandlinks($match[1][$x], $URI_PARTS["scheme"]."://".$this->host);
 		}
 		// have we already fetched framed content?
-		elseif(is_array($this->results))
+		elseif (is_array($this->results))
 			$this->results[] = $results;
 		// no framed content
 		else
@@ -583,66 +583,66 @@ 
 	Output:		
 \*======================================================================*/
 	
-	private function _httpsrequest($url,$URI,$http_method,$content_type="",$body="")
+	private function _httpsrequest($url, $URI, $http_method, $content_type = "", $body = "")
 	{
-		if($this->passcookies && $this->_redirectaddr)
+		if ($this->passcookies && $this->_redirectaddr)
 			$this->setcookies();
 
 		$headers = array();		
 					
 		$URI_PARTS = parse_url($URI);
-		if(empty($url))
+		if (empty($url))
 			$url = "/";
 		// GET ... header not needed for curl
 		//$headers[] = $http_method." ".$url." ".$this->_httpversion;		
-		if(!empty($this->agent))
+		if (!empty($this->agent))
 			$headers[] = "User-Agent: ".$this->agent;
-		if(!empty($this->host))
+		if (!empty($this->host))
 			$headers[] = "Host: ".$this->host;
-		if(!empty($this->accept))
+		if (!empty($this->accept))
 			$headers[] = "Accept: ".$this->accept;
-		if(!empty($this->referer))
+		if (!empty($this->referer))
 			$headers[] = "Referer: ".$this->referer;
-		if(!empty($this->cookies))
+		if (!empty($this->cookies))
 		{			
-			if(!is_array($this->cookies))
-				$this->cookies = (array)$this->cookies;
+			if (!is_array($this->cookies))
+				$this->cookies = (array) $this->cookies;
 	
 			reset($this->cookies);
-			if ( count($this->cookies) > 0 ) {
+			if (count($this->cookies) > 0) {
 				$cookie_str = 'Cookie: ';
-				foreach ( $this->cookies as $cookieKey => $cookieVal ) {
+				foreach ($this->cookies as $cookieKey => $cookieVal) {
 				$cookie_str .= $cookieKey."=".urlencode($cookieVal)."; ";
 				}
-				$headers[] = substr($cookie_str,0,-2);
+				$headers[] = substr($cookie_str, 0, -2);
 			}
 		}
-		if(!empty($this->rawheaders))
+		if (!empty($this->rawheaders))
 		{
-			if(!is_array($this->rawheaders))
-				$this->rawheaders = (array)$this->rawheaders;
-			while(list($headerKey,$headerVal) = each($this->rawheaders))
+			if (!is_array($this->rawheaders))
+				$this->rawheaders = (array) $this->rawheaders;
+			while (list($headerKey, $headerVal) = each($this->rawheaders))
 				$headers[] = $headerKey.": ".$headerVal;
 		}
-		if(!empty($content_type)) {
+		if (!empty($content_type)) {
 			if ($content_type == "multipart/form-data")
 				$headers[] = "Content-type: $content_type; boundary=".$this->_mime_boundary;
 			else
 				$headers[] = "Content-type: $content_type";
 		}
-		if(!empty($body))	
+		if (!empty($body))	
 			$headers[] = "Content-length: ".strlen($body);
-		if(!empty($this->user) || !empty($this->pass))	
+		if (!empty($this->user) || !empty($this->pass))	
 			$headers[] = "Authorization: BASIC ".base64_encode($this->user.":".$this->pass);
 			
-		for($curr_header = 0; $curr_header < count($headers); $curr_header++) {
+		for ($curr_header = 0; $curr_header < count($headers); $curr_header++) {
 			$cmdline_params .= " -H \"".$headers[$curr_header]."\"";
 		}
 			  	                         
-		if(!empty($body))
+		if (!empty($body))
 			$cmdline_params .= " -d \"$body\"";
 		
-		if($this->read_timeout > 0)
+		if ($this->read_timeout > 0)
 			$cmdline_params .= " -m ".$this->read_timeout;
 		
 		$headerfile = uniqid(time());
@@ -651,37 +651,37 @@ 
 		$cmdline_params .= " -k";
         $results = array();
         $return = 0;
-		exec($this->curl_path." -D \"/tmp/$headerfile\"".escapeshellcmd($cmdline_params)." ".escapeshellcmd($URI),$results,$return);
+		exec($this->curl_path." -D \"/tmp/$headerfile\"".escapeshellcmd($cmdline_params)." ".escapeshellcmd($URI), $results, $return);
 		
-		if($return)
+		if ($return)
 		{
 			$this->error = "Error: cURL could not retrieve the document, error $return.";
 			return false;
 		}
 			
 			
-		$results = implode("\r\n",$results);
+		$results = implode("\r\n", $results);
 		
 		$result_headers = file("/tmp/$headerfile");
 						
 		$this->_redirectaddr = false;
 		unset($this->headers);
 						
-		for($currentHeader = 0; $currentHeader < count($result_headers); $currentHeader++)
+		for ($currentHeader = 0; $currentHeader < count($result_headers); $currentHeader++)
 		{
 			
 			// if a header begins with Location: or URI:, set the redirect
-			if(preg_match("/^(Location: |URI: )/i",$result_headers[$currentHeader]))
+			if (preg_match("/^(Location: |URI: )/i", $result_headers[$currentHeader]))
 			{
 				// get URL portion of the redirect
-				preg_match("/^(Location: |URI:)(.*)/",chop($result_headers[$currentHeader]),$matches);
+				preg_match("/^(Location: |URI:)(.*)/", chop($result_headers[$currentHeader]), $matches);
 				// look for :// in the Location header to see if hostname is included
-				if(!preg_match("|\:\/\/|",$matches[2]))
+				if (!preg_match("|\:\/\/|", $matches[2]))
 				{
 					// no host in the path, so prepend
 					$this->_redirectaddr = $URI_PARTS["scheme"]."://".$this->host.":".$this->port;
 					// eliminate double slash
-					if(!preg_match("|^/|",$matches[2]))
+					if (!preg_match("|^/|", $matches[2]))
 							$this->_redirectaddr .= "/".$matches[2];
 					else
 							$this->_redirectaddr .= $matches[2];
@@ -690,12 +690,12 @@ 
 					$this->_redirectaddr = $matches[2];
 			}
 		
-			if(preg_match("|^HTTP/|",$result_headers[$currentHeader]))
+			if (preg_match("|^HTTP/|", $result_headers[$currentHeader]))
 			{
 			    $this->response_code = $result_headers[$currentHeader];
-			    if(preg_match("|^HTTP/[^\s]*\s(.*?)\s|",$this->response_code, $match))
+			    if (preg_match("|^HTTP/[^\s]*\s(.*?)\s|", $this->response_code, $match))
 			    {
-				$this->status= $match[1];
+				$this->status = $match[1];
                 	    }
 			}
 			$this->headers[] = $result_headers[$currentHeader];
@@ -703,20 +703,20 @@ 
 
 		// check if there is a a redirect meta tag
 		
-		if(preg_match("'<meta[\s]*http-equiv[^>]*?content[\s]*=[\s]*[\"\']?\d+;[\s]+URL[\s]*=[\s]*([^\"\']*?)[\"\']?>'i",$results,$match))
+		if (preg_match("'<meta[\s]*http-equiv[^>]*?content[\s]*=[\s]*[\"\']?\d+;[\s]+URL[\s]*=[\s]*([^\"\']*?)[\"\']?>'i", $results, $match))
 		{
-			$this->_redirectaddr = $this->_expandlinks($match[1],$URI);	
+			$this->_redirectaddr = $this->_expandlinks($match[1], $URI);	
 		}
 
 		// have we hit our frame depth and is there frame src to fetch?
-		if(($this->_framedepth < $this->maxframes) && preg_match_all("'<frame\s+.*src[\s]*=[\'\"]?([^\'\"\>]+)'i",$results,$match))
+		if (($this->_framedepth < $this->maxframes) && preg_match_all("'<frame\s+.*src[\s]*=[\'\"]?([^\'\"\>]+)'i", $results, $match))
 		{
 			$this->results[] = $results;
-			for($x=0; $x<count($match[1]); $x++)
-				$this->_frameurls[] = $this->_expandlinks($match[1][$x],$URI_PARTS["scheme"]."://".$this->host);
+			for ($x = 0; $x < count($match[1]); $x++)
+				$this->_frameurls[] = $this->_expandlinks($match[1][$x], $URI_PARTS["scheme"]."://".$this->host);
 		}
 		// have we already fetched framed content?
-		elseif(is_array($this->results))
+		elseif (is_array($this->results))
 			$this->results[] = $results;
 		// no framed content
 		else
@@ -734,9 +734,9 @@ 
 	
 	public function setcookies()
 	{
-		for($x=0; $x<count($this->headers); $x++)
+		for ($x = 0; $x < count($this->headers); $x++)
 		{
-		if(preg_match("/^set-cookie:[\s]+([^=]+)=([^;]+)/i", $this->headers[$x],$match))
+		if (preg_match("/^set-cookie:[\s]+([^=]+)=([^;]+)/i", $this->headers[$x], $match))
 			$this->cookies[$match[1]] = $match[2];
 		}
 	}
@@ -768,7 +768,7 @@ 
 	
 	private function _connect(&$fp)
 	{
-		if(!empty($this->proxy_host) && !empty($this->proxy_port))
+		if (!empty($this->proxy_host) && !empty($this->proxy_port))
 			{
 				$this->_isproxy = true;
 				$host = $this->proxy_host;
@@ -782,7 +782,7 @@ 
 	
 		$this->status = 0;
 		
-		if($fp = fsockopen(
+		if ($fp = fsockopen(
 					$host,
 					$port,
 					$errno,
@@ -798,16 +798,16 @@ 
 		{
 			// socket connection failed
 			$this->status = $errno;
-			switch($errno)
+			switch ($errno)
 			{
 				case -3:
-					$this->error="socket creation failed (-3)";
+					$this->error = "socket creation failed (-3)";
 				case -4:
-					$this->error="dns lookup failure (-4)";
+					$this->error = "dns lookup failure (-4)";
 				case -5:
-					$this->error="connection refused or timed out (-5)";
+					$this->error = "connection refused or timed out (-5)";
 				default:
-					$this->error="connection failed (".$errno.")";
+					$this->error = "connection failed (".$errno.")";
 			}
 			return false;
 		}
@@ -843,7 +843,7 @@ 
 		switch ($this->_submit_type) {
 			case "application/x-www-form-urlencoded":
 				reset($formvars);
-				while(list($key,$val) = each($formvars)) {
+				while (list($key, $val) = each($formvars)) {
 					if (is_array($val) || is_object($val)) {
 						while (list($cur_key, $cur_val) = each($val)) {
 							$postdata .= urlencode($key)."[]=".urlencode($cur_val)."&";
@@ -857,7 +857,7 @@ 
 				$this->_mime_boundary = "Snoopy".md5(uniqid(microtime()));
 				
 				reset($formvars);
-				while(list($key,$val) = each($formvars)) {
+				while (list($key, $val) = each($formvars)) {
 					if (is_array($val) || is_object($val)) {
 						while (list($cur_key, $cur_val) = each($val)) {
 							$postdata .= "--".$this->_mime_boundary."\r\n";

Braces +159 added lines, -118 removed lines

@@ -124,24 +124,26 @@ 
 	public function fetch($URI) {
 		//preg_match("|^([^:]+)://([^:/]+)(:[\d]+)*(.*)|",$URI,$URI_PARTS);
 		$URI_PARTS = parse_url($URI);
-		if (!empty($URI_PARTS["user"]))
-			$this->user = $URI_PARTS["user"];
-		if (!empty($URI_PARTS["pass"]))
-			$this->pass = $URI_PARTS["pass"];
+		if (!empty($URI_PARTS["user"])) {
+					$this->user = $URI_PARTS["user"];
+		}
+		if (!empty($URI_PARTS["pass"])) {
+					$this->pass = $URI_PARTS["pass"];
+		}
 		if (!isset($fp)) { $fp = false; }
 		switch ($URI_PARTS["scheme"]) {
 			case "http":
 				$this->host = $URI_PARTS["host"];
-				if(!empty($URI_PARTS["port"]))
-					$this->port = $URI_PARTS["port"];
+				if(!empty($URI_PARTS["port"])) {
+									$this->port = $URI_PARTS["port"];
+				}
 				if($this->_connect($fp))
 				{
 					if($this->_isproxy)
 					{
 						// using proxy, send entire URI
 						$this->_httprequest($URI,$fp,$URI,$this->_httpmethod);
-					}
-					else
+					} else
 					{
 						$path = $URI_PARTS["path"].(isset($URI_PARTS["query"]) ? "?".$URI_PARTS["query"] : "");
 						// no proxy, send only the path
@@ -177,13 +179,12 @@ 
 							{
 								$this->fetch($frameurl);
 								$this->_framedepth++;
+							} else {
+															break;
 							}
-							else
-								break;
 						}
 					}					
-				}
-				else
+				} else
 				{
 					return false;
 				}
@@ -195,14 +196,14 @@ 
 					return false;
 				}
 				$this->host = $URI_PARTS["host"];
-				if(!empty($URI_PARTS["port"]))
-					$this->port = $URI_PARTS["port"];
+				if(!empty($URI_PARTS["port"])) {
+									$this->port = $URI_PARTS["port"];
+				}
 				if($this->_isproxy)
 				{
 					// using proxy, send entire URI
 					$this->_httpsrequest($URI,$URI,$this->_httpmethod);
-				}
-				else
+				} else
 				{
 					$path = $URI_PARTS["path"].($URI_PARTS["query"] ? "?".$URI_PARTS["query"] : "");
 					// no proxy, send only the path
@@ -236,9 +237,9 @@ 
 						{
 							$this->fetch($frameurl);
 							$this->_framedepth++;
+						} else {
+													break;
 						}
-						else
-							break;
 					}
 				}					
 				return true;					
@@ -279,14 +280,16 @@ 
 
 		while(list($key,$val) = each($links[2]))
 		{
-			if(!empty($val))
-				$match[] = $val;
+			if(!empty($val)) {
+							$match[] = $val;
+			}
 		}				
 		
 		while(list($key,$val) = each($links[3]))
 		{
-			if(!empty($val))
-				$match[] = $val;
+			if(!empty($val)) {
+							$match[] = $val;
+			}
 		}		
 		
 		// return the links
@@ -402,27 +405,31 @@ 
 	
 	private function _httprequest($url,$fp,$URI,$http_method,$content_type="",$body="")
 	{
-		if($this->passcookies && $this->_redirectaddr)
-			$this->setcookies();
+		if($this->passcookies && $this->_redirectaddr) {
+					$this->setcookies();
+		}
 			
 		$URI_PARTS = parse_url($URI);
-		if(empty($url))
-			$url = "/";
+		if(empty($url)) {
+					$url = "/";
+		}
 		$headers = $http_method." ".$url." ".$this->_httpversion."\r\n";		
-		if(!empty($this->agent))
-			$headers .= "User-Agent: ".$this->agent."\r\n";
-		if(!empty($this->host) && !isset($this->rawheaders['Host']))
-			$headers .= "Host: ".$this->host."\r\n";
-		if(!empty($this->accept))
-			$headers .= "Accept: ".$this->accept."\r\n";
+		if(!empty($this->agent)) {
+					$headers .= "User-Agent: ".$this->agent."\r\n";
+		}
+		if(!empty($this->host) && !isset($this->rawheaders['Host'])) {
+					$headers .= "Host: ".$this->host."\r\n";
+		}
+		if(!empty($this->accept)) {
+					$headers .= "Accept: ".$this->accept."\r\n";
+		}
 		
 		if($this->use_gzip) {
 			// make sure PHP was built with --with-zlib
 			// and we can handle gzipp'ed data
 			if ( function_exists(gzinflate) ) {
 			   $headers .= "Accept-encoding: gzip\r\n";
-			}
-			else {
+			} else {
 			   trigger_error(
 			   	"use_gzip is on, but PHP was built without zlib support.".
 				"  Requesting file(s) without gzip encoding.", 
@@ -430,12 +437,14 @@ 
 			}
 		}
 		
-		if(!empty($this->referer))
-			$headers .= "Referer: ".$this->referer."\r\n";
+		if(!empty($this->referer)) {
+					$headers .= "Referer: ".$this->referer."\r\n";
+		}
 		if(!empty($this->cookies))
 		{			
-			if(!is_array($this->cookies))
-				$this->cookies = (array)$this->cookies;
+			if(!is_array($this->cookies)) {
+							$this->cookies = (array)$this->cookies;
+			}
 	
 			reset($this->cookies);
 			if ( count($this->cookies) > 0 ) {
@@ -448,27 +457,33 @@ 
 		}
 		if(!empty($this->rawheaders))
 		{
-			if(!is_array($this->rawheaders))
-				$this->rawheaders = (array)$this->rawheaders;
-			while(list($headerKey,$headerVal) = each($this->rawheaders))
-				$headers .= $headerKey.": ".$headerVal."\r\n";
+			if(!is_array($this->rawheaders)) {
+							$this->rawheaders = (array)$this->rawheaders;
+			}
+			while(list($headerKey,$headerVal) = each($this->rawheaders)) {
+							$headers .= $headerKey.": ".$headerVal."\r\n";
+			}
 		}
 		if(!empty($content_type)) {
 			$headers .= "Content-type: $content_type";
-			if ($content_type == "multipart/form-data")
-				$headers .= "; boundary=".$this->_mime_boundary;
+			if ($content_type == "multipart/form-data") {
+							$headers .= "; boundary=".$this->_mime_boundary;
+			}
 			$headers .= "\r\n";
 		}
-		if(!empty($body))	
-			$headers .= "Content-length: ".strlen($body)."\r\n";
-		if(!empty($this->user) || !empty($this->pass))	
-			$headers .= "Authorization: BASIC ".base64_encode($this->user.":".$this->pass)."\r\n";
+		if(!empty($body)) {
+					$headers .= "Content-length: ".strlen($body)."\r\n";
+		}
+		if(!empty($this->user) || !empty($this->pass)) {
+					$headers .= "Authorization: BASIC ".base64_encode($this->user.":".$this->pass)."\r\n";
+		}
 
 		$headers .= "\r\n";
 		
 		// set the read timeout if needed
-		if ($this->read_timeout > 0)
-			socket_set_timeout($fp, $this->read_timeout);
+		if ($this->read_timeout > 0) {
+					socket_set_timeout($fp, $this->read_timeout);
+		}
 		$this->timed_out = false;
 		
 		fwrite($fp,$headers.$body,strlen($headers.$body));
@@ -488,8 +503,9 @@ 
 			}
 				
 		//	if($currentHeader == "\r\n")
-			if(preg_match("/^\r?\n$/", $currentHeader) )
-			      break;
+			if(preg_match("/^\r?\n$/", $currentHeader) ) {
+						      break;
+			}
 						
 			// if a header begins with Location: or URI:, set the redirect
 			if(preg_match("/^(Location:|URI:)/i",$currentHeader))
@@ -502,13 +518,14 @@ 
 					// no host in the path, so prepend
 					$this->_redirectaddr = $URI_PARTS["scheme"]."://".$this->host.":".$this->port;
 					// eliminate double slash
-					if(!preg_match("|^/|",$matches[2]))
-							$this->_redirectaddr .= "/".$matches[2];
-					else
-							$this->_redirectaddr .= $matches[2];
+					if(!preg_match("|^/|",$matches[2])) {
+												$this->_redirectaddr .= "/".$matches[2];
+					} else {
+												$this->_redirectaddr .= $matches[2];
+					}
+				} else {
+									$this->_redirectaddr = $matches[2];
 				}
-				else
-					$this->_redirectaddr = $matches[2];
 			}
 		
 			if(preg_match("|^HTTP/|",$currentHeader))
@@ -561,15 +578,18 @@ 
 		if(($this->_framedepth < $this->maxframes) && preg_match_all("'<frame\s+.*src[\s]*=[\'\"]?([^\'\"\>]+)'i",$results,$match))
 		{
 			$this->results[] = $results;
-			for($x=0; $x<count($match[1]); $x++)
-				$this->_frameurls[] = $this->_expandlinks($match[1][$x],$URI_PARTS["scheme"]."://".$this->host);
+			for($x=0; $x<count($match[1]); $x++) {
+							$this->_frameurls[] = $this->_expandlinks($match[1][$x],$URI_PARTS["scheme"]."://".$this->host);
+			}
 		}
 		// have we already fetched framed content?
-		elseif(is_array($this->results))
-			$this->results[] = $results;
+		elseif(is_array($this->results)) {
+					$this->results[] = $results;
+		}
 		// no framed content
-		else
-			$this->results = $results;
+		else {
+					$this->results = $results;
+		}
 		
 		return true;
 	}
@@ -585,28 +605,35 @@ 
 	
 	private function _httpsrequest($url,$URI,$http_method,$content_type="",$body="")
 	{
-		if($this->passcookies && $this->_redirectaddr)
-			$this->setcookies();
+		if($this->passcookies && $this->_redirectaddr) {
+					$this->setcookies();
+		}
 
 		$headers = array();		
 					
 		$URI_PARTS = parse_url($URI);
-		if(empty($url))
-			$url = "/";
+		if(empty($url)) {
+					$url = "/";
+		}
 		// GET ... header not needed for curl
 		//$headers[] = $http_method." ".$url." ".$this->_httpversion;		
-		if(!empty($this->agent))
-			$headers[] = "User-Agent: ".$this->agent;
-		if(!empty($this->host))
-			$headers[] = "Host: ".$this->host;
-		if(!empty($this->accept))
-			$headers[] = "Accept: ".$this->accept;
-		if(!empty($this->referer))
-			$headers[] = "Referer: ".$this->referer;
+		if(!empty($this->agent)) {
+					$headers[] = "User-Agent: ".$this->agent;
+		}
+		if(!empty($this->host)) {
+					$headers[] = "Host: ".$this->host;
+		}
+		if(!empty($this->accept)) {
+					$headers[] = "Accept: ".$this->accept;
+		}
+		if(!empty($this->referer)) {
+					$headers[] = "Referer: ".$this->referer;
+		}
 		if(!empty($this->cookies))
 		{			
-			if(!is_array($this->cookies))
-				$this->cookies = (array)$this->cookies;
+			if(!is_array($this->cookies)) {
+							$this->cookies = (array)$this->cookies;
+			}
 	
 			reset($this->cookies);
 			if ( count($this->cookies) > 0 ) {
@@ -619,31 +646,38 @@ 
 		}
 		if(!empty($this->rawheaders))
 		{
-			if(!is_array($this->rawheaders))
-				$this->rawheaders = (array)$this->rawheaders;
-			while(list($headerKey,$headerVal) = each($this->rawheaders))
-				$headers[] = $headerKey.": ".$headerVal;
+			if(!is_array($this->rawheaders)) {
+							$this->rawheaders = (array)$this->rawheaders;
+			}
+			while(list($headerKey,$headerVal) = each($this->rawheaders)) {
+							$headers[] = $headerKey.": ".$headerVal;
+			}
 		}
 		if(!empty($content_type)) {
-			if ($content_type == "multipart/form-data")
-				$headers[] = "Content-type: $content_type; boundary=".$this->_mime_boundary;
-			else
-				$headers[] = "Content-type: $content_type";
-		}
-		if(!empty($body))	
-			$headers[] = "Content-length: ".strlen($body);
-		if(!empty($this->user) || !empty($this->pass))	
-			$headers[] = "Authorization: BASIC ".base64_encode($this->user.":".$this->pass);
+			if ($content_type == "multipart/form-data") {
+							$headers[] = "Content-type: $content_type; boundary=".$this->_mime_boundary;
+			} else {
+							$headers[] = "Content-type: $content_type";
+			}
+		}
+		if(!empty($body)) {
+					$headers[] = "Content-length: ".strlen($body);
+		}
+		if(!empty($this->user) || !empty($this->pass)) {
+					$headers[] = "Authorization: BASIC ".base64_encode($this->user.":".$this->pass);
+		}
 			
 		for($curr_header = 0; $curr_header < count($headers); $curr_header++) {
 			$cmdline_params .= " -H \"".$headers[$curr_header]."\"";
 		}
 			  	                         
-		if(!empty($body))
-			$cmdline_params .= " -d \"$body\"";
+		if(!empty($body)) {
+					$cmdline_params .= " -d \"$body\"";
+		}
 		
-		if($this->read_timeout > 0)
-			$cmdline_params .= " -m ".$this->read_timeout;
+		if($this->read_timeout > 0) {
+					$cmdline_params .= " -m ".$this->read_timeout;
+		}
 		
 		$headerfile = uniqid(time());
 		
@@ -681,13 +715,14 @@ 
 					// no host in the path, so prepend
 					$this->_redirectaddr = $URI_PARTS["scheme"]."://".$this->host.":".$this->port;
 					// eliminate double slash
-					if(!preg_match("|^/|",$matches[2]))
-							$this->_redirectaddr .= "/".$matches[2];
-					else
-							$this->_redirectaddr .= $matches[2];
+					if(!preg_match("|^/|",$matches[2])) {
+												$this->_redirectaddr .= "/".$matches[2];
+					} else {
+												$this->_redirectaddr .= $matches[2];
+					}
+				} else {
+									$this->_redirectaddr = $matches[2];
 				}
-				else
-					$this->_redirectaddr = $matches[2];
 			}
 		
 			if(preg_match("|^HTTP/|",$result_headers[$currentHeader]))
@@ -712,15 +747,18 @@ 
 		if(($this->_framedepth < $this->maxframes) && preg_match_all("'<frame\s+.*src[\s]*=[\'\"]?([^\'\"\>]+)'i",$results,$match))
 		{
 			$this->results[] = $results;
-			for($x=0; $x<count($match[1]); $x++)
-				$this->_frameurls[] = $this->_expandlinks($match[1][$x],$URI_PARTS["scheme"]."://".$this->host);
+			for($x=0; $x<count($match[1]); $x++) {
+							$this->_frameurls[] = $this->_expandlinks($match[1][$x],$URI_PARTS["scheme"]."://".$this->host);
+			}
 		}
 		// have we already fetched framed content?
-		elseif(is_array($this->results))
-			$this->results[] = $results;
+		elseif(is_array($this->results)) {
+					$this->results[] = $results;
+		}
 		// no framed content
-		else
-			$this->results = $results;
+		else {
+					$this->results = $results;
+		}
 
 		unlink("/tmp/$headerfile");
 		
@@ -736,8 +774,9 @@ 
 	{
 		for($x=0; $x<count($this->headers); $x++)
 		{
-		if(preg_match("/^set-cookie:[\s]+([^=]+)=([^;]+)/i", $this->headers[$x],$match))
-			$this->cookies[$match[1]] = $match[2];
+		if(preg_match("/^set-cookie:[\s]+([^=]+)=([^;]+)/i", $this->headers[$x],$match)) {
+					$this->cookies[$match[1]] = $match[2];
+		}
 		}
 	}
 
@@ -773,8 +812,7 @@ 
 				$this->_isproxy = true;
 				$host = $this->proxy_host;
 				$port = $this->proxy_port;
-			}
-		else
+			} else
 		{
 			$host = $this->host;
 			$port = $this->port;
@@ -793,8 +831,7 @@ 
 			// socket connection succeeded
 
 			return true;
-		}
-		else
+		} else
 		{
 			// socket connection failed
 			$this->status = $errno;
@@ -837,8 +874,9 @@ 
 		settype($formvars, "array");
 		settype($formfiles, "array");
 
-		if (count($formvars) == 0 && count($formfiles) == 0)
-			return;
+		if (count($formvars) == 0 && count($formfiles) == 0) {
+					return;
+		}
 		
 		switch ($this->_submit_type) {
 			case "application/x-www-form-urlencoded":
@@ -848,8 +886,9 @@ 
 						while (list($cur_key, $cur_val) = each($val)) {
 							$postdata .= urlencode($key)."[]=".urlencode($cur_val)."&";
 						}
-					} else
-						$postdata .= urlencode($key)."=".urlencode($val)."&";
+					} else {
+											$postdata .= urlencode($key)."=".urlencode($val)."&";
+					}
 				}
 				break;
 
@@ -875,7 +914,9 @@ 
 				while (list($field_name, $file_names) = each($formfiles)) {
 					settype($file_names, "array");
 					while (list(, $file_name) = each($file_names)) {
-						if (!is_readable($file_name)) continue;
+						if (!is_readable($file_name)) {
+						    continue;
+						}
 
 						$fp = fopen($file_name, "r");
 						$file_content = fread($fp, filesize($file_name));

Doc Comments +12 added lines

@@ -366,6 +366,9 @@ 
 	Output:		$expandedLinks	the expanded links
 \*======================================================================*/
 
+	/**
+	 * @param string $links
+	 */
 	private function _expandlinks($links,$URI)
 	{
 		
@@ -400,6 +403,9 @@ 
 	Output:		
 \*======================================================================*/
 	
+	/**
+	 * @param string $http_method
+	 */
 	private function _httprequest($url,$fp,$URI,$http_method,$content_type="",$body="")
 	{
 		if($this->passcookies && $this->_redirectaddr)
@@ -583,6 +589,9 @@ 
 	Output:		
 \*======================================================================*/
 	
+	/**
+	 * @param string $http_method
+	 */
 	private function _httpsrequest($url,$URI,$http_method,$content_type="",$body="")
 	{
 		if($this->passcookies && $this->_redirectaddr)
@@ -766,6 +775,9 @@ 
 	Input:		$fp	file pointer
 \*======================================================================*/
 	
+	/**
+	 * @param boolean $fp
+	 */
 	private function _connect(&$fp)
 	{
 		if(!empty($this->proxy_host) && !empty($this->proxy_port))

main/inc/lib/magpierss/rss_parse.inc

Spacing +110 added lines, -110 removed lines

@@ -24,7 +24,7 @@ 
 define('RSS', 'RSS');
 define('ATOM', 'Atom');
 
-require_once (MAGPIE_DIR . 'rss_utils.inc');
+require_once (MAGPIE_DIR.'rss_utils.inc');
 
 /**
 * Hybrid parser, and object, takes RSS as a string and returns a simple object.
@@ -36,16 +36,16 @@ 
 class MagpieRSS {
     public $parser;
     
-    public $current_item   = array();  // item currently being parsed
-    public $items          = array();  // collection of parsed items
-    public $channel        = array();  // hash of channel fields
+    public $current_item   = array(); // item currently being parsed
+    public $items          = array(); // collection of parsed items
+    public $channel        = array(); // hash of channel fields
     public $textinput      = array();
     public $image          = array();
     public $feed_type;
     public $feed_version;
-    public $encoding       = '';       // output encoding of parsed rss
+    public $encoding       = ''; // output encoding of parsed rss
     
-    private $_source_encoding = '';     // only set if we have to parse xml prolog
+    private $_source_encoding = ''; // only set if we have to parse xml prolog
     
     public $ERROR = "";
     public $WARNING = "";
@@ -93,15 +93,15 @@ 
      *                                  source encoding. (caveat emptor)
      *
      */
-    public function MagpieRSS ($source, $output_encoding='ISO-8859-1', 
-                        $input_encoding=null, $detect_encoding=true) 
+    public function MagpieRSS($source, $output_encoding = 'ISO-8859-1', 
+                        $input_encoding = null, $detect_encoding = true) 
     {   
         # if PHP xml isn't compiled in, die
         #
         if (!function_exists('xml_parser_create')) {
-            $this->error( "Failed to load PHP's XML Extension. " . 
+            $this->error("Failed to load PHP's XML Extension. ". 
                           "http://www.php.net/manual/en/ref.xml.php",
-                           E_USER_ERROR );
+                           E_USER_ERROR);
         }
         
         list($parser, $source) = $this->create_parser($source, 
@@ -109,9 +109,9 @@ 
         
         
         if (!is_resource($parser)) {
-            $this->error( "Failed to create an instance of PHP's XML parser. " .
+            $this->error("Failed to create an instance of PHP's XML parser. ".
                           "http://www.php.net/manual/en/ref.xml.php",
-                          E_USER_ERROR );
+                          E_USER_ERROR);
         }
 
         
@@ -120,27 +120,27 @@ 
         # pass in parser, and a reference to this object
         # setup handlers
         #
-        xml_set_object( $this->parser, $this );
+        xml_set_object($this->parser, $this);
         xml_set_element_handler($this->parser, 
-                'feed_start_element', 'feed_end_element' );
+                'feed_start_element', 'feed_end_element');
                         
-        xml_set_character_data_handler( $this->parser, 'feed_cdata' ); 
+        xml_set_character_data_handler($this->parser, 'feed_cdata'); 
     
-        $status = xml_parse( $this->parser, $source );
+        $status = xml_parse($this->parser, $source);
         
-        if (! $status ) {
-            $errorcode = xml_get_error_code( $this->parser );
-            if ( $errorcode != XML_ERROR_NONE ) {
-                $xml_error = xml_error_string( $errorcode );
+        if (!$status) {
+            $errorcode = xml_get_error_code($this->parser);
+            if ($errorcode != XML_ERROR_NONE) {
+                $xml_error = xml_error_string($errorcode);
                 $error_line = xml_get_current_line_number($this->parser);
                 $error_col = xml_get_current_column_number($this->parser);
                 $errormsg = "$xml_error at line $error_line, column $error_col";
 
-                $this->error( $errormsg );
+                $this->error($errormsg);
             }
         }
         
-        xml_parser_free( $this->parser );
+        xml_parser_free($this->parser);
 
         $this->normalize();
     }
@@ -151,26 +151,26 @@ 
         
         // check for a namespace, and split if found
         $ns = false;
-        if ( strpos( $element, ':' ) ) {
-            list($ns, $el) = split( ':', $element, 2); 
+        if (strpos($element, ':')) {
+            list($ns, $el) = split(':', $element, 2); 
         }
-        if ( $ns and $ns != 'rdf' ) {
+        if ($ns and $ns != 'rdf') {
             $this->current_namespace = $ns;
         }
             
         # if feed type isn't set, then this is first element of feed
         # identify feed from root element
         #
-        if (!isset($this->feed_type) ) {
-            if ( $el == 'rdf' ) {
+        if (!isset($this->feed_type)) {
+            if ($el == 'rdf') {
                 $this->feed_type = RSS;
                 $this->feed_version = '1.0';
             }
-            elseif ( $el == 'rss' ) {
+            elseif ($el == 'rss') {
                 $this->feed_type = RSS;
                 $this->feed_version = $attrs['version'];
             }
-            elseif ( $el == 'feed' ) {
+            elseif ($el == 'feed') {
                 $this->feed_type = ATOM;
                 $this->feed_version = $attrs['version'];
                 $this->inchannel = true;
@@ -178,14 +178,14 @@ 
             return;
         }
     
-        if ( $el == 'channel' ) 
+        if ($el == 'channel') 
         {
             $this->inchannel = true;
         }
-        elseif ($el == 'item' or $el == 'entry' ) 
+        elseif ($el == 'item' or $el == 'entry') 
         {
             $this->initem = true;
-            if ( isset($attrs['rdf:about']) ) {
+            if (isset($attrs['rdf:about'])) {
                 $this->current_item['about'] = $attrs['rdf:about']; 
             }
         }
@@ -209,10 +209,10 @@ 
         }
         
         # handle atom content constructs
-        elseif ( $this->feed_type == ATOM and in_array($el, $this->_CONTENT_CONSTRUCTS) )
+        elseif ($this->feed_type == ATOM and in_array($el, $this->_CONTENT_CONSTRUCTS))
         {
             // avoid clashing w/ RSS mod_content
-            if ($el == 'content' ) {
+            if ($el == 'content') {
                 $el = 'atom_content';
             }
             
@@ -222,31 +222,31 @@ 
         }
         
         // if inside an Atom content construct (e.g. content or summary) field treat tags as text
-        elseif ($this->feed_type == ATOM and $this->incontent ) 
+        elseif ($this->feed_type == ATOM and $this->incontent) 
         {
             // if tags are inlined, then flatten
             $attrs_str = join(' ', 
                     array_map('map_attrs', 
                     array_keys($attrs), 
-                    array_values($attrs) ) );
+                    array_values($attrs)));
             
-            $this->append_content( "<$element $attrs_str>"  );
+            $this->append_content("<$element $attrs_str>");
                     
-            array_unshift( $this->stack, $el );
+            array_unshift($this->stack, $el);
         }
         
         // Atom support many links per containging element.
         // Magpie treats link elements of type rel='alternate'
         // as being equivalent to RSS's simple link element.
         //
-        elseif ($this->feed_type == ATOM and $el == 'link' ) 
+        elseif ($this->feed_type == ATOM and $el == 'link') 
         {
-            if ( isset($attrs['rel']) and $attrs['rel'] == 'alternate' ) 
+            if (isset($attrs['rel']) and $attrs['rel'] == 'alternate') 
             {
                 $link_el = 'link';
             }
             else {
-                $link_el = 'link_' . $attrs['rel'];
+                $link_el = 'link_'.$attrs['rel'];
             }
             
             $this->append($link_el, $attrs['href']);
@@ -259,10 +259,10 @@ 
     
 
     
-    public function feed_cdata ($p, $text) {
+    public function feed_cdata($p, $text) {
         if ($this->feed_type == ATOM and $this->incontent) 
         {
-            $this->append_content( $text );
+            $this->append_content($text);
         }
         else {
             $current_el = join('_', array_reverse($this->stack));
@@ -270,35 +270,35 @@ 
         }
     }
     
-    public function feed_end_element ($p, $el) {
+    public function feed_end_element($p, $el) {
         $el = strtolower($el);
         
-        if ( $el == 'item' or $el == 'entry' ) 
+        if ($el == 'item' or $el == 'entry') 
         {
             $this->items[] = $this->current_item;
             $this->current_item = array();
             $this->initem = false;
         }
-        elseif ($this->feed_type == RSS and $this->current_namespace == '' and $el == 'textinput' ) 
+        elseif ($this->feed_type == RSS and $this->current_namespace == '' and $el == 'textinput') 
         {
             $this->intextinput = false;
         }
-        elseif ($this->feed_type == RSS and $this->current_namespace == '' and $el == 'image' ) 
+        elseif ($this->feed_type == RSS and $this->current_namespace == '' and $el == 'image') 
         {
             $this->inimage = false;
         }
-        elseif ($this->feed_type == ATOM and in_array($el, $this->_CONTENT_CONSTRUCTS) )
+        elseif ($this->feed_type == ATOM and in_array($el, $this->_CONTENT_CONSTRUCTS))
         {   
             $this->incontent = false;
         }
-        elseif ($el == 'channel' or $el == 'feed' ) 
+        elseif ($el == 'channel' or $el == 'feed') 
         {
             $this->inchannel = false;
         }
-        elseif ($this->feed_type == ATOM and $this->incontent  ) {
+        elseif ($this->feed_type == ATOM and $this->incontent) {
             // balance tags properly
             // note:  i don't think this is actually neccessary
-            if ( $this->stack[0] == $el ) 
+            if ($this->stack[0] == $el) 
             {
                 $this->append_content("</$el>");
             }
@@ -306,18 +306,18 @@ 
                 $this->append_content("<$el />");
             }
 
-            array_shift( $this->stack );
+            array_shift($this->stack);
         }
         else {
-            array_shift( $this->stack );
+            array_shift($this->stack);
         }
         
         $this->current_namespace = false;
     }
     
-    public function concat (&$str1, $str2="") {
-        if (!isset($str1) ) {
-            $str1="";
+    public function concat(&$str1, $str2 = "") {
+        if (!isset($str1)) {
+            $str1 = "";
         }
         $str1 .= $str2;
     }
@@ -325,11 +325,11 @@ 
     
     
     public function append_content($text) {
-        if ( $this->initem ) {
-            $this->concat( $this->current_item[ $this->incontent ], $text );
+        if ($this->initem) {
+            $this->concat($this->current_item[$this->incontent], $text);
         }
-        elseif ( $this->inchannel ) {
-            $this->concat( $this->channel[ $this->incontent ], $text );
+        elseif ($this->inchannel) {
+            $this->concat($this->channel[$this->incontent], $text);
         }
     }
     
@@ -338,59 +338,59 @@ 
         if (!$el) {
             return;
         }
-        if ( $this->current_namespace ) 
+        if ($this->current_namespace) 
         {
-            if ( $this->initem ) {
+            if ($this->initem) {
                 $this->concat(
-                    $this->current_item[ $this->current_namespace ][ $el ], $text);
+                    $this->current_item[$this->current_namespace][$el], $text);
             }
             elseif ($this->inchannel) {
                 $this->concat(
-                    $this->channel[ $this->current_namespace][ $el ], $text );
+                    $this->channel[$this->current_namespace][$el], $text );
             }
             elseif ($this->intextinput) {
                 $this->concat(
-                    $this->textinput[ $this->current_namespace][ $el ], $text );
+                    $this->textinput[$this->current_namespace][$el], $text );
             }
             elseif ($this->inimage) {
                 $this->concat(
-                    $this->image[ $this->current_namespace ][ $el ], $text );
+                    $this->image[$this->current_namespace][$el], $text );
             }
         }
         else {
-            if ( $this->initem ) {
+            if ($this->initem) {
                 $this->concat(
-                    $this->current_item[ $el ], $text);
+                    $this->current_item[$el], $text);
             }
             elseif ($this->intextinput) {
                 $this->concat(
-                    $this->textinput[ $el ], $text );
+                    $this->textinput[$el], $text );
             }
             elseif ($this->inimage) {
                 $this->concat(
-                    $this->image[ $el ], $text );
+                    $this->image[$el], $text );
             }
             elseif ($this->inchannel) {
                 $this->concat(
-                    $this->channel[ $el ], $text );
+                    $this->channel[$el], $text );
             }
             
         }
     }
     
-    public function normalize () {
+    public function normalize() {
         // if atom populate rss fields
-        if ( $this->is_atom() ) {
+        if ($this->is_atom()) {
             $this->channel['description'] = $this->channel['tagline'];
-            for ( $i = 0; $i < count($this->items); $i++) {
+            for ($i = 0; $i < count($this->items); $i++) {
                 $item = $this->items[$i];
-                if ( isset($item['summary']) )
+                if (isset($item['summary']))
                     $item['description'] = $item['summary'];
-                if ( isset($item['atom_content']))
+                if (isset($item['atom_content']))
                     $item['content']['encoded'] = $item['atom_content'];
                 
-                $atom_date = (isset($item['issued']) ) ? $item['issued'] : $item['modified'];
-                if ( $atom_date ) {
+                $atom_date = (isset($item['issued'])) ? $item['issued'] : $item['modified'];
+                if ($atom_date) {
                     $epoch = @parse_w3cdtf($atom_date);
                     if ($epoch and $epoch > 0) {
                         $item['date_timestamp'] = $epoch;
@@ -400,22 +400,22 @@ 
                 $this->items[$i] = $item;
             }       
         }
-        elseif ( $this->is_rss() ) {
+        elseif ($this->is_rss()) {
             $this->channel['tagline'] = $this->channel['description'];
-            for ( $i = 0; $i < count($this->items); $i++) {
+            for ($i = 0; $i < count($this->items); $i++) {
                 $item = $this->items[$i];
-                if ( isset($item['description']))
+                if (isset($item['description']))
                     $item['summary'] = $item['description'];
-                if ( isset($item['content']['encoded'] ) )
+                if (isset($item['content']['encoded']))
                     $item['atom_content'] = $item['content']['encoded'];
                 
-                if ( $this->is_rss() == '1.0' and isset($item['dc']['date']) ) {
+                if ($this->is_rss() == '1.0' and isset($item['dc']['date'])) {
                     $epoch = @parse_w3cdtf($item['dc']['date']);
                     if ($epoch and $epoch > 0) {
                         $item['date_timestamp'] = $epoch;
                     }
                 }
-                elseif ( isset($item['pubdate']) ) {
+                elseif (isset($item['pubdate'])) {
                     $epoch = @strtotime($item['pubdate']);
                     if ($epoch > 0) {
                         $item['date_timestamp'] = $epoch;
@@ -428,8 +428,8 @@ 
     }
     
     
-    public function is_rss () {
-        if ( $this->feed_type == RSS ) {
+    public function is_rss() {
+        if ($this->feed_type == RSS) {
             return $this->feed_version; 
         }
         else {
@@ -438,7 +438,7 @@ 
     }
     
     public function is_atom() {
-        if ( $this->feed_type == ATOM ) {
+        if ($this->feed_type == ATOM) {
             return $this->feed_version;
         }
         else {
@@ -451,7 +451,7 @@ 
     *
     */
     public function create_parser($source, $out_enc, $in_enc, $detect) {
-        if ( substr(phpversion(),0,1) == 5) {
+        if (substr(phpversion(), 0, 1) == 5) {
             $parser = $this->php5_create_parser($in_enc, $detect);
         }
         else {
@@ -476,7 +476,7 @@ 
     */
     public function php5_create_parser($in_enc, $detect) {
         // by default php5 does a fine job of detecting input encodings
-        if(!$detect && $in_enc) {
+        if (!$detect && $in_enc) {
             return xml_parser_create($in_enc);
         }
         else {
@@ -500,7 +500,7 @@ 
     *
     */
     public function php4_create_parser($source, $in_enc, $detect) {
-        if ( !$detect ) {
+        if (!$detect) {
             return array(xml_parser_create($in_enc), $source);
         }
         
@@ -524,8 +524,8 @@ 
         // cast the XML to a known encoding
         // @see http://php.net/iconv
        
-        if (function_exists('iconv'))  {
-            $encoded_source = iconv($in_enc,'UTF-8', $source);
+        if (function_exists('iconv')) {
+            $encoded_source = iconv($in_enc, 'UTF-8', $source);
             if ($encoded_source) {
                 return array(xml_parser_create('UTF-8'), $encoded_source);
             }
@@ -533,15 +533,15 @@ 
         
         // iconv didn't work, try mb_convert_encoding
         // @see http://php.net/mbstring
-        if(function_exists('mb_convert_encoding')) {
-            $encoded_source = mb_convert_encoding($source, 'UTF-8', $in_enc );
+        if (function_exists('mb_convert_encoding')) {
+            $encoded_source = mb_convert_encoding($source, 'UTF-8', $in_enc);
             if ($encoded_source) {
                 return array(xml_parser_create('UTF-8'), $encoded_source);
             }
         }
         
         // else 
-        $this->error("Feed is in an unsupported character encoding. ($in_enc) " .
+        $this->error("Feed is in an unsupported character encoding. ($in_enc) ".
                      "You may see strange artifacts, and mangled characters.",
                      E_USER_NOTICE);
             
@@ -550,7 +550,7 @@ 
     
     public function known_encoding($enc) {
         $enc = strtoupper($enc);
-        if ( in_array($enc, $this->_KNOWN_ENCODINGS) ) {
+        if (in_array($enc, $this->_KNOWN_ENCODINGS)) {
             return $enc;
         }
         else {
@@ -558,20 +558,20 @@ 
         }
     }
 
-    public function error ($errormsg, $lvl=E_USER_WARNING) {
+    public function error($errormsg, $lvl = E_USER_WARNING) {
         // append PHP's error message if track_errors enabled
-        if ( isset($php_errormsg) ) { 
+        if (isset($php_errormsg)) { 
             $errormsg .= " ($php_errormsg)";
         }
-        if ( MAGPIE_DEBUG ) {
-            trigger_error( $errormsg, $lvl);        
+        if (MAGPIE_DEBUG) {
+            trigger_error($errormsg, $lvl);        
         }
         else {
-            error_log( $errormsg, 0);
+            error_log($errormsg, 0);
         }
         
-        $notices = E_USER_NOTICE|E_NOTICE;
-        if ( $lvl&$notices ) {
+        $notices = E_USER_NOTICE | E_NOTICE;
+        if ($lvl & $notices) {
             $this->WARNING = $errormsg;
         } else {
             $this->ERROR = $errormsg;
@@ -589,15 +589,15 @@ 
 // courtesy, Ryan Currie, ryan@digibliss.com
 
 if (!function_exists('array_change_key_case')) {
-	define("CASE_UPPER",1);
-	define("CASE_LOWER",0);
+	define("CASE_UPPER", 1);
+	define("CASE_LOWER", 0);
 
 
-	function array_change_key_case($array,$case=CASE_LOWER) {
-       if ($case=CASE_LOWER) $cmd=strtolower;
-       elseif ($case=CASE_UPPER) $cmd=strtoupper;
-       foreach($array as $key=>$value) {
-               $output[$cmd($key)]=$value;
+	function array_change_key_case($array, $case = CASE_LOWER) {
+       if ($case = CASE_LOWER) $cmd = strtolower;
+       elseif ($case = CASE_UPPER) $cmd = strtoupper;
+       foreach ($array as $key=>$value) {
+               $output[$cmd($key)] = $value;
        }
        return $output;
 	}

Braces +47 added lines, -71 removed lines

@@ -165,12 +165,10 @@ 
             if ( $el == 'rdf' ) {
                 $this->feed_type = RSS;
                 $this->feed_version = '1.0';
-            }
-            elseif ( $el == 'rss' ) {
+            } elseif ( $el == 'rss' ) {
                 $this->feed_type = RSS;
                 $this->feed_version = $attrs['version'];
-            }
-            elseif ( $el == 'feed' ) {
+            } elseif ( $el == 'feed' ) {
                 $this->feed_type = ATOM;
                 $this->feed_version = $attrs['version'];
                 $this->inchannel = true;
@@ -181,8 +179,7 @@ 
         if ( $el == 'channel' ) 
         {
             $this->inchannel = true;
-        }
-        elseif ($el == 'item' or $el == 'entry' ) 
+        } elseif ($el == 'item' or $el == 'entry' ) 
         {
             $this->initem = true;
             if ( isset($attrs['rdf:about']) ) {
@@ -198,9 +195,7 @@ 
             $el == 'textinput' ) 
         {
             $this->intextinput = true;
-        }
-        
-        elseif (
+        } elseif (
             $this->feed_type == RSS and 
             $this->current_namespace == '' and 
             $el == 'image' ) 
@@ -244,8 +239,7 @@ 
             if ( isset($attrs['rel']) and $attrs['rel'] == 'alternate' ) 
             {
                 $link_el = 'link';
-            }
-            else {
+            } else {
                 $link_el = 'link_' . $attrs['rel'];
             }
             
@@ -263,8 +257,7 @@ 
         if ($this->feed_type == ATOM and $this->incontent) 
         {
             $this->append_content( $text );
-        }
-        else {
+        } else {
             $current_el = join('_', array_reverse($this->stack));
             $this->append($current_el, $text);
         }
@@ -278,37 +271,30 @@ 
             $this->items[] = $this->current_item;
             $this->current_item = array();
             $this->initem = false;
-        }
-        elseif ($this->feed_type == RSS and $this->current_namespace == '' and $el == 'textinput' ) 
+        } elseif ($this->feed_type == RSS and $this->current_namespace == '' and $el == 'textinput' ) 
         {
             $this->intextinput = false;
-        }
-        elseif ($this->feed_type == RSS and $this->current_namespace == '' and $el == 'image' ) 
+        } elseif ($this->feed_type == RSS and $this->current_namespace == '' and $el == 'image' ) 
         {
             $this->inimage = false;
-        }
-        elseif ($this->feed_type == ATOM and in_array($el, $this->_CONTENT_CONSTRUCTS) )
+        } elseif ($this->feed_type == ATOM and in_array($el, $this->_CONTENT_CONSTRUCTS) )
         {   
             $this->incontent = false;
-        }
-        elseif ($el == 'channel' or $el == 'feed' ) 
+        } elseif ($el == 'channel' or $el == 'feed' ) 
         {
             $this->inchannel = false;
-        }
-        elseif ($this->feed_type == ATOM and $this->incontent  ) {
+        } elseif ($this->feed_type == ATOM and $this->incontent  ) {
             // balance tags properly
             // note:  i don't think this is actually neccessary
             if ( $this->stack[0] == $el ) 
             {
                 $this->append_content("</$el>");
-            }
-            else {
+            } else {
                 $this->append_content("<$el />");
             }
 
             array_shift( $this->stack );
-        }
-        else {
+        } else {
             array_shift( $this->stack );
         }
         
@@ -327,8 +313,7 @@ 
     public function append_content($text) {
         if ( $this->initem ) {
             $this->concat( $this->current_item[ $this->incontent ], $text );
-        }
-        elseif ( $this->inchannel ) {
+        } elseif ( $this->inchannel ) {
             $this->concat( $this->channel[ $this->incontent ], $text );
         }
     }
@@ -343,34 +328,27 @@ 
             if ( $this->initem ) {
                 $this->concat(
                     $this->current_item[ $this->current_namespace ][ $el ], $text);
-            }
-            elseif ($this->inchannel) {
+            } elseif ($this->inchannel) {
                 $this->concat(
                     $this->channel[ $this->current_namespace][ $el ], $text );
-            }
-            elseif ($this->intextinput) {
+            } elseif ($this->intextinput) {
                 $this->concat(
                     $this->textinput[ $this->current_namespace][ $el ], $text );
-            }
-            elseif ($this->inimage) {
+            } elseif ($this->inimage) {
                 $this->concat(
                     $this->image[ $this->current_namespace ][ $el ], $text );
             }
-        }
-        else {
+        } else {
             if ( $this->initem ) {
                 $this->concat(
                     $this->current_item[ $el ], $text);
-            }
-            elseif ($this->intextinput) {
+            } elseif ($this->intextinput) {
                 $this->concat(
                     $this->textinput[ $el ], $text );
-            }
-            elseif ($this->inimage) {
+            } elseif ($this->inimage) {
                 $this->concat(
                     $this->image[ $el ], $text );
-            }
-            elseif ($this->inchannel) {
+            } elseif ($this->inchannel) {
                 $this->concat(
                     $this->channel[ $el ], $text );
             }
@@ -384,10 +362,12 @@ 
             $this->channel['description'] = $this->channel['tagline'];
             for ( $i = 0; $i < count($this->items); $i++) {
                 $item = $this->items[$i];
-                if ( isset($item['summary']) )
-                    $item['description'] = $item['summary'];
-                if ( isset($item['atom_content']))
-                    $item['content']['encoded'] = $item['atom_content'];
+                if ( isset($item['summary']) ) {
+                                    $item['description'] = $item['summary'];
+                }
+                if ( isset($item['atom_content'])) {
+                                    $item['content']['encoded'] = $item['atom_content'];
+                }
                 
                 $atom_date = (isset($item['issued']) ) ? $item['issued'] : $item['modified'];
                 if ( $atom_date ) {
@@ -399,23 +379,23 @@ 
                 
                 $this->items[$i] = $item;
             }       
-        }
-        elseif ( $this->is_rss() ) {
+        } elseif ( $this->is_rss() ) {
             $this->channel['tagline'] = $this->channel['description'];
             for ( $i = 0; $i < count($this->items); $i++) {
                 $item = $this->items[$i];
-                if ( isset($item['description']))
-                    $item['summary'] = $item['description'];
-                if ( isset($item['content']['encoded'] ) )
-                    $item['atom_content'] = $item['content']['encoded'];
+                if ( isset($item['description'])) {
+                                    $item['summary'] = $item['description'];
+                }
+                if ( isset($item['content']['encoded'] ) ) {
+                                    $item['atom_content'] = $item['content']['encoded'];
+                }
                 
                 if ( $this->is_rss() == '1.0' and isset($item['dc']['date']) ) {
                     $epoch = @parse_w3cdtf($item['dc']['date']);
                     if ($epoch and $epoch > 0) {
                         $item['date_timestamp'] = $epoch;
                     }
-                }
-                elseif ( isset($item['pubdate']) ) {
+                } elseif ( isset($item['pubdate']) ) {
                     $epoch = @strtotime($item['pubdate']);
                     if ($epoch > 0) {
                         $item['date_timestamp'] = $epoch;
@@ -431,8 +411,7 @@ 
     public function is_rss () {
         if ( $this->feed_type == RSS ) {
             return $this->feed_version; 
-        }
-        else {
+        } else {
             return false;
         }
     }
@@ -440,8 +419,7 @@ 
     public function is_atom() {
         if ( $this->feed_type == ATOM ) {
             return $this->feed_version;
-        }
-        else {
+        } else {
             return false;
         }
     }
@@ -453,8 +431,7 @@ 
     public function create_parser($source, $out_enc, $in_enc, $detect) {
         if ( substr(phpversion(),0,1) == 5) {
             $parser = $this->php5_create_parser($in_enc, $detect);
-        }
-        else {
+        } else {
             list($parser, $source) = $this->php4_create_parser($source, $in_enc, $detect);
         }
         if ($out_enc) {
@@ -478,8 +455,7 @@ 
         // by default php5 does a fine job of detecting input encodings
         if(!$detect && $in_enc) {
             return xml_parser_create($in_enc);
-        }
-        else {
+        } else {
             return xml_parser_create('');
         }
     }
@@ -508,8 +484,7 @@ 
             if (preg_match('/<?xml.*encoding=[\'"](.*?)[\'"].*?>/m', $source, $m)) {
                 $in_enc = strtoupper($m[1]);
                 $this->source_encoding = $in_enc;
-            }
-            else {
+            } else {
                 $in_enc = 'UTF-8';
             }
         }
@@ -552,8 +527,7 @@ 
         $enc = strtoupper($enc);
         if ( in_array($enc, $this->_KNOWN_ENCODINGS) ) {
             return $enc;
-        }
-        else {
+        } else {
             return false;
         }
     }
@@ -565,8 +539,7 @@ 
         }
         if ( MAGPIE_DEBUG ) {
             trigger_error( $errormsg, $lvl);        
-        }
-        else {
+        } else {
             error_log( $errormsg, 0);
         }
         
@@ -594,8 +567,11 @@ 
 
 
 	function array_change_key_case($array,$case=CASE_LOWER) {
-       if ($case=CASE_LOWER) $cmd=strtolower;
-       elseif ($case=CASE_UPPER) $cmd=strtoupper;
+       if ($case=CASE_LOWER) {
+           $cmd=strtolower;
+       } elseif ($case=CASE_UPPER) {
+           $cmd=strtoupper;
+       }
        foreach($array as $key=>$value) {
                $output[$cmd($key)]=$value;
        }

Indentation +41 added lines, -41 removed lines

@@ -100,8 +100,8 @@ 
         #
         if (!function_exists('xml_parser_create')) {
             $this->error( "Failed to load PHP's XML Extension. " . 
-                          "http://www.php.net/manual/en/ref.xml.php",
-                           E_USER_ERROR );
+                            "http://www.php.net/manual/en/ref.xml.php",
+                            E_USER_ERROR );
         }
         
         list($parser, $source) = $this->create_parser($source, 
@@ -110,8 +110,8 @@ 
         
         if (!is_resource($parser)) {
             $this->error( "Failed to create an instance of PHP's XML parser. " .
-                          "http://www.php.net/manual/en/ref.xml.php",
-                          E_USER_ERROR );
+                            "http://www.php.net/manual/en/ref.xml.php",
+                            E_USER_ERROR );
         }
 
         
@@ -447,9 +447,9 @@ 
     }
 
     /**
-    * return XML parser, and possibly re-encoded source
-    *
-    */
+     * return XML parser, and possibly re-encoded source
+     *
+     */
     public function create_parser($source, $out_enc, $in_enc, $detect) {
         if ( substr(phpversion(),0,1) == 5) {
             $parser = $this->php5_create_parser($in_enc, $detect);
@@ -466,14 +466,14 @@ 
     }
     
     /**
-    * Instantiate an XML parser under PHP5
-    *
-    * PHP5 will do a fine job of detecting input encoding
-    * if passed an empty string as the encoding. 
-    *
-    * All hail libxml2!
-    *
-    */
+     * Instantiate an XML parser under PHP5
+     *
+     * PHP5 will do a fine job of detecting input encoding
+     * if passed an empty string as the encoding. 
+     *
+     * All hail libxml2!
+     *
+     */
     public function php5_create_parser($in_enc, $detect) {
         // by default php5 does a fine job of detecting input encodings
         if(!$detect && $in_enc) {
@@ -485,20 +485,20 @@ 
     }
     
     /**
-    * Instaniate an XML parser under PHP4
-    *
-    * Unfortunately PHP4's support for character encodings
-    * and especially XML and character encodings sucks.  As
-    * long as the documents you parse only contain characters
-    * from the ISO-8859-1 character set (a superset of ASCII,
-    * and a subset of UTF-8) you're fine.  However once you
-    * step out of that comfy little world things get mad, bad,
-    * and dangerous to know.
-    *
-    * The following code is based on SJM's work with FoF
-    * @see http://minutillo.com/steve/weblog/2004/6/17/php-xml-and-character-encodings-a-tale-of-sadness-rage-and-data-loss
-    *
-    */
+     * Instaniate an XML parser under PHP4
+     *
+     * Unfortunately PHP4's support for character encodings
+     * and especially XML and character encodings sucks.  As
+     * long as the documents you parse only contain characters
+     * from the ISO-8859-1 character set (a superset of ASCII,
+     * and a subset of UTF-8) you're fine.  However once you
+     * step out of that comfy little world things get mad, bad,
+     * and dangerous to know.
+     *
+     * The following code is based on SJM's work with FoF
+     * @see http://minutillo.com/steve/weblog/2004/6/17/php-xml-and-character-encodings-a-tale-of-sadness-rage-and-data-loss
+     *
+     */
     public function php4_create_parser($source, $in_enc, $detect) {
         if ( !$detect ) {
             return array(xml_parser_create($in_enc), $source);
@@ -542,8 +542,8 @@ 
         
         // else 
         $this->error("Feed is in an unsupported character encoding. ($in_enc) " .
-                     "You may see strange artifacts, and mangled characters.",
-                     E_USER_NOTICE);
+                        "You may see strange artifacts, and mangled characters.",
+                        E_USER_NOTICE);
             
         return array(xml_parser_create(), $source);
     }
@@ -589,17 +589,17 @@ 
 // courtesy, Ryan Currie, ryan@digibliss.com
 
 if (!function_exists('array_change_key_case')) {
-	define("CASE_UPPER",1);
-	define("CASE_LOWER",0);
+    define("CASE_UPPER",1);
+    define("CASE_LOWER",0);
 
 
-	function array_change_key_case($array,$case=CASE_LOWER) {
-       if ($case=CASE_LOWER) $cmd=strtolower;
-       elseif ($case=CASE_UPPER) $cmd=strtoupper;
-       foreach($array as $key=>$value) {
-               $output[$cmd($key)]=$value;
-       }
-       return $output;
-	}
+    function array_change_key_case($array,$case=CASE_LOWER) {
+        if ($case=CASE_LOWER) $cmd=strtolower;
+        elseif ($case=CASE_UPPER) $cmd=strtoupper;
+        foreach($array as $key=>$value) {
+                $output[$cmd($key)]=$value;
+        }
+        return $output;
+    }
 
 }

Doc Comments +10 added lines

@@ -449,6 +449,10 @@ 
     /**
     * return XML parser, and possibly re-encoded source
     *
+    * @param string $source
+    * @param string $out_enc
+    * @param string|null $in_enc
+    * @param boolean $detect
     */
     public function create_parser($source, $out_enc, $in_enc, $detect) {
         if ( substr(phpversion(),0,1) == 5) {
@@ -558,6 +562,9 @@ 
         }
     }
 
+    /**
+     * @param integer $lvl
+     */
     public function error ($errormsg, $lvl=E_USER_WARNING) {
         // append PHP's error message if track_errors enabled
         if ( isset($php_errormsg) ) { 
@@ -593,6 +600,9 @@ 
 	define("CASE_LOWER",0);
 
 
+	/**
+	 * @param integer $case
+	 */
 	function array_change_key_case($array,$case=CASE_LOWER) {
        if ($case=CASE_LOWER) $cmd=strtolower;
        elseif ($case=CASE_UPPER) $cmd=strtoupper;