From f9d5fd3b3cdaa3cd07bd52e324d6e783b5d8775a Mon Sep 17 00:00:00 2001 From: moodler Date: Sun, 27 Apr 2003 03:32:45 +0000 Subject: [PATCH] Added a LIMIT to the SQL query for a bit more efficiency --- course/lib.php | 41 ++++++++++++++++++----------------------- 1 file changed, 18 insertions(+), 23 deletions(-) diff --git a/course/lib.php b/course/lib.php index 4f975d375e..5a4f677869 100644 --- a/course/lib.php +++ b/course/lib.php @@ -141,6 +141,8 @@ function print_log($course, $user=0, $date=0, $order="ORDER BY l.time ASC") { $selector .= " AND l.time > '$date' AND l.time < '$enddate'"; } + $order = $order." LIMIT ".COURSE_MAX_LOGS_PER_PAGE; // To keep it manageable + if (!$logs = get_logs($selector, $order)) { notify("No logs found!"); print_footer($course); @@ -150,47 +152,40 @@ function print_log($course, $user=0, $date=0, $order="ORDER BY l.time ASC") { $count=0; $tt = getdate(time()); $today = mktime (0, 0, 0, $tt["mon"], $tt["mday"], $tt["year"]); - if (($totalcountlogs = count($logs)) > COURSE_MAX_LOGS_PER_PAGE) { - $totalcountlogs = COURSE_MAX_LOGS_PER_PAGE."/$totalcountlogs"; + if (($totalcountlogs = count($logs)) == COURSE_MAX_LOGS_PER_PAGE) { + $totalcountlogs = "$totalcountlogs (+)"; } $strftimedatetime = get_string("strftimedatetime"); - echo "

"; + echo "

"; print_string("displayingrecords", "", $totalcountlogs); - echo "

"; + echo "

"; - $countlogs = 0; - echo ""; + echo "
"; foreach ($logs as $log) { - $countlogs++; - - if ($countlogs > COURSE_MAX_LOGS_PER_PAGE) { - break; - } - if ($ld = get_record("log_display", "module", "$log->module", "action", "$log->action")) { $log->info = get_field($ld->mtable, $ld->field, "id", $log->info); } - echo ""; + echo ""; if (! $course->category) { - echo ""; + echo ""; } - echo ""; - echo ""; + echo ""; + echo ""; echo ""; - echo ""; - echo ""; + echo ""; + echo ""; - echo ""; - echo ""; + echo ""; + echo ""; + echo ""; } - echo "
course\">".$courses[$log->course]."course\">".$courses[$log->course]."".userdate($log->time, "%A")."".userdate($log->time, $strftimedatetime)."".userdate($log->time, "%a")."".userdate($log->time, $strftimedatetime).""; link_to_popup_window("/lib/ipatlas/plot.php?address=$log->ip&user=$log->userid", "ipatlas","$log->ip", 400, 700); - echo "userid&course=$log->course\">$log->firstname $log->lastname"; + echo "userid&course=$log->course\">$log->firstname $log->lastname"; link_to_popup_window( make_log_url($log->module,$log->url), "fromloglive","$log->module $log->action", 400, 600); - echo "$log->info
$log->info
"; + echo ""; } -- 2.39.5