From acdd790f7495b33525596ce2a8e35b824a419c24 Mon Sep 17 00:00:00 2001
From: skodak <skodak>
Date: Mon, 15 Jan 2007 19:16:29 +0000
Subject: [PATCH] print_footer('none') during install and upgrade to hide home
 link and xhtml strict fixes

---
 admin/index.php      | 2 ++
 backup/lib.php       | 3 ++-
 group/db/upgrade.php | 4 ++--
 lib/adminlib.php     | 8 ++++----
 lib/blocklib.php     | 6 +++---
 lib/locallib.php     | 1 +
 6 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/admin/index.php b/admin/index.php
index 52a8953dde..1bc4d35056 100644
--- a/admin/index.php
+++ b/admin/index.php
@@ -190,6 +190,7 @@
             error("Error: Main databases NOT set up successfully");
         }
         print_continue('index.php');
+        print_footer('none');
         die;
     }
 
@@ -287,6 +288,7 @@
                         remove_dir($CFG->dataroot . '/cache', true); // flush cache
                         notify($strdatabasesuccess, "green");
                         print_continue("upgradesettings.php");
+                        print_footer('none');
                         exit;
                     } else {
                         notify("Upgrade failed!  (Could not update version in config table)");
diff --git a/backup/lib.php b/backup/lib.php
index d731e803f1..402e7ce6e7 100644
--- a/backup/lib.php
+++ b/backup/lib.php
@@ -351,7 +351,7 @@
                     notify(get_string("databasesuccess"), "green");
                     notify(get_string("databaseupgradebackups", "", $backup_version), "green");
                     print_continue($continueto);
-                    print_footer();
+                    print_footer('none');
                     exit;
                 } else {
                     error("Upgrade of backup system failed! (Could not update version in config table)");
@@ -412,6 +412,7 @@
                     notify(get_string("databasesuccess"), "green");
                     notify(get_string("databaseupgradebackups", "", $backup_version), "green");
                     print_continue($continueto);
+                    print_footer('none');
                     exit;
                 } else {
                     error("Upgrade of backup system failed! (Could not update version in config table)");
diff --git a/group/db/upgrade.php b/group/db/upgrade.php
index 5c15d8e1e7..45e3b60fcb 100644
--- a/group/db/upgrade.php
+++ b/group/db/upgrade.php
@@ -69,7 +69,7 @@ function upgrade_group_db($continueto) {
             notify(get_string('databasesuccess'), 'green');
             notify(get_string('databaseupgradegroups', '', $group_version), 'green');
             print_continue($continueto);
-            print_footer();
+            print_footer('none');
             exit;
         } else {
             error("Upgrade of group system failed! (Could not update version in config table)");
@@ -127,7 +127,7 @@ function upgrade_group_db($continueto) {
                 notify(get_string('databasesuccess'), 'green');
                 notify(get_string('databaseupgradegroups', '', $group_version), 'green');
                 print_continue($continueto);
-                print_footer();
+                print_footer('none');
                 exit;
             } else {
                 error("Upgrade of group system failed! (Could not update version in config table)");
diff --git a/lib/adminlib.php b/lib/adminlib.php
index 767f7e04d3..5466009c73 100644
--- a/lib/adminlib.php
+++ b/lib/adminlib.php
@@ -57,6 +57,7 @@ function upgrade_plugins($type, $dir, $return) {
 
         if (!empty($plugin->requires)) {
             if ($plugin->requires > $CFG->version) {
+                $info = new object();
                 $info->pluginname = $plug;
                 $info->pluginversion  = $plugin->version;
                 $info->currentmoodle = $CFG->version;
@@ -69,7 +70,6 @@ function upgrade_plugins($type, $dir, $return) {
                 upgrade_log_start();
                 notify(get_string('pluginrequirementsnotmet', 'error', $info));
                 $updated_plugins = true;
-                unset($info);
                 continue;
             }
         }
@@ -169,7 +169,7 @@ function upgrade_plugins($type, $dir, $return) {
 
     if ($updated_plugins) {
         print_continue($return);
-        print_footer();
+        print_footer('none');
         die;
     }
 }
@@ -227,6 +227,7 @@ function upgrade_activity_modules($return) {
 
         if (!empty($module->requires)) {
             if ($module->requires > $CFG->version) {
+                $info = new object();
                 $info->modulename = $mod;
                 $info->moduleversion  = $module->version;
                 $info->currentmoodle = $CFG->version;
@@ -239,7 +240,6 @@ function upgrade_activity_modules($return) {
                 upgrade_log_start();
                 notify(get_string('modulerequirementsnotmet', 'error', $info));
                 $updated_modules = true;
-                unset($info);
                 continue;
             }
         }
@@ -382,7 +382,7 @@ function upgrade_activity_modules($return) {
 
     if ($updated_modules) {
         print_continue($return);
-        print_footer();
+        print_footer('none');
         die;
     }
 }
diff --git a/lib/blocklib.php b/lib/blocklib.php
index 6231350035..ea05f0a634 100644
--- a/lib/blocklib.php
+++ b/lib/blocklib.php
@@ -1039,7 +1039,7 @@ function upgrade_blocks_db($continueto) {
                 notify(get_string('databasesuccess'), 'notifysuccess');
                 notify(get_string('databaseupgradeblocks', '', $blocks_version), 'notifysuccess');
                 print_continue($continueto);
-                print_footer();
+                print_footer('none');
                 exit;
             } else {
                 error('Upgrade of blocks system failed! (Could not update version in config table)');
@@ -1100,7 +1100,7 @@ function upgrade_blocks_db($continueto) {
                 notify(get_string('databasesuccess'), 'notifysuccess');
                 notify(get_string('databaseupgradeblocks', '', $blocks_version), 'notifysuccess');
                 print_continue($continueto);
-                print_footer();
+                print_footer('none');
                 exit;
             } else {
                 error('Upgrade of blocks system failed! (Could not update version in config table)');
@@ -1375,7 +1375,7 @@ function upgrade_blocks_plugins($continueto) {
 
     if (!empty($updated_blocks)) {
         print_continue($continueto);
-        print_footer();
+        print_footer('none');
         die;
     }
 }
diff --git a/lib/locallib.php b/lib/locallib.php
index b86b541194..fafd993de4 100644
--- a/lib/locallib.php
+++ b/lib/locallib.php
@@ -103,6 +103,7 @@ function upgrade_local_db($continueto) {
                 notify(get_string('databasesuccess'), 'notifysuccess');
                 notify(get_string('databaseupgradelocal', '', $local_version));
                 print_continue($continueto);
+                print_footer('none');
                 exit;
             } else {
                 error('Upgrade of local database customisations failed! (Could not update version in config table)');
-- 
2.39.5