Browse Source

Fixing query

Julio Montoya 11 years ago
parent
commit
2e08d6c8b6
1 changed files with 12 additions and 5 deletions
  1. 12 5
      main/admin/course_list.php

+ 12 - 5
main/admin/course_list.php

@@ -24,11 +24,11 @@ require_once '../gradebook/lib/be/category.class.php';
  */
 function get_number_of_courses() {
     $course_table = Database :: get_main_table(TABLE_MAIN_COURSE);
-    $sql = "SELECT COUNT(code) AS total_number_of_items FROM $course_table";
+    $sql = "SELECT COUNT(code) AS total_number_of_items FROM $course_table course";
 
     if ((api_is_platform_admin() || api_is_session_admin()) && api_is_multiple_url_enabled() && api_get_current_access_url_id() != -1) {
         $access_url_rel_course_table = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
-        $sql.= " INNER JOIN $access_url_rel_course_table url_rel_course ON (id = url_rel_course.c_id)";
+        $sql.= " INNER JOIN $access_url_rel_course_table url_rel_course ON (course.id = url_rel_course.c_id)";
     }
 
     if (isset ($_GET['keyword'])) {
@@ -42,7 +42,13 @@ function get_number_of_courses() {
         $keyword_visibility = Database::escape_string($_GET['keyword_visibility']);
         $keyword_subscribe = Database::escape_string($_GET['keyword_subscribe']);
         $keyword_unsubscribe = Database::escape_string($_GET['keyword_unsubscribe']);
-        $sql .= " WHERE (code LIKE '%".$keyword_code."%' OR visual_code LIKE '%".$keyword_code."%') AND title LIKE '%".$keyword_title."%' AND category_code LIKE '%".$keyword_category."%'  AND course_language LIKE '%".$keyword_language."%'   AND visibility LIKE '%".$keyword_visibility."%'    AND subscribe LIKE '".$keyword_subscribe."'AND unsubscribe LIKE '".$keyword_unsubscribe."'";
+        $sql .= " WHERE (code LIKE '%".$keyword_code."%' OR visual_code LIKE '%".$keyword_code."%') AND
+                        title LIKE '%".$keyword_title."%' AND
+                        category_code LIKE '%".$keyword_category."%' AND
+                        course_language LIKE '%".$keyword_language."%'  AND
+                        visibility LIKE '%".$keyword_visibility."%'    AND
+                        subscribe LIKE '".$keyword_subscribe."'AND
+                        unsubscribe LIKE '".$keyword_unsubscribe."'";
     }
 
      // adding the filter to see the user's only of the current access_url
@@ -72,11 +78,11 @@ function get_course_data($from, $number_of_items, $column, $direction) {
                     visibility AS col8,
                     directory as col9,
                     visual_code
-    		FROM $course_table";
+    		FROM $course_table course";
 
     if ((api_is_platform_admin() || api_is_session_admin()) && api_is_multiple_url_enabled() && api_get_current_access_url_id() != -1) {
         $access_url_rel_course_table = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
-        $sql.= " INNER JOIN $access_url_rel_course_table url_rel_course ON (id = url_rel_course.c_id)";
+        $sql.= " INNER JOIN $access_url_rel_course_table url_rel_course ON (course.id = url_rel_course.c_id)";
     }
 
     if (isset ($_GET['keyword'])) {
@@ -104,6 +110,7 @@ function get_course_data($from, $number_of_items, $column, $direction) {
     $res = Database::query($sql);
     $courses = array ();
     while ($course = Database::fetch_array($res)) {
+
         // Place colour icons in front of courses.
         $show_visual_code = $course['visual_code'] != $course[2] ? Display::label($course['visual_code'], 'info') : null;
         $course[1] = get_course_visibility_icon($course[8]).'<a href="'.api_get_path(WEB_COURSE_PATH).$course[9].'/index.php">'.$course[1].'</a> '.$show_visual_code;