<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr">
<head>
<meta http-equiv="Content-type" content="text/html; charset=utf-8" />
- <title>MediaWiki <?php echo( $wgVersion ); ?> Installation</title>
+ <meta name="robots" content="noindex,nofollow"/>
+ <title>MediaWiki <?php echo htmlspecialchars( $wgVersion ); ?> Installation</title>
<style type="text/css">
@import "../skins/monobook/main.css";
<div id="content">
<div id="bodyContent">
-<h1>MediaWiki <?php print $wgVersion ?> Installation</h1>
+<h1>MediaWiki <?php print htmlspecialchars( $wgVersion ) ?> Installation</h1>
<?php
$mainListOpened = false; # Is the main list (environement checking) opend ? Used by dieout
install_version_checks();
$self = 'Installer'; # Maintenance script name, to please Setup.php
-print "<li>PHP " . phpversion() . " installed</li>\n";
+print "<li>PHP " . htmlspecialchars( phpversion() ) . " installed</li>\n";
error_reporting( 0 );
$phpdatabases = array();
$conf->safeMode = false;
}
-$sapi = php_sapi_name();
+$sapi = htmlspecialchars( php_sapi_name() );
print "<li>PHP server API is $sapi; ";
$script = defined('MW_INSTALL_PHP5_EXT') ? 'index.php5' : 'index.php';
if( $wgUsePathInfo ) {
: $_SERVER["SERVER_ADMIN"];
$conf->EmergencyContact = importPost( "EmergencyContact", $defaultEmail );
$conf->DBtype = importPost( "DBtype", $DefaultDBtype );
+ if ( !isset( $ourdb[$conf->DBtype] ) ) {
+ $conf->DBtype = $DefaultDBtype;
+ }
$conf->DBserver = importPost( "DBserver", "localhost" );
$conf->DBname = importPost( "DBname", "wikidb" );
}
if( !preg_match( '/^[A-Za-z_0-9]*$/', $conf->DBprefix ) ) {
$errs["DBprefix"] = "Invalid table prefix";
+} else {
+ untaint( $conf->DBprefix, TC_MYSQL );
}
error_reporting( E_ALL );
/* Test memcached servers */
if ( $conf->Shm == 'memcached' && $conf->MCServers ) {
- $conf->MCServerArray = array_map( 'trim', explode( ',', $conf->MCServers ) );
+ $conf->MCServerArray = wfArrayMap( 'trim', explode( ',', $conf->MCServers ) );
foreach ( $conf->MCServerArray as $server ) {
$error = testMemcachedServer( $server );
if ( $error ) {
$errs["DBtype"] = "Unknown database type '$conf->DBtype'";
continue;
}
- print "<li>Database type: {$conf->DBtypename}</li>\n";
+ print "<li>Database type: " . htmlspecialchars( $conf->DBtypename ) . "</li>\n";
$dbclass = 'Database'.ucfirst($conf->DBtype);
$wgDBtype = $conf->DBtype;
$wgDBadminuser = "root";
$wgTitle = Title::newFromText( "Installation script" );
error_reporting( E_ALL );
- print "<li>Loading class: $dbclass</li>\n";
+ print "<li>Loading class: " . htmlspecialchars( $dbclass ) . "</li>\n";
$dbc = new $dbclass;
if( $conf->DBtype == 'mysql' ) {
}
# Attempt to connect
- echo( "<li>Attempting to connect to database server as $db_user..." );
+ echo( "<li>Attempting to connect to database server as " . htmlspecialchars( $db_user ) . "..." );
$wgDatabase = Database::newFromParams( $wgDBserver, $db_user, $db_pass, '', 1 );
# Check the connection and respond to errors
case 2003:
default:
# General connection problem
- echo( "failed with error [$errno] $errtx.</li>\n" );
+ echo( htmlspecialchars( "failed with error [$errno] $errtx." ) . "</li>\n" );
$errs["DBserver"] = "Connection failed";
break;
} # switch
$db_pass = $wgDBpassword;
}
- echo( "<li>Attempting to connect to database \"$wgDBname\" as \"$db_user\"..." );
+ echo( "<li>Attempting to connect to database \"" . htmlspecialchars( $wgDBname ) .
+ "\" as \"" . htmlspecialchars( $db_user ) . "\"..." );
$wgDatabase = $dbc->newFromParams($wgDBserver, $db_user, $db_pass, $wgDBname, 1);
if (!$wgDatabase->isOpen()) {
- print " error: " . $wgDatabase->lastError() . "</li>\n";
+ print " error: " . htmlspecialchars( $wgDatabase->lastError() ) . "</li>\n";
} else {
$myver = $wgDatabase->getServerVersion();
}
// Changed !mysql to postgres check since it seems to only apply to postgres
if( $useRoot && $conf->DBtype == 'postgres' ) {
$wgDBsuperuser = $conf->RootUser;
- echo( "<li>Attempting to connect to database \"postgres\" as superuser \"$wgDBsuperuser\"..." );
+ echo( "<li>Attempting to connect to database \"postgres\" as superuser \"" .
+ htmlspecialchars( $wgDBsuperuser ) . "\"..." );
$wgDatabase = $dbc->newFromParams($wgDBserver, $wgDBsuperuser, $conf->RootPW, "postgres", 1);
if (!$wgDatabase->isOpen()) {
- print " error: " . $wgDatabase->lastError() . "</li>\n";
+ print " error: " . htmlspecialchars( $wgDatabase->lastError() ) . "</li>\n";
$errs["DBserver"] = "Could not connect to database as superuser";
$errs["RootUser"] = "Check username";
$errs["RootPW"] = "and password";
}
$wgDatabase->initial_setup($conf->RootPW, 'postgres');
}
- echo( "<li>Attempting to connect to database \"$wgDBname\" as \"$wgDBuser\"..." );
+ echo( "<li>Attempting to connect to database \"" . htmlspecialchars( $wgDBname ) .
+ "\" as \"" . htmlspecialchars( $wgDBuser ) . "\"..." );
$wgDatabase = $dbc->newFromParams($wgDBserver, $wgDBuser, $wgDBpassword, $wgDBname, 1);
if (!$wgDatabase->isOpen()) {
- print " error: " . $wgDatabase->lastError() . "</li>\n";
+ print " error: " . htmlspecialchars( $wgDatabase->lastError() ) . "</li>\n";
} else {
$myver = $wgDatabase->getServerVersion();
}
continue;
}
- print "<li>Connected to {$conf->DBtype} $myver";
+ print "<li>Connected to " . htmlspecialchars( "{$conf->DBtype} $myver" );
if ($conf->DBtype == 'mysql') {
if( version_compare( $myver, "4.0.14" ) < 0 ) {
print "</li>\n";
}
}
if ( $existingSchema && $existingSchema != $conf->DBschema ) {
- print "<li><strong>Warning:</strong> you requested the {$conf->DBschema} schema, " .
- "but the existing database has the $existingSchema schema. This upgrade script ".
- "can't convert it, so it will remain $existingSchema.</li>\n";
+ $encExisting = htmlspecialchars( $existingSchema );
+ $encRequested = htmlspecialchars( $conf->DBschema );
+ print "<li><strong>Warning:</strong> you requested the $encRequested schema, " .
+ "but the existing database has the $encExisting schema. This upgrade script ".
+ "can't convert it, so it will remain $encExisting.</li>\n";
$conf->setSchema( $existingSchema, $conf->DBengine );
}
if ( $existingEngine && $existingEngine != $conf->DBengine ) {
- print "<li><strong>Warning:</strong> you requested the {$conf->DBengine} storage " .
- "engine, but the existing database uses the $existingEngine engine. This upgrade " .
- "script can't convert it, so it will remain $existingEngine.</li>\n";
+ $encExisting = htmlspecialchars( $existingEngine );
+ $encRequested = htmlspecialchars( $conf->DBengine );
+ print "<li><strong>Warning:</strong> you requested the $encRequested storage " .
+ "engine, but the existing database uses the $encExisting engine. This upgrade " .
+ "script can't convert it, so it will remain $encExisting.</li>\n";
$conf->setSchema( $conf->DBschema, $existingEngine );
}
}
}
$wgDatabase->freeResult( $res );
if ( !$found && $conf->DBengine != 'MyISAM' ) {
- echo "<li><strong>Warning:</strong> {$conf->DBengine} storage engine not available, " .
+ echo "<li><strong>Warning:</strong> " . htmlspecialchars( $conf->DBengine ) .
+ " storage engine not available, " .
"using MyISAM instead</li>\n";
$conf->setSchema( $conf->DBschema, 'MyISAM' );
}
if( $wgDatabase2->isOpen() ) {
# Nope, just close the test connection and continue
$wgDatabase2->close();
- echo( "<li>User $wgDBuser exists. Skipping grants.</li>\n" );
+ echo( "<li>User " . htmlspecialchars( $wgDBuser ) . " exists. Skipping grants.</li>\n" );
} else {
# Yes, so run the grants
- echo( "<li>Granting user permissions to $wgDBuser on $wgDBname..." );
+ echo( "<li>" . htmlspecialchars( "Granting user permissions to $wgDBuser on $wgDBname..." ) );
dbsource( "../maintenance/users.sql", $wgDatabase );
echo( "success.</li>\n" );
}
$list = getLanguageList();
foreach( $list as $code => $name ) {
$sel = ($code == $conf->LanguageCode) ? 'selected="selected"' : '';
- echo "\n\t\t<option value=\"$code\" $sel>$name</option>";
+ $encCode = htmlspecialchars( $code );
+ $encName = htmlspecialchars( $name );
+ echo "\n\t\t<option value=\"$encCode\" $sel>$encName</option>";
}
echo "\n";
?>
<div class="config-section">
<div class="config-input">
<label class='column'>Database type:</label>
-<?php if (isset($errs['DBpicktype'])) print "\t<span class='error'>$errs[DBpicktype]</span>\n"; ?>
+<?php
+ if (isset($errs['DBpicktype'])) {
+ print "\t<span class='error'>" . htmlspecialchars( $errs[DBpicktype] ) . "</span>\n";
+ }
+?>
<ul class='plain'><?php
database_picker($conf);
?></ul>
</div>
</form>
<script type="text/javascript">
-window.onload = toggleDBarea('<?php echo $conf->DBtype; ?>',
+window.onload = toggleDBarea('<?php echo htmlspecialchars( Xml::encodeJsVar( $conf->DBtype ) ); ?>',
<?php
## If they passed in a root user name, don't populate it on page load
echo strlen(importPost('RootUser', '')) ? 0 : 1;
}
# Add slashes to strings for double quoting
- $slconf = array_map( "escapePhpString", get_object_vars( $conf ) );
+ $slconf = wfArrayMap( "escapePhpString", get_object_vars( $conf ) );
if( $conf->License == 'gfdl1_2' || $conf->License == 'pd' || $conf->License == 'gfdl1_3' ) {
# Needs literal string interpolation for the current style path
$slconf['RightsIcon'] = $conf->RightsIcon;
} else {
$retval = $default;
}
+ taint( $retval );
return $retval;
}
return importVar( $_REQUEST, $name, $default );
}
-$radioCount = 0;
-
function aField( &$conf, $field, $text, $type = "text", $value = "", $onclick = '' ) {
- global $radioCount;
+ static $radioCount = 0;
if( $type != "" ) {
$xtype = "type=\"$type\"";
} else {
}
global $errs;
- if(isset($errs[$field])) echo "<span class='error'>" . $errs[$field] . "</span>\n";
+ if(isset($errs[$field])) {
+ echo "<span class='error'>" . htmlspecialchars( $errs[$field] ) . "</span>\n";
+ }
}
function getLanguageList() {
return false;
}
- $lines = array_map( 'trim', $lines );
+ $lines = wfArrayMap( 'trim', $lines );
$candidatesByLocale = array();
$candidatesByLang = array();
foreach ( $lines as $line ) {
return false;
}
+function wfArrayMap( $function, $input ) {
+ $ret = array_map( $function, $input );
+ foreach ( $ret as $key => $value ) {
+ $taint = istainted( $input[$key] );
+ if ( $taint ) {
+ taint( $ret[$key], $taint );
+ }
+ }
+ return $ret;
+}
+
?>
<div class="license">
global $wgDatabase;
if ( $wgDatabase->tableExists( $from ) ) {
if ( $wgDatabase->tableExists( $to ) ) {
- echo "...can't move table $from to $to, $to already exists.\n";
+ wfOut( "...can't move table $from to $to, $to already exists.\n" );
} else {
- echo "Moving table $from to $to...";
+ wfOut( "Moving table $from to $to..." );
dbsource( archive($patch), $wgDatabase );
- echo "ok\n";
+ wfOut( "ok\n" );
}
} else {
// Source table does not exist
function add_table( $name, $patch, $fullpath=false ) {
global $wgDatabase;
if ( $wgDatabase->tableExists( $name ) ) {
- echo "...$name table already exists.\n";
+ wfOut( "...$name table already exists.\n" );
} else {
- echo "Creating $name table...";
+ wfOut( "Creating $name table..." );
if( $fullpath ) {
dbsource( $patch, $wgDatabase );
} else {
dbsource( archive($patch), $wgDatabase );
}
- echo "ok\n";
+ wfOut( "ok\n" );
}
}
function add_field( $table, $field, $patch, $fullpath=false ) {
global $wgDatabase;
if ( !$wgDatabase->tableExists( $table ) ) {
- echo "...$table table does not exist, skipping new field patch\n";
+ wfOut( "...$table table does not exist, skipping new field patch\n" );
} elseif ( $wgDatabase->fieldExists( $table, $field ) ) {
- echo "...have $field field in $table table.\n";
+ wfOut( "...have $field field in $table table.\n" );
} else {
- echo "Adding $field field to table $table...";
+ wfOut( "Adding $field field to table $table..." );
if( $fullpath ) {
dbsource( $patch, $wgDatabase );
} else {
dbsource( archive($patch), $wgDatabase );
}
- echo "ok\n";
+ wfOut( "ok\n" );
}
}
function add_index( $table, $index, $patch, $fullpath=false ) {
global $wgDatabase;
if( $wgDatabase->indexExists( $table, $index ) ) {
- echo "...$index key already set on $table table.\n";
+ wfOut( "...$index key already set on $table table.\n" );
} else {
- echo "Adding $index key to table $table... ";
+ wfOut( "Adding $index key to table $table... " );
if( $fullpath ) {
dbsource( $patch, $wgDatabase );
} else {
dbsource( archive($patch), $wgDatabase );
}
- echo "ok\n";
+ wfOut( "ok\n" );
}
}
global $wgDatabase;
$fname = "Update script: update_passwords()";
- print "\nIt appears that you need to update the user passwords in your\n" .
+ wfOut( "\nIt appears that you need to update the user passwords in your\n" .
"database. If you have already done this (if you've run this update\n" .
"script once before, for example), doing so again will make all your\n" .
"user accounts inaccessible, so be sure you only do this once.\n" .
- "Update user passwords? (yes/no)";
+ "Update user passwords? (yes/no)" );
$resp = readconsole();
if ( ! ( "Y" == $resp{0} || "y" == $resp{0} ) ) { return; }
# Check that interwiki table exists; if it doesn't source it
global $wgDatabase, $IP;
if( $wgDatabase->tableExists( "interwiki" ) ) {
- echo "...already have interwiki table\n";
+ wfOut( "...already have interwiki table\n" );
return true;
}
- echo "Creating interwiki table: ";
+ wfOut( "Creating interwiki table: " );
dbsource( archive("patch-interwiki.sql") );
- echo "ok\n";
- echo "Adding default interwiki definitions: ";
+ wfOut( "ok\n" );
+ wfOut( "Adding default interwiki definitions: " );
dbsource( "$IP/maintenance/interwiki.sql" );
- echo "ok\n";
+ wfOut( "ok\n" );
}
function do_index_update() {
global $wgDatabase;
$meta = $wgDatabase->fieldInfo( "recentchanges", "rc_timestamp" );
if( !$meta->isMultipleKey() ) {
- echo "Updating indexes to 20031107: ";
+ wfOut( "Updating indexes to 20031107: " );
dbsource( archive("patch-indexes.sql") );
- echo "ok\n";
+ wfOut( "ok\n" );
return true;
}
- echo "...indexes seem up to 20031107 standards\n";
+ wfOut( "...indexes seem up to 20031107 standards\n" );
return false;
}
$meta = $wgDatabase->fieldInfo( "image", "img_major_mime" );
if( !$meta->isMultipleKey() ) {
- echo "Updating indexes to 20050912: ";
+ wfOut( "Updating indexes to 20050912: " );
dbsource( archive("patch-mimesearch-indexes.sql") );
- echo "ok\n";
+ wfOut( "ok\n" );
return true;
}
- echo "...indexes seem up to 20050912 standards\n";
+ wfOut( "...indexes seem up to 20050912 standards\n" );
return false;
}
function do_image_name_unique_update() {
global $wgDatabase;
if( $wgDatabase->indexExists( 'image', 'PRIMARY' ) ) {
- echo "...image primary key already set.\n";
+ wfOut( "...image primary key already set.\n" );
} else {
- echo "Making img_name the primary key... ";
+ wfOut( "Making img_name the primary key... " );
dbsource( archive("patch-image_name_primary.sql"), $wgDatabase );
- echo "ok\n";
+ wfOut( "ok\n" );
}
}
function do_logging_timestamp_index() {
global $wgDatabase;
if( $wgDatabase->indexExists( 'logging', 'times' ) ) {
- echo "...timestamp key on logging already exists.\n";
+ wfOut( "...timestamp key on logging already exists.\n" );
} else {
- echo "Adding timestamp key on logging table... ";
+ wfOut( "Adding timestamp key on logging table... " );
dbsource( archive("patch-logging-times-index.sql"), $wgDatabase );
- echo "ok\n";
+ wfOut( "ok\n" );
}
}
function do_archive_user_index() {
global $wgDatabase;
if( $wgDatabase->indexExists( 'archive', 'usertext_timestamp' ) ) {
- echo "...usertext,timestamp key on archive already exists.\n";
+ wfOut( "...usertext,timestamp key on archive already exists.\n" );
} else {
- echo "Adding usertext,timestamp key on archive table... ";
+ wfOut( "Adding usertext,timestamp key on archive table... " );
dbsource( archive("patch-archive-user-index.sql"), $wgDatabase );
- echo "ok\n";
+ wfOut( "ok\n" );
}
}
function do_image_user_index() {
global $wgDatabase;
if( $wgDatabase->indexExists( 'image', 'img_usertext_timestamp' ) ) {
- echo "...usertext,timestamp key on image already exists.\n";
+ wfOut( "...usertext,timestamp key on image already exists.\n" );
} else {
- echo "Adding usertext,timestamp key on image table... ";
+ wfOut( "Adding usertext,timestamp key on image table... " );
dbsource( archive("patch-image-user-index.sql"), $wgDatabase );
- echo "ok\n";
+ wfOut( "ok\n" );
}
}
function do_oldimage_user_index() {
global $wgDatabase;
if( $wgDatabase->indexExists( 'oldimage', 'oi_usertext_timestamp' ) ) {
- echo "...usertext,timestamp key on oldimage already exists.\n";
+ wfOut( "...usertext,timestamp key on oldimage already exists.\n" );
} else {
- echo "Adding usertext,timestamp key on oldimage table... ";
+ wfOut( "Adding usertext,timestamp key on oldimage table... " );
dbsource( archive("patch-oldimage-user-index.sql"), $wgDatabase );
- echo "ok\n";
+ wfOut( "ok\n" );
}
}
global $wgDatabase;
$fname = 'do_watchlist_update';
if( $wgDatabase->fieldExists( 'watchlist', 'wl_notificationtimestamp' ) ) {
- echo "The watchlist table is already set up for email notification.\n";
+ wfOut( "The watchlist table is already set up for email notification.\n" );
} else {
- echo "Adding wl_notificationtimestamp field for email notification management.";
+ wfOut( "Adding wl_notificationtimestamp field for email notification management." );
/* ALTER TABLE watchlist ADD (wl_notificationtimestamp varchar(14) binary NOT NULL default '0'); */
dbsource( archive( 'patch-email-notification.sql' ), $wgDatabase );
- echo "ok\n";
+ wfOut( "ok\n" );
}
# Check if we need to add talk page rows to the watchlist
$talk = $wgDatabase->selectField( 'watchlist', 'count(*)', 'wl_namespace & 1', $fname );
$nontalk = $wgDatabase->selectField( 'watchlist', 'count(*)', 'NOT (wl_namespace & 1)', $fname );
if ( $talk != $nontalk ) {
- echo "Adding missing watchlist talk page rows... ";
+ wfOut( "Adding missing watchlist talk page rows... " );
flush();
$wgDatabase->insertSelect( 'watchlist', 'watchlist',
'wl_title' => 'wl_title',
'wl_notificationtimestamp' => 'wl_notificationtimestamp'
), array( 'NOT (wl_namespace & 1)' ), $fname, 'IGNORE' );
- echo "ok\n";
+ wfOut( "ok\n" );
} else {
- echo "...watchlist talk page rows already present\n";
+ wfOut( "...watchlist talk page rows already present\n" );
}
}
$res = $wgDatabase->safeQuery( 'SELECT user_id, user_ip FROM !',
$wgDatabase->tableName( 'user_newtalk' ) );
$num_newtalks=$wgDatabase->numRows($res);
- echo "Now converting ".$num_newtalks." user_newtalk entries to watchlist table entries ... \n";
+ wfOut( "Now converting $num_newtalks user_newtalk entries to watchlist table entries ... \n" );
$user = new User();
for ( $i = 1; $i <= $num_newtalks; $i++ ) {
);
}
}
- echo "Done.\n";
+ wfOut( "Done.\n" );
}
function do_user_update() {
global $wgDatabase;
if( $wgDatabase->fieldExists( 'user', 'user_emailauthenticationtimestamp' ) ) {
- echo "User table contains old email authentication field. Dropping... ";
+ wfOut( "User table contains old email authentication field. Dropping... " );
dbsource( archive( 'patch-email-authentication.sql' ), $wgDatabase );
- echo "ok\n";
+ wfOut( "ok\n" );
} else {
- echo "...user table does not contain old email authentication field.\n";
+ wfOut( "...user table does not contain old email authentication field.\n" );
}
}
$wgDatabase->freeResult( $res );
if( in_array( 'binary', $flags ) ) {
- echo "$table table has correct $field encoding.\n";
+ wfOut( "$table table has correct $field encoding.\n" );
} else {
- echo "Fixing $field encoding on $table table... ";
+ wfOut( "Fixing $field encoding on $table table... " );
dbsource( archive( $patchFile ), $wgDatabase );
- echo "ok\n";
+ wfOut( "ok\n" );
}
}
global $wgDatabase;
$fname="do_schema_restructuring";
if ( $wgDatabase->tableExists( 'page' ) ) {
- echo "...page table already exists.\n";
+ wfOut( "...page table already exists.\n" );
} else {
- echo "...converting from cur/old to page/revision/text DB structure.\n"; flush();
- echo wfTimestamp( TS_DB );
- echo "......checking for duplicate entries.\n"; flush();
+ wfOut( "...converting from cur/old to page/revision/text DB structure.\n" );
+ wfOut( wfTimestamp( TS_DB ) );
+ wfOut( "......checking for duplicate entries.\n" );
list ($cur, $old, $page, $revision, $text) = $wgDatabase->tableNamesN( 'cur', 'old', 'page', 'revision', 'text' );
FROM $cur GROUP BY cur_title, cur_namespace HAVING c>1", $fname );
if ( $wgDatabase->numRows( $rows ) > 0 ) {
- echo wfTimestamp( TS_DB );
- echo "......<b>Found duplicate entries</b>\n";
- echo ( sprintf( "<b> %-60s %3s %5s</b>\n", 'Title', 'NS', 'Count' ) );
+ wfOut( wfTimestamp( TS_DB ) );
+ wfOut( "......<b>Found duplicate entries</b>\n" );
+ wfOut( sprintf( "<b> %-60s %3s %5s</b>\n", 'Title', 'NS', 'Count' ) );
while ( $row = $wgDatabase->fetchObject( $rows ) ) {
if ( ! isset( $duplicate[$row->cur_namespace] ) ) {
$duplicate[$row->cur_namespace] = array();
}
$duplicate[$row->cur_namespace][] = $row->cur_title;
- echo ( sprintf( " %-60s %3s %5s\n", $row->cur_title, $row->cur_namespace, $row->c ) );
+ wfOut( sprintf( " %-60s %3s %5s\n", $row->cur_title, $row->cur_namespace, $row->c ) );
}
$sql = "SELECT cur_title, cur_namespace, cur_id, cur_timestamp FROM $cur WHERE ";
$firstCond = true;
}
$sql = "DELETE FROM $cur WHERE cur_id IN ( " . join( ',', $deleteId ) . ')';
$rows = $wgDatabase->query( $sql, $fname );
- echo wfTimestamp( TS_DB );
- echo "......<b>Deleted</b> ".$wgDatabase->affectedRows()." records.\n";
+ wfOut( wfTimestamp( TS_DB ) );
+ wfOut( "......<b>Deleted</b> ".$wgDatabase->affectedRows()." records.\n" );
}
- echo wfTimestamp( TS_DB );
- echo "......Creating tables.\n";
+ wfOut( wfTimestamp( TS_DB ) );
+ wfOut( "......Creating tables.\n" );
$wgDatabase->query("CREATE TABLE $page (
page_id int(8) unsigned NOT NULL auto_increment,
page_namespace int NOT NULL,
INDEX usertext_timestamp (rev_user_text,rev_timestamp)
) ENGINE=InnoDB", $fname );
- echo wfTimestamp( TS_DB );
- echo "......Locking tables.\n";
+ wfOut( wfTimestamp( TS_DB ) );
+ wfOut( "......Locking tables.\n" );
$wgDatabase->query( "LOCK TABLES $page WRITE, $revision WRITE, $old WRITE, $cur WRITE", $fname );
$maxold = intval( $wgDatabase->selectField( 'old', 'max(old_id)', '', $fname ) );
- echo wfTimestamp( TS_DB );
- echo "......maxold is {$maxold}\n";
+ wfOut( wfTimestamp( TS_DB ) );
+ wfOut( "......maxold is {$maxold}\n" );
- echo wfTimestamp( TS_DB );
+ wfOut( wfTimestamp( TS_DB ) );
global $wgLegacySchemaConversion;
if( $wgLegacySchemaConversion ) {
// Create HistoryBlobCurStub entries.
// Text will be pulled from the leftover 'cur' table at runtime.
- echo "......Moving metadata from cur; using blob references to text in cur table.\n";
+ wfOut( "......Moving metadata from cur; using blob references to text in cur table.\n" );
$cur_text = "concat('O:18:\"historyblobcurstub\":1:{s:6:\"mCurId\";i:',cur_id,';}')";
$cur_flags = "'object'";
} else {
// Copy all cur text in immediately: this may take longer but avoids
// having to keep an extra table around.
- echo "......Moving text from cur.\n";
+ wfOut( "......Moving text from cur.\n" );
$cur_text = 'cur_text';
$cur_flags = "''";
}
SELECT cur_namespace, cur_title, $cur_text, cur_comment, cur_user, cur_user_text, cur_timestamp, cur_minor_edit, $cur_flags
FROM $cur", $fname );
- echo wfTimestamp( TS_DB );
- echo "......Setting up revision table.\n";
+ wfOut( wfTimestamp( TS_DB ) );
+ wfOut( "......Setting up revision table.\n" );
$wgDatabase->query( "INSERT INTO $revision (rev_id, rev_page, rev_comment, rev_user, rev_user_text, rev_timestamp,
rev_minor_edit)
SELECT old_id, cur_id, old_comment, old_user, old_user_text,
old_timestamp, old_minor_edit
FROM $old,$cur WHERE old_namespace=cur_namespace AND old_title=cur_title", $fname );
- echo wfTimestamp( TS_DB );
- echo "......Setting up page table.\n";
+ wfOut( wfTimestamp( TS_DB ) );
+ wfOut( "......Setting up page table.\n" );
$wgDatabase->query( "INSERT INTO $page (page_id, page_namespace, page_title, page_restrictions, page_counter,
page_is_redirect, page_is_new, page_random, page_touched, page_latest, page_len)
SELECT cur_id, cur_namespace, cur_title, cur_restrictions, cur_counter, cur_is_redirect, cur_is_new,
FROM $cur,$revision
WHERE cur_id=rev_page AND rev_timestamp=cur_timestamp AND rev_id > {$maxold}", $fname );
- echo wfTimestamp( TS_DB );
- echo "......Unlocking tables.\n";
+ wfOut( wfTimestamp( TS_DB ) );
+ wfOut( "......Unlocking tables.\n" );
$wgDatabase->query( "UNLOCK TABLES", $fname );
- echo wfTimestamp( TS_DB );
- echo "......Renaming old.\n";
+ wfOut( wfTimestamp( TS_DB ) );
+ wfOut( "......Renaming old.\n" );
$wgDatabase->query( "ALTER TABLE $old RENAME TO $text", $fname );
- echo wfTimestamp( TS_DB );
- echo "...done.\n";
+ wfOut( wfTimestamp( TS_DB ) );
+ wfOut( "...done.\n" );
}
}
function do_inverse_timestamp() {
global $wgDatabase;
if( $wgDatabase->fieldExists( 'revision', 'inverse_timestamp' ) ) {
- echo "Removing revision.inverse_timestamp and fixing indexes... ";
+ wfOut( "Removing revision.inverse_timestamp and fixing indexes... " );
dbsource( archive( 'patch-inverse_timestamp.sql' ), $wgDatabase );
- echo "ok\n";
+ wfOut( "ok\n" );
} else {
- echo "revision timestamp indexes already up to 2005-03-13\n";
+ wfOut( "revision timestamp indexes already up to 2005-03-13\n" );
}
}
function do_text_id() {
global $wgDatabase;
if( $wgDatabase->fieldExists( 'revision', 'rev_text_id' ) ) {
- echo "...rev_text_id already in place.\n";
+ wfOut( "...rev_text_id already in place.\n" );
} else {
- echo "Adding rev_text_id field... ";
+ wfOut( "Adding rev_text_id field... " );
dbsource( archive( 'patch-rev_text_id.sql' ), $wgDatabase );
- echo "ok\n";
+ wfOut( "ok\n" );
}
}
$wgDatabase->freeResult( $result );
if( substr( $info->Type, 0, 3 ) == 'int' ) {
- echo "...$field is already a full int ($info->Type).\n";
+ wfOut( "...$field is already a full int ($info->Type).\n" );
} else {
- echo "Promoting $field from $info->Type to int... ";
+ wfOut( "Promoting $field from $info->Type to int... " );
$sql = "ALTER TABLE $tablename MODIFY $field int NOT NULL";
$wgDatabase->query( $sql );
- echo "ok\n";
+ wfOut( "ok\n" );
}
}
function do_pagelinks_update() {
global $wgDatabase;
if( $wgDatabase->tableExists( 'pagelinks' ) ) {
- echo "...already have pagelinks table.\n";
+ wfOut( "...already have pagelinks table.\n" );
} else {
- echo "Converting links and brokenlinks tables to pagelinks... ";
+ wfOut( "Converting links and brokenlinks tables to pagelinks... " );
dbsource( archive( 'patch-pagelinks.sql' ), $wgDatabase );
- echo "ok\n";
+ wfOut( "ok\n" );
flush();
global $wgCanonicalNamespaceNames;
global $wgDatabase, $wgContLang;
$ns = intval( $namespace );
- echo "Cleaning up broken links for namespace $ns... ";
+ wfOut( "Cleaning up broken links for namespace $ns... " );
$pagelinks = $wgDatabase->tableName( 'pagelinks' );
$name = $wgContLang->getNsText( $ns );
AND pl_title LIKE '$likeprefix:%'";
$wgDatabase->query( $sql, 'do_pagelinks_namespace' );
- echo "ok\n";
+ wfOut( "ok\n" );
}
function do_drop_img_type() {
global $wgDatabase;
if( $wgDatabase->fieldExists( 'image', 'img_type' ) ) {
- echo "Dropping unused img_type field in image table... ";
+ wfOut( "Dropping unused img_type field in image table... " );
dbsource( archive( 'patch-drop_img_type.sql' ), $wgDatabase );
- echo "ok\n";
+ wfOut( "ok\n" );
} else {
- echo "No img_type field in image table; Good.\n";
+ wfOut( "No img_type field in image table; Good.\n" );
}
}
function do_old_links_update() {
global $wgDatabase;
if( $wgDatabase->tableExists( 'pagelinks' ) ) {
- echo "Already have pagelinks; skipping old links table updates.\n";
+ wfOut( "Already have pagelinks; skipping old links table updates.\n" );
} else {
convertLinks(); flush();
}
global $wgDatabase;
$duper = new UserDupes( $wgDatabase );
if( $duper->hasUniqueIndex() ) {
- echo "Already have unique user_name index.\n";
+ wfOut( "Already have unique user_name index.\n" );
} else {
if( !$duper->clearDupes() ) {
- echo "WARNING: This next step will probably fail due to unfixed duplicates...\n";
+ wfOut( "WARNING: This next step will probably fail due to unfixed duplicates...\n" );
}
- echo "Adding unique index on user_name... ";
+ wfOut( "Adding unique index on user_name... " );
dbsource( archive( 'patch-user_nameindex.sql' ), $wgDatabase );
- echo "ok\n";
+ wfOut( "ok\n" );
}
}
global $wgDatabase;
if( $wgDatabase->tableExists( 'user_groups' ) ) {
- echo "...user_groups table already exists.\n";
+ wfOut( "...user_groups table already exists.\n" );
return do_user_groups_reformat();
}
- echo "Adding user_groups table... ";
+ wfOut( "Adding user_groups table... " );
dbsource( archive( 'patch-user_groups.sql' ), $wgDatabase );
- echo "ok\n";
+ wfOut( "ok\n" );
if( !$wgDatabase->tableExists( 'user_rights' ) ) {
if( $wgDatabase->fieldExists( 'user', 'user_rights' ) ) {
- echo "Upgrading from a 1.3 or older database? Breaking out user_rights for conversion...";
+ wfOut( "Upgrading from a 1.3 or older database? Breaking out user_rights for conversion..." );
dbsource( archive( 'patch-user_rights.sql' ), $wgDatabase );
- echo "ok\n";
+ wfOut( "ok\n" );
} else {
- echo "*** WARNING: couldn't locate user_rights table or field for upgrade.\n";
- echo "*** You may need to manually configure some sysops by manipulating\n";
- echo "*** the user_groups table.\n";
+ wfOut( "*** WARNING: couldn't locate user_rights table or field for upgrade.\n" );
+ wfOut( "*** You may need to manually configure some sysops by manipulating\n" );
+ wfOut( "*** the user_groups table.\n" );
return;
}
}
- echo "Converting user_rights table to user_groups... ";
+ wfOut( "Converting user_rights table to user_groups... " );
$result = $wgDatabase->select( 'user_rights',
array( 'ur_user', 'ur_rights' ),
array( "ur_rights != ''" ),
}
}
$wgDatabase->freeResult( $result );
- echo "ok\n";
+ wfOut( "ok\n" );
}
function do_user_groups_reformat() {
if( $info->type() == 'int' ) {
$oldug = $wgDatabase->tableName( 'user_groups' );
$newug = $wgDatabase->tableName( 'user_groups_bogus' );
- echo "user_groups is in bogus intermediate format. Renaming to $newug... ";
+ wfOut( "user_groups is in bogus intermediate format. Renaming to $newug... " );
$wgDatabase->query( "ALTER TABLE $oldug RENAME TO $newug" );
- echo "ok\n";
+ wfOut( "ok\n" );
- echo "Re-adding fresh user_groups table... ";
+ wfOut( "Re-adding fresh user_groups table... " );
dbsource( archive( 'patch-user_groups.sql' ), $wgDatabase );
- echo "ok\n";
+ wfOut( "ok\n" );
- echo "***\n";
- echo "*** WARNING: You will need to manually fix up user permissions in the user_groups\n";
- echo "*** table. Old 1.5 alpha versions did some pretty funky stuff...\n";
- echo "***\n";
+ wfOut( "***\n" );
+ wfOut( "*** WARNING: You will need to manually fix up user permissions in the user_groups\n" );
+ wfOut( "*** table. Old 1.5 alpha versions did some pretty funky stuff...\n" );
+ wfOut( "***\n" );
} else {
- echo "...user_groups is in current format.\n";
+ wfOut( "...user_groups is in current format.\n" );
}
}
$info = $wgDatabase->fieldInfo( 'watchlist', 'wl_notificationtimestamp' );
if( !$info->nullable() ) {
- echo "Making wl_notificationtimestamp nullable... ";
+ wfOut( "Making wl_notificationtimestamp nullable... " );
dbsource( archive( 'patch-watchlist-null.sql' ), $wgDatabase );
- echo "ok\n";
+ wfOut( "ok\n" );
} else {
- echo "...wl_notificationtimestamp is already nullable.\n";
+ wfOut( "...wl_notificationtimestamp is already nullable.\n" );
}
}
function do_page_random_update() {
global $wgDatabase;
- echo "Setting page_random to a random value on rows where it equals 0...";
+ wfOut( "Setting page_random to a random value on rows where it equals 0..." );
$page = $wgDatabase->tableName( 'page' );
$wgDatabase->query( "UPDATE $page SET page_random = RAND() WHERE page_random = 0", 'do_page_random_update' );
$rows = $wgDatabase->affectedRows();
- echo "changed $rows rows\n";
+ wfOut( "changed $rows rows\n" );
}
function do_templatelinks_update() {
$fname = 'do_templatelinks_update';
if ( $wgDatabase->tableExists( 'templatelinks' ) ) {
- echo "...templatelinks table already exists\n";
+ wfOut( "...templatelinks table already exists\n" );
return;
}
- echo "Creating templatelinks table...\n";
+ wfOut( "Creating templatelinks table...\n" );
dbsource( archive('patch-templatelinks.sql'), $wgDatabase );
- echo "Populating...\n";
+ wfOut( "Populating...\n" );
if ( isset( $wgLoadBalancer ) && $wgLoadBalancer->getServerCount() > 1 ) {
// Slow, replication-friendly update
$res = $wgDatabase->select( 'pagelinks', array( 'pl_from', 'pl_namespace', 'pl_title' ),
), $fname
);
}
- echo "Done. Please run maintenance/refreshLinks.php for a more thorough templatelinks update.\n";
+ wfOut( "Done. Please run maintenance/refreshLinks.php for a more thorough templatelinks update.\n" );
}
// Add index on ( rc_namespace, rc_user_text ) [Jul. 2006]
// Add index on ( rc_user_text, rc_timestamp ) [Nov. 2006]
function do_rc_indices_update() {
global $wgDatabase;
- echo( "Checking for additional recent changes indices...\n" );
+ wfOut( "Checking for additional recent changes indices...\n" );
$indexes = array(
'rc_ns_usertext' => 'patch-recentchanges-utindex.sql',
foreach( $indexes as $index => $patch ) {
$info = $wgDatabase->indexInfo( 'recentchanges', $index, __METHOD__ );
if( !$info ) {
- echo( "...index `{$index}` not found; adding..." );
+ wfOut( "...index `{$index}` not found; adding..." );
dbsource( archive( $patch ) );
- echo( "done.\n" );
+ wfOut( "done.\n" );
} else {
- echo( "...index `{$index}` seems ok.\n" );
+ wfOut( "...index `{$index}` seems ok.\n" );
}
}
}
function index_has_field($table, $index, $field) {
global $wgDatabase;
- echo( "Checking if $table index $index includes field $field...\n" );
+ wfOut( "Checking if $table index $index includes field $field...\n" );
$info = $wgDatabase->indexInfo( $table, $index, __METHOD__ );
if( $info ) {
foreach($info as $row) {
if($row->Column_name == $field) {
- echo( "...index $index on table $table seems to be ok\n" );
+ wfOut( "...index $index on table $table seems to be ok\n" );
return true;
}
}
}
- echo( "...index $index on table $table has no field $field; adding\n" );
+ wfOut( "...index $index on table $table has no field $field; adding\n" );
return false;
}
function do_backlinking_indices_update() {
- echo( "Checking for backlinking indices...\n" );
+ wfOut( "Checking for backlinking indices...\n" );
if (!index_has_field('pagelinks', 'pl_namespace', 'pl_from') ||
!index_has_field('templatelinks', 'tl_namespace', 'tl_from') ||
!index_has_field('imagelinks', 'il_to', 'il_from'))
{
dbsource( archive( 'patch-backlinkindexes.sql' ) );
- echo( "...backlinking indices updated\n" );
+ wfOut( "...backlinking indices updated\n" );
}
}
function do_categorylinks_indices_update() {
- echo( "Checking for categorylinks indices...\n" );
+ wfOut( "Checking for categorylinks indices...\n" );
if (!index_has_field('categorylinks', 'cl_sortkey', 'cl_from'))
{
dbsource( archive( 'patch-categorylinksindex.sql' ) );
- echo( "...categorylinks indices updated\n" );
+ wfOut( "...categorylinks indices updated\n" );
}
}
function do_filearchive_indices_update() {
global $wgDatabase;
- echo( "Checking filearchive indices...\n" );
+ wfOut( "Checking filearchive indices...\n" );
$info = $wgDatabase->indexInfo( 'filearchive', 'fa_user_timestamp', __METHOD__ );
if ( !$info )
{
dbsource( archive( 'patch-filearhive-user-index.sql' ) );
- echo( "...filearchive indices updated\n" );
+ wfOut( "...filearchive indices updated\n" );
}
}
if ( !$wgDatabase->tableExists( 'profiling' ) ) {
// Simply ignore
} elseif ( $wgDatabase->fieldExists( 'profiling', 'pf_memory' ) ) {
- echo "profiling table has pf_memory field.\n";
+ wfOut( "profiling table has pf_memory field.\n" );
} else {
- echo "Adding pf_memory field to table profiling...";
+ wfOut( "Adding pf_memory field to table profiling..." );
dbsource( archive( 'patch-profiling-memory.sql' ), $wgDatabase );
- echo "ok\n";
+ wfOut( "ok\n" );
}
}
function do_stats_init() {
// Sometimes site_stats table is not properly populated.
global $wgDatabase;
- echo "Checking site_stats row...";
+ wfOut( "Checking site_stats row..." );
$row = $wgDatabase->selectRow( 'site_stats', '*', array( 'ss_row_id' => 1 ), __METHOD__ );
if( $row === false ) {
- echo "data is missing! rebuilding...\n";
+ wfOut( "data is missing! rebuilding...\n" );
} elseif ( isset( $row->site_stats ) && $row->ss_total_pages == -1 ) {
- echo "missing ss_total_pages, rebuilding...\n";
+ wfOut( "missing ss_total_pages, rebuilding...\n" );
} else {
- echo "ok.\n";
+ wfOut( "ok.\n" );
return;
}
array( 'ss_row_id' => 1 ), __METHOD__, array( 'LIMIT' => 1 )
);
}
- echo( "...ss_active_users user count set...\n" );
+ wfOut( "...ss_active_users user count set...\n" );
}
function purge_cache() {
global $wgDatabase;
# We can't guarantee that the user will be able to use TRUNCATE,
# but we know that DELETE is available to us
- echo( "Purging caches..." );
+ wfOut( "Purging caches..." );
$wgDatabase->delete( 'objectcache', '*', __METHOD__ );
- echo( "done.\n" );
+ wfOut( "done.\n" );
}
function do_all_updates( $shared = false, $purge = true ) {
}
- echo "Deleting old default messages (this may take a long time!)..."; flush();
+ wfOut( "Deleting old default messages (this may take a long time!)..." );
deleteDefaultMessages();
- echo "Done\n"; flush();
+ wfOut( "Done\n" );
- do_stats_init(); flush();
+ do_stats_init();
if( $purge ) {
purge_cache();
- flush();
}
}
$patch2 = 'patch-page_restrictions_sortkey.sql';
if ( $wgDatabase->tableExists( $name ) ) {
- echo "...$name table already exists.\n";
+ wfOut( "...$name table already exists.\n" );
} else {
- echo "Creating $name table...";
+ wfOut( "Creating $name table..." );
dbsource( archive($patch), $wgDatabase );
dbsource( archive($patch2), $wgDatabase );
- echo "ok\n";
+ wfOut( "ok\n" );
- echo "Migrating old restrictions to new table...";
+ wfOut( "Migrating old restrictions to new table..." );
$res = $wgDatabase->select( 'page', array( 'page_id', 'page_restrictions' ), array("page_restrictions!=''", "page_restrictions!='edit=:move='"), __METHOD__ );
__METHOD__ );
}
}
- print "ok\n";
+ wfOut( "ok\n" );
}
}
function do_category_population() {
if( update_row_exists( 'populate category' ) ) {
- echo "...category table already populated.\n";
+ wfOut( "...category table already populated.\n" );
return;
}
require_once( 'populateCategory.inc' );
- echo "Populating category table, printing progress markers. ".
+ wfOut( "Populating category table, printing progress markers. " ).
"For large databases, you\n".
"may want to hit Ctrl-C and do this manually with maintenance/\n".
"populateCategory.php.\n";
populateCategory( '', 10, 0, true );
- echo "Done populating category table.\n";
+ wfOut( "Done populating category table.\n" );
}
function do_populate_parent_id() {
if( update_row_exists( 'populate rev_parent_id' ) ) {
- echo "...rev_parent_id column already populated.\n";
+ wfOut( "...rev_parent_id column already populated.\n" );
return;
}
require_once( 'populateParentId.inc' );
function update_password_format() {
if ( update_row_exists( 'password format' ) ) {
- echo "...password hash format already changed\n";
+ wfOut( "...password hash format already changed\n" );
return;
}
- echo "Updating password hash format...";
+ wfOut( "Updating password hash format..." );
global $wgDatabase, $wgPasswordSalt;
$user = $wgDatabase->tableName( 'user' );
$wgDatabase->query( $sql, __METHOD__ );
$wgDatabase->insert( 'updatelog', array( 'ul_key' => 'password format' ), __METHOD__ );
- echo "done\n";
+ wfOut( "done\n" );
}
function sqlite_initial_indexes() {
global $wgDatabase;
if ( update_row_exists( 'initial_indexes' ) ) {
- echo "...have initial indexes\n";
+ wfOut( "...have initial indexes\n" );
return;
}
- echo "Adding initial indexes...";
+ wfOut( "Adding initial indexes..." );
$wgDatabase->sourceFile( archive( 'initial-indexes.sql' ) );
- echo "done\n";
+ wfOut( "done\n" );
}
function do_unique_pl_tl_il() {
global $wgDatabase;
$info = $wgDatabase->indexInfo( 'pagelinks', 'pl_namespace' );
if( is_array($info) && !$info[0]->Non_unique ) {
- echo "...pl_namespace, tl_namespace, il_to indices are already UNIQUE.\n";
+ wfOut( "...pl_namespace, tl_namespace, il_to indices are already UNIQUE.\n" );
} else {
- echo "Making pl_namespace, tl_namespace and il_to indices UNIQUE... ";
+ wfOut( "Making pl_namespace, tl_namespace and il_to indices UNIQUE... " );
dbsource( archive( 'patch-pl-tl-il-unique.sql' ), $wgDatabase );
- echo "ok\n";
+ wfOut( "ok\n" );
}
}
$search_path = $conf['search_path'];
}
if( strpos( $search_path, $wgDBmwschema ) === false ) {
- echo "Adding in schema \"$wgDBmwschema\" to search_path for user \"$wgDBuser\"\n";
+ wfOut( "Adding in schema \"$wgDBmwschema\" to search_path for user \"$wgDBuser\"\n" );
$search_path = "$wgDBmwschema, $search_path";
}
if( strpos( $search_path, $wgDBts2schema ) === false ) {
- echo "Adding in schema \"$wgDBts2schema\" to search_path for user \"$wgDBuser\"\n";
+ wfOut( "Adding in schema \"$wgDBts2schema\" to search_path for user \"$wgDBuser\"\n" );
$search_path = "$search_path, $wgDBts2schema";
}
$search_path = str_replace( ', ,', ',', $search_path);
}
else {
$path = $conf['search_path'];
- echo "... search_path for user \"$wgDBuser\" looks correct ($path)\n";
+ wfOut( "... search_path for user \"$wgDBuser\" looks correct ($path)\n" );
}
$goodconf = array(
'client_min_messages' => 'error',
foreach( array_keys( $goodconf ) AS $key ) {
$value = $goodconf[$key];
if( !array_key_exists( $key, $conf ) or $conf[$key] !== $value ) {
- echo "Setting $key to '$value' for user \"$wgDBuser\"\n";
+ wfOut( "Setting $key to '$value' for user \"$wgDBuser\"\n" );
$wgDatabase->doQuery( "ALTER USER $wgDBuser SET $key = '$value'" );
$wgDatabase->doQuery( "SET $key = '$value'" );
}
else {
- echo "... default value of \"$key\" is correctly set to \"$value\" for user \"$wgDBuser\"\n";
+ wfOut( "... default value of \"$key\" is correctly set to \"$value\" for user \"$wgDBuser\"\n" );
}
}
foreach ($newsequences as $ns) {
if ($wgDatabase->sequenceExists($ns)) {
- echo "... sequence \"$ns\" already exists\n";
+ wfOut( "... sequence \"$ns\" already exists\n" );
continue;
}
- echo "Creating sequence \"$ns\"\n";
+ wfOut( "Creating sequence \"$ns\"\n" );
$wgDatabase->query("CREATE SEQUENCE $ns");
}
foreach ($newtables as $nt) {
if ($wgDatabase->tableExists($nt[0])) {
- echo "... table \"$nt[0]\" already exists\n";
+ wfOut( "... table \"$nt[0]\" already exists\n" );
continue;
}
- echo "Creating table \"$nt[0]\"\n";
+ wfOut( "Creating table \"$nt[0]\"\n" );
dbsource(archive($nt[1]));
}
## Needed before newcols
if ($wgDatabase->tableExists("archive2")) {
- echo "Converting \"archive2\" back to normal archive table\n";
+ wfOut( "Converting \"archive2\" back to normal archive table\n" );
if ($wgDatabase->ruleExists("archive", "archive_insert")) {
- echo "Dropping rule \"archive_insert\"\n";
+ wfOut( "Dropping rule \"archive_insert\"\n" );
$wgDatabase->query("DROP RULE archive_insert ON archive");
}
if ($wgDatabase->ruleExists("archive", "archive_delete")) {
- echo "Dropping rule \"archive_delete\"\n";
+ wfOut( "Dropping rule \"archive_delete\"\n" );
$wgDatabase->query("DROP RULE archive_delete ON archive");
}
dbsource(archive("patch-remove-archive2.sql"));
}
else
- echo "... obsolete table \"archive2\" does not exist\n";
+ wfOut( "... obsolete table \"archive2\" does not exist\n" );
foreach ($newcols as $nc) {
$fi = $wgDatabase->fieldInfo($nc[0], $nc[1]);
if (!is_null($fi)) {
- echo "... column \"$nc[0].$nc[1]\" already exists\n";
+ wfOut( "... column \"$nc[0].$nc[1]\" already exists\n" );
continue;
}
- echo "Adding column \"$nc[0].$nc[1]\"\n";
+ wfOut( "Adding column \"$nc[0].$nc[1]\"\n" );
$wgDatabase->query("ALTER TABLE $nc[0] ADD $nc[1] $nc[2]");
}
foreach ($typechanges as $tc) {
$fi = $wgDatabase->fieldInfo($tc[0], $tc[1]);
if (is_null($fi)) {
- echo "... error: expected column $tc[0].$tc[1] to exist\n";
+ wfOut( "... error: expected column $tc[0].$tc[1] to exist\n" );
exit(1);
}
if ($fi->type() === $tc[2])
- echo "... column \"$tc[0].$tc[1]\" is already of type \"$tc[2]\"\n";
+ wfOut( "... column \"$tc[0].$tc[1]\" is already of type \"$tc[2]\"\n" );
else {
- echo "Changing column type of \"$tc[0].$tc[1]\" from \"{$fi->type()}\" to \"$tc[2]\"\n";
+ wfOut( "Changing column type of \"$tc[0].$tc[1]\" from \"{$fi->type()}\" to \"$tc[2]\"\n" );
$sql = "ALTER TABLE $tc[0] ALTER $tc[1] TYPE $tc[2]";
if (strlen($tc[3])) {
$default = array();
}
if ($wgDatabase->fieldInfo('oldimage','oi_deleted')->type() !== 'smallint') {
- echo "Changing \"oldimage.oi_deleted\" to type \"smallint\"\n";
+ wfOut( "Changing \"oldimage.oi_deleted\" to type \"smallint\"\n" );
$wgDatabase->query( "ALTER TABLE oldimage ALTER oi_deleted DROP DEFAULT" );
$wgDatabase->query( "ALTER TABLE oldimage ALTER oi_deleted TYPE SMALLINT USING (oi_deleted::smallint)" );
$wgDatabase->query( "ALTER TABLE oldimage ALTER oi_deleted SET DEFAULT 0" );
}
else
- echo "... column \"oldimage.oi_deleted\" is already of type \"smallint\"\n";
+ wfOut( "... column \"oldimage.oi_deleted\" is already of type \"smallint\"\n" );
foreach ($newindexes as $ni) {
if (pg_index_exists($ni[0], $ni[1])) {
- echo "... index \"$ni[1]\" on table \"$ni[0]\" already exists\n";
+ wfOut( "... index \"$ni[1]\" on table \"$ni[0]\" already exists\n" );
continue;
}
- echo "Creating index \"$ni[1]\" on table \"$ni[0]\" $ni[2]\n";
+ wfOut( "Creating index \"$ni[1]\" on table \"$ni[0]\" $ni[2]\n" );
$wgDatabase->query( "CREATE INDEX $ni[1] ON $ni[0] $ni[2]" );
}
foreach ($newrules as $nr) {
if ($wgDatabase->ruleExists($nr[0], $nr[1])) {
- echo "... rule \"$nr[1]\" on table \"$nr[0]\" already exists\n";
+ wfOut( "... rule \"$nr[1]\" on table \"$nr[0]\" already exists\n" );
continue;
}
- echo "Adding rule \"$nr[1]\" to table \"$nr[0]\"\n";
+ wfOut( "Adding rule \"$nr[1]\" to table \"$nr[0]\"\n" );
dbsource(archive($nr[2]));
}
if ($wgDatabase->hasConstraint("oldimage_oi_name_fkey")) {
- echo "Making foriegn key on table \"oldimage\" (to image) a cascade delete\n";
+ wfOut( "Making foriegn key on table \"oldimage\" (to image) a cascade delete\n" );
$wgDatabase->query( "ALTER TABLE oldimage DROP CONSTRAINT oldimage_oi_name_fkey" );
$wgDatabase->query( "ALTER TABLE oldimage ADD CONSTRAINT oldimage_oi_name_fkey_cascade ".
"FOREIGN KEY (oi_name) REFERENCES image(img_name) ON DELETE CASCADE" );
}
else
- echo "... table \"oldimage\" has correct cascade delete foreign key to image\n";
+ wfOut( "... table \"oldimage\" has correct cascade delete foreign key to image\n" );
if (!$wgDatabase->triggerExists("page", "page_deleted")) {
- echo "Adding function and trigger \"page_deleted\" to table \"page\"\n";
+ wfOut( "Adding function and trigger \"page_deleted\" to table \"page\"\n" );
dbsource(archive('patch-page_deleted.sql'));
}
else
- echo "... table \"page\" has \"page_deleted\" trigger\n";
+ wfOut( "... table \"page\" has \"page_deleted\" trigger\n" );
$fi = $wgDatabase->fieldInfo("recentchanges", "rc_cur_id");
if (!$fi->nullable()) {
- echo "Removing NOT NULL constraint from \"recentchanges.rc_cur_id\"\n";
+ wfOut( "Removing NOT NULL constraint from \"recentchanges.rc_cur_id\"\n" );
dbsource(archive('patch-rc_cur_id-not-null.sql'));
}
else
- echo "... column \"recentchanges.rc_cur_id\" has a NOT NULL constraint\n";
+ wfOut( "... column \"recentchanges.rc_cur_id\" has a NOT NULL constraint\n" );
$pu = pg_describe_index("pagelink_unique");
if (!is_null($pu) && ($pu[0] != "pl_from" || $pu[1] != "pl_namespace" || $pu[2] != "pl_title")) {
- echo "Dropping obsolete version of index \"pagelink_unique index\"\n";
+ wfOut( "Dropping obsolete version of index \"pagelink_unique index\"\n" );
$wgDatabase->query("DROP INDEX pagelink_unique");
$pu = null;
}
else
- echo "... obsolete version of index \"pagelink_unique index\" does not exist\n";
+ wfOut( "... obsolete version of index \"pagelink_unique index\" does not exist\n" );
if (is_null($pu)) {
- echo "Creating index \"pagelink_unique index\"\n";
+ wfOut( "Creating index \"pagelink_unique index\"\n" );
$wgDatabase->query("CREATE UNIQUE INDEX pagelink_unique ON pagelinks (pl_from,pl_namespace,pl_title)");
}
else
- echo "... index \"pagelink_unique_index\" already exists\n";
+ wfOut( "... index \"pagelink_unique_index\" already exists\n" );
if (pg_fkey_deltype("revision_rev_user_fkey") == 'r') {
- echo "... constraint \"revision_rev_user_fkey\" is ON DELETE RESTRICT\n";
+ wfOut( "... constraint \"revision_rev_user_fkey\" is ON DELETE RESTRICT\n" );
}
else {
- echo "Changing constraint \"revision_rev_user_fkey\" to ON DELETE RESTRICT\n";
+ wfOut( "Changing constraint \"revision_rev_user_fkey\" to ON DELETE RESTRICT\n" );
dbsource(archive('patch-revision_rev_user_fkey.sql'));
}
# Fix ipb_address index
if (pg_index_exists('ipblocks', 'ipb_address' )) {
- echo "Removing deprecated index 'ipb_address'...\n";
+ wfOut( "Removing deprecated index 'ipb_address'...\n" );
$wgDatabase->query('DROP INDEX ipb_address');
}
if (pg_index_exists('ipblocks', 'ipb_address_unique' )) {
- echo "... have ipb_address_unique\n";
+ wfOut( "... have ipb_address_unique\n" );
}
else {
- echo "Adding ipb_address_unique index\n";
+ wfOut( "Adding ipb_address_unique index\n" );
dbsource(archive('patch-ipb_address_unique.sql'));
}
# Add missing extension tables
foreach ( $wgExtNewTables as $nt ) {
if ($wgDatabase->tableExists($nt[0])) {
- echo "... table \"$nt[0]\" already exists\n";
+ wfOut( "... table \"$nt[0]\" already exists\n" );
continue;
}
- echo "Creating table \"$nt[0]\"\n";
+ wfOut( "Creating table \"$nt[0]\"\n" );
dbsource($nt[1]);
}
# Add missing extension fields
foreach ( $wgExtPGNewFields as $nc ) {
$fi = $wgDatabase->fieldInfo($nc[0], $nc[1]);
if (!is_null($fi)) {
- echo "... column \"$nc[0].$nc[1]\" already exists\n";
+ wfOut( "... column \"$nc[0].$nc[1]\" already exists\n" );
continue;
}
- echo "Adding column \"$nc[0].$nc[1]\"\n";
+ wfOut( "Adding column \"$nc[0].$nc[1]\"\n" );
$wgDatabase->query( "ALTER TABLE $nc[0] ADD $nc[1] $nc[2]" );
}
# Add missing extension indexes
foreach ( $wgExtNewIndexes as $ni ) {
if (pg_index_exists($ni[0], $ni[1])) {
- echo "... index \"$ni[1]\" on table \"$ni[0]\" already exists\n";
+ wfOut( "... index \"$ni[1]\" on table \"$ni[0]\" already exists\n" );
continue;
}
- echo "Creating index \"$ni[1]\" on table \"$ni[0]\"\n";
+ wfOut( "Creating index \"$ni[1]\" on table \"$ni[0]\"\n" );
dbsource($ni[2]);
}
dépôts / lhc / web / wiklou.git / commitdiff