From: martin <martin>
Date: Thu, 8 Aug 2002 17:29:22 +0000 (+0000)
Subject: Tweaks and cleanups
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=adecd142a36e8a059fba624a156821f607deedef;p=moodle.git

Tweaks and cleanups
---

diff --git a/course/lib.php b/course/lib.php
index 7afdf12162..967d8d27db 100644
--- a/course/lib.php
+++ b/course/lib.php
@@ -497,12 +497,12 @@ function print_side_block($heading="", $list=NULL, $footer="", $icons=NULL) {
     echo "</TABLE><BR>\n\n";
 }
 
-function print_admin_links () {
+function print_admin_links ($siteid) {
     global $THEME, $CFG;
     
     print_simple_box(get_string("administration"), $align="CENTER", $width="100%", $color="$THEME->cellheading");
     $icon = "<IMG SRC=\"$CFG->wwwroot/pix/i/settings.gif\" HEIGHT=16 WIDTH=16 ALT=\"\">";
-    $moddata[]="<A HREF=\"$CFG->wwwroot/course/log.php?id=$site->id\">".get_string("sitelogs")."</A>";
+    $moddata[]="<A HREF=\"$CFG->wwwroot/course/log.php?id=$siteid\">".get_string("sitelogs")."</A>";
     $modicon[]=$icon;
     $moddata[]="<A HREF=\"$CFG->wwwroot/admin/site.php\">".get_string("sitesettings")."</A>";
     $modicon[]=$icon;
diff --git a/course/loggraph.php b/course/loggraph.php
index 6b375c2896..b47d980e4b 100644
--- a/course/loggraph.php
+++ b/course/loggraph.php
@@ -7,7 +7,7 @@
     require_variable($id);    // Course ID
     require_variable($type);  // Graph Type
     optional_variable($user);  // Student ID
-    optional_variable($date);  // Midnight of a date
+    optional_variable($date);  // A time of a day (in GMT)
 
     if (! $course = get_record("course", "id", $id)) {
         error("Course is misconfigured");
diff --git a/course/loginas.php b/course/loginas.php
index c011b19f0d..be38c15cca 100644
--- a/course/loginas.php
+++ b/course/loginas.php
@@ -16,7 +16,7 @@
         error("Only teachers can use this page!");
     }
 
-    if (!isstudent($course->id, $user)) {
+    if ($course->category and !isstudent($course->id, $user)) {
         error("This student is not in this course!");
     }
 
diff --git a/course/user.php b/course/user.php
index 39995571d9..0770c76b67 100644
--- a/course/user.php
+++ b/course/user.php
@@ -64,7 +64,7 @@
     switch ($mode) {
         case "todaylogs" :
             echo "<HR><CENTER>";
-            print_log_graph($course, $user->id, "userday.png", time() );
+            print_log_graph($course, $user->id, "userday.png");
             echo "</CENTER>";
             print_log($course, $user->id, usergetmidnight(time()), "ORDER BY l.time DESC");
             break;