Browse Source

Minor - format code, fix function name

Julio Montoya 5 years ago
parent
commit
e3921c60f8

+ 1 - 1
main/auth/courses.php

@@ -273,7 +273,7 @@ switch ($action) {
             api_not_allowed(true);
         }
 
-        $courseController->sessionsList($action, $nameTools, $limit);
+        $courseController->sessionList($action, $nameTools, $limit);
         break;
     case 'subscribe_to_session':
         if (!$user_can_view_page) {

+ 3 - 3
main/auth/courses_controller.php

@@ -636,13 +636,13 @@ class CoursesController
     }
 
     /**
-     * Return Session Catalogue rendered view.
+     * Return Session catalog rendered view.
      *
      * @param string $action
      * @param string $nameTools
      * @param array  $limit
      */
-    public function sessionsList($action, $nameTools, $limit = [])
+    public function sessionList($action, $nameTools, $limit = [])
     {
         $date = isset($_POST['date']) ? $_POST['date'] : date('Y-m-d');
         $hiddenLinks = isset($_GET['hidden_links']) ? intval($_GET['hidden_links']) == 1 : false;
@@ -667,7 +667,7 @@ class CoursesController
         $tpl = new Template();
         $tpl->assign('show_courses', CoursesAndSessionsCatalog::showCourses());
         $tpl->assign('show_sessions', CoursesAndSessionsCatalog::showSessions());
-        $tpl->assign('show_tutor', api_get_setting('show_session_coach') === 'true' ? true : false);
+        $tpl->assign('show_tutor', api_get_setting('show_session_coach') === 'true');
         $tpl->assign('course_url', $courseUrl);
         $tpl->assign('catalog_pagination', $cataloguePagination);
         $tpl->assign('hidden_links', $hiddenLinks);

+ 13 - 18
main/inc/lib/CoursesAndSessionsCatalog.class.php

@@ -571,27 +571,23 @@ class CoursesAndSessionsCatalog
         $em = Database::getManager();
         $urlId = api_get_current_access_url_id();
 
-        $sql = "SELECT s.id FROM session s ";
-        $sql .= "
-            INNER JOIN access_url_rel_session ars
-            ON s.id = ars.session_id
-        ";
-
-        $sql .= "
-            WHERE s.nbr_courses > 0
-                AND ars.access_url_id = $urlId
-        ";
+        $sql = "SELECT s.id FROM session s 
+                INNER JOIN access_url_rel_session ars
+                ON s.id = ars.session_id
+                WHERE 
+                      s.nbr_courses > 0 AND 
+                      ars.access_url_id = $urlId";
 
         if (!is_null($date)) {
             $date = Database::escape_string($date);
             $sql .= "
                 AND (
-                    ('$date' BETWEEN DATE(s.access_start_date) AND DATE(s.access_end_date))
-                    OR (s.access_end_date IS NULL)
-                    OR (
-                        s.access_start_date IS NULL
-                        AND s.access_end_date IS NOT NULL
-                        AND DATE(s.access_end_date) >= '$date'
+                    ('$date' BETWEEN DATE(s.access_start_date) AND DATE(s.access_end_date)) OR 
+                    (s.access_end_date IS NULL) OR 
+                    (
+                        s.access_start_date IS NULL AND 
+                        s.access_end_date IS NOT NULL AND 
+                        DATE(s.access_end_date) >= '$date'
                     )
                 )
             ";
@@ -606,8 +602,7 @@ class CoursesAndSessionsCatalog
         $list = Database::store_result(Database::query($sql), 'ASSOC');
         $sessions = [];
         foreach ($list as $sessionData) {
-            $id = $sessionData['id'];
-            $sessions[] = $em->find('ChamiloCoreBundle:Session', $id);
+            $sessions[] = $em->find('ChamiloCoreBundle:Session', $sessionData['id']);
         }
 
         return $sessions;