MDL-16613 refactore session IP tracking; MDL-14213 improved message when IP changes; MDL-17754 SID is regenerated when terminating session and old session is deleted

lib/setup.php

@@ -386,11 +386,7 @@ global $HTTPSPAGEREQUIRED;
         }
     }
 
-/// start session and prepare global $SESSION, $USER
-    session_get_instance();
-    $SESSION = &$_SESSION['SESSION'];
-    $USER    = &$_SESSION['USER'];
-
+/// initialise ME's
     if (defined('FULLME')) {     // Usually in command-line scripts like admin/cron.php
         $FULLME = FULLME;
         $ME = FULLME;
@@ -399,6 +395,11 @@ global $HTTPSPAGEREQUIRED;
         $ME = strip_querystring($FULLME);
     }
 
+/// start session and prepare global $SESSION, $USER
+    session_get_instance();
+    $SESSION = &$_SESSION['SESSION'];
+    $USER    = &$_SESSION['USER'];
+
 /// Load up theme variables (colours etc)
 
     if (!isset($CFG->themedir)) {