From 51779ded07cb0bc6395cd3cd9468600992839c8f Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Fri, 1 Jun 2012 14:59:50 +0200
Subject: [PATCH] Fixing courses catalog order see BT#4346

---
 main/auth/courses.php            |  2 +-
 main/auth/courses_controller.php |  2 +-
 main/inc/lib/auth.lib.php        | 38 +++++++++++++++++++++++++-------
 3 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/main/auth/courses.php b/main/auth/courses.php
index 2be926f72a..0385d53f80 100644
--- a/main/auth/courses.php
+++ b/main/auth/courses.php
@@ -23,7 +23,7 @@ require_once api_get_path(LIBRARY_PATH).'mail.lib.inc.php';
 
 if (api_get_setting('show_courses_descriptions_in_catalog') == 'true') {
     $htmlHeadXtra[] = '
-    <script type="text/javascript">
+    <script>
     	$(document).ready(function() {
 	        $(\'.ajax\').live(\'click\', function() {
 	            var url     = this.href;
diff --git a/main/auth/courses_controller.php b/main/auth/courses_controller.php
index 4bd385be94..497e366d99 100644
--- a/main/auth/courses_controller.php
+++ b/main/auth/courses_controller.php
@@ -84,7 +84,7 @@ class CoursesController { // extends Controller {
         $browse_course_categories = $this->model->browse_course_categories();        
         
         if ($action == 'display_random_courses') {
-            $data['browse_courses_in_category'] = $this->model->browse_courses_in_category(null, 20);
+            $data['browse_courses_in_category'] = $this->model->browse_courses_in_category(null, 10);
         } else {
             if (!isset($category_code)) {
                 $category_code = $browse_course_categories[0][1]['code']; // by default first category
diff --git a/main/inc/lib/auth.lib.php b/main/inc/lib/auth.lib.php
index 42720b1e8a..f7ecf90b0f 100644
--- a/main/inc/lib/auth.lib.php
+++ b/main/inc/lib/auth.lib.php
@@ -450,19 +450,41 @@ class Auth
         
         if (!empty($random_value)) {
             $random_value = intval($random_value);
-            $sql = "SELECT * FROM $tbl_course course, (SELECT CEIL(MAX($tbl_course.id) * RAND()) AS randId FROM $tbl_course ) AS someRandId 
-            WHERE course.id >= someRandId.randId $without_special_courses";
-        
+                  
+            $sql = "SELECT COUNT(*) FROM $tbl_course";
+            $result = Database::query($sql);
+            list($num_records) = Database::fetch_row($result);
+            
             if ($_configuration['multiple_access_urls']) {
+            
                 $url_access_id = api_get_current_access_url_id();                
                 $tbl_url_rel_course = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
+            
+                $sql = "SELECT COUNT(*) FROM $tbl_course 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 ";
+                $result = Database::query($sql);
+                list($num_records) = Database::fetch_row($result);
                 
-                //$table_course_ranking ranking
-                //AND ranking.c_id
-                $sql = "SELECT * FROM $tbl_course course, (SELECT CEIL(MAX($tbl_course.id) * RAND()) AS randId FROM $tbl_course INNER JOIN $tbl_url_rel_course as url_rel_course
-                        ON (url_rel_course.course_code=$tbl_course.code) WHERE access_url_id = $url_access_id ) AS someRandId
-                        WHERE course.id AND course.id >= someRandId.randId $without_special_courses $without_special_courses";
+                $sql = "SELECT course.id FROM $tbl_course 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 
+                                RAND()*$num_records< $random_value
+                                $without_special_courses ORDER BY RAND() LIMIT 0, $random_value";                                
+            } else {
+                $sql = "SELECT id FROM $tbl_course course WHERE RAND()*$num_records< $random_value $without_special_courses ORDER BY RAND() LIMIT 0, $random_value";
             }
+            
+            $result = Database::query($sql);
+            $id_in = null;
+            while (list($id) = Database::fetch_row($result)){
+                if ($id_in) {
+                    $id_in.=",$id"; 
+                } else { 
+                    $id_in="$id";
+                }
+            }            
+            $sql = "SELECT * FROM $tbl_course WHERE id IN($id_in)";
+            
         } else {
             $category_code = Database::escape_string($category_code);
             $sql = "SELECT * FROM $tbl_course WHERE category_code='$category_code' $without_special_courses ORDER BY title ";