Moved code from footer.html into print_footer()

Don't update user on login check if it isn't a real user.

diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index 37ecfa5f3c1ff1c74b3b51dcbab0763b3a7b9ca8..b3915812eb971f7fb7da0670cc16962eb16c304f 100644 (file)
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -47,6 +47,19 @@ function print_footer ($course=NULL) {
     } else {
         $homelink = "<A TARGET=_top HREF=\"$CFG->wwwroot\">Home</A>";
     }
+    if ($USER->realuser) {
+        if ($realuser = get_record("user", "id", $USER->realuser)) {
+            $realuserinfo = " [$realuser->firstname $realuser->lastname] ";
+        }
+    }
+    if ($USER->id) {
+        $loggedinas = $realuserinfo.get_string("loggedinas", "moodle", "$USER->firstname $USER->lastname").
+                      " (<A HREF=\"$CFG->wwwroot/login/logout.php\">".get_string("logout")."</A>)";
+    } else { 
+        $loggedinas = get_string("loggedinnot", "moodle").
+                      " (<A HREF=\"$CFG->wwwroot/login/\">".get_string("login")."</A>)";
+    } 
+
     include ("$CFG->dirroot/theme/$CFG->theme/footer.html");
 }
 
@@ -921,7 +934,9 @@ function require_login($courseid=0) {
     // Next, check if the user can be in a particular course
     if ($courseid) {
         if ($USER->student[$courseid] || $USER->teacher[$courseid] || $USER->admin) {
-            update_user_in_db();
+            if (!isset($USER->realuser)) {  // Don't log if this isn't a realuser
+                update_user_in_db();
+            }
             return;   // user is a member of this course.
         }
         if (! $course = get_record("course", "id", $courseid)) {