chnages in course catalog display all -refs #7137

main/inc/lib/course.lib.php

@@ -4361,16 +4361,22 @@ class CourseManager
     }
     
     /**
-     * Get available courses count
+     * Get availab le courses count
      * @param int Access URL ID (optional)
      * @return int Number of courses
      */
     public static function countAvailableCourses($accessUrlId = null) {
         $tableCourse = Database::get_main_table(TABLE_MAIN_COURSE);
         $tableCourseRelAccessUrl = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
-        $sql = "SELECT count(id) FROM $tableCourse c";
+        $specialCourseList = self::get_special_course_list();
+
+        $withoutSpecialCourses = '';
+        if (!empty($specialCourseList)) {
+            $withoutSpecialCourses = ' AND c.code NOT IN ("'.implode('","',$specialCourseList).'")';
+        }
+        
         if (!empty($accessUrlId) && $accessUrlId == intval($accessUrlId)) {
-            $sql .= ", $tableCourseRelAccessUrl u WHERE c.code = u.course_code AND u.access_url_id = $accessUrlId AND visibility != 0 AND visibility != 4";
+            $sql = "SELECT count(id) FROM $tableCourse c, $tableCourseRelAccessUrl u WHERE c.code = u.course_code AND u.access_url_id = $accessUrlId AND c.visibility != 0 AND c.visibility != 4 $withoutSpecialCourses";
         }
         $res = Database::query($sql);
         $row = Database::fetch_row($res);

main/inc/lib/course_category.lib.php

@@ -510,7 +510,7 @@ function countCoursesInCategory($category_code="")
     }
 
     $sql = "SELECT * FROM $tbl_course
-            WHERE category_code" . "='" . $category_code . "'" . $without_special_courses;
+            WHERE visibility != '0' AND visibility != '4' AND category_code" . "='" . $category_code . "'" . $without_special_courses;
     // Showing only the courses of the current portal access_url_id.
 
     if (api_is_multiple_url_enabled()) {
@@ -520,7 +520,7 @@ function countCoursesInCategory($category_code="")
             $sql = "SELECT * FROM $tbl_course as course
                     INNER JOIN $tbl_url_rel_course as url_rel_course
                     ON (url_rel_course.course_code=course.code)
-                    WHERE access_url_id = $url_access_id AND category_code" . "='" . $category_code . "'" . $without_special_courses;
+                    WHERE access_url_id = $url_access_id AND course.visibility != '0' AND course.visibility != '4' AND category_code" . "='" . $category_code . "'" . $without_special_courses;
         }
     }
     return Database::num_rows(Database::query($sql));
@@ -599,8 +599,7 @@ function browseCoursesInCategory($category_code, $random_value = null)
     } else {
         $category_code = Database::escape_string($category_code);
         if (empty($category_code) || $category_code == "ALL") {
-            //$sql = "SELECT * FROM $tbl_course WHERE 1=1 $without_special_courses ORDER BY title ";
-            $sql = "SELECT * FROM $tbl_course ORDER BY title ";
+            $sql = "SELECT * FROM $tbl_course WHERE 1=1 $without_special_courses ORDER BY title ";
         } else {
             if ($category_code == 'NONE') {
                 $category_code = '';