MDL-17427 - removed old file based logging from ugprade - going to add new upgrade...

diff --git a/admin/cliupgrade.php b/admin/cliupgrade.php
index 85ed390e221932f1a05a385da878351399fadf19..3f63c10e94b066ecb9fc5ed429f466fd542cd928 100644 (file)
--- a/admin/cliupgrade.php
+++ b/admin/cliupgrade.php
@@ -966,12 +966,9 @@ if ( file_exists(dirname(dirname(__FILE__)) . '/config.php')) {
                 console_write_error('Main Upgrade failed!  See lib/db/upgrade.php','',false);
 
             }
-            upgrade_log_finish();
 
         } else if ($version < $CFG->version) {
-            upgrade_log_start();
             notify("WARNING!!!  The code you are using is OLDER than the version that made these databases!");
-            upgrade_log_finish();
         }
     } else {
         if (!set_config("version", $version)) {

diff --git a/index.php b/index.php
index 2e6c363fbd9463984081ae3f2baa25b3ae5e7d37..f6449e0643ee7a50d70c58499bf8e068dceed7f0 100644 (file)
--- a/index.php
+++ b/index.php
@@ -68,7 +68,7 @@
         user_accesstime_log();
     }
 
-    if ($CFG->rolesactive) { // if already using roles system
+    if (!empty($CFG->rolesactive)) { // if already using roles system
         if (has_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM))) {
             if (moodle_needs_upgrading()) {
                 redirect($CFG->wwwroot .'/'. $CFG->admin .'/index.php');
@@ -79,7 +79,7 @@
             }
         }
     } else { // if upgrading from 1.6 or below
-        if (is_siteadmin() && moodle_needs_upgrading()) {
+        if (is_siteadmin($USER->id) && moodle_needs_upgrading()) {
             redirect($CFG->wwwroot .'/'. $CFG->admin .'/index.php');
         }
     }

diff --git a/lib/adminlib.php b/lib/adminlib.php
index eced21fd2d9f7f983fd9253e41bb52031ab2a665..f86a7d92133d9a5e41933a350fe0d4328eb421a4 100644 (file)
--- a/lib/adminlib.php
+++ b/lib/adminlib.php
@@ -14,11 +14,6 @@ require_once($CFG->libdir.'/ddllib.php');
 require_once($CFG->libdir.'/xmlize.php');
 require_once($CFG->libdir.'/messagelib.php');      // Messagelib functions
 
-global $upgradeloghandle, $upgradelogbuffer;
-
-$upgradeloghandle = false;
-$upgradelogbuffer = '';
-
 define('INSECURE_DATAROOT_WARNING', 1);
 define('INSECURE_DATAROOT_ERROR', 2);
 
@@ -116,7 +111,6 @@ function upgrade_db($version, $release) {
     /// return to original debugging level
         $CFG->debug = $origdebug;
         error_reporting($CFG->debug);
-        upgrade_log_start();
         $DB->set_debug(true);
 
         if (!$DB->setup_is_unicodedb()) {
@@ -127,6 +121,7 @@ function upgrade_db($version, $release) {
         }
 
         $DB->get_manager()->install_from_xmldb_file("$CFG->libdir/db/install.xml");
+        upgrade_log_start(); // move here because we want the flag to be stored in config table ;-)
 
     /// set all core default records and default settings
         require_once("$CFG->libdir/db/install.php");
@@ -310,12 +305,9 @@ function upgrade_db($version, $release) {
                 print_footer('none');
                 die;
             }
-            upgrade_log_finish();
         }
     } else if ($version < $CFG->version) {
-        upgrade_log_start();
         notify("WARNING!!!  The code you are using is OLDER than the version that made these databases!");
-        upgrade_log_finish();
     }
 
 /// Updated human-readable release version if necessary
@@ -837,13 +829,10 @@ function upgrade_plugins($type, $dir) {
                 echo '<hr />';
             }
         } else {
-            upgrade_log_start();
             print_error('cannotdowngrade', 'debug', '', (object)array('oldversion'=>$installedversion, 'newversion'=>$plugin->version));
         }
     }
 
-    upgrade_log_finish();
-
     return $updated_plugins;
 }
 
@@ -972,7 +961,6 @@ function upgrade_activity_modules() {
                 $updated_modules = true;
 
             } else {
-                upgrade_log_start();
                 print_error('cannotdowngrade', 'debug', '', (object)array('oldversion'=>$currmodule->version, 'newversion'=>$module->version));
             }
 
@@ -1065,8 +1053,6 @@ function upgrade_activity_modules() {
         }
     }
 
-    upgrade_log_finish(); // finish logging if started
-
     return $updated_modules;
 }
 
@@ -1246,7 +1232,7 @@ function create_admin_user($user_input=NULL) {
  * Marks start of upgrade, blocks any other access to site.
  * The upgrade is finished at the end of script or after timeout.
  */
-function start_upgrade() {
+function upgrade_log_start() {
     global $CFG, $DB;
 
     static $started = false;
@@ -1257,89 +1243,26 @@ function start_upgrade() {
     } else {
         ignore_user_abort(true);
         register_shutdown_function('upgrade_finished_handler');
-        if ($CFG->version === '' || !$DB->get_manager()->table_exists(new xmldb_table('config'))) {
-            // db not installed yet
-            $CFG->upgraderunning = time()+300;
-        } else {
-            set_config('upgraderunning', time()+300);
-        }
+        set_config('upgraderunning', time()+300);
         $started = true;
     }
 }
 
 /**
- * Internal function - executed at the very end of each upgrade.
+ * Internal function - executed if upgrade interruped.
  */
 function upgrade_finished_handler() {
     upgrade_log_finish();
-    unset_config('upgraderunning');
-    ignore_user_abort(false);
 }
 
 /**
- * Start logging of output into file (if not disabled) and
- * prevent aborting and concurrent execution of upgrade script.
- *
- * Please note that you can not write into session variables after calling this function!
- *
- * This function may be called repeatedly.
- */
-function upgrade_log_start() {
-    global $upgradeloghandle;
-
-    start_upgrade(); // make sure the upgrade is started
-
-    if ($upgradeloghandle and ($upgradeloghandle !== 'error')) {
-        return;
-    }
-
-    make_upload_directory('upgradelogs');
-    ob_start('upgrade_log_callback', 2); // function for logging to disk; flush each line of text ASAP
-}
-
-/**
- * Terminate logging of output, flush all data.
- *
- * Please make sure that each upgrade_log_start() is properly terminated by
- * this function or print_error().
+ * Indicates upgrade is finished.
  *
  * This function may be called repeatedly.
  */
 function upgrade_log_finish() {
-    global $CFG, $upgradeloghandle, $upgradelogbuffer;
-
-    @ob_end_flush();
-    if ($upgradelogbuffer !== '') {
-        @fwrite($upgradeloghandle, $upgradelogbuffer);
-        $upgradelogbuffer = '';
-    }
-    if ($upgradeloghandle and ($upgradeloghandle !== 'error')) {
-        @fclose($upgradeloghandle);
-        $upgradeloghandle = false;
-    }
-}
-
-/**
- * Callback function for logging into files. Not more than one file is created per minute,
- * upgrade session (terminated by upgrade_log_finish()) is always stored in one file.
- *
- * This function must not output any characters or throw warnigns and errors!
- */
-function upgrade_log_callback($string) {
-    global $CFG, $upgradeloghandle, $upgradelogbuffer;
-
-    if (empty($CFG->disableupgradelogging) and ($string != '') and ($upgradeloghandle !== 'error')) {
-        if ($upgradeloghandle or ($upgradeloghandle = @fopen($CFG->dataroot.'/upgradelogs/upg_'.date('Ymd-Hi').'.html', 'a'))) {
-            $upgradelogbuffer .= $string;
-            if (strlen($upgradelogbuffer) > 2048) { // 2kB write buffer
-                @fwrite($upgradeloghandle, $upgradelogbuffer);
-                $upgradelogbuffer = '';
-            }
-        } else {
-            $upgradeloghandle = 'error';
-        }
-    }
-    return $string;
+    unset_config('upgraderunning');
+    ignore_user_abort(false);
 }
 
 /**

diff --git a/lib/blocklib.php b/lib/blocklib.php
index d7efa6263e17d99a22fc5de78aeeb4d2c60b9235..66b030910ba92ba697140a457b7366cc41d39f9b 100644 (file)
--- a/lib/blocklib.php
+++ b/lib/blocklib.php
@@ -1226,7 +1226,6 @@ function upgrade_blocks_plugins() {
                 echo '<hr />';
                 }
             } else {
-                upgrade_log_start();
                 print_error('cannotdowngrade', 'debug', '', (object)array('oldversion'=>$currblock->version, 'newversion'=>$block->version));
             }
 
@@ -1297,7 +1296,6 @@ function upgrade_blocks_plugins() {
     }
 
     if(!empty($notices)) {
-        upgrade_log_start();
         foreach($notices as $notice) {
             notify($notice);
         }
@@ -1306,8 +1304,6 @@ function upgrade_blocks_plugins() {
     // Finally, if we are in the first_install of BLOCKS setup frontpage and admin page blocks
     if ($first_install) {
         require_once($CFG->dirroot.'/'.$CFG->admin.'/pagelib.php');
-
-        upgrade_log_start();
         //Iterate over each course - there should be only site course here now
         if ($courses = $DB->get_records('course')) {
             foreach ($courses as $course) {
@@ -1321,8 +1317,6 @@ function upgrade_blocks_plugins() {
         blocks_repopulate_page($page);
     }
 
-    upgrade_log_finish();
-
     return $updated_blocks;
 }
 

diff --git a/lib/locallib.php b/lib/locallib.php
index 34ca6cea3874e7ad4a05ab5ae0c0acd1fde62477..6b67e2c8c48df012d01c0bd30aeac75e6fbcc6bf 100644 (file)
--- a/lib/locallib.php
+++ b/lib/locallib.php
@@ -172,7 +172,6 @@ function upgrade_local_db($continueto) {
         }
 
     } else if ($local_version < $CFG->local_version) {
-        upgrade_log_start();
         notify('WARNING!!!  The local version you are using is OLDER than the version that made these databases!');
     }
 
@@ -180,8 +179,6 @@ function upgrade_local_db($continueto) {
     if (!update_capabilities('local')) {
         print_error('cannotsetupcapformod', 'error', '', 'local');
     }
-
-    upgrade_log_finish();
 }
 
 /**