From 54db1d1d4bd1cc3f7775aec4e98f2bd361a4e3a9 Mon Sep 17 00:00:00 2001 From: jmontoyaa Date: Fri, 23 Sep 2016 09:15:19 +0200 Subject: [PATCH] Minor - format code --- main/inc/lib/sessionmanager.lib.php | 7 +- main/inc/lib/usermanager.lib.php | 218 +++++++++++++--------------- 2 files changed, 107 insertions(+), 118 deletions(-) diff --git a/main/inc/lib/sessionmanager.lib.php b/main/inc/lib/sessionmanager.lib.php index ccf7f0b036..9be9a8a02b 100755 --- a/main/inc/lib/sessionmanager.lib.php +++ b/main/inc/lib/sessionmanager.lib.php @@ -4105,19 +4105,20 @@ class SessionManager /** * @param int $user_id - * @param bool $ignore_visibility_for_admins + * @param bool $ignoreVisibilityForAdmins * @param bool $ignoreTimeLimit * * @return array */ - public static function get_sessions_by_user($user_id, $ignore_visibility_for_admins = false, $ignoreTimeLimit = false) + public static function get_sessions_by_user($user_id, $ignoreVisibilityForAdmins = false, $ignoreTimeLimit = false) { $sessionCategories = UserManager::get_sessions_by_category( $user_id, false, - $ignore_visibility_for_admins, + $ignoreVisibilityForAdmins, $ignoreTimeLimit ); + $sessionArray = array(); if (!empty($sessionCategories)) { foreach ($sessionCategories as $category) { diff --git a/main/inc/lib/usermanager.lib.php b/main/inc/lib/usermanager.lib.php index 77460c1e0b..c3ac9d09d3 100755 --- a/main/inc/lib/usermanager.lib.php +++ b/main/inc/lib/usermanager.lib.php @@ -2499,148 +2499,136 @@ class UserManager // Get the list of sessions per user $now = new DateTime('now', new DateTimeZone('UTC')); - $dql = " - SELECT DISTINCT - S.id, - S.name, - S.accessStartDate AS access_start_date, - S.accessEndDate AS access_end_date, - SC.id AS session_category_id, - SC.name AS session_category_name, - SC.dateStart AS session_category_date_start, - SC.dateEnd AS session_category_date_end, - S.coachAccessStartDate AS coach_access_start_date, - S.coachAccessEndDate AS coach_access_end_date - FROM ChamiloCoreBundle:Session AS S - LEFT JOIN ChamiloCoreBundle:SessionCategory AS SC WITH S.category = SC - LEFT JOIN ChamiloCoreBundle:SessionRelCourseRelUser AS SCU WITH SCU.session = S - WHERE SCU.user = :user OR S.generalCoach = :user - ORDER BY SC.name, S.name"; - - $sessionData = Database::getManager() + $dql = "SELECT DISTINCT + s.id, + s.name, + s.accessStartDate AS access_start_date, + s.accessEndDate AS access_end_date, + sc.id AS session_category_id, + sc.name AS session_category_name, + sc.dateStart AS session_category_date_start, + sc.dateEnd AS session_category_date_end, + s.coachAccessStartDate AS coach_access_start_date, + s.coachAccessEndDate AS coach_access_end_date + FROM ChamiloCoreBundle:Session AS s + LEFT JOIN ChamiloCoreBundle:SessionCategory AS sc WITH s.category = sc + LEFT JOIN ChamiloCoreBundle:SessionRelCourseRelUser AS scu WITH scu.session = s + WHERE scu.user = :user OR s.generalCoach = :user + ORDER BY sc.name, s.name"; + + $dql = Database::getManager() ->createQuery($dql) ->setParameters(['user' => $user_id]) - ->getResult(); + ; + + $sessionData = $dql->getResult(); $categories = []; + foreach ($sessionData as $row) { - // User portal filters: + // User portal filters: + if ($ignoreTimeLimit === false) { + if ($is_time_over) { + // History + if (empty($row['access_end_date'])) { + continue; + } - if ($ignoreTimeLimit === false) { - if ($is_time_over) { - // History - if (empty($row['access_end_date'])) { + if (!empty($row['access_end_date'])) { + if ($row['access_end_date'] > $now) { continue; } - if (!empty($row['access_end_date'])) { - if ($row['access_end_date'] > $now) { - continue; - } - - } + } + } else { + // Current user portal + if (api_is_allowed_to_create_course()) { + // Teachers can access the session depending in the access_coach date } else { - // Current user portal - if (api_is_allowed_to_create_course()) { - // Teachers can access the session depending in the access_coach date - } else { - if (isset($row['access_end_date']) && - !empty($row['access_end_date']) - ) { - if ($row['access_end_date'] <= $now) { - continue; - } + if (isset($row['access_end_date']) && + !empty($row['access_end_date']) + ) { + if ($row['access_end_date'] <= $now) { + continue; } } } } + } - $categories[$row['session_category_id']]['session_category'] = array( - 'id' => $row['session_category_id'], - 'name' => $row['session_category_name'], - 'date_start' => $row['session_category_date_start'] - ? $row['session_category_date_start']->format('Y-m-d H:i:s') - : null, - 'date_end' => $row['session_category_date_end'] - ? $row['session_category_date_end']->format('Y-m-d H:i:s') - : null - ); + $categories[$row['session_category_id']]['session_category'] = array( + 'id' => $row['session_category_id'], + 'name' => $row['session_category_name'], + 'date_start' => $row['session_category_date_start'] ? $row['session_category_date_start']->format('Y-m-d H:i:s') : null, + 'date_end' => $row['session_category_date_end'] ? $row['session_category_date_end']->format('Y-m-d H:i:s') : null + ); - $session_id = $row['id']; - $courseList = UserManager::get_courses_list_by_session( - $user_id, - $row['id'] - ); + $session_id = $row['id']; + $courseList = UserManager::get_courses_list_by_session( + $user_id, + $session_id + ); - $visibility = api_get_session_visibility( - $session_id, - null, - $ignore_visibility_for_admins - ); + $visibility = api_get_session_visibility( + $session_id, + null, + $ignore_visibility_for_admins + ); - if ($visibility != SESSION_VISIBLE) { + if ($visibility != SESSION_VISIBLE) { + // Course Coach session visibility. + $blockedCourseCount = 0; + $closedVisibilityList = array( + COURSE_VISIBILITY_CLOSED, + COURSE_VISIBILITY_HIDDEN + ); - // Course Coach session visibility. - $blockedCourseCount = 0; - $closedVisibilityList = array( - COURSE_VISIBILITY_CLOSED, - COURSE_VISIBILITY_HIDDEN + foreach ($courseList as $course) { + // Checking session visibility + $sessionCourseVisibility = api_get_session_visibility( + $session_id, + $course['real_id'], + $ignore_visibility_for_admins ); - foreach ($courseList as $course) { - // Checking session visibility - $sessionCourseVisibility = api_get_session_visibility( - $session_id, - $course['real_id'], - $ignore_visibility_for_admins - ); - - $courseIsVisible = !in_array( - $course['visibility'], - $closedVisibilityList - ); - if ($courseIsVisible === false || $sessionCourseVisibility == SESSION_INVISIBLE) { - $blockedCourseCount++; - } - } - - // If all courses are blocked then no show in the list. - if ($blockedCourseCount === count($courseList)) { - $visibility = SESSION_INVISIBLE; - } else { - $visibility = SESSION_VISIBLE; + $courseIsVisible = !in_array( + $course['visibility'], + $closedVisibilityList + ); + if ($courseIsVisible === false || $sessionCourseVisibility == SESSION_INVISIBLE) { + $blockedCourseCount++; } } - switch ($visibility) { - case SESSION_VISIBLE_READ_ONLY: - case SESSION_VISIBLE: - case SESSION_AVAILABLE: - break; - case SESSION_INVISIBLE: - if ($ignore_visibility_for_admins == false) { - continue 2; - } + // If all courses are blocked then no show in the list. + if ($blockedCourseCount === count($courseList)) { + $visibility = SESSION_INVISIBLE; + } else { + $visibility = SESSION_VISIBLE; } + } - $categories[$row['session_category_id']]['sessions'][$row['id']] = array( - 'session_name' => $row['name'], - 'session_id' => $row['id'], - 'access_start_date' => $row['access_start_date'] - ? $row['access_start_date']->format('Y-m-d H:i:s') - : null, - 'access_end_date' => $row['access_end_date'] - ? $row['access_end_date']->format('Y-m-d H:i:s') - : null, - 'coach_access_start_date' => $row['coach_access_start_date'] - ? $row['coach_access_start_date']->format('Y-m-d H:i:s') - : null, - 'coach_access_end_date' => $row['coach_access_end_date'] - ? $row['coach_access_end_date']->format('Y-m-d H:i:s') - : null, - 'courses' => $courseList - ); + switch ($visibility) { + case SESSION_VISIBLE_READ_ONLY: + case SESSION_VISIBLE: + case SESSION_AVAILABLE: + break; + case SESSION_INVISIBLE: + if ($ignore_visibility_for_admins == false) { + continue 2; + } } + $categories[$row['session_category_id']]['sessions'][$row['id']] = array( + 'session_name' => $row['name'], + 'session_id' => $row['id'], + 'access_start_date' => $row['access_start_date'] ? $row['access_start_date']->format('Y-m-d H:i:s') : null, + 'access_end_date' => $row['access_end_date'] ? $row['access_end_date']->format('Y-m-d H:i:s') : null, + 'coach_access_start_date' => $row['coach_access_start_date'] ? $row['coach_access_start_date']->format('Y-m-d H:i:s') : null, + 'coach_access_end_date' => $row['coach_access_end_date'] ? $row['coach_access_end_date']->format('Y-m-d H:i:s') : null, + 'courses' => $courseList + ); + } + return $categories; }