<?php
-
-# MediaWiki web-based config/installation
-# Copyright (C) 2004 Brion Vibber <brion@pobox.com>, 2006 Rob Church <robchur@gmail.com>
-# http://www.mediawiki.org/
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-# http://www.gnu.org/copyleft/gpl.html
+/**
+ * MediaWiki web-based config/installation
+ *
+ * Copyright © 2004 Brion Vibber <brion@pobox.com>, 2006 Rob Church <robchur@gmail.com>
+ * http://www.mediawiki.org/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ */
if( !defined( 'MEDIAWIKI_INSTALL' ) ) {
die( 'Not an entry point.' );
'serverless' => true
);
+$ourdb['mssql'] = array(
+ 'fullname' => 'Microsoft SQL Server',
+ 'havedriver' => 0,
+ 'compile' => 'sqlsrv',
+ 'bgcolor' => '#cccccc',
+ 'rootuser' => 'root',
+ 'serverless' => false
+);
+
$ourdb['ibm_db2'] = array(
'fullname' => 'DB2',
'havedriver' => 0,
<p>Afterwards retry to start the <a href=\"\">setup</a>.</p>" );
}
-
-require_once( "$IP/maintenance/updaters.inc" );
-
class ConfigData {
function getEncoded( $data ) {
# removing latin1 support, no need...
$conf->SQLiteDataDir = importPost( "SQLiteDataDir", "$IP/../data" );
## DB2 specific:
- // New variable in order to have a different default port number
$conf->DBport_db2 = importPost( "DBport_db2", "50000" );
- $conf->DBcataloged = importPost( "DBcataloged", "cataloged" );
$conf->DBdb2schema = importPost( "DBdb2schema", "mediawiki" );
// Oracle specific
}
## DB2 specific:
- $wgDBcataloged = $conf->DBcataloged;
+ if ( $conf->DBtype == 'ibm_db2' ) {
+ $wgDBport = $conf->DBport_db2;
+ }
$wgCommandLineMode = true;
if (! defined ( 'STDERR' ) )
if( !$ok ) { continue; }
}
+ else if ( $conf->DBtype == 'mssql' ) {
+ # Possible connect as a superuser
+ if ( $useRoot ) {
+ echo( "<li>Attempting to connect to database \"{$conf->DBtype}\" as superuser \"{$conf->RootUser}\"" );
+ $wgDatabase = $dbc->newFromParams(
+ $conf->DBserver,
+ $conf->RootUser,
+ $conf->RootPW,
+ false,
+ false,
+ 1
+ );
+ if ( !$wgDatabase->isOpen() ) {
+ echo( " error: {$wgDatabase->lastError()}</li>\n" );
+ $errs['DBserver'] = 'Could not connect to database as superuser';
+ $errs['RootUser'] = 'Check username';
+ $errs['RootPW'] = 'and password';
+ continue;
+ }
+ $wgDatabase->initial_setup( $conf->DBname, $conf->DBuser, $conf->DBpassword );
+ }
+ echo( "<li>Attempting to connect to database \"{$wgDBname}\" as \"{$wgDBuser}\"..." );
+ $wgDatabase = $dbc->newFromParams(
+ $conf->DBserver,
+ $conf->DBuser,
+ $conf->DBpassword,
+ $conf->DBname,
+ 1
+ );
+ if ( !$wgDatabase->isOpen() ) {
+ echo( " error: {$wgDatabase->lastError()} </li>\n" );
+ } else {
+ $myver = $wgDatabase->getServerVersion();
+ }
+ }
else if( $conf->DBtype == 'ibm_db2' ) {
if( $useRoot ) {
$db_user = $conf->RootUser;
echo "<li>Connect failed.</li>";
if ($useRoot) {
if (ini_get('oci8.privileged_connect') === false) {
- echo "<li>Privileged connect disabled, please set oci8.privileged_connect or run maintenance/ora/user.sql script manually prior to continuing.</li>";
+ echo "<li>Privileged connect disabled, please set oci8.privileged_connect or run maintenance/oracle/user.sql script manually prior to continuing.</li>";
$ok = false;
} else {
$wgDBadminuser = $conf->RootUser;
if ($wgDatabase->isOpen()) {
$wgDBOracleDefTS = $conf->DBdefTS_ora;
$wgDBOracleTempTS = $conf->DBtempTS_ora;
- $res = $wgDatabase->sourceFile( "../maintenance/ora/user.sql" );
+ $res = $wgDatabase->sourceFile( "../maintenance/oracle/user.sql" );
if ($res !== true) dieout($res);
} else {
echo "<li>Invalid database superuser, please supply a valid superuser account.</li>";
}
} else { # not mysql
error_reporting( E_ALL | E_STRICT );
- $wgSuperUser = '';
## Possible connect as a superuser
// 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 \"" .
- htmlspecialchars( $wgDBsuperuser ) . "\"..." );
- $wgDatabase = $dbc->newFromParams($wgDBserver, $wgDBsuperuser, $conf->RootPW, "postgres", 1);
+ htmlspecialchars( $conf->RootUser ) . "\"..." );
+ $wgDatabase = $dbc->newFromParams($wgDBserver, $conf->RootUser, $conf->RootPW, "postgres", 1);
if (!$wgDatabase->isOpen()) {
print " error: " . htmlspecialchars( $wgDatabase->lastError() ) . "</li>\n";
$errs["DBserver"] = "Could not connect to database as superuser";
$errs["RootPW"] = "and password";
continue;
}
- $wgDatabase->initial_setup($conf->RootPW, 'postgres');
+ $wgDatabase->initial_setup($conf->RootUser, $conf->RootPW, 'postgres');
}
echo( "<li>Attempting to connect to database \"" . htmlspecialchars( $wgDBname ) .
"\" as \"" . htmlspecialchars( $wgDBuser ) . "\"..." );
print "</ul><pre>\n";
chdir( ".." );
flush();
- do_all_updates();
+
+ define( 'MW_NO_SETUP', true );
+ $updater = DatabaseUpdater::newForDb( $wgDatabase, false );
+ $updater->doUpdates();
+ foreach( $updater->getPostDatabaseUpdateMaintenance() as $maint ) {
+ call_user_func_array( array( new $maint, 'execute' ), array() );
+ }
+
chdir( "config" );
print "</pre>\n";
print "<ul><li>Finished update checks.</li>\n";
break;
}
}
- $wgDatabase->freeResult( $res );
if ( !$found && $conf->DBengine != 'MyISAM' ) {
echo "<li><strong>Warning:</strong> " . htmlspecialchars( $conf->DBengine ) .
" storage engine not available, " .
}
?>
<ul class='plain'><?php
- database_picker($conf);
+ database_picker($ourdb, $conf);
?></ul>
</div>
</p>
</div>
- <?php database_switcher('mysql'); ?>
+ <?php database_switcher($ourdb, 'mysql'); ?>
<div class="config-input"><?php aField( $conf, "DBprefix", "Database table prefix:" ); ?></div>
<div class="config-desc">
<p>If you need to share one database between multiple wikis, or
</p>
</fieldset>
- <?php database_switcher('postgres'); ?>
+ <?php database_switcher($ourdb, 'postgres'); ?>
<div class="config-input"><?php aField( $conf, "DBport", "Database port:" ); ?></div>
<div class="config-input"><?php aField( $conf, "DBpgschema", "Schema for mediawiki:" ); ?></div>
<div class="config-input"><?php aField( $conf, "DBts2schema", "Schema for tsearch2:" ); ?></div>
</div>
</fieldset>
- <?php database_switcher('sqlite'); ?>
+ <?php database_switcher($ourdb, 'sqlite'); ?>
<div class="config-input"><?php
aField( $conf, "SQLiteDataDir", "SQLite data directory:" );
?></div>
</div>
</fieldset>
- <?php database_switcher('ibm_db2'); ?>
+
+ <?php database_switcher($ourdb, 'mssql' ); ?>
+ <div class="config-desc">
+ <p>No MS SQL Server specific options at this time.</p>
+ </div>
+ </fieldset>
+
+
+ <?php database_switcher($ourdb, 'ibm_db2'); ?>
<div class="config-input"><?php
aField( $conf, "DBport_db2", "Database port:" );
?></div>
+ <div class="config-desc">
+ <p>50000 is the usual DB2 port.</p>
+ </div>
<div class="config-input"><?php
aField( $conf, "DBdb2schema", "Schema for mediawiki:" );
?></div>
- <div>Select one:</div>
- <ul class="plain">
- <li><?php aField( $conf, "DBcataloged", "Cataloged (DB2 installed locally)", "radio", "cataloged" ); ?></li>
- <li><?php aField( $conf, "DBcataloged", "Uncataloged (remote DB2 through ODBC)", "radio", "uncataloged" ); ?></li>
- </ul>
<div class="config-desc">
<p>If you need to share one database between multiple wikis, or
between MediaWiki and another web application, you may specify
</div>
</fieldset>
- <?php database_switcher('oracle'); ?>
+ <?php database_switcher($ourdb, 'oracle'); ?>
<div class="config-input"><?php aField( $conf, "DBprefix_ora", "Database table prefix:" ); ?></div>
<div class="config-desc">
<p>If you need to share one database between multiple wikis, or
"# SQLite-specific settings
\$wgSQLiteDataDir = \"{$sqliteDataDir}\";";
} elseif( $conf->DBtype == 'ibm_db2' ) {
- $dbsettings =
-"# DB2 specific settings
-\$wgDBport_db2 = \"{$slconf['DBport_db2']}\";
-\$wgDBmwschema = \"{$slconf['DBdb2schema']}\";
-\$wgDBcataloged = \"{$slconf['DBcataloged']}\";";
+ $dbsettings = <<<MULTILINE
+# DB2 specific settings
+\$wgDBport = "{$slconf['DBport_db2']}";
+\$wgDBmwschema = "{$slconf['DBdb2schema']}";
+MULTILINE;
} elseif( $conf->DBtype == 'oracle' ) {
$dbsettings =
"# Oracle specific settings
return $errstr;
}
-function database_picker($conf) {
- global $ourdb;
+function database_picker($ourdb, $conf) {
print "\n";
foreach(array_keys($ourdb) as $db) {
if ($ourdb[$db]['havedriver']) {
print "\n\t";
}
-function database_switcher($db) {
- global $ourdb;
+function database_switcher($ourdb, $db) {
$color = $ourdb[$db]['bgcolor'];
$full = $ourdb[$db]['fullname'];
print "<fieldset id='$db' style='clear:both'><legend>$full-specific options</legend>\n";
<li><a href="http://www.mediawiki.org/wiki/Manual:Contents">Administrator's Guide</a></li>
<li><a href="http://www.mediawiki.org/wiki/Manual:FAQ">FAQ</a></li>
</ul>
- <p style="font-size:90%;margin-top:1em">MediaWiki is Copyright © 2001-2009 by Magnus Manske, Brion Vibber,
+ <p style="font-size:90%;margin-top:1em">MediaWiki is Copyright © 2001-2010 by Magnus Manske, Brion Vibber,
Lee Daniel Crocker, Tim Starling, Erik Möller, Gabriel Wicke, Ævar Arnfjörð Bjarmason, Niklas Laxström,
Domas Mituzas, Rob Church, Yuri Astrakhan, Aryeh Gregor, Aaron Schulz and others.</p>
</div></div>
dépôts / lhc / web / wiklou.git / blobdiff