chamilo / chamilo-lms

main/auth/courses.php

Switch Indentation +135 added lines, -135 removed lines

@@ -171,28 +171,52 @@ 
 }
 
 switch ($action) {
-    case 'subscribe_user_with_password':
-        $courses_controller->subscribe_user(
-            isset($_POST['subscribe_user_with_password']) ? $_POST['subscribe_user_with_password'] : '',
-            isset($_POST['search_term']) ? $_POST['search_term'] : '',
-            isset($_POST['category_code']) ? $_POST['category_code'] : ''
-        );
-        break;
-    case 'createcoursecategory':
-        $courses_controller->categories_list($action);
-        break;
-    case 'deletecoursecategory':
-        $courses_controller->courses_list($action);
-        break;
-    case 'sortmycourses':
-        $courses_controller->courses_list($action);
-        break;
-    case 'subscribe':
-        if (!$user_can_view_page) {
-            api_not_allowed(true);
-        }
-
-        if (!CoursesAndSessionsCatalog::is(CATALOG_SESSIONS)) {
+        case 'subscribe_user_with_password':
+            $courses_controller->subscribe_user(
+                isset($_POST['subscribe_user_with_password']) ? $_POST['subscribe_user_with_password'] : '',
+                isset($_POST['search_term']) ? $_POST['search_term'] : '',
+                isset($_POST['category_code']) ? $_POST['category_code'] : ''
+            );
+            break;
+        case 'createcoursecategory':
+            $courses_controller->categories_list($action);
+            break;
+        case 'deletecoursecategory':
+            $courses_controller->courses_list($action);
+            break;
+        case 'sortmycourses':
+            $courses_controller->courses_list($action);
+            break;
+        case 'subscribe':
+            if (!$user_can_view_page) {
+                api_not_allowed(true);
+            }
+
+            if (!CoursesAndSessionsCatalog::is(CATALOG_SESSIONS)) {
+                $courses_controller->courses_categories(
+                    $action,
+                    $categoryCode,
+                    null,
+                    null,
+                    null,
+                    $limit
+                );
+            } else {
+                header('Location: ' . api_get_self());
+            }
+            break;
+        case 'display_random_courses':
+            if (!$user_can_view_page) {
+                api_not_allowed(true);
+            }
+
+            $courses_controller->courses_categories($action);
+            break;
+        case 'display_courses':
+            if (!$user_can_view_page) {
+                api_not_allowed(true);
+            }
+
             $courses_controller->courses_categories(
                 $action,
                 $categoryCode,
@@ -201,126 +225,102 @@ 
                 null,
                 $limit
             );
-        } else {
-            header('Location: ' . api_get_self());
-        }
-        break;
-    case 'display_random_courses':
-        if (!$user_can_view_page) {
-            api_not_allowed(true);
-        }
-
-        $courses_controller->courses_categories($action);
-        break;
-    case 'display_courses':
-        if (!$user_can_view_page) {
-            api_not_allowed(true);
-        }
-
-        $courses_controller->courses_categories(
-            $action,
-            $categoryCode,
-            null,
-            null,
-            null,
-            $limit
-        );
-        break;
-    case 'display_sessions':
-        if (!$user_can_view_page) {
-            api_not_allowed(true);
-        }
-
-        $courses_controller->sessionsList($action, $nameTools, $limit);
-        break;
-    case 'subscribe_to_session':
-        if (!$user_can_view_page) {
-            api_not_allowed(true);
-        }
-
-        $userId = api_get_user_id();
-        $confirmed = isset($_GET['confirm']);
-        $sessionId = intval($_GET['session_id']);
-
-        if (empty($userId)) {
-            api_not_allowed();
-            exit;
-        }
-
-        if (!$confirmed) {
-            $template = new Template(null, false, false, false, false, false);
-            $template->assign('session_id', $sessionId);
-
-            $layout = $template->get_template('auth/confirm_session_subscription.tpl');
-
-            echo $template->fetch($layout);
-            exit;
-        }
-
-        $registrationAllowed = api_get_setting('catalog_allow_session_auto_subscription');
-        if ($registrationAllowed === 'true') {
-            $entityManager = Database::getManager();
-            $repository = $entityManager->getRepository('ChamiloCoreBundle:SequenceResource');
-
-            $sequences = $repository->getRequirements(
-                $sessionId,
-                SequenceResource::SESSION_TYPE
-            );
+            break;
+        case 'display_sessions':
+            if (!$user_can_view_page) {
+                api_not_allowed(true);
+            }
+
+            $courses_controller->sessionsList($action, $nameTools, $limit);
+            break;
+        case 'subscribe_to_session':
+            if (!$user_can_view_page) {
+                api_not_allowed(true);
+            }
+
+            $userId = api_get_user_id();
+            $confirmed = isset($_GET['confirm']);
+            $sessionId = intval($_GET['session_id']);
 
-            if (count($sequences) > 0) {
-                $requirementsData = SequenceResourceManager::checkRequirementsForUser(
-                    $sequences,
-                    SequenceResource::SESSION_TYPE,
-                    $userId
+            if (empty($userId)) {
+                api_not_allowed();
+                exit;
+            }
+
+            if (!$confirmed) {
+                $template = new Template(null, false, false, false, false, false);
+                $template->assign('session_id', $sessionId);
+
+                $layout = $template->get_template('auth/confirm_session_subscription.tpl');
+
+                echo $template->fetch($layout);
+                exit;
+            }
+
+            $registrationAllowed = api_get_setting('catalog_allow_session_auto_subscription');
+            if ($registrationAllowed === 'true') {
+                $entityManager = Database::getManager();
+                $repository = $entityManager->getRepository('ChamiloCoreBundle:SequenceResource');
+
+                $sequences = $repository->getRequirements(
+                    $sessionId,
+                    SequenceResource::SESSION_TYPE
                 );
 
-                $continueWithSubscription = SequenceResourceManager::checkSequenceAreCompleted($requirementsData);
+                if (count($sequences) > 0) {
+                    $requirementsData = SequenceResourceManager::checkRequirementsForUser(
+                        $sequences,
+                        SequenceResource::SESSION_TYPE,
+                        $userId
+                    );
+
+                    $continueWithSubscription = SequenceResourceManager::checkSequenceAreCompleted($requirementsData);
 
-                if (!$continueWithSubscription) {
-                    header('Location: ' .  api_get_path(WEB_CODE_PATH) . 'auth/courses.php');
-                    exit;
+                    if (!$continueWithSubscription) {
+                        header('Location: ' .  api_get_path(WEB_CODE_PATH) . 'auth/courses.php');
+                        exit;
+                    }
                 }
-            }
 
-            SessionManager::suscribe_users_to_session(
-                $_GET['session_id'],
-                array($userId),
-                SESSION_VISIBLE_READ_ONLY,
-                false
-            );
+                SessionManager::suscribe_users_to_session(
+                    $_GET['session_id'],
+                    array($userId),
+                    SESSION_VISIBLE_READ_ONLY,
+                    false
+                );
 
-            $coursesList = SessionManager::get_course_list_by_session_id($_GET['session_id']);
-            $count = count($coursesList);
-            $url = '';
-
-            if ($count <= 0) {
-                // no course in session -> return to catalog
-                $url = api_get_path(WEB_CODE_PATH) . 'auth/courses.php';
-            } elseif ($count == 1) {
-                // only one course, so redirect directly to this course
-                foreach ($coursesList as $course) {
-                    $url = api_get_path(WEB_COURSE_PATH) . $course['directory'] . '/index.php?id_session=' . intval($_GET['session_id']);
+                $coursesList = SessionManager::get_course_list_by_session_id($_GET['session_id']);
+                $count = count($coursesList);
+                $url = '';
+
+                if ($count <= 0) {
+                    // no course in session -> return to catalog
+                    $url = api_get_path(WEB_CODE_PATH) . 'auth/courses.php';
+                } elseif ($count == 1) {
+                    // only one course, so redirect directly to this course
+                    foreach ($coursesList as $course) {
+                        $url = api_get_path(WEB_COURSE_PATH) . $course['directory'] . '/index.php?id_session=' . intval($_GET['session_id']);
+                    }
+                } else {
+                    $url = api_get_path(WEB_CODE_PATH) . 'session/index.php?session_id=' . intval($_GET['session_id']);
                 }
-            } else {
-                $url = api_get_path(WEB_CODE_PATH) . 'session/index.php?session_id=' . intval($_GET['session_id']);
+                header('Location: ' . $url);
+                exit;
             }
-            header('Location: ' . $url);
-            exit;
-        }
-        //else show error message?
-        break;
-    case 'search_tag':
-        if (!$user_can_view_page) {
-            api_not_allowed(true);
-        }
-
-        $courses_controller->sessionsListByCoursesTag($limit);
-        break;
-    case 'search_session':
-        if (!$user_can_view_page) {
-            api_not_allowed(true);
-        }
-
-        $courses_controller->sessionListBySearch($limit);
-        break;
+            //else show error message?
+            break;
+        case 'search_tag':
+            if (!$user_can_view_page) {
+                api_not_allowed(true);
+            }
+
+            $courses_controller->sessionsListByCoursesTag($limit);
+            break;
+        case 'search_session':
+            if (!$user_can_view_page) {
+                api_not_allowed(true);
+            }
+
+            $courses_controller->sessionListBySearch($limit);
+            break;
 }

main/inc/lib/course_category.lib.php

Spacing +28 added lines, -28 removed lines

@@ -68,7 +68,7 @@ 
 
     $parentIdCondition = " AND (t1.parent_id IS NULL OR t1.parent_id = '' )";
     if (!empty($category)) {
-        $parentIdCondition =  " AND t1.parent_id  = '$category' ";
+        $parentIdCondition = " AND t1.parent_id  = '$category' ";
     }
 
     $sql = "SELECT
@@ -99,7 +99,7 @@ 
 
     $categories = Database::store_result($result);
     foreach ($categories as $category) {
-        $category['nbr_courses'] =  1;
+        $category['nbr_courses'] = 1;
     }
 
     return $categories;
@@ -196,13 +196,13 @@ 
     if ($row = Database::fetch_array($result)) {
         if (!empty($row['parent_id'])) {
             Database::query("UPDATE $tbl_course SET category_code = '".$row['parent_id']."' WHERE category_code='$node'");
-            Database::query("UPDATE $tbl_category SET parent_id='" . $row['parent_id'] . "' WHERE parent_id='$node'");
+            Database::query("UPDATE $tbl_category SET parent_id='".$row['parent_id']."' WHERE parent_id='$node'");
         } else {
             Database::query("UPDATE $tbl_course SET category_code='' WHERE category_code='$node'");
             Database::query("UPDATE $tbl_category SET parent_id=NULL WHERE parent_id='$node'");
         }
 
-        Database::query("UPDATE $tbl_category SET tree_pos=tree_pos-1 WHERE tree_pos > '" . $row['tree_pos'] . "'");
+        Database::query("UPDATE $tbl_category SET tree_pos=tree_pos-1 WHERE tree_pos > '".$row['tree_pos']."'");
         Database::query("DELETE FROM $tbl_category WHERE code='$node'");
 
         if (!empty($row['parent_id'])) {
@@ -291,13 +291,13 @@ 
     }
 
     $sql = "UPDATE $tbl_category
-            SET tree_pos ='" . $row['tree_pos'] . "'
+            SET tree_pos ='".$row['tree_pos']."'
             WHERE code='$code'";
     Database::query($sql);
 
     $sql = "UPDATE $tbl_category
             SET tree_pos = '$tree_pos'
-            WHERE code= '" . $row['code'] . "'";
+            WHERE code= '".$row['code']."'";
     Database::query($sql);
 
     return true;
@@ -423,12 +423,12 @@ 
 
         $editIcon = Display::return_icon('edit.png', get_lang('EditNode'), null, ICON_SIZE_SMALL);
         $deleteIcon = Display::return_icon('delete.png', get_lang('DeleteNode'), null, ICON_SIZE_SMALL);
-        $moveIcon =  Display::return_icon('up.png', get_lang('UpInSameLevel'), null, ICON_SIZE_SMALL);
+        $moveIcon = Display::return_icon('up.png', get_lang('UpInSameLevel'), null, ICON_SIZE_SMALL);
 
         foreach ($categories as $category) {
 
             $editUrl = $mainUrl.'&id='.$category['code'].'&action=edit';
-            $moveUrl  = $mainUrl.'&id='.$category['code'].'&action=moveUp&tree_pos='.$category['tree_pos'];
+            $moveUrl = $mainUrl.'&id='.$category['code'].'&action=moveUp&tree_pos='.$category['tree_pos'];
             $deleteUrl = $mainUrl.'&id='.$category['code'].'&action=delete';
 
             $actions = Display::url($editIcon, $editUrl).Display::url($moveIcon, $moveUrl).Display::url($deleteIcon, $deleteUrl);
@@ -562,12 +562,12 @@ 
 
     $count_courses = countCoursesInCategory();
 
-    $categories[0][count($categories[0])+1] = array(
+    $categories[0][count($categories[0]) + 1] = array(
         'id' =>0,
         'name' => get_lang('None'),
         'code' => 'NONE',
         'parent_id' => null,
-        'tree_pos' => $row['tree_pos']+1,
+        'tree_pos' => $row['tree_pos'] + 1,
         'children_count' => 0,
         'auth_course_child' => true,
         'auth_cat_child' => true,
@@ -594,7 +594,7 @@ 
 
     $without_special_courses = '';
     if (!empty($specialCourseList)) {
-        $without_special_courses = ' AND course.code NOT IN ("' . implode('","', $specialCourseList) . '")';
+        $without_special_courses = ' AND course.code NOT IN ("'.implode('","', $specialCourseList).'")';
     }
 
     $visibilityCondition = null;
@@ -608,15 +608,15 @@ 
     if ($categoryCode == 'ALL') {
         // Nothing to do
     } elseif ($categoryCode == 'NONE') {
-        $categoryFilter =  ' AND category_code = "" ';
+        $categoryFilter = ' AND category_code = "" ';
     } else {
-        $categoryFilter =  ' AND category_code = "' . $categoryCode . '" ';
+        $categoryFilter = ' AND category_code = "'.$categoryCode.'" ';
     }
 
     if (!empty($searchTerm)) {
-        $searchFilter = ' AND (code LIKE "%' . $searchTerm . '%"
-            OR title LIKE "%' . $searchTerm . '%"
-            OR tutor_name LIKE "%' . $searchTerm . '%") ';
+        $searchFilter = ' AND (code LIKE "%'.$searchTerm.'%"
+            OR title LIKE "%' . $searchTerm.'%"
+            OR tutor_name LIKE "%' . $searchTerm.'%") ';
     }
 
     $sql = "SELECT * FROM $tbl_course
@@ -668,7 +668,7 @@ 
 
     $without_special_courses = '';
     if (!empty($specialCourseList)) {
-        $without_special_courses = ' AND course.code NOT IN ("' . implode('","', $specialCourseList) . '")';
+        $without_special_courses = ' AND course.code NOT IN ("'.implode('","', $specialCourseList).'")';
     }
     $visibilityCondition = null;
     $hidePrivate = api_get_setting('course_catalog_hide_private');
@@ -719,7 +719,7 @@ 
         $id_in = null;
         while (list($id) = Database::fetch_row($result)) {
             if ($id_in) {
-                $id_in.=",$id";
+                $id_in .= ",$id";
             } else {
                 $id_in = "$id";
             }
@@ -959,7 +959,7 @@ 
     if (!empty($limit) && is_array($limit)) {
         $limitStart = isset($limit['start']) ? $limit['start'] : 0;
         $limitLength = isset($limit['length']) ? $limit['length'] : 10;
-        $limitFilter = 'LIMIT ' . $limitStart . ', ' . $limitLength;
+        $limitFilter = 'LIMIT '.$limitStart.', '.$limitLength;
     }
 
     return $limitFilter;
@@ -1045,21 +1045,21 @@ 
     $hiddenLinks = isset($hiddenLinks) ? Security::remove_XSS($hiddenLinksRequest) : $categoryCodeRequest;
 
         // Start URL with params
-    $pageUrl = api_get_self() .
-        '?action=' . $action .
-        '&category_code=' .$categoryCode.
-        '&hidden_links=' .$hiddenLinks.
-        '&pageCurrent=' . $pageCurrent .
-        '&pageLength=' . $pageLength
+    $pageUrl = api_get_self().
+        '?action='.$action.
+        '&category_code='.$categoryCode.
+        '&hidden_links='.$hiddenLinks.
+        '&pageCurrent='.$pageCurrent.
+        '&pageLength='.$pageLength
     ;
 
     switch ($action) {
         case 'subscribe':
             // for search
             $pageUrl .=
-                '&search_term=' . $searchTerm .
-                '&search_course=1' .
-                '&sec_token=' . $_SESSION['sec_token'];
+                '&search_term='.$searchTerm.
+                '&search_course=1'.
+                '&sec_token='.$_SESSION['sec_token'];
             break;
         case 'display_courses':
             // No break