From aba01116ea0e377c6f04dce51548921206aee432 Mon Sep 17 00:00:00 2001
From: Yannick Warnier <ywarnier@beeznest.org>
Date: Tue, 3 Mar 2015 22:34:12 -0500
Subject: [PATCH] Remove unnecessary quotes from queries using
 track_e_course_access (more) - refs #7555

---
 main/inc/lib/course.lib.php     | 2 +-
 main/inc/lib/myspace.lib.php    | 6 +++---
 main/inc/lib/tracking.lib.php   | 6 +++---
 main/reports/modules/course.php | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/main/inc/lib/course.lib.php b/main/inc/lib/course.lib.php
index 1fb41ee61f..50cdff97da 100755
--- a/main/inc/lib/course.lib.php
+++ b/main/inc/lib/course.lib.php
@@ -4676,7 +4676,7 @@ class CourseManager
         $now = api_get_utc_datetime(time());
         $sql = "SELECT COUNT(course_access_id) course_count, a.c_id, visibility
                 FROM $table_course c INNER JOIN $table_course_access a
-                ON (c.code = a.c_id) INNER JOIN $table_course_url u ON u.course_code = c.code
+                ON (c.id = a.c_id) INNER JOIN $table_course_url u ON u.course_code = c.code
                 WHERE
                     u.access_url_id = " . api_get_current_access_url_id() . " AND
                     login_course_date <= '$now' AND
diff --git a/main/inc/lib/myspace.lib.php b/main/inc/lib/myspace.lib.php
index da9c3d3b91..7af2518591 100644
--- a/main/inc/lib/myspace.lib.php
+++ b/main/inc/lib/myspace.lib.php
@@ -104,7 +104,7 @@ class MySpace
 
         $sql = 'SELECT login_course_date, logout_course_date FROM ' . $tbl_track_course . '
                 WHERE   user_id = '.$user_id.' AND
-                        c_id="'.$courseId.'" AND
+                        c_id = '.$courseId.' AND
                         session_id = '.$session_id.'
                 ORDER BY login_course_date ASC';
         $rs = Database::query($sql);
@@ -2678,7 +2678,7 @@ function get_stats($user_id, $courseId, $start_date = null, $end_date = null)
                 FROM ' . $tbl_track_course . '
                 WHERE
                     user_id = ' . intval($user_id) . ' AND
-                    c_id = "' . intval($courseId) . '" '.$strg_sd.' '.$strg_ed.' '.'
+                    c_id = ' . intval($courseId) . ' '.$strg_sd.' '.$strg_ed.' '.'
                 ORDER BY login_course_date ASC';
 
         $rs = Database::query($sql);
@@ -2727,7 +2727,7 @@ function get_connections_to_course_by_date($user_id, $courseId, $start_date, $en
                 FROM $tbl_track_course
                 WHERE
                   user_id = $user_id AND
-                  c_id = '$courseId' AND
+                  c_id = $courseId AND
                   login_course_date BETWEEN '$start_date' AND '$end_date' AND
                   logout_course_date BETWEEN '$start_date' AND '$end_date'
                 ORDER BY login_course_date ASC";
diff --git a/main/inc/lib/tracking.lib.php b/main/inc/lib/tracking.lib.php
index e12f4d6706..e200538828 100755
--- a/main/inc/lib/tracking.lib.php
+++ b/main/inc/lib/tracking.lib.php
@@ -1288,7 +1288,7 @@ class Tracking
     		$condition_user = " AND user_id IN (".implode(',',$user_id).") ";
     	} else {
     		$user_id = intval($user_id);
-    		$condition_user = " AND user_id = '$user_id' ";
+    		$condition_user = " AND user_id = $user_id ";
     	}
 
     	$sql = "SELECT SUM(UNIX_TIMESTAMP(logout_course_date) - UNIX_TIMESTAMP(login_course_date)) as nb_seconds
@@ -1428,7 +1428,7 @@ class Tracking
     	        FROM '.$tbl_track_login.'
                 WHERE
                     user_id = '.$student_id.' AND
-                    c_id = "'.$courseId.'" AND
+                    c_id = '.$courseId.' AND
                     session_id = '.$session_id.'
                 ORDER BY login_course_date ASC LIMIT 0,1';
     	$rs = Database::query($sql);
@@ -3719,7 +3719,7 @@ class Tracking
             ),
             #TABLE_STATISTIC_TRACK_E_HOTPOTATOES,
             /*TABLE_STATISTIC_TRACK_E_COURSE_ACCESS => array(
-                'course'    => 'course_code',
+                'course'    => 'c_id',
                 'session'   => 'session_id',
                 'user'      => 'user_id',
                 'start_date'=> 'login_course_date',
diff --git a/main/reports/modules/course.php b/main/reports/modules/course.php
index 572afb4550..317abb4b57 100755
--- a/main/reports/modules/course.php
+++ b/main/reports/modules/course.php
@@ -24,6 +24,6 @@ function reports_modules_course_val($course, $key_id) {
 			'NULL as progress, '.
 			'(sum(logout_course_date) - sum(login_course_date)) as time, null as ts from '.
 			Database::get_main_table(TABLE_STATISTIC_TRACK_E_COURSE_ACCESS).
-			' where c_id = '."'".$course['real_id']."'".
+			' where c_id = ' . $course['real_id'] .
 			' group by user_id');
 }