From bee54194f74b02e327abd213af04594e1906ed60 Mon Sep 17 00:00:00 2001 From: Ivan Tcholakov Date: Thu, 14 Oct 2010 03:15:11 +0300 Subject: [PATCH] Feature #2099 - Some variable names have been upadated. --- main/admin/course_request_accepted.php | 12 ++++++------ main/admin/course_request_rejected.php | 12 ++++++------ main/admin/course_request_review.php | 14 +++++++------- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/main/admin/course_request_accepted.php b/main/admin/course_request_accepted.php index befc8db6ac..72110452f8 100644 --- a/main/admin/course_request_accepted.php +++ b/main/admin/course_request_accepted.php @@ -101,7 +101,7 @@ function get_number_of_requests() { * Get course data to display */ function get_request_data($from, $number_of_items, $column, $direction) { - $course_table = Database :: get_main_table(TABLE_MAIN_COURSE_REQUEST); + $course_request_table = Database :: get_main_table(TABLE_MAIN_COURSE_REQUEST); $users_table = Database :: get_main_table(TABLE_MAIN_USER); $course_users_table = Database :: get_main_table(TABLE_MAIN_COURSE_USER); @@ -112,18 +112,18 @@ function get_request_data($from, $number_of_items, $column, $direction) { tutor_name AS col4, request_date AS col5, id AS col6 - FROM $course_table WHERE status = ".COURSE_REQUEST_ACCEPTED; + FROM $course_request_table WHERE status = ".COURSE_REQUEST_ACCEPTED; $sql .= " ORDER BY col$column $direction "; $sql .= " LIMIT $from,$number_of_items"; $res = Database :: query($sql); - $courses = array(); - while ($course = Database :: fetch_row($res)) { - $courses[] = $course; + $course_requests = array(); + while ($course_request = Database :: fetch_row($res)) { + $course_requests[] = $course_request; } - return $courses; + return $course_requests; } /** diff --git a/main/admin/course_request_rejected.php b/main/admin/course_request_rejected.php index e4741831b0..9efb00f343 100644 --- a/main/admin/course_request_rejected.php +++ b/main/admin/course_request_rejected.php @@ -135,7 +135,7 @@ function get_number_of_requests() { * Get course data to display */ function get_request_data($from, $number_of_items, $column, $direction) { - $course_table = Database :: get_main_table(TABLE_MAIN_COURSE_REQUEST); + $course_request_table = Database :: get_main_table(TABLE_MAIN_COURSE_REQUEST); $users_table = Database :: get_main_table(TABLE_MAIN_USER); $course_users_table = Database :: get_main_table(TABLE_MAIN_COURSE_USER); @@ -146,18 +146,18 @@ function get_request_data($from, $number_of_items, $column, $direction) { tutor_name AS col4, request_date AS col5, id AS col6 - FROM $course_table WHERE status = ".COURSE_REQUEST_REJECTED; + FROM $course_request_table WHERE status = ".COURSE_REQUEST_REJECTED; $sql .= " ORDER BY col$column $direction "; $sql .= " LIMIT $from,$number_of_items"; $res = Database :: query($sql); - $courses = array(); - while ($course = Database :: fetch_row($res)) { - $courses[] = $course; + $course_requests = array(); + while ($course_request = Database :: fetch_row($res)) { + $course_requests[] = $course_request; } - return $courses; + return $course_requests; } /** diff --git a/main/admin/course_request_review.php b/main/admin/course_request_review.php index 0315a8d2b1..2e85374bf6 100644 --- a/main/admin/course_request_review.php +++ b/main/admin/course_request_review.php @@ -154,7 +154,7 @@ function get_number_of_requests() { * Get course data to display */ function get_request_data($from, $number_of_items, $column, $direction) { - $course_table = Database :: get_main_table(TABLE_MAIN_COURSE_REQUEST); + $course_request_table = Database :: get_main_table(TABLE_MAIN_COURSE_REQUEST); $users_table = Database :: get_main_table(TABLE_MAIN_USER); $course_users_table = Database :: get_main_table(TABLE_MAIN_COURSE_USER); @@ -166,7 +166,7 @@ function get_request_data($from, $number_of_items, $column, $direction) { tutor_name AS col4, request_date AS col5, id AS col6 - FROM $course_table WHERE status = ".COURSE_REQUEST_PENDING; + FROM $course_request_table WHERE status = ".COURSE_REQUEST_PENDING; } else { $sql = "SELECT code AS col0, @@ -175,19 +175,19 @@ function get_request_data($from, $number_of_items, $column, $direction) { tutor_name AS col3, request_date AS col4, id AS col5 - FROM $course_table WHERE status = ".COURSE_REQUEST_PENDING; + FROM $course_request_table WHERE status = ".COURSE_REQUEST_PENDING; } $sql .= " ORDER BY col$column $direction "; $sql .= " LIMIT $from,$number_of_items"; $res = Database::query($sql); - $courses = array(); - while ($course = Database::fetch_row($res)) { - $courses[] = $course; + $course_requests = array(); + while ($course_request = Database::fetch_row($res)) { + $course_requests[] = $course_request; } - return $courses; + return $course_requests; } /**