chamilo / chamilo-lms

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 +5 added lines, -4 removed lines

@@ -2896,10 +2896,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

Doc Comments +19 added lines, -17 removed lines

@@ -1532,7 +1532,7 @@ 
      * @param	array	$id_checked an array to delete sessions
      * @param   boolean  $from_ws 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
      * */
     public static function delete($id_checked, $from_ws = false)
     {
@@ -1669,7 +1669,7 @@ 
      * @param array $user_list
      * @param int $session_visibility
      * @param bool $empty_users
-     * @return bool
+     * @return false|null
      */
     public static function subscribe_users_to_session(
         $id_session,
@@ -1942,7 +1942,7 @@ 
      * @param array $courseInfo
      * @param int $status
      * @param bool $updateTotal
-     * @return bool
+     * @return false|null
      */
     public static function removeUsersFromCourseSession(
         $userList,
@@ -2008,7 +2008,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,
@@ -2192,7 +2192,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,
@@ -2441,7 +2441,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)
     {
@@ -2670,7 +2670,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)
@@ -3436,8 +3436,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
@@ -3562,6 +3562,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)
@@ -3820,6 +3821,7 @@ 
      * Updates a session status
      * @param	int 	session id
      * @param	int 	status
+     * @param integer $status
      */
     public static function set_session_status($session_id, $status)
     {
@@ -4028,7 +4030,7 @@ 
      * Protect a session to be edited.
      * @param int $id
      * @param bool $checkSession
-     * @return mixed | bool true if pass the check, api_not_allowed otherwise
+     * @return boolean|null | bool true if pass the check, api_not_allowed otherwise
      */
     public static function protectSession($id, $checkSession = true)
     {
@@ -4136,7 +4138,7 @@ 
 
     /**
      * @param $id
-     * @return bool
+     * @return null|boolean
      */
     public static function protect_teacher_session_edit($id)
     {
@@ -4201,7 +4203,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
@@ -5504,7 +5506,6 @@ 
      * @param string $lastConnectionDate
      * @param array $sessionIdList
      * @param array $studentIdList
-     * @param int $userStatus STUDENT|COURSEMANAGER constants
      *
      * @return array|int
      */
@@ -5656,7 +5657,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()
     {
@@ -5670,7 +5671,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)
     {
@@ -6320,6 +6321,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(
@@ -7656,7 +7658,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)
     {
@@ -7673,7 +7675,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)
     {

Spacing +191 added lines, -191 removed lines

@@ -182,7 +182,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;
@@ -295,7 +295,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));
 
@@ -326,7 +326,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."'
                             )
                       ";
 
@@ -344,7 +344,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(
@@ -389,7 +389,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
@@ -439,14 +439,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 ExtraFieldModel('session');
@@ -498,10 +498,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
@@ -604,7 +604,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'];
@@ -656,7 +656,7 @@ 
 
         $limit = null;
         if (!empty($options['limit'])) {
-            $limit = " LIMIT " . $options['limit'];
+            $limit = " LIMIT ".$options['limit'];
         }
 
         if (!empty($options['where'])) {
@@ -665,7 +665,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
@@ -724,13 +724,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;
         }
@@ -771,7 +771,7 @@ 
 
         $limit = null;
         if (!empty($options['limit'])) {
-            $limit = " LIMIT " . $options['limit'];
+            $limit = " LIMIT ".$options['limit'];
         }
 
         if (!empty($options['where'])) {
@@ -780,7 +780,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
@@ -882,7 +882,7 @@ 
 
         $limit = null;
         if (!empty($options['limit'])) {
-            $limit = " LIMIT " . $options['limit'];
+            $limit = " LIMIT ".$options['limit'];
         }
 
         if (!empty($options['where'])) {
@@ -891,7 +891,7 @@ 
 
         $order = null;
         if (!empty($options['order'])) {
-            $order = " ORDER BY " . $options['order'];
+            $order = " ORDER BY ".$options['order'];
         }
 
         //TODO, fix create report without session
@@ -924,7 +924,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());
@@ -932,7 +932,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']++;
             }
         }
 
@@ -1008,7 +1008,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;
             }
         }
 
@@ -1062,7 +1062,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;
             }
@@ -1092,7 +1092,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;
             }
@@ -1101,7 +1101,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;
             }
@@ -1114,7 +1114,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;
             }
@@ -1122,58 +1122,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.'%'),
             );
         }
 
@@ -1255,7 +1255,7 @@ 
 
         $limit = null;
         if (!empty($options['limit'])) {
-            $limit = " LIMIT " . $options['limit'];
+            $limit = " LIMIT ".$options['limit'];
         }
 
         if (!empty($options['where'])) {
@@ -1264,7 +1264,7 @@ 
 
         $order = null;
         if (!empty($options['order'])) {
-            $order = " ORDER BY " . $options['order'];
+            $order = " ORDER BY ".$options['order'];
         }
 
         //TODO add course name
@@ -1277,7 +1277,7 @@ 
                     " : "
                     u.lastname,
                     u.firstname,
-                ") . "
+                ")."
                 a.logout_course_date,
                 a.counter,
                 c.title,
@@ -1359,7 +1359,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;
@@ -1866,7 +1866,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);
         }
 
@@ -1877,7 +1877,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);
         }
 
@@ -1969,7 +1969,7 @@ 
         $statusCondition = null;
         if (isset($status) && !is_null($status)) {
             $status = intval($status);
-            $statusCondition  = " AND status = $status";
+            $statusCondition = " AND status = $status";
         }
 
         foreach ($userList as $userId) {
@@ -2101,7 +2101,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
@@ -2144,7 +2144,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($sql);
         $return = Database::affected_rows($result);
 
@@ -2229,7 +2229,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);
 
@@ -2240,7 +2240,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);
 
@@ -2303,7 +2303,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;
                             $parentId = $cat->get_parent_id();
@@ -2490,7 +2490,7 @@ 
         $return_value = false;
         $sql = "SELECT c_id FROM $tbl_session_course
                 WHERE
-                  session_id = " . intval($session_id) . " AND
+                  session_id = ".intval($session_id)." AND
                   c_id = " . intval($courseId);
         $result = Database::query($sql);
         $num = Database::num_rows($result);
@@ -2514,8 +2514,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) {
@@ -2555,8 +2555,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');
@@ -2633,8 +2633,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');
@@ -2654,13 +2654,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";
@@ -2690,10 +2690,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'];
@@ -2705,7 +2705,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
@@ -2778,7 +2778,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."'";
                 }
             }
         }
@@ -2845,8 +2845,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) {
@@ -2999,7 +2999,7 @@ 
         $sql = "DELETE FROM $tbl_session_rel_user
                 WHERE
                     session_id = $sessionId AND                            
-                    relation_type =" . SESSION_RELATION_TYPE_RRHH;
+                    relation_type =".SESSION_RELATION_TYPE_RRHH;
         Database::query($sql);
 
         return true;
@@ -3053,12 +3053,12 @@ 
                         ON (a.session_id = s.session_id)
                         WHERE
                             s.user_id = $userId AND
-                            relation_type = " . SESSION_RELATION_TYPE_RRHH . " AND
+                            relation_type = ".SESSION_RELATION_TYPE_RRHH." AND
                             access_url_id = " . api_get_current_access_url_id();
             } else {
                 $sql = "SELECT s.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);
 
@@ -3068,7 +3068,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);
                 }
             }
@@ -3083,7 +3083,7 @@ 
                         WHERE
                             session_id = $session_id AND
                             user_id = $userId AND
-                            relation_type = '" . SESSION_RELATION_TYPE_RRHH . "'";
+                            relation_type = '".SESSION_RELATION_TYPE_RRHH."'";
                 $result = Database::query($sql);
                 if (Database::num_rows($result) == 0) {
                     $sql = "INSERT IGNORE INTO $tbl_session_rel_user (session_id, user_id, relation_type, registered_at)
@@ -3133,8 +3133,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
@@ -3143,7 +3143,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."'
                     ";
         }
 
@@ -3243,7 +3243,7 @@ 
 
         $limitCondition = null;
         if (!empty($start) && !empty($limit)) {
-            $limitCondition = " LIMIT " . intval($start) . ", " . intval($limit);
+            $limitCondition = " LIMIT ".intval($start).", ".intval($limit);
         }
 
         if (empty($orderCondition)) {
@@ -3320,26 +3320,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::return_icon('session_default_small.png', null, null, null, null, true);
 
             $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;
                 }
 
                 if ($row['display_start_date'] == '0000-00-00 00:00:00' || $row['display_start_date'] == '0000-00-00') {
@@ -3439,7 +3439,7 @@ 
                 return intval($count['count']);
             }
 
-            while ($row = Database::fetch_array($result,'ASSOC'))	{
+            while ($row = Database::fetch_array($result, 'ASSOC')) {
                 $courses[$row['real_id']] = $row;
             }
         }
@@ -3483,7 +3483,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 ";
@@ -3508,7 +3508,7 @@ 
 		        ";
         if ($getCount) {
             $result = Database::query($sql);
-            $row = Database::fetch_array($result,'ASSOC');
+            $row = Database::fetch_array($result, 'ASSOC');
             return $row['count'];
         }
 
@@ -3523,7 +3523,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;
             }
         }
@@ -3601,7 +3601,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'];
         }
 
@@ -3720,9 +3720,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';
@@ -3756,8 +3756,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);
@@ -3788,8 +3788,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;
@@ -3866,7 +3866,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);
@@ -3888,16 +3888,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
         );
 
@@ -4016,7 +4016,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;
@@ -4035,7 +4035,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);
@@ -4274,7 +4274,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();
@@ -4410,10 +4410,10 @@ 
                     $suffix = null;
                     while (!$unique_name) {
                         if ($i > 1) {
-                            $suffix = ' - ' . $i;
+                            $suffix = ' - '.$i;
                         }
-                        $sql = 'SELECT 1 FROM ' . $tbl_session . '
-                                WHERE name="' . Database::escape_string($session_name). $suffix . '"';
+                        $sql = 'SELECT 1 FROM '.$tbl_session.'
+                                WHERE name="' . Database::escape_string($session_name).$suffix.'"';
                         $rs = Database::query($sql);
 
                         if (Database::result($rs, 0, 0)) {
@@ -4426,14 +4426,14 @@ 
 
                     // Creating the session.
                     $sql = "INSERT IGNORE INTO $tbl_session SET
-                            name = '" . Database::escape_string($session_name). "',
+                            name = '".Database::escape_string($session_name)."',
                             id_coach = '$coach_id',
                             access_start_date = '$dateStart',
                             access_end_date = '$dateEnd',
                             display_start_date = '$dateStart',
                             display_end_date = '$dateEnd',
                             visibility = '$visibilityAfterExpirationPerSession',                            
-                            session_admin_id = " . $defaultUserId . " 
+                            session_admin_id = ".$defaultUserId." 
                             $sessionCondition $extraParameters $extraSessionParameters";
                     Database::query($sql);
 
@@ -4499,7 +4499,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'";
@@ -4590,7 +4590,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'";
@@ -4633,7 +4633,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");
@@ -5201,7 +5201,7 @@ 
             foreach ($sessions as $session) {
                 $courseList = SessionManager::get_course_list_by_session_id($session['id']);
                 foreach ($courseList as $course) {
-                    $coursesFromSession[$course['code'].':'.$session['id']] = $course['visual_code'] . ' - ' . $course['title'] . ' (' . $session['name'] . ')';
+                    $coursesFromSession[$course['code'].':'.$session['id']] = $course['visual_code'].' - '.$course['title'].' ('.$session['name'].')';
                 }
             }
         }
@@ -5348,7 +5348,7 @@ 
 
         if (!empty($lastConnectionDate)) {
             $lastConnectionDate = Database::escape_string($lastConnectionDate);
-            $userConditions .=  " AND u.last_login <= '$lastConnectionDate' ";
+            $userConditions .= " AND u.last_login <= '$lastConnectionDate' ";
         }
 
         if (!empty($keyword)) {
@@ -5418,7 +5418,7 @@ 
         $result = Database::query($sql);
         $result = Database::store_result($result);
 
-        return $result ;
+        return $result;
     }
 
     /**
@@ -5478,7 +5478,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)) {
@@ -5491,7 +5491,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::subscribe_users_to_session(
                                 $sessionDestinationId,
                                 $newUserList,
@@ -5546,7 +5546,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;
 
@@ -5561,7 +5561,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) {
@@ -5674,7 +5674,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);
@@ -5686,7 +5686,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 {
@@ -5761,7 +5761,7 @@ 
         $toolList = self::getCourseToolToBeManaged();
 
         foreach ($toolList as $tool) {
-            $method = 'add' . $tool;
+            $method = 'add'.$tool;
             if (method_exists(get_class(), $method)) {
                 self::$method($sessionId, $courseId);
             }
@@ -5780,7 +5780,7 @@ 
         $toolList = self::getCourseToolToBeManaged();
 
         foreach ($toolList as $tool) {
-            $method = 'remove' . $tool;
+            $method = 'remove'.$tool;
             if (method_exists(get_class(), $method)) {
                 self::$method($sessionId, $courseId);
             }
@@ -5898,18 +5898,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 />';
                     }
                 }
             }
@@ -6089,8 +6089,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;
     }
@@ -6382,7 +6382,7 @@ 
                 FROM $table 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);
@@ -6420,7 +6420,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);
@@ -6463,14 +6463,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 ExtraFieldModel('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) {
@@ -6479,7 +6479,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) {
@@ -6532,7 +6532,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';
@@ -6591,7 +6591,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',
@@ -6678,7 +6678,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;
             }
         }
 
@@ -6782,7 +6782,7 @@ 
 
         $sessionExtraField = new ExtraFieldModel('session');
         $fieldList = $sessionExtraField->get_all(array(
-            "variable IN ( " . implode(", ", $variablePlaceHolders) . " ) " => $variables,
+            "variable IN ( ".implode(", ", $variablePlaceHolders)." ) " => $variables,
         ));
 
         $fields = array();
@@ -6796,7 +6796,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),
             )
         );
 
@@ -6868,7 +6868,7 @@ 
                 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
                 )";
 
@@ -6884,7 +6884,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
                             )";
             }
@@ -7106,7 +7106,7 @@ 
                     get_lang('CoachName'),
                     $coachInfo ? [$coachInfo['id'] => $coachInfo['complete_name_with_username']] : [],
                     [
-                        '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%',
                     ]
                 );
@@ -7117,7 +7117,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',
@@ -7296,16 +7296,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']
             );
 
@@ -7347,10 +7347,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
@@ -7395,12 +7395,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':
@@ -7413,12 +7413,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',
@@ -7426,8 +7426,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;
         }
@@ -7436,14 +7436,14 @@ 
         $session_field = new ExtraFieldModel('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,
@@ -7532,7 +7532,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 ";
             }
         }
 
@@ -7614,11 +7614,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']
             );
 
@@ -7653,10 +7653,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)
@@ -7680,7 +7680,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']);
@@ -7695,14 +7695,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;
                 }
 
@@ -7778,7 +7778,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;
     }
 
     /**
@@ -7796,7 +7796,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) {
@@ -8007,7 +8007,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;
@@ -8022,8 +8022,8 @@ 
             );
 
             $userCatId = intval($userCatId);
-            $listResults[$userCatId]['courseInUserCategoryId'] =  $userCatId;
-            $listResults[$userCatId]['courseInUserCategoryTitle'] =  $userCatTitle;
+            $listResults[$userCatId]['courseInUserCategoryId'] = $userCatId;
+            $listResults[$userCatId]['courseInUserCategoryTitle'] = $userCatTitle;
             $listResults[$userCatId]['courseInUserCatList'][] = $listOneCourse;
         }
 
@@ -8049,7 +8049,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;
@@ -8069,7 +8069,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;
@@ -8085,7 +8085,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;
@@ -8101,7 +8101,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;
@@ -8146,8 +8146,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;
                 }
 
@@ -8212,12 +8212,12 @@ 
                 $userId = api_get_user_id();
                 $response = self::isUserSubscribedAsStudent($sessionId, $userId);
                 if ($response) {
-                    $urlToRedirect = api_get_path(WEB_CODE_PATH) . 'session/index.php?session_id=' . $sessionId;
+                    $urlToRedirect = api_get_path(WEB_CODE_PATH).'session/index.php?session_id='.$sessionId;
                     if (!empty($onlyOneCourseSessionToRedirect)) {
-                        $urlToRedirect = api_get_path(WEB_PATH) . 'courses/' . $onlyOneCourseSessionToRedirect . '/index.php?id_session=' . $sessionId;
+                        $urlToRedirect = api_get_path(WEB_PATH).'courses/'.$onlyOneCourseSessionToRedirect.'/index.php?id_session='.$sessionId;
                     }
 
-                    header('Location: ' . $urlToRedirect);
+                    header('Location: '.$urlToRedirect);
                     exit;
                 }
             }

main/inc/lib/conditional_login.class.php

Spacing +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
                     if (isset($condition['conditional_function']) && $condition['conditional_function']($user) == false) {
                         $_SESSION['conditional_login']['uid'] = $user['user_id'];
                         $_SESSION['conditional_login']['can_login'] = false;
-                        header("Location:". $condition['url']);
+                        header("Location:".$condition['url']);
                         exit();
                     }
                 }

main/inc/lib/image.lib.php

Indentation +120 added lines, -120 removed lines

@@ -47,7 +47,7 @@ 
             if ($height >= $max_size_for_picture) {
                 // scale width
                 $new_width = round($width * ($max_size_for_picture / $height));
-                 $this->image_wrapper->resize($new_width, $max_size_for_picture, 0);
+                    $this->image_wrapper->resize($new_width, $max_size_for_picture, 0);
             }
         }
     }
@@ -149,7 +149,7 @@ 
 
     public function __construct($path)
     {
-          parent::__construct($path);
+            parent::__construct($path);
     }
 
     public function set_image_wrapper()
@@ -184,19 +184,19 @@ 
         }
     }
 
-	public function get_image_size()
+    public function get_image_size()
     {
-		$imagesize = array('width'=>0,'height'=>0);
-	    if ($this->image_validated) {
+        $imagesize = array('width'=>0,'height'=>0);
+        if ($this->image_validated) {
             $imagesize = $this->image->getImageGeometry();
-	    }
-	    return $imagesize;
-	}
+        }
+        return $imagesize;
+    }
 
-	//@todo implement border logic case for Imagick
-	public function resize($thumbw, $thumbh, $border, $specific_size = false)
+    //@todo implement border logic case for Imagick
+    public function resize($thumbw, $thumbh, $border, $specific_size = false)
     {
-	    if (!$this->image_validated) return false;
+        if (!$this->image_validated) return false;
 
         if ($specific_size) {
             $width = $thumbw;
@@ -206,10 +206,10 @@ 
             $width  = (int)($this->width * $scale);
             $height = (int)($this->height * $scale);
         }
-		$result = $this->image->resizeImage($width, $height, $this->filter, 1);
-		$this->width  = $thumbw;
-		$this->height = $thumbh;
-	}
+        $result = $this->image->resizeImage($width, $height, $this->filter, 1);
+        $this->width  = $thumbw;
+        $this->height = $thumbh;
+    }
     
     /**
      * @author José Loguercio <jose.loguercio@beeznest.com>
@@ -224,8 +224,8 @@ 
     public function crop($x, $y, $width, $height, $src_width, $src_height) {
         if (!$this->image_validated) return false;
         $this->image->cropimage($width, $height, $x, $y);
-		$this->width  = $width;
-		$this->height = $height;
+        $this->width  = $width;
+        $this->height = $height;
     }
 
     public function send_image($file = '', $compress = -1, $convert_file_to = null)
@@ -235,35 +235,35 @@ 
         if (!empty($convert_file_to) && in_array($convert_file_to, $this->allowed_extensions)) {
             $type = $convert_file_to;
         }
-		switch ($type) {
-		    case 'jpeg':
-			case 'jpg':
-				if (!$file) header("Content-type: image/jpeg");
-				break;
-			case 'png':
-				if (!$file) header("Content-type: image/png");
-				break;
-			case 'gif':
-				if (!$file) header("Content-type: image/gif");
-				break;
-		}
-		$result = false;
-		try {
-		    $result = $this->image->writeImage($file);
-		} catch(ImagickException $e) {
+        switch ($type) {
+            case 'jpeg':
+            case 'jpg':
+                if (!$file) header("Content-type: image/jpeg");
+                break;
+            case 'png':
+                if (!$file) header("Content-type: image/png");
+                break;
+            case 'gif':
+                if (!$file) header("Content-type: image/gif");
+                break;
+        }
+        $result = false;
+        try {
+            $result = $this->image->writeImage($file);
+        } catch(ImagickException $e) {
             if ($this->debug) error_log($e->getMessage());
         }
 
-		if (!$file) {
-		    echo $this->image;
-		    $this->image->clear();
+        if (!$file) {
+            echo $this->image;
+            $this->image->clear();
             $this->image->destroy();
-		} else {
-		    $this->image->clear();
+        } else {
+            $this->image->clear();
             $this->image->destroy();
-		    return $result;
-		}
-	}
+            return $result;
+        }
+    }
 
 }
 
@@ -285,21 +285,21 @@ 
         $this->fill_image_info();
 
         switch ($this->type) {
-        	case 0:
-        		$handler = false;
-        		break;
-		    case 1 :
+            case 0:
+                $handler = false;
+                break;
+            case 1 :
                 $handler = @imagecreatefromgif($this->path);
                 $this->type = 'gif';
                 break;
-		    case 2 :
+            case 2 :
                 $handler = @imagecreatefromjpeg($this->path);
                 $this->type = 'jpg';
                 break;
-		    case 3 :
-		        $handler = @imagecreatefrompng($this->path);
-		        $this->type = 'png';
-		        break;
+            case 3 :
+                $handler = @imagecreatefrompng($this->path);
+                $this->type = 'png';
+                break;
         }
         if ($handler) {
             $this->image_validated = true;
@@ -313,29 +313,29 @@ 
     {
         $return_array = array('width'=>0,'height'=>0);
         if ($this->image_validated) {
-	        $return_array = array('width'=>$this->width,'height'=>$this->height);
+            $return_array = array('width'=>$this->width,'height'=>$this->height);
         }
         return $return_array;
-	}
+    }
 
     public function fill_image_info()
     {
-    	if (file_exists($this->path)) {
-	        $image_info     = getimagesize($this->path);
-			$this->width    = $image_info[0];
-			$this->height   = $image_info[1];
-			$this->type     = $image_info[2];
-    	} else {
-    		$this->width    = 0;
-    		$this->height   = 0;
-    		$this->type     = 0;
-    	}
+        if (file_exists($this->path)) {
+            $image_info     = getimagesize($this->path);
+            $this->width    = $image_info[0];
+            $this->height   = $image_info[1];
+            $this->type     = $image_info[2];
+        } else {
+            $this->width    = 0;
+            $this->height   = 0;
+            $this->type     = 0;
+        }
     }
 
     public function resize($thumbw, $thumbh, $border, $specific_size = false)
     {
         if (!$this->image_validated) return false;
-		if ($border == 1) {
+        if ($border == 1) {
             if ($specific_size) {
                 $width = $thumbw;
                 $height = $thumbh;
@@ -344,17 +344,17 @@ 
                 $width = (int)($this->width * $scale);
                 $height = (int)($this->height * $scale);
             }
-			$deltaw = (int)(($thumbw - $width) / 2);
-			$deltah = (int)(($thumbh - $height) / 2);
-			$dst_img = @ImageCreateTrueColor($thumbw, $thumbh);
-            		@imagealphablending($dst_img, false);
-		        @imagesavealpha($dst_img, true);
-			if (!empty($this->color)) {
-				@imagefill($dst_img, 0, 0, $this->color);
-			}
-			$this->width = $thumbw;
-			$this->height = $thumbh;
-		} elseif ($border == 0) {
+            $deltaw = (int)(($thumbw - $width) / 2);
+            $deltah = (int)(($thumbh - $height) / 2);
+            $dst_img = @ImageCreateTrueColor($thumbw, $thumbh);
+                    @imagealphablending($dst_img, false);
+                @imagesavealpha($dst_img, true);
+            if (!empty($this->color)) {
+                @imagefill($dst_img, 0, 0, $this->color);
+            }
+            $this->width = $thumbw;
+            $this->height = $thumbh;
+        } elseif ($border == 0) {
             if ($specific_size) {
                 $width = $thumbw;
                 $height = $thumbh;
@@ -363,19 +363,19 @@ 
                 $width  = (int)($this->width * $scale);
                 $height = (int)($this->height * $scale);
             }
-			$deltaw = 0;
-			$deltah = 0;
-			$dst_img = @ImageCreateTrueColor($width, $height);
-            		@imagealphablending($dst_img, false);
-		        @imagesavealpha($dst_img, true);
-			$this->width = $width;
-			$this->height = $height;
-		}
-		$src_img = $this->bg;
-		@ImageCopyResampled($dst_img, $src_img, $deltaw, $deltah, 0, 0, $width, $height, ImageSX($src_img), ImageSY($src_img));
-		$this->bg = $dst_img;
-		@imagedestroy($src_img);
-	}
+            $deltaw = 0;
+            $deltah = 0;
+            $dst_img = @ImageCreateTrueColor($width, $height);
+                    @imagealphablending($dst_img, false);
+                @imagesavealpha($dst_img, true);
+            $this->width = $width;
+            $this->height = $height;
+        }
+        $src_img = $this->bg;
+        @ImageCopyResampled($dst_img, $src_img, $deltaw, $deltah, 0, 0, $width, $height, ImageSX($src_img), ImageSY($src_img));
+        $this->bg = $dst_img;
+        @imagedestroy($src_img);
+    }
     
     /**
      * @author José Loguercio <jose.loguercio@beeznest.com>
@@ -389,7 +389,7 @@ 
     public function crop($x, $y, $width, $height, $src_width, $src_height) {
         if (!$this->image_validated) return false;
         $this->width = $width;
-		$this->height = $height;
+        $this->height = $height;
         $src = null;
         $dest = @imagecreatetruecolor($width, $height);
         $type = $this->type;
@@ -400,56 +400,56 @@ 
                 @imagecopy($dest, $src, 0, 0, $x, $y, $src_width, $src_height);
                 @imagejpeg($dest, $this->path);
                 break;
-		    case 'png' :
+            case 'png' :
                 $src = @imagecreatefrompng($this->path);
                 @imagecopy($dest, $src, 0, 0, $x, $y, $src_width, $src_height);
                 @imagepng($dest, $this->path);
                 break;
-		    case 'gif' :
-		        $src = @imagecreatefromgif($this->path);
+            case 'gif' :
+                $src = @imagecreatefromgif($this->path);
                 @imagecopy($dest, $src, 0, 0, $x, $y, $src_width, $src_height);
                 @imagegif($dest, $this->path);
-		        break;
+                break;
             default: return 0;
         }
         @imagedestroy($dest);
         @imagedestroy($src);
     }
 
-	public function send_image($file = '', $compress = -1, $convert_file_to = null)
+    public function send_image($file = '', $compress = -1, $convert_file_to = null)
     {
-	    if (!$this->image_validated) return false;
+        if (!$this->image_validated) return false;
         $compress = (int)$compress;
         $type = $this->type;
         if (!empty($convert_file_to) && in_array($convert_file_to, $this->allowed_extensions)) {
             $type = $convert_file_to;
         }
-		switch ($type) {
-		    case 'jpeg':
-			case 'jpg':
-				if (!$file) header("Content-type: image/jpeg");
-				if ($compress == -1) $compress = 100;
-				return imagejpeg($this->bg, $file, $compress);
-				break;
-			case 'png':
-				if (!$file) header("Content-type: image/png");
-				if ($compress != -1) {
-					@imagetruecolortopalette($this->bg, true, $compress);
-				}
-				return imagepng($this->bg, $file, $compress);
-				break;
-			case 'gif':
-				if (!$file) header("Content-type: image/gif");
-				if ($compress != -1) {
-					@imagetruecolortopalette($this->bg, true, $compress);
-				}
-				return imagegif($this->bg, $file, $compress);
-				break;
-			default: return 0;
-		}
-		// TODO: Occupied memory is not released, because the following fragment of code is actually dead.
-		@imagedestroy($this->bg);
-	}
+        switch ($type) {
+            case 'jpeg':
+            case 'jpg':
+                if (!$file) header("Content-type: image/jpeg");
+                if ($compress == -1) $compress = 100;
+                return imagejpeg($this->bg, $file, $compress);
+                break;
+            case 'png':
+                if (!$file) header("Content-type: image/png");
+                if ($compress != -1) {
+                    @imagetruecolortopalette($this->bg, true, $compress);
+                }
+                return imagepng($this->bg, $file, $compress);
+                break;
+            case 'gif':
+                if (!$file) header("Content-type: image/gif");
+                if ($compress != -1) {
+                    @imagetruecolortopalette($this->bg, true, $compress);
+                }
+                return imagegif($this->bg, $file, $compress);
+                break;
+            default: return 0;
+        }
+        // TODO: Occupied memory is not released, because the following fragment of code is actually dead.
+        @imagedestroy($this->bg);
+    }
 
     /**
      * Convert image to black & white

Braces +57 added lines, -19 removed lines

@@ -154,7 +154,9 @@ 
 
     public function set_image_wrapper()
     {
-        if ($this->debug) error_log('Image::set_image_wrapper loaded');
+        if ($this->debug) {
+            error_log('Image::set_image_wrapper loaded');
+        }
         try {
             if (file_exists($this->path)) {
                 $this->image     = new Imagick($this->path);
@@ -163,10 +165,14 @@ 
                     $this->fill_image_info(); //Fills height, width and type
                 }
             } else {
-                if ($this->debug) error_log('Image::image does not exist');
+                if ($this->debug) {
+                    error_log('Image::image does not exist');
+                }
             }
         } catch(ImagickException $e) {
-            if ($this->debug) error_log($e->getMessage());
+            if ($this->debug) {
+                error_log($e->getMessage());
+            }
         }
     }
 
@@ -180,7 +186,9 @@ 
 
         if (in_array($this->type, $this->allowed_extensions)) {
             $this->image_validated = true;
-            if ($this->debug) error_log('image_validated true');
+            if ($this->debug) {
+                error_log('image_validated true');
+            }
         }
     }
 
@@ -196,7 +204,9 @@ 
 	//@todo implement border logic case for Imagick
 	public function resize($thumbw, $thumbh, $border, $specific_size = false)
     {
-	    if (!$this->image_validated) return false;
+	    if (!$this->image_validated) {
+	        return false;
+	    }
 
         if ($specific_size) {
             $width = $thumbw;
@@ -222,7 +232,9 @@ 
      */
     
     public function crop($x, $y, $width, $height, $src_width, $src_height) {
-        if (!$this->image_validated) return false;
+        if (!$this->image_validated) {
+            return false;
+        }
         $this->image->cropimage($width, $height, $x, $y);
 		$this->width  = $width;
 		$this->height = $height;
@@ -230,7 +242,9 @@ 
 
     public function send_image($file = '', $compress = -1, $convert_file_to = null)
     {
-        if (!$this->image_validated) return false;
+        if (!$this->image_validated) {
+            return false;
+        }
         $type = $this->type;
         if (!empty($convert_file_to) && in_array($convert_file_to, $this->allowed_extensions)) {
             $type = $convert_file_to;
@@ -238,20 +252,28 @@ 
 		switch ($type) {
 		    case 'jpeg':
 			case 'jpg':
-				if (!$file) header("Content-type: image/jpeg");
+				if (!$file) {
+				    header("Content-type: image/jpeg");
+				}
 				break;
 			case 'png':
-				if (!$file) header("Content-type: image/png");
+				if (!$file) {
+				    header("Content-type: image/png");
+				}
 				break;
 			case 'gif':
-				if (!$file) header("Content-type: image/gif");
+				if (!$file) {
+				    header("Content-type: image/gif");
+				}
 				break;
 		}
 		$result = false;
 		try {
 		    $result = $this->image->writeImage($file);
 		} catch(ImagickException $e) {
-            if ($this->debug) error_log($e->getMessage());
+            if ($this->debug) {
+                error_log($e->getMessage());
+            }
         }
 
 		if (!$file) {
@@ -334,7 +356,9 @@ 
 
     public function resize($thumbw, $thumbh, $border, $specific_size = false)
     {
-        if (!$this->image_validated) return false;
+        if (!$this->image_validated) {
+            return false;
+        }
 		if ($border == 1) {
             if ($specific_size) {
                 $width = $thumbw;
@@ -387,7 +411,9 @@ 
      * @param int $src_height the source height of the original image
      */
     public function crop($x, $y, $width, $height, $src_width, $src_height) {
-        if (!$this->image_validated) return false;
+        if (!$this->image_validated) {
+            return false;
+        }
         $this->width = $width;
 		$this->height = $height;
         $src = null;
@@ -418,7 +444,9 @@ 
 
 	public function send_image($file = '', $compress = -1, $convert_file_to = null)
     {
-	    if (!$this->image_validated) return false;
+	    if (!$this->image_validated) {
+	        return false;
+	    }
         $compress = (int)$compress;
         $type = $this->type;
         if (!empty($convert_file_to) && in_array($convert_file_to, $this->allowed_extensions)) {
@@ -427,19 +455,27 @@ 
 		switch ($type) {
 		    case 'jpeg':
 			case 'jpg':
-				if (!$file) header("Content-type: image/jpeg");
-				if ($compress == -1) $compress = 100;
+				if (!$file) {
+				    header("Content-type: image/jpeg");
+				}
+				if ($compress == -1) {
+				    $compress = 100;
+				}
 				return imagejpeg($this->bg, $file, $compress);
 				break;
 			case 'png':
-				if (!$file) header("Content-type: image/png");
+				if (!$file) {
+				    header("Content-type: image/png");
+				}
 				if ($compress != -1) {
 					@imagetruecolortopalette($this->bg, true, $compress);
 				}
 				return imagepng($this->bg, $file, $compress);
 				break;
 			case 'gif':
-				if (!$file) header("Content-type: image/gif");
+				if (!$file) {
+				    header("Content-type: image/gif");
+				}
 				if ($compress != -1) {
 					@imagetruecolortopalette($this->bg, true, $compress);
 				}
@@ -456,7 +492,9 @@ 
      */
     function convert2bw()
     {
-        if (!$this->image_validated) return false;
+        if (!$this->image_validated) {
+            return false;
+        }
 
         $dest_img = imagecreatetruecolor(imagesx($this->bg), imagesy($this->bg));
         /* copy ignore the transparent color

Doc Comments +16 added lines

@@ -63,6 +63,9 @@ 
         return $image;
     }
 
+    /**
+     * @param string $convert_file_to
+     */
     public function send_image(
         $file = '',
         $compress = -1,
@@ -144,6 +147,9 @@ 
     public $image;
     public $filter = Imagick::FILTER_LANCZOS;
 
+    /**
+     * @param string $path
+     */
     public function __construct($path)
     {
           parent::__construct($path);
@@ -191,6 +197,10 @@ 
 	}
 
 	//@todo implement border logic case for Imagick
+
+	/**
+	 * @param integer $border
+	 */
 	public function resize($thumbw, $thumbh, $border, $specific_size = false)
     {
 	    if (!$this->image_validated) return false;
@@ -272,6 +282,9 @@ 
 {
     public $bg;
 
+    /**
+     * @param string $path
+     */
     function __construct($path) {
         parent::__construct($path);
     }
@@ -329,6 +342,9 @@ 
     	}
     }
 
+    /**
+     * @param integer $border
+     */
     public function resize($thumbw, $thumbh, $border, $specific_size = false)
     {
         if (!$this->image_validated) return false;

Spacing +19 added lines, -19 removed lines

@@ -114,7 +114,7 @@ 
             return false;
         }
         $this->path = $path;
-        $this->set_image_wrapper();  //Creates image obj
+        $this->set_image_wrapper(); //Creates image obj
     }
 
     abstract function set_image_wrapper();
@@ -156,7 +156,7 @@ 
         if ($this->debug) error_log('Image::set_image_wrapper loaded');
         try {
             if (file_exists($this->path)) {
-                $this->image     = new Imagick($this->path);
+                $this->image = new Imagick($this->path);
 
                 if ($this->image) {
                     $this->fill_image_info(); //Fills height, width and type
@@ -164,7 +164,7 @@ 
             } else {
                 if ($this->debug) error_log('Image::image does not exist');
             }
-        } catch(ImagickException $e) {
+        } catch (ImagickException $e) {
             if ($this->debug) error_log($e->getMessage());
         }
     }
@@ -185,7 +185,7 @@ 
 
 	public function get_image_size()
     {
-		$imagesize = array('width'=>0,'height'=>0);
+		$imagesize = array('width'=>0, 'height'=>0);
 	    if ($this->image_validated) {
             $imagesize = $this->image->getImageGeometry();
 	    }
@@ -202,8 +202,8 @@ 
             $height = $thumbh;
         } else {
             $scale  = ($this->width > 0 && $this->height > 0) ? min($thumbw / $this->width, $thumbh / $this->height) : 0;
-            $width  = (int)($this->width * $scale);
-            $height = (int)($this->height * $scale);
+            $width  = (int) ($this->width * $scale);
+            $height = (int) ($this->height * $scale);
         }
 		$result = $this->image->resizeImage($width, $height, $this->filter, 1);
 		$this->width  = $thumbw;
@@ -249,7 +249,7 @@ 
 		$result = false;
 		try {
 		    $result = $this->image->writeImage($file);
-		} catch(ImagickException $e) {
+		} catch (ImagickException $e) {
             if ($this->debug) error_log($e->getMessage());
         }
 
@@ -310,9 +310,9 @@ 
 
     public function get_image_size()
     {
-        $return_array = array('width'=>0,'height'=>0);
+        $return_array = array('width'=>0, 'height'=>0);
         if ($this->image_validated) {
-	        $return_array = array('width'=>$this->width,'height'=>$this->height);
+	        $return_array = array('width'=>$this->width, 'height'=>$this->height);
         }
         return $return_array;
 	}
@@ -320,7 +320,7 @@ 
     public function fill_image_info()
     {
     	if (file_exists($this->path)) {
-	        $image_info     = getimagesize($this->path);
+	        $image_info = getimagesize($this->path);
 			$this->width    = $image_info[0];
 			$this->height   = $image_info[1];
 			$this->type     = $image_info[2];
@@ -340,11 +340,11 @@ 
                 $height = $thumbh;
             } else {
                 $scale = min($thumbw / $this->width, $thumbh / $this->height);
-                $width = (int)($this->width * $scale);
-                $height = (int)($this->height * $scale);
+                $width = (int) ($this->width * $scale);
+                $height = (int) ($this->height * $scale);
             }
-			$deltaw = (int)(($thumbw - $width) / 2);
-			$deltah = (int)(($thumbh - $height) / 2);
+			$deltaw = (int) (($thumbw - $width) / 2);
+			$deltah = (int) (($thumbh - $height) / 2);
 			$dst_img = @ImageCreateTrueColor($thumbw, $thumbh);
             		@imagealphablending($dst_img, false);
 		        @imagesavealpha($dst_img, true);
@@ -359,8 +359,8 @@ 
                 $height = $thumbh;
             } else {
                 $scale = ($this->width > 0 && $this->height > 0) ? min($thumbw / $this->width, $thumbh / $this->height) : 0;
-                $width  = (int)($this->width * $scale);
-                $height = (int)($this->height * $scale);
+                $width  = (int) ($this->width * $scale);
+                $height = (int) ($this->height * $scale);
             }
 			$deltaw = 0;
 			$deltah = 0;
@@ -418,7 +418,7 @@ 
 	public function send_image($file = '', $compress = -1, $convert_file_to = null)
     {
 	    if (!$this->image_validated) return false;
-        $compress = (int)$compress;
+        $compress = (int) $compress;
         $type = $this->type;
         if (!empty($convert_file_to) && in_array($convert_file_to, $this->allowed_extensions)) {
             $type = $convert_file_to;
@@ -462,11 +462,11 @@ 
          * so that we can use black (0,0,0) as transparent, which is what
          * the image is filled with when created.
          */
-        $transparent = imagecolorallocate($dest_img, 0,0,0);
+        $transparent = imagecolorallocate($dest_img, 0, 0, 0);
         imagealphablending($dest_img, false);
         imagesavealpha($dest_img, true);
         imagecolortransparent($dest_img, $transparent);
-        imagecopy($dest_img, $this->bg, 0,0, 0, 0,imagesx($this->bg), imagesx($this->bg));
+        imagecopy($dest_img, $this->bg, 0, 0, 0, 0, imagesx($this->bg), imagesx($this->bg));
         imagefilter($dest_img, IMG_FILTER_GRAYSCALE);
         $this->bg = $dest_img;
 

main/inc/lib/timeline.lib.php

Indentation +23 added lines, -23 removed lines

@@ -25,10 +25,10 @@ 
     );
     public $is_course_model = true;
 
-	public function __construct()
+    public function __construct()
     {
         $this->table =  Database::get_course_table(TABLE_TIMELINE);
-	}
+    }
 
     /**
      * Get the count of elements
@@ -52,16 +52,16 @@ 
     /**
      * Displays the title + grid
      */
-	public function listing()
+    public function listing()
     {
-		// action links
-		$html = '<div class="actions">';
+        // action links
+        $html = '<div class="actions">';
         //$html .= '<a href="career_dashboard.php">'.Display::return_icon('back.png',get_lang('Back'),'','32').'</a>';
-		$html .= '<a href="'.api_get_self().'?action=add">'.Display::return_icon('add.png', get_lang('Add'),'','32').'</a>';
-		$html .= '</div>';
+        $html .= '<a href="'.api_get_self().'?action=add">'.Display::return_icon('add.png', get_lang('Add'),'','32').'</a>';
+        $html .= '</div>';
         $html .= Display::grid_html('timelines');
         return $html;
-	}
+    }
 
     public function get_status_list()
     {
@@ -89,7 +89,7 @@ 
 
         $form->addElement('text', 'headline', get_lang('Name'), array('size' => '70'));
         //$form->addHtmlEditor('description', get_lang('Description'), false, false, array('ToolbarSet' => 'Careers','Width' => '100%', 'Height' => '250'));
-	    $status_list = $this->get_status_list();
+        $status_list = $this->get_status_list();
         $form->addElement('select', 'status', get_lang('Status'), $status_list);
         if ($action == 'edit') {
             //$form->addElement('text', 'created_at', get_lang('CreatedAt'));
@@ -173,7 +173,7 @@ 
 
         // Setting the rules
         $form->addRule('headline', get_lang('ThisFieldIsRequired'), 'required');
-		return $form;
+        return $form;
 
     }
 
@@ -184,11 +184,11 @@ 
     public function save_item($params)
     {
         $params['c_id'] = api_get_course_int_id();
-	    $id = parent::save($params);
-	    if (!empty($id)) {
-	    	//event_system(LOG_CAREER_CREATE, LOG_CAREER_ID, $id, api_get_utc_datetime(), api_get_user_id());
-   		}
-   		return $id;
+        $id = parent::save($params);
+        if (!empty($id)) {
+            //event_system(LOG_CAREER_CREATE, LOG_CAREER_ID, $id, api_get_utc_datetime(), api_get_user_id());
+            }
+            return $id;
     }
 
     /**
@@ -199,16 +199,16 @@ 
         $params['c_id'] = api_get_course_int_id();
         $params['parent_id'] = '0';
         $params['type'] = 'default';
-	    $id = parent::save($params);
-	    if (!empty($id)) {
-	    	//event_system(LOG_CAREER_CREATE, LOG_CAREER_ID, $id, api_get_utc_datetime(), api_get_user_id());
-   		}
-   		return $id;
+        $id = parent::save($params);
+        if (!empty($id)) {
+            //event_system(LOG_CAREER_CREATE, LOG_CAREER_ID, $id, api_get_utc_datetime(), api_get_user_id());
+            }
+            return $id;
     }
 
     public function delete($id) {
-	    parent::delete($id);
-	    //event_system(LOG_CAREER_DELETE, LOG_CAREER_ID, $id, api_get_utc_datetime(), api_get_user_id());
+        parent::delete($id);
+        //event_system(LOG_CAREER_DELETE, LOG_CAREER_ID, $id, api_get_utc_datetime(), api_get_user_id());
     }
 
     public function get_url($id) {
@@ -247,7 +247,7 @@ 
         $item['asset'] = array( 'media'     => $item['media'],
                                 'credit'    => $item['media_credit'],
                                 'caption'   => $item['media_caption'],
-         );
+            );
 
         //Cleaning items
         unset($item['id']);

Spacing +4 added lines, -4 removed lines

@@ -27,7 +27,7 @@ 
 
 	public function __construct()
     {
-        $this->table =  Database::get_course_table(TABLE_TIMELINE);
+        $this->table = Database::get_course_table(TABLE_TIMELINE);
 	}
 
     /**
@@ -46,7 +46,7 @@ 
      */
     public function get_all($where_conditions = array())
     {
-        return Database::select('*',$this->table, array('where'=>$where_conditions,'order' =>'headline ASC'));
+        return Database::select('*', $this->table, array('where'=>$where_conditions, 'order' =>'headline ASC'));
     }
 
     /**
@@ -57,7 +57,7 @@ 
 		// action links
 		$html = '<div class="actions">';
         //$html .= '<a href="career_dashboard.php">'.Display::return_icon('back.png',get_lang('Back'),'','32').'</a>';
-		$html .= '<a href="'.api_get_self().'?action=add">'.Display::return_icon('add.png', get_lang('Add'),'','32').'</a>';
+		$html .= '<a href="'.api_get_self().'?action=add">'.Display::return_icon('add.png', get_lang('Add'), '', '32').'</a>';
 		$html .= '</div>';
         $html .= Display::grid_html('timelines');
         return $html;
@@ -244,7 +244,7 @@ 
         }
         unset($item['end_date']);
         // Assets
-        $item['asset'] = array( 'media'     => $item['media'],
+        $item['asset'] = array('media'     => $item['media'],
                                 'credit'    => $item['media_credit'],
                                 'caption'   => $item['media_caption'],
          );

main/inc/lib/urlmanager.lib.php

Indentation +66 added lines, -66 removed lines

@@ -11,15 +11,15 @@ 
 class UrlManager
 {
     /**
-    * Creates a new url access
-    *
-    * @author Julio Montoya <gugli100@gmail.com>,
-    *
-    * @param	string	$url The URL of the site
-    * @param	string  $description The description of the site
-    * @param	int		$active is active or not
-    * @return boolean if success
-    */
+     * Creates a new url access
+     *
+     * @author Julio Montoya <gugli100@gmail.com>,
+     *
+     * @param	string	$url The URL of the site
+     * @param	string  $description The description of the site
+     * @param	int		$active is active or not
+     * @return boolean if success
+     */
     public static function add($url, $description, $active)
     {
         $tms = time();
@@ -36,15 +36,15 @@ 
     }
 
     /**
-    * Updates an URL access
-    * @author Julio Montoya <gugli100@gmail.com>,
-    *
-    * @param	int 	$url_id The url id
-    * @param	string 	$url
-    * @param	string  $description The description of the site
-    * @param	int		$active is active or not
-    * @return 	boolean if success
-    */
+     * Updates an URL access
+     * @author Julio Montoya <gugli100@gmail.com>,
+     *
+     * @param	int 	$url_id The url id
+     * @param	string 	$url
+     * @param	string  $description The description of the site
+     * @param	int		$active is active or not
+     * @return 	boolean if success
+     */
     public static function update($url_id, $url, $description, $active)
     {
         $url_id = intval($url_id);
@@ -63,12 +63,12 @@ 
     }
 
     /**
-    * Deletes an url
-    * @author Julio Montoya
-    * @param int $id url id
+     * Deletes an url
+     * @author Julio Montoya
+     * @param int $id url id
      *
-    * @return boolean true if success
-    * */
+     * @return boolean true if success
+     * */
     public static function delete($id)
     {
         $id = intval($id);
@@ -200,12 +200,12 @@ 
     }
 
     /**
-    * Gets the inner join of access_url and the course table
-    *
-    * @author Julio Montoya
-    * @param int  access url id
-    * @return array   Database::store_result of the result
-    **/
+     * Gets the inner join of access_url and the course table
+     *
+     * @author Julio Montoya
+     * @param int  access url id
+     * @return array   Database::store_result of the result
+     **/
     public static function get_url_rel_course_data($access_url_id = null)
     {
         $where = '';
@@ -362,12 +362,12 @@ 
     }
 
     /**
-    * Checks the relationship between an URL and a User (return the num_rows)
-    * @author Julio Montoya
-    * @param int user id
-    * @param int url id
-    * @return boolean true if success
-    * */
+     * Checks the relationship between an URL and a User (return the num_rows)
+     * @author Julio Montoya
+     * @param int user id
+     * @param int url id
+     * @return boolean true if success
+     * */
     public static function relation_url_user_exist($user_id, $url_id)
     {
         $table = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
@@ -377,15 +377,15 @@ 
         $num = Database::num_rows($result);
 
         return $num;
-	}
+    }
 
     /**
-    * Checks the relationship between an URL and a Course (return the num_rows)
-    * @author Julio Montoya
-    * @param int $courseId
-    * @param int $urlId
-    * @return boolean true if success
-    * */
+     * Checks the relationship between an URL and a Course (return the num_rows)
+     * @author Julio Montoya
+     * @param int $courseId
+     * @param int $urlId
+     * @return boolean true if success
+     * */
     public static function relation_url_course_exist($courseId, $urlId)
     {
         $table_url_rel_course = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
@@ -420,12 +420,12 @@ 
     }
 
     /**
-    * Checks the relationship between an URL and a Session (return the num_rows)
-    * @author Julio Montoya
-    * @param int user id
-    * @param int url id
-    * @return boolean true if success
-    * */
+     * Checks the relationship between an URL and a Session (return the num_rows)
+     * @author Julio Montoya
+     * @param int user id
+     * @param int url id
+     * @return boolean true if success
+     * */
     public static function relation_url_session_exist($session_id, $url_id)
     {
         $table_url_rel_session= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
@@ -737,13 +737,13 @@ 
     }
 
     /**
-    * Deletes an url and user relationship
-    * @author Julio Montoya
-    * @param int user id
-    * @param int url id
+     * Deletes an url and user relationship
+     * @author Julio Montoya
+     * @param int user id
+     * @param int url id
      *
-    * @return boolean true if success
-    * */
+     * @return boolean true if success
+     * */
     public static function delete_url_rel_user($user_id, $url_id)
     {
         $table_url_rel_user = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
@@ -758,13 +758,13 @@ 
     }
 
     /**
-    * Deletes an url and course relationship
-    * @author Julio Montoya
-    * @param  int  $courseId
-    * @param  int  $urlId
+     * Deletes an url and course relationship
+     * @author Julio Montoya
+     * @param  int  $courseId
+     * @param  int  $urlId
      *
-    * @return boolean true if success
-    * */
+     * @return boolean true if success
+     * */
     public static function delete_url_rel_course($courseId, $urlId)
     {
         $table_url_rel_course= Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
@@ -814,13 +814,13 @@ 
     }
 
     /**
-    * Deletes an url and session relationship
-    * @author Julio Montoya
-    * @param  char  course code
-    * @param  int url id
+     * Deletes an url and session relationship
+     * @author Julio Montoya
+     * @param  char  course code
+     * @param  int url id
      *
-    * @return boolean true if success
-    * */
+     * @return boolean true if success
+     * */
     public static function delete_url_rel_session($session_id, $url_id)
     {
         $table_url_rel_session = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);

Doc Comments +16 added lines, -13 removed lines

@@ -18,7 +18,7 @@ 
     * @param	string	$url The URL of the site
     * @param	string  $description The description of the site
     * @param	int		$active is active or not
-    * @return boolean if success
+    * @return Doctrine\DBAL\Driver\Statement|null if success
     */
     public static function add($url, $description, $active)
     {
@@ -43,7 +43,7 @@ 
     * @param	string 	$url
     * @param	string  $description The description of the site
     * @param	int		$active is active or not
-    * @return 	boolean if success
+    * @return 	Doctrine\DBAL\Driver\Statement|null if success
     */
     public static function update($url_id, $url, $description, $active)
     {
@@ -386,7 +386,7 @@ 
     * @author Julio Montoya
     * @param int user id
     * @param int url id
-    * @return boolean true if success
+    * @return integer true if success
     * */
     public static function relation_url_user_exist($user_id, $url_id)
     {
@@ -404,7 +404,7 @@ 
     * @author Julio Montoya
     * @param int $courseId
     * @param int $urlId
-    * @return boolean true if success
+    * @return integer true if success
     * */
     public static function relation_url_course_exist($courseId, $urlId)
     {
@@ -425,7 +425,7 @@ 
      * @author Julio Montoya
      * @param int $userGroupId
      * @param int $urlId
-     * @return boolean true if success
+     * @return integer true if success
      * */
     public static function relationUrlUsergroupExist($userGroupId, $urlId)
     {
@@ -445,7 +445,7 @@ 
     * @author Julio Montoya
     * @param int user id
     * @param int url id
-    * @return boolean true if success
+    * @return integer true if success
     * */
     public static function relation_url_session_exist($session_id, $url_id)
     {
@@ -568,6 +568,8 @@ 
      * @author Julio Montoya
      * @param  array of course ids
      * @param  array of url_ids
+     * @param integer[] $courseCategoryList
+     * @param integer[] $urlList
      * @return array
      **/
     public static function addCourseCategoryListToUrl($courseCategoryList, $urlList)
@@ -598,7 +600,7 @@ 
      * @author Julio Montoya
      * @param int $categoryCourseId
      * @param int $urlId
-     * @return boolean true if success
+     * @return integer true if success
      * */
     public static function relationUrlCourseCategoryExist($categoryCourseId, $urlId)
     {
@@ -615,7 +617,7 @@ 
     /**
      * @param int $userGroupId
      * @param int $urlId
-     * @return int
+     * @return string
      */
     public static function addUserGroupToUrl($userGroupId, $urlId)
     {
@@ -716,7 +718,7 @@ 
      * @param int $courseId
      * @param int $url_id
      *
-     * @return resource
+     * @return boolean
      */
     public static function add_course_to_url($courseId, $url_id = 1)
     {
@@ -807,7 +809,7 @@ 
     * @param  int  $courseId
     * @param  int  $urlId
      *
-    * @return boolean true if success
+    * @return Doctrine\DBAL\Driver\Statement|null true if success
     * */
     public static function delete_url_rel_course($courseId, $urlId)
     {
@@ -825,7 +827,7 @@ 
      * @param  int $userGroupId
      * @param  int $urlId
      *
-     * @return boolean true if success
+     * @return Doctrine\DBAL\Driver\Statement|null true if success
      * */
     public static function delete_url_rel_usergroup($userGroupId, $urlId)
     {
@@ -844,7 +846,7 @@ 
      * @param  int $userGroupId
      * @param  int $urlId
      *
-     * @return boolean true if success
+     * @return Doctrine\DBAL\Driver\Statement|null true if success
      * */
     public static function deleteUrlRelCourseCategory($userGroupId, $urlId)
     {
@@ -862,8 +864,9 @@ 
     * @author Julio Montoya
     * @param  char  course code
     * @param  int url id
+    * @param integer $url_id
      *
-    * @return boolean true if success
+    * @return Doctrine\DBAL\Driver\Statement|null true if success
     * */
     public static function delete_url_rel_session($session_id, $url_id)
     {

Spacing +39 added lines, -39 removed lines

@@ -23,7 +23,7 @@ 
     public static function add($url, $description, $active)
     {
         $tms = time();
-        $table= Database :: get_main_table(TABLE_MAIN_ACCESS_URL);
+        $table = Database :: get_main_table(TABLE_MAIN_ACCESS_URL);
         $sql = "INSERT INTO $table
                 SET url 	= '".Database::escape_string($url)."',
                 description = '".Database::escape_string($description)."',
@@ -92,7 +92,7 @@ 
         $sql = "DELETE FROM $tableUser WHERE access_url_id = ".$id;
         Database::query($sql);
 
-        $sql= "DELETE FROM $table WHERE id = ".$id;
+        $sql = "DELETE FROM $table WHERE id = ".$id;
         Database::query($sql);
 
         return true;
@@ -105,7 +105,7 @@ 
      */
     public static function url_exist($url)
     {
-        $table= Database :: get_main_table(TABLE_MAIN_ACCESS_URL);
+        $table = Database :: get_main_table(TABLE_MAIN_ACCESS_URL);
         $sql = "SELECT id FROM $table
                 WHERE url = '".Database::escape_string($url)."' ";
         $res = Database::query($sql);
@@ -139,10 +139,10 @@ 
      * */
     public static function url_count()
     {
-        $table_access_url= Database :: get_main_table(TABLE_MAIN_ACCESS_URL);
+        $table_access_url = Database :: get_main_table(TABLE_MAIN_ACCESS_URL);
         $sql = "SELECT count(id) as count_result FROM $table_access_url";
         $res = Database::query($sql);
-        $url = Database::fetch_array($res,'ASSOC');
+        $url = Database::fetch_array($res, 'ASSOC');
         $result = $url['count_result'];
 
         return $result;
@@ -160,7 +160,7 @@ 
                 FROM $table
                 ORDER BY id";
         $res = Database::query($sql);
-        $urls = array ();
+        $urls = array();
         while ($url = Database::fetch_array($res)) {
             $urls[] = $url;
         }
@@ -277,7 +277,7 @@ 
      **/
     public static function get_url_rel_session_data($access_url_id = null)
     {
-        $where ='';
+        $where = '';
         $table_url_rel_session = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
         $tbl_session = Database :: get_main_table(TABLE_MAIN_SESSION);
 
@@ -313,7 +313,7 @@ 
         $table_user_group = Database::get_main_table(TABLE_USERGROUP);
 
         if (!empty($access_url_id)) {
-            $where ="WHERE $table_url_rel_usergroup.access_url_id = ".intval($access_url_id);
+            $where = "WHERE $table_url_rel_usergroup.access_url_id = ".intval($access_url_id);
         }
 
         $sql = "SELECT u.id, u.name, access_url_id
@@ -391,7 +391,7 @@ 
     public static function relation_url_user_exist($user_id, $url_id)
     {
         $table = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
-        $sql= "SELECT user_id FROM $table
+        $sql = "SELECT user_id FROM $table
                WHERE access_url_id = ".intval($url_id)." AND user_id = ".intval($user_id)." ";
         $result = Database::query($sql);
         $num = Database::num_rows($result);
@@ -409,7 +409,7 @@ 
     public static function relation_url_course_exist($courseId, $urlId)
     {
         $table_url_rel_course = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
-        $sql= "SELECT c_id FROM $table_url_rel_course
+        $sql = "SELECT c_id FROM $table_url_rel_course
                WHERE
                     access_url_id = ".intval($urlId)." AND
                     c_id = '".intval($courseId)."'";
@@ -430,7 +430,7 @@ 
     public static function relationUrlUsergroupExist($userGroupId, $urlId)
     {
         $table = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USERGROUP);
-        $sql= "SELECT usergroup_id FROM $table
+        $sql = "SELECT usergroup_id FROM $table
                WHERE 
                     access_url_id = ".intval($urlId)." AND
                     usergroup_id = ".intval($userGroupId);
@@ -449,9 +449,9 @@ 
     * */
     public static function relation_url_session_exist($session_id, $url_id)
     {
-        $table_url_rel_session= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
+        $table_url_rel_session = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
         $session_id = intval($session_id);
-        $url_id		= intval($url_id);
+        $url_id = intval($url_id);
         $sql = "SELECT session_id FROM $table_url_rel_session
                 WHERE
                     access_url_id = ".intval($url_id)." AND
@@ -477,7 +477,7 @@ 
         if (is_array($user_list) && is_array($url_list)) {
             foreach ($url_list as $url_id) {
                 foreach ($user_list as $user_id) {
-                    $count = UrlManager::relation_url_user_exist($user_id,$url_id);
+                    $count = UrlManager::relation_url_user_exist($user_id, $url_id);
                     if ($count == 0) {
                         $sql = "INSERT INTO $table_url_rel_user
                                 SET 
@@ -505,7 +505,7 @@ 
      * @param  array of url_ids
      * @return array
      **/
-    public static function add_courses_to_urls($course_list,$url_list)
+    public static function add_courses_to_urls($course_list, $url_list)
     {
         $table_url_rel_course = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
         $result_array = array();
@@ -517,7 +517,7 @@ 
                     $courseId = $courseInfo['real_id'];
 
                     $count = self::relation_url_course_exist($courseId, $url_id);
-                    if ($count==0) {
+                    if ($count == 0) {
                         $sql = "INSERT INTO $table_url_rel_course
                                 SET c_id = '".$courseId."', access_url_id = ".intval($url_id);
                         $result = Database::query($sql);
@@ -603,7 +603,7 @@ 
     public static function relationUrlCourseCategoryExist($categoryCourseId, $urlId)
     {
         $table = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE_CATEGORY);
-        $sql= "SELECT course_category_id FROM $table
+        $sql = "SELECT course_category_id FROM $table
                WHERE access_url_id = ".intval($urlId)." AND
                      course_category_id = ".intval($categoryCourseId);
         $result = Database::query($sql);
@@ -774,7 +774,7 @@ 
         $table_url_rel_user = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
         $result = true;
         if (!empty($user_id) && !empty($url_id)) {
-            $sql= "DELETE FROM $table_url_rel_user
+            $sql = "DELETE FROM $table_url_rel_user
                    WHERE user_id = ".intval($user_id)." AND access_url_id = ".intval($url_id);
             $result = Database::query($sql);
         }
@@ -794,7 +794,7 @@ 
         $table_url_rel_user = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
         $result = true;
         if (!empty($userId)) {
-            $sql= "DELETE FROM $table_url_rel_user
+            $sql = "DELETE FROM $table_url_rel_user
                    WHERE user_id = ".intval($userId);
             Database::query($sql);
         }
@@ -812,8 +812,8 @@ 
     * */
     public static function delete_url_rel_course($courseId, $urlId)
     {
-        $table_url_rel_course= Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
-        $sql= "DELETE FROM $table_url_rel_course
+        $table_url_rel_course = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
+        $sql = "DELETE FROM $table_url_rel_course
                WHERE c_id = '".intval($courseId)."' AND access_url_id=".intval($urlId)."  ";
         $result = Database::query($sql);
 
@@ -831,7 +831,7 @@ 
     public static function delete_url_rel_usergroup($userGroupId, $urlId)
     {
         $table = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USERGROUP);
-        $sql= "DELETE FROM $table
+        $sql = "DELETE FROM $table
                WHERE usergroup_id = '".intval($userGroupId)."' AND
                      access_url_id = ".intval($urlId);
         $result = Database::query($sql);
@@ -850,7 +850,7 @@ 
     public static function deleteUrlRelCourseCategory($userGroupId, $urlId)
     {
         $table = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE_CATEGORY);
-        $sql= "DELETE FROM $table
+        $sql = "DELETE FROM $table
                WHERE course_category_id = '".intval($userGroupId)."' AND
                      access_url_id=".intval($urlId)."  ";
         $result = Database::query($sql);
@@ -869,9 +869,9 @@ 
     public static function delete_url_rel_session($session_id, $url_id)
     {
         $table_url_rel_session = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
-        $sql= "DELETE FROM $table_url_rel_session
+        $sql = "DELETE FROM $table_url_rel_session
                WHERE session_id = ".intval($session_id)." AND access_url_id=".intval($url_id)."  ";
-        $result = Database::query($sql,'ASSOC');
+        $result = Database::query($sql, 'ASSOC');
 
         return $result;
     }
@@ -884,7 +884,7 @@ 
      * */
     public static function update_urls_rel_user($user_list, $access_url_id)
     {
-        $table_url_rel_user	= Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
+        $table_url_rel_user = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
         $sql = "SELECT user_id 
                 FROM $table_url_rel_user 
                 WHERE access_url_id = ".intval($access_url_id);
@@ -940,7 +940,7 @@ 
         $result = Database::query($sql);
 
         $existing_courses = array();
-        while ($row = Database::fetch_array($result)){
+        while ($row = Database::fetch_array($result)) {
             $existing_courses[] = $row['c_id'];
         }
 
@@ -973,7 +973,7 @@ 
         $result = Database::query($sql);
         $existingItems = array();
 
-        while ($row = Database::fetch_array($result)){
+        while ($row = Database::fetch_array($result)) {
             $existingItems[] = $row['usergroup_id'];
         }
 
@@ -1006,7 +1006,7 @@ 
         $result = Database::query($sql);
         $existingItems = array();
 
-        while ($row = Database::fetch_array($result)){
+        while ($row = Database::fetch_array($result)) {
             $existingItems[] = $row['course_category_id'];
         }
 
@@ -1046,13 +1046,13 @@ 
      * */
     public static function update_urls_rel_session($session_list, $access_url_id)
     {
-        $table_url_rel_session	= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
+        $table_url_rel_session = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
 
         $sql = "SELECT session_id FROM $table_url_rel_session WHERE access_url_id=".intval($access_url_id);
         $result = Database::query($sql);
         $existing_sessions = array();
 
-        while ($row = Database::fetch_array($result)){
+        while ($row = Database::fetch_array($result)) {
             $existing_sessions[] = $row['session_id'];
         }
 
@@ -1082,13 +1082,13 @@ 
      */
     public static function get_access_url_from_user($user_id)
     {
-        $table_url_rel_user	= Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
-        $table_url	= Database :: get_main_table(TABLE_MAIN_ACCESS_URL);
+        $table_url_rel_user = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
+        $table_url = Database :: get_main_table(TABLE_MAIN_ACCESS_URL);
         $sql = "SELECT url, access_url_id FROM $table_url_rel_user url_rel_user INNER JOIN $table_url u
                 ON (url_rel_user.access_url_id = u.id)
                 WHERE user_id = ".intval($user_id);
         $result = Database::query($sql);
-        $url_list = Database::store_result($result,'ASSOC');
+        $url_list = Database::store_result($result, 'ASSOC');
 
         return $url_list;
     }
@@ -1099,14 +1099,14 @@ 
      */
     public static function get_access_url_from_course($courseId)
     {
-        $table	= Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
-        $table_url	= Database :: get_main_table(TABLE_MAIN_ACCESS_URL);
+        $table = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
+        $table_url = Database :: get_main_table(TABLE_MAIN_ACCESS_URL);
         $sql = "SELECT url, access_url_id FROM $table c INNER JOIN $table_url u
                 ON (c.access_url_id = u.id)
                 WHERE c_id = ".intval($courseId);
 
         $result = Database::query($sql);
-        $url_list = Database::store_result($result,'ASSOC');
+        $url_list = Database::store_result($result, 'ASSOC');
         return $url_list;
     }
 
@@ -1117,7 +1117,7 @@ 
     public static function get_access_url_from_session($session_id)
     {
         $table_url_rel_session = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
-        $table_url  = Database :: get_main_table(TABLE_MAIN_ACCESS_URL);
+        $table_url = Database :: get_main_table(TABLE_MAIN_ACCESS_URL);
         $sql = "SELECT url, access_url_id FROM $table_url_rel_session url_rel_session INNER JOIN $table_url u
                 ON (url_rel_session.access_url_id = u.id)
                 WHERE session_id = ".intval($session_id);
@@ -1133,7 +1133,7 @@ 
      */
     public static function get_url_id($url)
     {
-        $table_access_url= Database :: get_main_table(TABLE_MAIN_ACCESS_URL);
+        $table_access_url = Database :: get_main_table(TABLE_MAIN_ACCESS_URL);
         $sql = "SELECT id FROM $table_access_url WHERE url = '".Database::escape_string($url)."'";
         $result = Database::query($sql);
         $access_url_id = Database::result($result, 0, 0);

main/inc/lib/zombie/zombie_manager.class.php

Spacing +3 added lines, -3 removed lines

@@ -79,7 +79,7 @@ 
         $count = intval($count);
         $from = intval($from);
 
-        $sql .=  " ORDER BY $column $direction";
+        $sql .= " ORDER BY $column $direction";
         $sql .= " LIMIT $count, $from ";
 
         $result = Database::query($sql);
@@ -93,8 +93,8 @@ 
     static function deactivate_zombies($ceiling)
     {
         $zombies = self::list_zombies($ceiling);
-        $ids  = array();
-        foreach($zombies as $zombie) {
+        $ids = array();
+        foreach ($zombies as $zombie) {
             $ids[] = $zombie['user_id'];
         }
         UserManager::deactivate_users($ids);

main/tracking/lp_results_by_user.php

Braces +2 added lines, -1 removed lines

@@ -73,8 +73,9 @@
 //$form->addElement('submit','submit',get_lang('Filter'));
 $form->addButtonFilter(get_lang('Filter'));
 
-if (!empty($_REQUEST['course_code']))
+if (!empty($_REQUEST['course_code'])) {
     $selected_course = $_REQUEST['course_code'];
+}
 if (!empty($selected_course)) {
     $selected_course = api_get_course_info($selected_course);
     $course_list = array($selected_course);

Indentation +102 added lines, -102 removed lines

@@ -16,34 +16,34 @@ 
 $is_allowedToTrack = $is_courseAdmin || $is_platformAdmin || $is_courseCoach || $is_sessionAdmin;
 
 if (!$is_allowedToTrack) {
-	Display :: display_header(null);
-	api_not_allowed();
-	Display :: display_footer();
+    Display :: display_header(null);
+    api_not_allowed();
+    Display :: display_footer();
 }
 
 $export_to_csv = false;
 if (isset($_GET['export'])) {
-	$export_to_csv = true;
+    $export_to_csv = true;
 }
 
 if (api_is_platform_admin() ) {
-	$global = true;
+    $global = true;
 } else {
-	$global = false;
+    $global = false;
 }
 
 if ($global) {
-	$temp_course_list = CourseManager :: get_courses_list();
-	foreach($temp_course_list  as $temp_course_item) {
-		$course_item = CourseManager ::get_course_information($temp_course_item['code']);
+    $temp_course_list = CourseManager :: get_courses_list();
+    foreach($temp_course_list  as $temp_course_item) {
+        $course_item = CourseManager ::get_course_information($temp_course_item['code']);
         $course_list[] = array(
             'code' => $course_item['code'],
             'title' => $course_item['title'],
         );
-	}
+    }
 } else {
     $current_course['code'] = $_course['id'];
-	$course_list = array($current_course);
+    $course_list = array($current_course);
 }
 
 $new_course_select = array();
@@ -54,20 +54,20 @@ 
 $form = new FormValidator('search_simple', 'POST', '', '', null, false);
 $form->addElement('select','course_code',get_lang('Course'), $new_course_select);
 if ($global) {
-	$form->addElement('hidden','view','admin');
+    $form->addElement('hidden','view','admin');
 } else {
-	//Get exam lists
+    //Get exam lists
     $course_id = api_get_course_int_id();
-	$t_quiz = Database::get_course_table(TABLE_QUIZ_TEST);
-	$sqlExercices = "SELECT quiz.title,id FROM ".$t_quiz." AS quiz
+    $t_quiz = Database::get_course_table(TABLE_QUIZ_TEST);
+    $sqlExercices = "SELECT quiz.title,id FROM ".$t_quiz." AS quiz
 	                 WHERE c_id = $course_id AND active='1'
 	                 ORDER BY quiz.title ASC";
-	$resultExercices = Database::query($sqlExercices);
-	$exercise_list[0] = get_lang('All');
-	while($a_exercices = Database::fetch_array($resultExercices)) {
-		$exercise_list[$a_exercices['id']] = $a_exercices['title'];
-	}
-	$form->addElement('select', 'exercise_id', get_lang('Exercise'), $exercise_list);
+    $resultExercices = Database::query($sqlExercices);
+    $exercise_list[0] = get_lang('All');
+    while($a_exercices = Database::fetch_array($resultExercices)) {
+        $exercise_list[$a_exercices['id']] = $a_exercices['title'];
+    }
+    $form->addElement('select', 'exercise_id', get_lang('Exercise'), $exercise_list);
 }
 
 //$form->addElement('submit','submit',get_lang('Filter'));
@@ -81,9 +81,9 @@ 
 }
 
 if (!$export_to_csv) {
-	Display :: display_header(get_lang('Reporting'));
-	echo '<div class="actions" style ="font-size:10pt;">';
-	if ($global) {
+    Display :: display_header(get_lang('Reporting'));
+    echo '<div class="actions" style ="font-size:10pt;">';
+    if ($global) {
 
         echo '<div style="float:right"> <a href="'.api_get_self().'?export=1&score='.$filter_score.'&exercise_id='.$exercise_id.'">
                 '.Display::return_icon('csv.gif').'
@@ -93,81 +93,81 @@ 
                 &nbsp;'.get_lang('Print').'</a>
                 	</div>';
 
-		$menu_items[] = '<a href="'.api_get_path(WEB_CODE_PATH).'mySpace/?view=teacher">'.get_lang('TeacherInterface').'</a>';
+        $menu_items[] = '<a href="'.api_get_path(WEB_CODE_PATH).'mySpace/?view=teacher">'.get_lang('TeacherInterface').'</a>';
         if (api_is_platform_admin()) {
-		  $menu_items[] = '<a href="'.api_get_path(WEB_CODE_PATH).'mySpace/?view=admin">'.get_lang('AdminInterface').'</a>';
+            $menu_items[] = '<a href="'.api_get_path(WEB_CODE_PATH).'mySpace/?view=admin">'.get_lang('AdminInterface').'</a>';
         } else {
             $menu_items[] = '<a href="'.api_get_path(WEB_CODE_PATH).'mySpace/?view=coach">'.get_lang('AdminInterface').'</a>';
         }
-		$menu_items[] = get_lang('ExamTracking');
-		$nb_menu_items = count($menu_items);
-		if($nb_menu_items>1) {
-			foreach($menu_items as $key=> $item) {
-				echo $item;
-				if($key!=$nb_menu_items-1) {
-					echo ' | ';
-				}
-			}
-			echo '<br />';
-		}
-	} else {
-	    echo '<a href="courseLog.php?'.api_get_cidreq().'&studentlist=true">'.get_lang('StudentsTracking').'</a>&nbsp;|
+        $menu_items[] = get_lang('ExamTracking');
+        $nb_menu_items = count($menu_items);
+        if($nb_menu_items>1) {
+            foreach($menu_items as $key=> $item) {
+                echo $item;
+                if($key!=$nb_menu_items-1) {
+                    echo ' | ';
+                }
+            }
+            echo '<br />';
+        }
+    } else {
+        echo '<a href="courseLog.php?'.api_get_cidreq().'&studentlist=true">'.get_lang('StudentsTracking').'</a>&nbsp;|
 		     <a href="courseLog.php?'.api_get_cidreq().'&studentlist=false">'.get_lang('CourseTracking').'</a>&nbsp;|&nbsp';
         echo '<a href="courseLog.php?'.api_get_cidreq().'&studentlist=resources">'.get_lang('ResourcesTracking').'</a>';
-		echo ' | '.get_lang('ExamTracking').'';
+        echo ' | '.get_lang('ExamTracking').'';
         echo '<a href="'.api_get_self().'?export=1&score='.$filter_score.'&exercise_id='.$exercise_id.'">
             '.Display::return_icon('excel.gif').'
             &nbsp;'.get_lang('ExportAsXLS').'</a><br /><br />';
 
-	}
+    }
     echo '</div>';
-	echo '<br /><br />';
-	$form->display();
+    echo '<br /><br />';
+    $form->display();
 }
 $main_result = array();
 $session_id = 0;
 $user_list = array();
 // Getting course list
 foreach ($course_list  as $current_course ) {
-	$course_info = api_get_course_info($current_course['code']);
-	$_course = $course_info;
-
-	// Getting LP list
-	$list = new LearnpathList('', $current_course['code'], $session_id);
-	$lp_list = $list->get_flat_list();
-
-	// Looping LPs
-	$lps = array();
-	foreach ($lp_list as $lp_id =>$lp) {
-		$exercise_list = Event::get_all_exercises_from_lp($lp_id, $course_info['real_id']);
-		$attempt_result = array();
-		// Looping Chamilo Exercises in LP
-		foreach ($exercise_list as $exercise) {
-			$exercise_stats = Event::get_all_exercise_event_from_lp(
-				$exercise['path'],
-				$course_info['real_id'],
-				$session_id
-			);
-			// Looping Exercise Attempts
-			foreach ($exercise_stats as $stats) {
-				$attempt_result[$exercise['id']]['users'][$stats['exe_user_id']][$stats['exe_id']] = $stats;
-				$user_list[$stats['exe_user_id']] = $stats['exe_user_id'];
-			}
-			$exercise_list_name[$exercise['id']] = $exercise['title'];
-		}
-		$lps[$lp_id] = array('lp_name' =>$lp['lp_name'], 'exercises' =>$attempt_result);
-		$lp_list_name[$lp_id] = $lp['lp_name'];
-	}
-	$main_result[$current_course['code']] = $lps;
+    $course_info = api_get_course_info($current_course['code']);
+    $_course = $course_info;
+
+    // Getting LP list
+    $list = new LearnpathList('', $current_course['code'], $session_id);
+    $lp_list = $list->get_flat_list();
+
+    // Looping LPs
+    $lps = array();
+    foreach ($lp_list as $lp_id =>$lp) {
+        $exercise_list = Event::get_all_exercises_from_lp($lp_id, $course_info['real_id']);
+        $attempt_result = array();
+        // Looping Chamilo Exercises in LP
+        foreach ($exercise_list as $exercise) {
+            $exercise_stats = Event::get_all_exercise_event_from_lp(
+                $exercise['path'],
+                $course_info['real_id'],
+                $session_id
+            );
+            // Looping Exercise Attempts
+            foreach ($exercise_stats as $stats) {
+                $attempt_result[$exercise['id']]['users'][$stats['exe_user_id']][$stats['exe_id']] = $stats;
+                $user_list[$stats['exe_user_id']] = $stats['exe_user_id'];
+            }
+            $exercise_list_name[$exercise['id']] = $exercise['title'];
+        }
+        $lps[$lp_id] = array('lp_name' =>$lp['lp_name'], 'exercises' =>$attempt_result);
+        $lp_list_name[$lp_id] = $lp['lp_name'];
+    }
+    $main_result[$current_course['code']] = $lps;
 }
 
 if (!empty($user_list)) {
     foreach($user_list as $user_id) {
         $user_data = api_get_user_info($user_id);
-		$user_list_name[$user_id] = api_get_person_name(
-			$user_data['firstname'],
-			$user_data['lastname']
-		);
+        $user_list_name[$user_id] = api_get_person_name(
+            $user_data['firstname'],
+            $user_data['lastname']
+        );
     }
 }
 $export_array =  array();
@@ -207,15 +207,15 @@ 
                         $html_result .= Display::tag('td', $result);
 
                         $html_result .= '</tr>';
-						$export_array[] = array(
-							$course_code,
-							$lp_list_name[$lp_id],
-							$exercise_list_name[$exercise_id],
-							$user_list_name[$user_id],
-							$attempt,
-							api_get_local_time($attempt_data['exe_date']),
-							$result,
-						);
+                        $export_array[] = array(
+                            $course_code,
+                            $lp_list_name[$lp_id],
+                            $exercise_list_name[$exercise_id],
+                            $user_list_name[$user_id],
+                            $attempt,
+                            api_get_local_time($attempt_data['exe_date']),
+                            $result,
+                        );
                         $attempt++;
                     }
                 }
@@ -226,30 +226,30 @@ 
 }
 
 if (!$export_to_csv) {
-	echo $html_result;
+    echo $html_result;
 }
 $filename = 'learning_path_results-'.date('Y-m-d-h:i:s').'.xls';
 if ($export_to_csv) {
     export_complete_report_csv($filename, $export_array);
-	exit;
+    exit;
 }
 
 function export_complete_report_csv($filename, $array)
 {
-	$header[] = array(
-		get_lang('Course'),
-		get_lang('LearningPath'),
-		get_lang('Exercise'),
-		get_lang('User'),
-		get_lang('Attempt'),
-		get_lang('Date'),
-		get_lang('Results'),
-	);
-	if (!empty($array)) {
-		$array = array_merge($header, $array);
-		Export :: arrayToCsv($array, $filename);
-	}
-	exit;
+    $header[] = array(
+        get_lang('Course'),
+        get_lang('LearningPath'),
+        get_lang('Exercise'),
+        get_lang('User'),
+        get_lang('Attempt'),
+        get_lang('Date'),
+        get_lang('Results'),
+    );
+    if (!empty($array)) {
+        $array = array_merge($header, $array);
+        Export :: arrayToCsv($array, $filename);
+    }
+    exit;
 
 }
 Display :: display_footer();

Spacing +16 added lines, -16 removed lines

@@ -26,7 +26,7 @@ 
 	$export_to_csv = true;
 }
 
-if (api_is_platform_admin() ) {
+if (api_is_platform_admin()) {
 	$global = true;
 } else {
 	$global = false;
@@ -34,7 +34,7 @@ 
 
 if ($global) {
 	$temp_course_list = CourseManager :: get_courses_list();
-	foreach($temp_course_list  as $temp_course_item) {
+	foreach ($temp_course_list  as $temp_course_item) {
 		$course_item = CourseManager ::get_course_information($temp_course_item['code']);
         $course_list[] = array(
             'code' => $course_item['code'],
@@ -47,14 +47,14 @@ 
 }
 
 $new_course_select = array();
-foreach($course_list as $data) {
+foreach ($course_list as $data) {
     $new_course_select[$data['code']] = $data['title'];
 }
 
 $form = new FormValidator('search_simple', 'POST', '', '', null, false);
-$form->addElement('select','course_code',get_lang('Course'), $new_course_select);
+$form->addElement('select', 'course_code', get_lang('Course'), $new_course_select);
 if ($global) {
-	$form->addElement('hidden','view','admin');
+	$form->addElement('hidden', 'view', 'admin');
 } else {
 	//Get exam lists
     $course_id = api_get_course_int_id();
@@ -64,7 +64,7 @@ 
 	                 ORDER BY quiz.title ASC";
 	$resultExercices = Database::query($sqlExercices);
 	$exercise_list[0] = get_lang('All');
-	while($a_exercices = Database::fetch_array($resultExercices)) {
+	while ($a_exercices = Database::fetch_array($resultExercices)) {
 		$exercise_list[$a_exercices['id']] = $a_exercices['title'];
 	}
 	$form->addElement('select', 'exercise_id', get_lang('Exercise'), $exercise_list);
@@ -87,7 +87,7 @@ 
 
         echo '<div style="float:right"> <a href="'.api_get_self().'?export=1&score='.$filter_score.'&exercise_id='.$exercise_id.'">
                 '.Display::return_icon('csv.gif').'
-                &nbsp;'.get_lang('ExportAsCSV').'</a>' .
+                &nbsp;'.get_lang('ExportAsCSV').'</a>'.
                 '<a href="javascript: void(0);" onclick="javascript: window.print()">
                 '.Display::return_icon('printmgr.gif').'
                 &nbsp;'.get_lang('Print').'</a>
@@ -101,10 +101,10 @@ 
         }
 		$menu_items[] = get_lang('ExamTracking');
 		$nb_menu_items = count($menu_items);
-		if($nb_menu_items>1) {
-			foreach($menu_items as $key=> $item) {
+		if ($nb_menu_items > 1) {
+			foreach ($menu_items as $key=> $item) {
 				echo $item;
-				if($key!=$nb_menu_items-1) {
+				if ($key != $nb_menu_items - 1) {
 					echo ' | ';
 				}
 			}
@@ -128,7 +128,7 @@ 
 $session_id = 0;
 $user_list = array();
 // Getting course list
-foreach ($course_list  as $current_course ) {
+foreach ($course_list  as $current_course) {
 	$course_info = api_get_course_info($current_course['code']);
 	$_course = $course_info;
 
@@ -162,7 +162,7 @@ 
 }
 
 if (!empty($user_list)) {
-    foreach($user_list as $user_id) {
+    foreach ($user_list as $user_id) {
         $user_data = api_get_user_info($user_id);
 		$user_list_name[$user_id] = api_get_person_name(
 			$user_data['firstname'],
@@ -170,7 +170,7 @@ 
 		);
     }
 }
-$export_array =  array();
+$export_array = array();
 if (!empty($main_result)) {
 
     $html_result .= '<table  class="data_table">';
@@ -193,9 +193,9 @@ 
 
             foreach ($exercises as $exercise_id => $exercise_data) {
                 $users = $exercise_data['users'];
-                foreach($users as $user_id => $attempts) {
+                foreach ($users as $user_id => $attempts) {
                     $attempt = 1;
-                    foreach($attempts as $exe_id => $attempt_data) {
+                    foreach ($attempts as $exe_id => $attempt_data) {
                         $html_result .= '<tr colspan="">';
                         $html_result .= Display::tag('td', $course_code);
                         $html_result .= Display::tag('td', $lp_list_name[$lp_id]);
@@ -222,7 +222,7 @@ 
             }
         }
     }
-    $html_result .='</table>';
+    $html_result .= '</table>';
 }
 
 if (!$export_to_csv) {

main/tracking/logins_details.php

Spacing +25 added lines, -25 removed lines

@@ -75,13 +75,13 @@ 
     // check if uid is tutor of this group
     $courseId = api_get_course_int_id();
 
-    if (( $is_allowedToTrack || $is_allowedToTrackEverybodyInCourse)) {
+    if (($is_allowedToTrack || $is_allowedToTrackEverybodyInCourse)) {
         if ($is_allowedToTrackEverybodyInCourse) {
             $sql = "SELECT u.firstname,u.lastname, u.email
                     FROM $TABLECOURSUSER cu , $TABLEUSER u
                     WHERE
                         cu.user_id = u.user_id AND
-                        cu.relation_type<>" . COURSE_RELATION_TYPE_RRHH . " AND
+                        cu.relation_type<>".COURSE_RELATION_TYPE_RRHH." AND
                         cu.c_id = '$courseId' AND
                         u.user_id = '$uInfo'";
         } else {
@@ -97,21 +97,21 @@ 
             $res[2] == "" ? $res2 = get_lang('NoEmail') : $res2 = Display::encrypted_mailto_link($res[2]);
 
             echo "<tr><td>";
-            echo $informationsAbout . " : <br>";
+            echo $informationsAbout." : <br>";
             echo "<ul>\n"
-            . "<li>" . get_lang('FirstName') . " : " . $res[0] . "</li>\n"
-            . "<li>" . get_lang('LastName') . " : " . $res[1] . "</li>\n"
-            . "<li>" . get_lang('Email') . " : " . $res2 . "</li>\n"
+            . "<li>".get_lang('FirstName')." : ".$res[0]."</li>\n"
+            . "<li>".get_lang('LastName')." : ".$res[1]."</li>\n"
+            . "<li>".get_lang('Email')." : ".$res2."</li>\n"
             . "</ul>";
             echo "</td></tr>";
             /*             * ***** MENU ******* */
             echo "<tr>
                 <td>
-                [<a href='userLog.php?uInfo=$uInfo&view=$view'>" . get_lang('Back') . "</a>]
+                [<a href='userLog.php?uInfo=$uInfo&view=$view'>".get_lang('Back')."</a>]
         ";
             echo "  &nbsp;&nbsp;&nbsp;||&nbsp;&nbsp;&nbsp;
-                [<a href='" . api_get_self() . "?uInfo=$uInfo&view=$view&period=week&reqdate=$reqdate' class='specialLink'>" . get_lang('PeriodWeek') . "</a>]
-                [<a href='" . api_get_self() . "?uInfo=$uInfo&view=$view&period=month&reqdate=$reqdate' class='specialLink'>" . get_lang('PeriodMonth') . "</a>]
+                [<a href='" . api_get_self()."?uInfo=$uInfo&view=$view&period=week&reqdate=$reqdate' class='specialLink'>".get_lang('PeriodWeek')."</a>]
+                [<a href='" . api_get_self()."?uInfo=$uInfo&view=$view&period=month&reqdate=$reqdate' class='specialLink'>".get_lang('PeriodMonth')."</a>]
                 &nbsp;&nbsp;&nbsp;||&nbsp;&nbsp;&nbsp;
         ";
             switch ($period) {
@@ -120,8 +120,8 @@ 
                     $previousReqDate = $reqdate - 7 * 86400;
                     $nextReqDate = $reqdate + 7 * 86400;
                     echo "
-                    [<a href='" . api_get_self() . "?uInfo=$uInfo&view=$view&period=week&reqdate=$previousReqDate' class='specialLink'>" . get_lang('PreviousWeek') . "</a>]
-                    [<a href='" . api_get_self() . "?uInfo=$uInfo&view=$view&period=week&reqdate=$nextReqDate' class='specialLink'>" . get_lang('NextWeek') . "</a>]
+                    [<a href='" . api_get_self()."?uInfo=$uInfo&view=$view&period=week&reqdate=$previousReqDate' class='specialLink'>".get_lang('PreviousWeek')."</a>]
+                    [<a href='" . api_get_self()."?uInfo=$uInfo&view=$view&period=week&reqdate=$nextReqDate' class='specialLink'>".get_lang('NextWeek')."</a>]
                 ";
                     break;
                 default :
@@ -132,8 +132,8 @@ 
                     $previousReqDate = mktime(1, 1, 1, date("m", $reqdate) - 1, 1, date("Y", $reqdate));
                     $nextReqDate = mktime(1, 1, 1, date("m", $reqdate) + 1, 1, date("Y", $reqdate));
                     echo "
-                    [<a href='" . api_get_self() . "?uInfo=$uInfo&view=$view&period=month&reqdate=$previousReqDate' class='specialLink'>" . get_lang('PreviousMonth') . "</a>]
-                    [<a href='" . api_get_self() . "?uInfo=$uInfo&view=$view&period=month&reqdate=$nextReqDate' class='specialLink'>" . get_lang('NextMonth') . "</a>]
+                    [<a href='" . api_get_self()."?uInfo=$uInfo&view=$view&period=month&reqdate=$previousReqDate' class='specialLink'>".get_lang('PreviousMonth')."</a>]
+                    [<a href='" . api_get_self()."?uInfo=$uInfo&view=$view&period=month&reqdate=$nextReqDate' class='specialLink'>".get_lang('NextMonth')."</a>]
                 ";
                     break;
             }
@@ -153,7 +153,7 @@ 
                         AND YEAR(access_date) = YEAR(FROM_UNIXTIME('$reqdate'))
                         GROUP BY DAYOFMONTH(access_date)
                         ORDER BY access_date ASC";
-                $displayedDate = $MonthsLong[date("n", $reqdate) - 1] . date(" Y", $reqdate);
+                $displayedDate = $MonthsLong[date("n", $reqdate) - 1].date(" Y", $reqdate);
                 break;
             case "week" :
                 $sql = "SELECT access_date
@@ -165,24 +165,24 @@ 
                         GROUP BY DAYOFMONTH(access_date)
                         ORDER BY access_date ASC";
                 $weeklowreqdate = ($reqdate - (86400 * date("w", $reqdate)));
-                $weekhighreqdate = ($reqdate + (86400 * (6 - date("w", $reqdate)) ));
-                $displayedDate = get_lang('From') . " " . date("d ", $weeklowreqdate) . $MonthsLong[date("n", $weeklowreqdate) - 1] . date(" Y", $weeklowreqdate)
-                        . " " . get_lang('To') . " " . date("d ", $weekhighreqdate) . $MonthsLong[date("n", $weekhighreqdate) - 1] . date(" Y", $weekhighreqdate);
+                $weekhighreqdate = ($reqdate + (86400 * (6 - date("w", $reqdate))));
+                $displayedDate = get_lang('From')." ".date("d ", $weeklowreqdate).$MonthsLong[date("n", $weeklowreqdate) - 1].date(" Y", $weeklowreqdate)
+                        . " ".get_lang('To')." ".date("d ", $weekhighreqdate).$MonthsLong[date("n", $weekhighreqdate) - 1].date(" Y", $weekhighreqdate);
                 break;
         }
         echo "<tr><td>";
         $results = StatsUtils::getManyResults1Col($sql);
         /*             * * display of the displayed period  ** */
         echo "<table width='100%' cellpadding='2' cellspacing='1' border='0' align=center>";
-        echo "<td bgcolor='#E6E6E6'>" . $displayedDate . "</td>";
+        echo "<td bgcolor='#E6E6E6'>".$displayedDate."</td>";
         if (is_array($results)) {
             for ($j = 0; $j < sizeof($results); $j++) {
                 $beautifulDateTime = api_convert_and_format_date($results[$j], null, date_default_timezone_get());
                 echo "<tr>";
-                echo "<td style='padding-left : 40px;' valign='top'>" . $beautifulDateTime . "</td>";
+                echo "<td style='padding-left : 40px;' valign='top'>".$beautifulDateTime."</td>";
                 echo"</tr>";
                 // $limit is used to select only results between $results[$j] (current login) and next one
-                if ($j == ( sizeof($results) - 1 ))
+                if ($j == (sizeof($results) - 1))
                     $limit = date("Y-m-d H:i:s", $nextReqDate);
                 else
                     $limit = $results[$j + 1];
@@ -192,8 +192,8 @@ 
                         FROM $TABLETRACK_ACCESS
                         WHERE access_user_id = $uInfo
                             AND access_tool IS NOT NULL
-                            AND access_date > '" . $results[$j] . "'
-                            AND access_date < '" . $limit . "'
+                            AND access_date > '".$results[$j]."'
+                            AND access_date < '" . $limit."'
                             AND c_id = $courseId
                         GROUP BY access_tool
                         ORDER BY access_tool ASC";
@@ -204,8 +204,8 @@ 
                     echo "<table width='50%' cellpadding='0' cellspacing='0' border='0'>\n";
                     for ($k = 0; $k < count($results2); $k++) {
                         echo "<tr>\n";
-                        echo "<td width='70%' style='padding-left : 60px;'>" . get_lang($results2[$k][0]) . "</td>\n";
-                        echo "<td width='30%' align='right' style='padding-right : 40px'>" . $results2[$k][1] . " " . get_lang('Visits') . "</td>\n";
+                        echo "<td width='70%' style='padding-left : 60px;'>".get_lang($results2[$k][0])."</td>\n";
+                        echo "<td width='30%' align='right' style='padding-right : 40px'>".$results2[$k][1]." ".get_lang('Visits')."</td>\n";
                         echo "</tr>";
                     }
                     echo "</table>\n";
@@ -215,7 +215,7 @@ 
             }
         } else {
             echo "<tr>";
-            echo "<td colspan='2' bgcolor='#eeeeee'>" . get_lang('NoResult') . "</td>";
+            echo "<td colspan='2' bgcolor='#eeeeee'>".get_lang('NoResult')."</td>";
             echo "</tr>";
         }
         echo "</table>";

Braces +5 added lines, -4 removed lines

@@ -182,10 +182,11 @@
                 echo "<td style='padding-left : 40px;' valign='top'>" . $beautifulDateTime . "</td>";
                 echo"</tr>";
                 // $limit is used to select only results between $results[$j] (current login) and next one
-                if ($j == ( sizeof($results) - 1 ))
-                    $limit = date("Y-m-d H:i:s", $nextReqDate);
-                else
-                    $limit = $results[$j + 1];
+                if ($j == ( sizeof($results) - 1 )) {
+                                    $limit = date("Y-m-d H:i:s", $nextReqDate);
+                } else {
+                                    $limit = $results[$j + 1];
+                }
                 // select all access to tool between displayed date and next displayed date or now() if
                 // displayed date is the last login date
                 $sql = "SELECT access_tool, count(access_tool)

Indentation -1 removed lines

@@ -7,7 +7,6 @@
  * 	@author Sebastien Piraux
  *
  * 	@package chamilo.tracking
-
  */
 /**
  * Code

main/tracking/course_log_groups.php

Spacing +2 added lines, -2 removed lines

@@ -98,7 +98,7 @@ 
 
 $action_links = '
 function action_formatter(cellvalue, options, rowObject) {
-    return \'<a href="course_log_tools.php?id_session=0&cidReq='.$course_code.'&gidReq=\'+options.rowId+\'">'.Display::return_icon('2rightarrow.png',get_lang('Edit'),'',ICON_SIZE_SMALL).'</a>'.
+    return \'<a href="course_log_tools.php?id_session=0&cidReq='.$course_code.'&gidReq=\'+options.rowId+\'">'.Display::return_icon('2rightarrow.png', get_lang('Edit'), '', ICON_SIZE_SMALL).'</a>'.
     '\';
 }';
 
@@ -108,7 +108,7 @@ 
 $htmlHeadXtra[] = '
 <script>
 $(function() {
-    '.Display::grid_js('group_users',$url, $columns, $column_model, $extra_params, array(), $action_links, true).'
+    '.Display::grid_js('group_users', $url, $columns, $column_model, $extra_params, array(), $action_links, true).'
 });
 </script>';