Better checking of admin user stuff

diff --git a/admin/cron.php b/admin/cron.php
index b582e1aa9e972136aabc605fc514ade1d9a37523..3996f39f2b1295058610f15e88aead2405e1b65f 100644 (file)
--- a/admin/cron.php
+++ b/admin/cron.php
@@ -17,7 +17,9 @@
 
     require_once("../config.php");
 
-    $USER = get_admin();
+    if (!$alreadyadmin = isadmin()) {
+        $USER = get_admin();      /// Temporarily, to provide environment for this script
+    }
 
     echo "<pre>\n";
 
@@ -133,7 +135,10 @@
 
     echo "Cron script completed correctly\n";
 
-    unset($USER);
+    if (!$alreadyadmin) {
+        $SESSION = NULL;
+        $USER = NULL;
+    }
 
     $difftime = microtime_diff($starttime, microtime());
     echo "Execution took ".$difftime." seconds\n"; 

diff --git a/admin/index.php b/admin/index.php
index fdee2a5980d85b3ffe65f73ea87db6457db739e7..cd9f97eb42f9e49eb91c98384b257c9e1697bddd 100644 (file)
--- a/admin/index.php
+++ b/admin/index.php
@@ -346,6 +346,8 @@
     }
 
 /// Check for valid admin user
+    require_login();
+
     if (!isadmin()) {
         error("You need to be an admin user to use this page.", "$CFG->wwwroot/login/index.php");
     }