Merging $CFG->disablestatsprocessing from stable

diff --git a/admin/configvars.php b/admin/configvars.php
index c3188444cdace843c720b0899be5403f5c286357..b7fb49fcbe72162f4c65b1849863012c5c399982 100644 (file)
--- a/admin/configvars.php
+++ b/admin/configvars.php
@@ -594,6 +594,7 @@ class configvarrss extends configvar {
     }
     
 /// enable stats
+if (empty($CFG->disablestatsprocessing)) {
     $stats['enablestats'] = new configvar (get_string('configenablestats','admin'),
         choose_from_menu($noyesoptions, 'enablestats', $config->enablestats, '', '', '', true) );
 
@@ -639,7 +640,7 @@ class configvarrss extends configvar {
 
     $stats['statsuserthreshold'] = new configvar (get_string('configstatsuserthreshold','admin'),
       '<input type="text" name="statsuserthreshold" size="4" value="'.$config->statsuserthreshold.'" />');
-                                              
+}                                        
 
 ////////////////////////////////////////////////////////////////////
 
@@ -652,6 +653,8 @@ class configvarrss extends configvar {
     $configvars['permissions']     = $permissions;
     $configvars['requestedcourse'] = $reqcourse;
     $configvars['misc']            = $misc;
+if (empty($CFG->disablestatsprocessing)) {
     $configvars['stats']           = $stats;
+}
 
 ?>

diff --git a/admin/cron.php b/admin/cron.php
index 821c069313fc1f3d27d644b03c075b7062df93fe..9840e7969c7eb60e715bbeb324bfc453d411d96d 100644 (file)
--- a/admin/cron.php
+++ b/admin/cron.php
@@ -274,7 +274,7 @@
         unset($enrol);
     }
 
-    if (!empty($CFG->enablestats)) {
+    if (!empty($CFG->enablestats) and empty($CFG->disablestatsprocessing)) {
 
         // check we're not before our runtime
         $timetocheck = strtotime("$CFG->statsruntimestarthour:$CFG->statsruntimestartminute today");

diff --git a/config-dist.php b/config-dist.php
index 10a9f848770e9ac985678ccb72924aa4a706258f..155273689264b84818f3063a3b64045f281c9c01 100644 (file)
--- a/config-dist.php
+++ b/config-dist.php
@@ -139,6 +139,9 @@ $CFG->admin = 'admin';
 // Useful for webhost operators who have alternate methods of backups
 //      $CFG->disablescheduledbackups = true;
 //
+// Prevent stats processing and hide the GUI
+//      $CFG->disablestatsprocessing = true;
+//
 // Set global password for "Login as", teacher is prompted only once in each session.
 // Set your own password and tell it only to teachers that should have access to this feature.
 //      $CFG->loginaspassword = 'yoursharedpassword';