소스 검색

Remove course.db_name calls.

Julio Montoya 10 년 전
부모
커밋
b0f7a0c993
4개의 변경된 파일31개의 추가작업 그리고 26개의 파일을 삭제
  1. 16 8
      main/inc/lib/auth.lib.php
  2. 11 11
      main/inc/lib/usermanager.lib.php
  3. 0 2
      main/inc/lib/userportal.lib.php
  4. 4 5
      plugin/search_course/lib/search_course_widget.class.php

+ 16 - 8
main/inc/lib/auth.lib.php

@@ -54,20 +54,28 @@ class Auth
 
         // Secondly we select the courses that are in a category (user_course_cat<>0) and sort these according to the sort of the category
         $user_id = intval($user_id);
-        $sql = "SELECT course.code k, course.visual_code  vc, course.subscribe subscr, course.unsubscribe unsubscr,
-                      course.title i, course.tutor_name t, course.db_name db, course.directory dir, course_rel_user.status status,
-                      course_rel_user.sort sort, course_rel_user.user_course_cat user_course_cat
+        $sql = "SELECT
+                    course.code k,
+                    course.visual_code vc,
+                    course.subscribe subscr,
+                    course.unsubscribe unsubscr,
+                    course.title i,
+                    course.tutor_name t,
+                    course.directory dir,
+                    course_rel_user.status status,
+                    course_rel_user.sort sort,
+                    course_rel_user.user_course_cat user_course_cat
                 FROM $TABLECOURS course, $TABLECOURSUSER  course_rel_user
-                WHERE course.id = course_rel_user.c_id
-                AND   course_rel_user.relation_type<>" . COURSE_RELATION_TYPE_RRHH . "
-                AND   course_rel_user.user_id = '" . $user_id . "' $without_special_courses
+                WHERE
+                    course.id = course_rel_user.c_id AND
+                    course_rel_user.relation_type<>" . COURSE_RELATION_TYPE_RRHH . " AND
+                    course_rel_user.user_id = '" . $user_id . "' $without_special_courses
                 ORDER BY course_rel_user.sort ASC";
         $result = Database::query($sql);
         $courses = array();
         while ($row = Database::fetch_array($result)) {
             //we only need the database name of the course
             $courses[] = array(
-                'db' => $row['db'],
                 'code' => $row['k'],
                 'visual_code' => $row['vc'],
                 'title' => $row['i'],
@@ -139,7 +147,7 @@ class Auth
 
         $sql = "SELECT
                     course.code, course.visual_code, course.subscribe subscr, course.unsubscribe unsubscr,
-                    course.title title, course.tutor_name tutor, course.db_name, course.directory, course_rel_user.status status,
+                    course.title title, course.tutor_name tutor, course.directory, course_rel_user.status status,
                     course_rel_user.sort sort, course_rel_user.user_course_cat user_course_cat
                 FROM $TABLECOURS course,
                 $TABLECOURSUSER  course_rel_user

+ 11 - 11
main/inc/lib/usermanager.lib.php

@@ -3999,17 +3999,17 @@ class UserManager
 
         $course_list = array();
         if (!empty($code_special_courses)) {
-            $course_list_sql = "SELECT course.code k, course.directory d, course.visual_code c, course.db_name db, course.title i, course.tutor_name t, course.course_language l, course_rel_user.status s, course_rel_user.sort sort, course_rel_user.user_course_cat user_course_cat
-                                FROM ".$tbl_course_user." course_rel_user
-                                LEFT JOIN ".$tbl_course." course
-                                ON course.id = course_rel_user.c_id
-                                LEFT JOIN ".$tbl_user_course_category." user_course_category
-                                ON course_rel_user.user_course_cat = user_course_category.id
-                                $join_access_url
-                                WHERE  $code_special_courses $where_access_url
-                                GROUP BY course.code
-                                ORDER BY user_course_category.sort,course.title,course_rel_user.sort ASC";
-            $course_list_sql_result = Database::query($course_list_sql);
+            $sql = "SELECT course.code k, course.directory d, course.visual_code c, course.title i, course.tutor_name t, course.course_language l, course_rel_user.status s, course_rel_user.sort sort, course_rel_user.user_course_cat user_course_cat
+                    FROM ".$tbl_course_user." course_rel_user
+                    LEFT JOIN ".$tbl_course." course
+                    ON course.id = course_rel_user.c_id
+                    LEFT JOIN ".$tbl_user_course_category." user_course_category
+                    ON course_rel_user.user_course_cat = user_course_category.id
+                    $join_access_url
+                    WHERE  $code_special_courses $where_access_url
+                    GROUP BY course.code
+                    ORDER BY user_course_category.sort,course.title,course_rel_user.sort ASC";
+            $course_list_sql_result = Database::query($sql);
             while ($result_row = Database::fetch_array($course_list_sql_result)) {
                 $course_list[] = $result_row;
             }

+ 0 - 2
main/inc/lib/userportal.lib.php

@@ -668,7 +668,6 @@ class IndexManager
             course.unsubscribe unsubscr,
             course.title i,
             course.tutor_name t,
-            course.db_name db,
             course.directory dir,
             course_rel_user.status status,
             course_rel_user.sort sort,
@@ -686,7 +685,6 @@ class IndexManager
         while ($row = Database::fetch_array($result)) {
             // We only need the database name of the course.
             $courses[$row['k']] = array(
-                'db' => $row['db'],
                 'code' => $row['k'],
                 'visual_code' => $row['vc'],
                 'title' => $row['i'],

+ 4 - 5
plugin/search_course/lib/search_course_widget.class.php

@@ -390,19 +390,17 @@ EOT;
 
         $user_id = intval($user_id);
         $sql_select_courses = "SELECT course.code k, course.visual_code  vc, course.subscribe subscr, course.unsubscribe unsubscr,
-                                      course.title i, course.tutor_name t, course.db_name db, course.directory dir, course_rel_user.status status,
+                                      course.title i, course.tutor_name t, course.directory dir, course_rel_user.status status,
 				      course_rel_user.sort sort, course_rel_user.user_course_cat user_course_cat
 		               FROM $course_table course, $user_course_table course_rel_user
 		               WHERE course.id = course_rel_user.c_id
 		                     AND course_rel_user.user_id = $user_id
 		               ORDER BY course_rel_user.sort ASC";
         $result = array();
-        $resultset = api_sql_query($sql_select_courses, __FILE__, __LINE__);
-        while ($row = Database::fetch_array($resultset))
-        {
+        $resultset = api_sql_query($sql_select_courses);
+        while ($row = Database::fetch_array($resultset)) {
             $code = $row['k'];
             $result[$code] = array(
-                'db' => $row['db'],
                 'code' => $code,
                 'visual_code' => $row['vc'],
                 'title' => $row['i'],
@@ -414,6 +412,7 @@ EOT;
                 'sort' => $row['sort'],
                 'user_course_category' => $row['user_course_cat']);
         }
+
         return $result;
     }