Fixed user graphs for site-level, all logs

diff --git a/course/loggraph.php b/course/loggraph.php
index faf9f108700c705dfcfdd814692a94d1524c38e0..e07405cb6a90642670c58f75bdaa5941bc9a6f70 100644 (file)
--- a/course/loggraph.php
+++ b/course/loggraph.php
@@ -34,6 +34,14 @@
     switch ($type) {
      case "usercourse.png":
 
+       $site = get_site();
+        
+       if ($course->id == $site->id) {
+           $courseselect = 0;
+       } else {
+           $courseselect = $course->id;
+       }
+
        $maxseconds = COURSE_MAX_LOG_DISPLAY * 3600 * 24;  // seconds
        if ($timenow - $course->startdate > $maxseconds) {
            $course->startdate = $timenow - $maxseconds;
@@ -63,7 +71,7 @@
            $timestart = $timefinish;
        }
 
-       if ($rawlogs = get_logs_usercourse($user->id, $course->id, $coursestart)) {
+       if ($rawlogs = get_logs_usercourse($user->id, $courseselect, $coursestart)) {
            foreach ($rawlogs as $rawlog) {
                $logs[$rawlog->day] = $rawlog->num;
            }

diff --git a/lib/datalib.php b/lib/datalib.php
index 7ad75db571e588795250d2e933c54c1aaf72d0cf..25546877641e7360025d6640c99d693c1b90ba2c 100644 (file)
--- a/lib/datalib.php
+++ b/lib/datalib.php
@@ -1249,11 +1249,14 @@ function get_logs($select, $order) {
 function get_logs_usercourse($userid, $courseid, $coursestart) {
     global $CFG;
 
+    if ($courseid) {
+       $courseselect = " AND course = '$courseid' ";
+    }
+
     return get_records_sql("SELECT floor((`time` - $coursestart)/86400) as day, count(*) as num 
                             FROM {$CFG->prefix}log 
                            WHERE userid = '$userid' 
-                             AND course = '$courseid'
-                             AND `time` > '$coursestart'
+                             AND `time` > '$coursestart' $courseselect
                         GROUP BY day ");
 }