Merged logging from stable

diff --git a/login/index.php b/login/index.php
index aa6352a1e7ff687b916226b3b3b26b61f1e5e400..b914b97e2bd43e9f661b6db750fe5001e1fec6f9 100644 (file)
--- a/login/index.php
+++ b/login/index.php
@@ -111,6 +111,7 @@
             }
 
             
+            add_to_log(SITEID, "user", "login", "view.php?id=$user->id&course=".SITEID, $user->id, 0, $user->id);
             
             if (user_not_fully_set_up($USER)) {
                 $urltogo = $CFG->wwwroot.'/user/edit.php?id='.$USER->id.'&course='.SITEID;
@@ -141,10 +142,10 @@
                 }
             }
 
-            redirect($urltogo);
-            
             reset_login_count();
 
+            redirect($urltogo);
+
             die;
     
         } else {

diff --git a/login/logout.php b/login/logout.php
index 256840ff249037afd89cdccfec92a7494c788df1..32aedb26433059590aaaa10bcc7cc2a500f5ac56 100644 (file)
--- a/login/logout.php
+++ b/login/logout.php
@@ -3,6 +3,10 @@
 
     require_once("../config.php");
 
+    if (isset($USER) and isset($USER->id)) {
+        add_to_log(SITEID, "user", "logout", "view.php?id=$USER->id&course=".SITEID, $USER->id, 0, $USER->id);
+    }
+
     if (ini_get_bool("register_globals") and check_php_version("4.3.0")) {
         // This method is just to try to avoid silly warnings from PHP 4.3.0
         session_unregister("USER");