* Reordered wiki table handling and __TOC__ extraction in the parser to better handle...

[lhc/web/wiklou.git] / maintenance / update.php

diff --git a/maintenance/update.php b/maintenance/update.php
index 9064780..8643aa7 100644 (file)
--- a/maintenance/update.php
+++ b/maintenance/update.php
@@ -1,4 +1,5 @@
 <?php
+require_once 'counter.php';
 /**
  * Run all updaters.
  *
@@ -13,10 +14,36 @@ $options = array( 'quick' );
 require_once( "commandLine.inc" );
 require_once( "updaters.inc" );
 $wgTitle = Title::newFromText( "MediaWiki database updater" );
-$dbclass = 'Database'.ucfirst($wgDBtype);
+$dbclass = 'Database' . ucfirst( $wgDBtype ) ;
 require_once("$dbclass.php");
 $dbc = new $dbclass;
-$wgDatabase = $dbc->newFromParams( $wgDBserver, $wgDBadminuser, $wgDBadminpassword, $wgDBname );
+
+echo( "MediaWiki {$wgVersion} Updater\n\n" );
+
+# Do a pre-emptive check to ensure we've got credentials supplied
+# We can't, at this stage, check them, but we can detect their absence,
+# which seems to cause most of the problems people whinge about
+if( !isset( $wgDBadminuser ) || !isset( $wgDBadminpassword ) ) {
+       echo( "No superuser credentials could be found. Please provide the details\n" );
+       echo( "of a user with appropriate permissions to update the database. See\n" );
+       echo( "AdminSettings.sample for more details.\n\n" );
+       exit();
+}
+
+# Attempt to connect to the database as a privileged user
+# This will vomit up an error if there are permissions problems
+$wgDatabase = $dbc->newFromParams( $wgDBserver, $wgDBadminuser, $wgDBadminpassword, $wgDBname, 1 );
+
+if( !$wgDatabase->isOpen() ) {
+       # Appears to have failed
+       echo( "A connection to the database could not be established. Check the\n" );
+       # Let's be a bit clever and guess at what's wrong
+       if( isset( $wgDBadminuser ) && isset( $wgDBadminpassword ) ) {
+               # Tell the user the value(s) are wrong
+               echo( 'values of $wgDBadminuser and $wgDBadminpassword.' . "\n" );
+       }
+       exit();
+}
 
 print "Going to run database updates for $wgDBname\n";
 print "Depending on the size of your database this may take a while!\n";
@@ -24,14 +51,20 @@ print "Depending on the size of your database this may take a while!\n";
 if( !isset( $options['quick'] ) ) {
        print "Abort with control-c in the next five seconds... ";
 
-       for ($i = 5; $i >= 0; --$i) {
-               echo $i;
+       for ($i = 6; $i >= 1;) {
+               print_c($i, --$i);
                sleep(1);
-               echo( ($i == 0) ? "\n" : chr(8) );
        }
+       echo "\n";
+}
+
+if ( isset( $options['doshared'] ) ) {
+       $doShared = true;
+} else {
+       $doShared = false;
 }
 
-do_all_updates();
+do_all_updates( $doShared );
 
 print "Done.\n";