From c154abd095dd33a19bafeb0dcc740aeb948e345b Mon Sep 17 00:00:00 2001
From: Ankit Agarwal <ankit@moodle.com>
Date: Wed, 15 Jan 2014 15:17:48 +0800
Subject: [PATCH] MDL-41266 logging: Legacy reader should convert passed
 courseid to course in sql queries

---
 .../log/store/legacy/classes/log/store.php    | 27 +++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/admin/tool/log/store/legacy/classes/log/store.php b/admin/tool/log/store/legacy/classes/log/store.php
index 88b16ead9cb..ca21292833b 100644
--- a/admin/tool/log/store/legacy/classes/log/store.php
+++ b/admin/tool/log/store/legacy/classes/log/store.php
@@ -47,13 +47,25 @@ class store implements \tool_log\log\store, \core\log\reader {
 
         $selectwhere = str_replace('timecreated', 'time', $selectwhere);
         $sort = str_replace('timecreated', 'time', $sort);
+        if (isset($params['timecreated'])) {
+            $params['time'] = $params['timecreated'];
+            unset($params['timecreated']);
+        }
+
+        $selectwhere = str_replace('courseid', 'course', $selectwhere);
+        $sort = str_replace('courseid', 'course', $sort);
+        if (isset($params['courseid'])) {
+            $params['course'] = $params['courseid'];
+            unset($params['courseid']);
+        }
 
         $events = array();
+        $records = array();
 
         try {
             $records = $DB->get_records_select('log', $selectwhere, $params, $sort, '*', $limitfrom, $limitnum);
         } catch (\moodle_exception $ex) {
-            debugging("error converting legacy event data", $ex->getMessage().$ex->debuginfo);
+            debugging("error converting legacy event data ". $ex->getMessage() . $ex->debuginfo, DEBUG_DEVELOPER);
         }
 
         foreach ($records as $data) {
@@ -66,10 +78,21 @@ class store implements \tool_log\log\store, \core\log\reader {
     public function get_events_count($selectwhere, array $params) {
         global $DB;
         $selectwhere = str_replace('timecreated', 'time', $selectwhere);
+        if (isset($params['timecreated'])) {
+            $params['time'] = $params['timecreated'];
+            unset($params['timecreated']);
+        }
+
+        $selectwhere = str_replace('courseid', 'course', $selectwhere);
+        if (isset($params['courseid'])) {
+            $params['course'] = $params['courseid'];
+            unset($params['courseid']);
+        }
+
         try {
             return $DB->count_records_select('log', $selectwhere, $params);
         } catch (\moodle_exception $ex) {
-            debugging("error converting legacy event data", $ex->getMessage().$ex->debuginfo);
+            debugging("error converting legacy event data ". $ex->getMessage() . $ex->debuginfo, DEBUG_DEVELOPER);
             return 0;
         }
     }