From 7e4a64888b2d49948fe574d4b5272533cc116395 Mon Sep 17 00:00:00 2001
From: moodler <moodler>
Date: Thu, 24 Jul 2003 01:54:06 +0000
Subject: [PATCH] When displaying a user's logs for the current day, make the
 graph display ALL courses (ie to match the logs printed below).

---
 course/loggraph.php | 10 +++++++++-
 lib/datalib.php     |  7 +++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/course/loggraph.php b/course/loggraph.php
index 83c3a88e2f..faf9f10870 100644
--- a/course/loggraph.php
+++ b/course/loggraph.php
@@ -97,6 +97,14 @@
 
      case "userday.png":
 
+       $site = get_site();
+        
+       if ($course->id == $site->id) {
+           $courseselect = 0;
+       } else {
+           $courseselect = $course->id;
+       }
+
        if ($date) {
            $daystart = usergetmidnight($date);
        } else {
@@ -111,7 +119,7 @@
            $hours[$i] = userdate($hour, "$hh %p");
        }
 
-       if ($rawlogs = get_logs_userday($user->id, $course->id, $daystart)) {
+       if ($rawlogs = get_logs_userday($user->id, $courseselect, $daystart)) {
            foreach ($rawlogs as $rawlog) {
                $logs[$rawlog->hour] = $rawlog->num;
            }
diff --git a/lib/datalib.php b/lib/datalib.php
index df060091eb..7ad75db571 100644
--- a/lib/datalib.php
+++ b/lib/datalib.php
@@ -1260,11 +1260,14 @@ function get_logs_usercourse($userid, $courseid, $coursestart) {
 function get_logs_userday($userid, $courseid, $daystart) {
     global $CFG;
 
+    if ($courseid) {
+       $courseselect = " AND course = '$courseid' ";
+    }
+
     return get_records_sql("SELECT floor((`time` - $daystart)/3600) as hour, count(*) as num
                             FROM {$CFG->prefix}log
                            WHERE userid = '$userid' 
-                             AND course = '$courseid'
-                             AND `time` > '$daystart'
+                             AND `time` > '$daystart' $courseselect
                         GROUP BY hour ");
 }
 
-- 
2.39.5