Some cleanups

diff --git a/course/report/log/index.php b/course/report/log/index.php
index 1ca37957042d9815883781d84aca1257187fa0a8..6cd33380415c069363818d37e6f3b0916daa1800 100644 (file)
--- 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, 
-                         "<a href=\"view.php?id=$course->id\">$course->shortname</a> ->
-                          <a href=\"log.php?id=$course->id\">$strlogs</a> -> $userinfo, $dateinfo", '');
+                         "<a href=\"$CFG->wwwroot/course/view.php?id=$course->id\">$course->shortname</a> ->
+                          <a href=\"$CFG->wwwroot/course/report.php?id=$course->id\">$strreports</a> ->
+                          <a href=\"index.php?id=$course->id\">$strlogs</a> -> $userinfo, $dateinfo", '');
         } else {
             print_header($course->shortname .': '. $strlogs, $course->fullname, 
-                         "<a href=\"../$CFG->admin/index.php\">$stradministration</a> ->
-                          <a href=\"log.php?id=$course->id\">$strlogs</a> -> $userinfo, $dateinfo", '');
+                         "<a href=\"$CFG->wwwroot/$CFG->admin/index.php\">$stradministration</a> ->
+                          <a href=\"$CFG->wwwroot/$CFG->admin/report.php\">$strreports</a> ->
+                          <a href=\"index.php?id=$course->id\">$strlogs</a> -> $userinfo, $dateinfo", '');
         }
         
         print_heading("$course->fullname: $userinfo, $dateinfo (".usertimezone().")");
 
         print_log_selector_form($course, $user, $date, $modname, $modid, $modaction, $group, $showcourses, $showusers);
         
-        echo '<p align="center">[ <a href="'.$CFG->wwwroot.'/course/stats.php?course='.$course->id.'">'.get_string('seealsostats').'</a> ]</p>';
-
         print_log($course, $user, $date, 'l.time DESC', $page, $perpage, 
-                  "log.php?id=$course->id&amp;chooselog=1&amp;user=$user&amp;date=$date&amp;modid=$modid&amp;modaction=$modaction&amp;group=$group", 
+                  "index.php?id=$course->id&amp;chooselog=1&amp;user=$user&amp;date=$date&amp;modid=$modid&amp;modaction=$modaction&amp;group=$group", 
                   $modname, $modid, $modaction, $group);
 
     } else {
         if ($course->category) {
             print_header($course->shortname .': '. $strlogs, $course->fullname, 
-                     "<a href=\"view.php?id=$course->id\">$course->shortname</a> -> $strlogs", '');
+                     "<a href=\"$CFG->wwwroot/course/view.php?id=$course->id\">$course->shortname</a> -> 
+                      <a href=\"$CFG->wwwroot/course/report.php?id=$course->id\">$strreports</a> ->
+                      $strlogs", '');
         } else {
             print_header($course->shortname .': '. $strlogs, $course->fullname, 
-                     "<a href=\"../$CFG->admin/index.php\">$stradministration</a> -> $strlogs", '');
+                     "<a href=\"$CFG->wwwroot/$CFG->admin/index.php\">$stradministration</a> -> 
+                      <a href=\"$CFG->wwwroot/$CFG->admin/report.php\">$strreports</a> ->
+                      $strlogs", '');
         }
 
         print_heading(get_string('chooselogs') .':');

diff --git a/course/report/log/lib.php b/course/report/log/lib.php
index c748d066fe5f668aa2dce45a3ce0fd76da3a4c82..208029b4513e0629a8cc52385936c3e2434f5726 100644 (file)
--- 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 "<center>\n";
-    echo "<form action=\"log.php\" method=\"get\">\n";
+    echo "<form action=\"index.php\" method=\"get\">\n";
     echo "<input type=\"hidden\" name=\"chooselog\" value=\"1\" />\n";
     echo "<input type=\"hidden\" name=\"showusers\" value=\"$showusers\" />\n";
     echo "<input type=\"hidden\" name=\"showcourses\" value=\"$showcourses\" />\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 c4dacefbf822d7bd5aba207afa72087d6b3e0fb8..2be71383852db1cf3486490ed2ca6a0cef1e694c 100644 (file)
--- a/course/report/log/mod.php
+++ b/course/report/log/mod.php
@@ -5,7 +5,7 @@
     }
 
     $strlogs = get_string('logs');
-    echo "<center><a href=\"{$CFG->wwwroot}/course/report/logs/index.php?id={$course->id}\">";
+    echo "<center><a href=\"{$CFG->wwwroot}/course/report/log/index.php?id={$course->id}\">";
     echo "$strlogs</a></center>\n";
 
 ?>