From 6b2f1037b3a194866909029111119ee1760c11db Mon Sep 17 00:00:00 2001 From: moodler Date: Thu, 9 Mar 2006 15:13:02 +0000 Subject: [PATCH] Some cleanups --- course/report/log/index.php | 23 ++++++++++++++--------- course/report/log/lib.php | 6 +++--- course/report/log/mod.php | 2 +- 3 files changed, 18 insertions(+), 13 deletions(-) diff --git a/course/report/log/index.php b/course/report/log/index.php index 1ca37957042..6cd33380415 100644 --- a/course/report/log/index.php +++ b/course/report/log/index.php @@ -36,6 +36,7 @@ $strlogs = get_string('logs'); $stradministration = get_string('administration'); + $strreports = get_string('reports'); session_write_close(); @@ -55,31 +56,35 @@ if ($course->category) { print_header($course->shortname .': '. $strlogs, $course->fullname, - "id\">$course->shortname -> - id\">$strlogs -> $userinfo, $dateinfo", ''); + "wwwroot/course/view.php?id=$course->id\">$course->shortname -> + wwwroot/course/report.php?id=$course->id\">$strreports -> + id\">$strlogs -> $userinfo, $dateinfo", ''); } else { print_header($course->shortname .': '. $strlogs, $course->fullname, - "admin/index.php\">$stradministration -> - id\">$strlogs -> $userinfo, $dateinfo", ''); + "wwwroot/$CFG->admin/index.php\">$stradministration -> + wwwroot/$CFG->admin/report.php\">$strreports -> + id\">$strlogs -> $userinfo, $dateinfo", ''); } print_heading("$course->fullname: $userinfo, $dateinfo (".usertimezone().")"); print_log_selector_form($course, $user, $date, $modname, $modid, $modaction, $group, $showcourses, $showusers); - echo '

[ '.get_string('seealsostats').' ]

'; - print_log($course, $user, $date, 'l.time DESC', $page, $perpage, - "log.php?id=$course->id&chooselog=1&user=$user&date=$date&modid=$modid&modaction=$modaction&group=$group", + "index.php?id=$course->id&chooselog=1&user=$user&date=$date&modid=$modid&modaction=$modaction&group=$group", $modname, $modid, $modaction, $group); } else { if ($course->category) { print_header($course->shortname .': '. $strlogs, $course->fullname, - "id\">$course->shortname -> $strlogs", ''); + "wwwroot/course/view.php?id=$course->id\">$course->shortname -> + wwwroot/course/report.php?id=$course->id\">$strreports -> + $strlogs", ''); } else { print_header($course->shortname .': '. $strlogs, $course->fullname, - "admin/index.php\">$stradministration -> $strlogs", ''); + "wwwroot/$CFG->admin/index.php\">$stradministration -> + wwwroot/$CFG->admin/report.php\">$strreports -> + $strlogs", ''); } print_heading(get_string('chooselogs') .':'); diff --git a/course/report/log/lib.php b/course/report/log/lib.php index c748d066fe5..208029b4513 100644 --- a/course/report/log/lib.php +++ b/course/report/log/lib.php @@ -142,7 +142,7 @@ function print_log_selector_form($course, $selecteduser=0, $selecteddate="today" } echo "
\n"; - echo "
\n"; + echo "\n"; echo "\n"; echo "\n"; echo "\n"; @@ -154,7 +154,7 @@ function print_log_selector_form($course, $selecteduser=0, $selecteddate="today" $courses[$course->id] = $course->fullname . ((empty($course->category)) ? ' (Site) ' : ''); choose_from_menu($courses,"id",$course->id,false); if (isadmin()) { - $a->url = "log.php?chooselog=0&group=$selectedgroup&user=$selecteduser" + $a->url = "index.php?chooselog=0&group=$selectedgroup&user=$selecteduser" ."&id=$course->id&date=$selecteddate&modid=$selectedactivity&showcourses=1&showusers=$showusers"; print_string('logtoomanycourses','moodle',$a); } @@ -185,7 +185,7 @@ function print_log_selector_form($course, $selecteduser=0, $selecteddate="today" $users[0] = get_string('allparticipants'); } choose_from_menu($users,'user',$selecteduser,false); - $a->url = "log.php?chooselog=0&group=$selectedgroup&user=$selecteduser" + $a->url = "index.php?chooselog=0&group=$selectedgroup&user=$selecteduser" ."&id=$course->id&date=$selecteddate&modid=$selectedactivity&showusers=1&showcourses=$showcourses"; print_string('logtoomanyusers','moodle',$a); } diff --git a/course/report/log/mod.php b/course/report/log/mod.php index c4dacefbf82..2be71383852 100644 --- a/course/report/log/mod.php +++ b/course/report/log/mod.php @@ -5,7 +5,7 @@ } $strlogs = get_string('logs'); - echo "
wwwroot}/course/report/logs/index.php?id={$course->id}\">"; + echo "
wwwroot}/course/report/log/index.php?id={$course->id}\">"; echo "$strlogs
\n"; ?>