From 286871d62c9ca53690e81df86e1dbfc3c43dfe32 Mon Sep 17 00:00:00 2001 From: Dries Buytaert Date: Sat, 7 Dec 2002 11:24:16 +0000 Subject: - Some changes to the update.php script: revised the instructions a bit, added some logic and a link to "upgrade 4.0.x to 4.1.x", etc. --- update.php | 64 +++++++++++++++++++++++++++++++------------------------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/update.php b/update.php index ef2856578..03761877a 100644 --- a/update.php +++ b/update.php @@ -704,7 +704,7 @@ function update_page() { switch ($op) { case "Update": // make sure we have updates to run. - print "

Drupal update

"; + print "

Drupal database update

"; print "» home
\n"; print "» administer
\n"; if ($edit["start"] == -1) { @@ -731,6 +731,9 @@ function update_page() { print "\n"; print ""; break; + case "upgrade4": + variable_set("update_start", "2002-05-15"); + // fall through: default: $start = variable_get("update_start", 0); $dates[] = "All"; @@ -747,7 +750,7 @@ function update_page() { $form .= form_select("Perform updates since", "start", (isset($selected) ? $selected : -1), $dates); $form .= form_select("Stop on errors", "bail", 0, array("Disabled", "Enabled"), "Don't forget to backup your database before performing an update."); $form .= form_submit("Update"); - print "

Drupal update

"; + print "

Drupal database update

"; print form($form); print ""; break; @@ -755,47 +758,44 @@ function update_page() { } function update_info() { - print "

Drupal update

"; - print "

Instructions

\n"; + + print "

Drupal database update

"; print "
    \n"; - print "

  1. Before doing anything backup your database. This process will change your database and its values, and some things might get lost.

    2. \n"; - print "

  2. Don't run this script twice as it will cause some serious problems!

    3. \n"; - print "
  3. Before doing anything else these queries have to be run manually:
    \n"; + print "
  4. Use this script to upgrade an existing Drupal installation. You don't need this script when installing Drupal from scratch.
    5. "; + print "
  5. Before doing anything backup your database. This process will change your database and its values, and some things might get lost.
    6. \n"; + print "
  6. Don't run this script twice as it will cause problems.

    7. \n"; + print "
  7. "; + print "Click the proper link below:
    "; + print "

    » Upgrade 4.0.x to 4.1.x

    \n"; + print "

    » Upgrade to CVS

    \n"; + print "

    » Upgrade 3.0.x to 4.0.0 (Warning: clicking this link will update your database without confirmation.)

    \n"; + print "

    If you are upgrading from Drupal 3.0.x, you'll want to run these queries manually before doing anything else:

    \n"; print "
    \n";
-  print "ALTER TABLE watchdog CHANGE user uid int(10) DEFAULT '0' NOT NULL;\n";
-  print "ALTER TABLE watchdog CHANGE id wid int(5) DEFAULT '0' NOT NULL auto_increment;\n";
-  print "ALTER TABLE users ADD sid varchar(32) DEFAULT '' NOT NULL;\n";
-  print "ALTER TABLE users ADD session TEXT;\n";
-  print "ALTER TABLE users CHANGE last_host hostname varchar(128) DEFAULT '' NOT NULL;\n";
-  print "ALTER TABLE users CHANGE last_access timestamp int(11) DEFAULT '0' NOT NULL;\n";
-  print "CREATE TABLE system (filename varchar(255) NOT NULL default '', name varchar(255) NOT NULL default '', type varchar(255) NOT NULL default '', description varchar(255) NOT NULL default '', status int(2) NOT NULL default '0', PRIMARY KEY (filename));\n";
-  print "CREATE TABLE permission (rid INT UNSIGNED NOT NULL, perm TEXT, tid INT UNSIGNED NOT NULL, KEY (rid));\n";
-  print "INSERT INTO permission (rid, perm) SELECT rid, perm FROM role;\n";
-  print "ALTER TABLE users ADD rid INT UNSIGNED NOT NULL;\n";
-  print "
    8. \n"; - print "

  8. You might have to by-pass the access check near the bottom of the file called update.php such that you can gain access to the updates: search for user_access().

    9. "; - print "

  9. "; - print "Choose one of the links below to either upgrade from Drupal 3.x or update from a CVS checkout.
    "; - print "» upgrading will by default enable the standard Drupal themes and modules as well as setting some default values.
    "; - print "» updating will require modules and themes enabled manually under Administer | Site configuration | modules.
    "; - print "

    » Upgrade 3.x to 4.0.0

    \n"; - print "

    » Update CVS database

    \n"; - print "

    Once you are done remove or disable access to update.php so nobody else can tamper with the database.

    \n"; - print "

    10. "; - print "

  10. Go through the various administration pages to change the existing and new settings to your liking.

    11. \n"; - print "

  11. Thanks for using Drupal!

    12. \n"; + print " ALTER TABLE watchdog CHANGE user uid int(10) DEFAULT '0' NOT NULL;\n"; + print " ALTER TABLE watchdog CHANGE id wid int(5) DEFAULT '0' NOT NULL auto_increment;\n"; + print " ALTER TABLE users ADD sid varchar(32) DEFAULT '' NOT NULL;\n"; + print " ALTER TABLE users ADD session TEXT;\n"; + print " ALTER TABLE users CHANGE last_host hostname varchar(128) DEFAULT '' NOT NULL;\n"; + print " ALTER TABLE users CHANGE last_access timestamp int(11) DEFAULT '0' NOT NULL;\n"; + print " CREATE TABLE system (filename varchar(255) NOT NULL default '', name varchar(255) NOT NULL default '', type varchar(255) NOT NULL default '', description varchar(255) NOT NULL default '', status int(2) NOT NULL default '0', PRIMARY KEY (filename));\n"; + print " CREATE TABLE permission (rid INT UNSIGNED NOT NULL, perm TEXT, tid INT UNSIGNED NOT NULL, KEY (rid));\n"; + print " INSERT INTO permission (rid, perm) SELECT rid, perm FROM role;\n"; + print " ALTER TABLE users ADD rid INT UNSIGNED NOT NULL;\n"; + print "\n"; + print ""; + print "
  12. Go through the various administration pages to change the existing and new settings to your liking.
    13. \n"; print "
"; print ""; } if ($op) { include_once "includes/common.inc"; - // Security check: - if (user_access(NULL) || variable_get("update_start", 0) == 0) { + // Access check: + if ($user->uid == 1) { update_page(); } else { - print message_access(); + print "Access denied. You are not authorized to access to this page. Please log in as the user with user ID #1 or edit update.php to by-pass this access check; search for \$user->uid == 1 near the bottom of the file."; } } else { -- cgit v1.2.3