@ini_set( "display_errors", true );
# In case of errors, let output be clean.
-$wgRequestTime = microtime();
+$wgRequestTime = microtime( true );
# Attempt to set up the include path, to fix problems with relative includes
$IP = dirname( dirname( __FILE__ ) );
require_once( "includes/DefaultSettings.php" );
require_once( "includes/MagicWord.php" );
require_once( "includes/Namespace.php" );
+require_once( "includes/ProfilerStub.php" );
+
+## Databases we support:
+
+$ourdb = array();
+$ourdb['mysql']['fullname'] = 'MySQL';
+$ourdb['mysql']['havedriver'] = 0;
+$ourdb['mysql']['compile'] = 'mysql';
+$ourdb['mysql']['bgcolor'] = '#ffe5a7';
+$ourdb['mysql']['rootuser'] = 'root';
+
+$ourdb['postgres']['fullname'] = 'PostgreSQL';
+$ourdb['postgres']['havedriver'] = 0;
+$ourdb['postgres']['compile'] = 'pgsql';
+$ourdb['postgres']['bgcolor'] = '#aaccff';
+$ourdb['postgres']['rootuser'] = 'postgres';
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
.error-top {
color: red;
background-color: #FFF0F0;
- border: 2px solid red;
+ border: 2px solid red;
font-size: 130%;
font-weight: bold;
padding: 1em 1.5em;
}
</style>
+ <script type="text/javascript">
+ <!--
+ function hideall() {
+ <?php foreach (array_keys($ourdb) as $db) {
+ echo "\n document.getElementById('$db').style.display='none';";
+ }
+ ?>
+
+ }
+ function toggleDBarea(id,defaultroot) {
+ hideall();
+ var dbarea = document.getElementById(id).style;
+ dbarea.display = (dbarea.display == 'none') ? 'block' : 'none';
+ var db = document.getElementById('RootUser');
+ if (defaultroot) {
+<?php foreach (array_keys($ourdb) as $db) {
+ echo " if (id == '$db') { db.value = '".$ourdb[$db]['rootuser']."';}\n";
+}?>
+ }
+ }
+ // -->
+ </script>
</head>
<body>
/* Check for existing configurations and bug out! */
if( file_exists( "../LocalSettings.php" ) ) {
- dieout( "
<p><strong>Setup has completed, <a href='../index.php'>your wiki</a> is configured.</strong></p>
+ dieout( "<p><strong>Setup has completed, <a href='../index.php'>your wiki</a> is configured.</strong></p>
<p>Please delete the /config directory for extra security.</p></div></div></div></div>" );
}
<pre>
cd <i>/path/to/wiki</i>
chmod a+w config
- </pre>" );
+ </pre>
+
+ <p>Afterwards retry to start the <a href=\"\">setup</a>.</p>" );
}
print "<li>PHP " . phpversion() . " installed</li>\n";
+## Temporarily turn off all errors as we try to discover installed databases
+$olderrnum = error_reporting(0);
+
+$phpdatabases = array();
+foreach (array_keys($ourdb) as $db) {
+ $compname = $ourdb[$db]['compile'];
+ if (extension_loaded($compname) or dl($compname . '.' . PHP_SHLIB_SUFFIX)) {
+ array_push($phpdatabases, $db);
+ $ourdb[$db]['havedriver'] = 1;
+ }
+}
+
+error_reporting($olderrornum);
+
+if (!$phpdatabases) {
+ print "Could not find a suitable database driver!<ul>";
+ foreach (array_keys($ourdb) AS $db) {
+ $comp = $ourdb[$db]['compile'];
+ $full = $ourdb[$db]['fullname'];
+ print "<li>For <b>$full</b>, compile PHP using <b>--with-$comp</b>, "
+ ."or install the $comp.so module</li>\n";
+ }
+ dieout( "</ul></ul>" );
+}
+
+print "<li>Found database drivers for:";
+foreach (array_keys($ourdb) AS $db) {
+ if ($ourdb[$db]['havedriver']) {
+ $DefaultDBtype = $db;
+ print " ".$ourdb[$db]['fullname'];
+ }
+}
+print "</li>\n";
+if (count($phpdatabases) != 1)
+ $DefaultDBtype = '';
+
if( ini_get( "register_globals" ) ) {
?>
<li>
<div style="font-size:110%">
<strong class="error">Warning:</strong>
- <strong>PHP's
<tt><a href="http://php.net/register_globals">register_globals</a></tt> option is enabled. Disable it if you can.</strong>
+ <strong>PHP's <tt><a href="http://php.net/register_globals">register_globals</a></tt> option is enabled. Disable it if you can.</strong>
</div>
MediaWiki will work, but your server is more exposed to PHP-based security vulnerabilities.
</li>
if( !function_exists( 'session_name' ) )
dieout( "PHP's session module is missing. MediaWiki requires session support in order to function." );
+# Likewise for PCRE
+if( !function_exists( 'preg_match' ) )
+ dieout( "The PCRE regular expression functions are missing. MediaWiki requires these in order to function." );
+
$memlimit = ini_get( "memory_limit" );
$conf->raiseMemory = false;
if( empty( $memlimit ) || $memlimit == -1 ) {
if ( $conf->turck ) {
print "<li><a href=\"http://turck-mmcache.sourceforge.net/\">Turck MMCache</a> installed</li>\n";
}
+
+$conf->apc = function_exists('apc_fetch');
+if ($conf->apc ) {
+ print "<li><a href=\"http://www.php.net/apc\">APC</a> installed</li>";
+}
+
$conf->eaccel = function_exists( 'eaccelerator_get' );
if ( $conf->eaccel ) {
- $conf->turck = 'eaccelerator';
- print "<li><a href=\"http://eaccelerator.sourceforge.net/\">eAccelerator</a> installed</li>\n";
+ $conf->turck = 'eaccelerator';
+
print "<li><a href=\"http://eaccelerator.sourceforge.net/\">eAccelerator</a> installed</li>\n";
}
-if (!$conf->turck && !$conf->eaccel) {
- print "<li>Neither <a href=\"http://turck-mmcache.sourceforge.net/\">Turck MMCache</a> nor <a href=\"http://eaccelerator.sourceforge.net/\">eAccelerator</a> are installed, " .
- "can't use object caching functions</li>\n";
+
+if( !$conf->turck && !$conf->eaccel && !$conf->apc ) {
+ echo( '<li>Couldn\'t find <a href="http://turck-mmcache.sourceforge.net">Turck MMCache</a>,
+ <a href="http://eaccelerator.sourceforge.net">eAccelerator</a> or
+ <a href="http://www.php.net/apc">APC</a>. Object caching functions cannot be used.</li>' );
}
$conf->diff3 = false;
-$diff3locations = array("/usr/bin", "/opt/csw/bin", "/usr/gnu/bin", "/usr/sfw/bin") + explode($sep, getenv("PATH"));
-$diff3names = array("gdiff3", "diff3", "diff3.exe");
+$diff3locations = array( "/usr/bin", "/usr/local/bin", "/opt/csw/bin", "/usr/gnu/bin", "/usr/sfw/bin" ) + explode( $sep, getenv( "PATH" ) );
+$diff3names = array( "gdiff3", "diff3", "diff3.exe" );
-$diff3versioninfo = array('$1 --version 2>&1', 'diff3 (GNU diffutils)');
+$diff3versioninfo = array( '$1 --version 2>&1', 'diff3 (GNU diffutils)' );
foreach ($diff3locations as $loc) {
$exe = locate_executable($loc, $diff3names, $diff3versioninfo);
if ($exe !== false) {
print "<li>GNU diff3 not found.</li>";
$conf->ImageMagick = false;
-$imcheck = array( "/usr/bin", "/usr/local/bin", "/sw/bin", "/opt/local/bin" );
+$imcheck = array( "/usr/bin", "/opt/csw/bin", "/usr/local/bin", "/sw/bin", "/opt/local/bin" );
foreach( $imcheck as $dir ) {
$im = "$dir/convert";
if( file_exists( $im ) ) {
? 'root@localhost'
: $_SERVER["SERVER_ADMIN"];
$conf->EmergencyContact = importPost( "EmergencyContact", $defaultEmail );
- $conf->DBtype = importPost( "DBtype", "mysql" );
+ $conf->DBtype = importPost( "DBtype", $DefaultDBtype );
+?>
+
+<?php
$conf->DBserver = importPost( "DBserver", "localhost" );
$conf->DBname = importPost( "DBname", "wikidb" );
$conf->DBuser = importPost( "DBuser", "wikiuser" );
$conf->DBpassword = importPost( "DBpassword" );
$conf->DBpassword2 = importPost( "DBpassword2" );
- $conf->DBprefix = importPost( "DBprefix" );
- $conf->DBmysql5 = (importPost( "DBmysql5" ) == "true") ? "true" : "false";
- $conf->RootUser = importPost( "RootUser", "root" );
- $conf->RootPW = importPost( "RootPW", "-" );
- $conf->LanguageCode = importPost( "LanguageCode", "en" );
$conf->SysopName = importPost( "SysopName", "WikiSysop" );
$conf->SysopPass = importPost( "SysopPass" );
$conf->SysopPass2 = importPost( "SysopPass2" );
+ $conf->RootUser = importPost( "RootUser", "root" );
+ $conf->RootPW = importPost( "RootPW", "-" );
+
+ ## MySQL specific:
+ $conf->DBprefix = importPost( "DBprefix" );
+ $conf->DBmysql5 = (importPost( "DBmysql5" ) == "true") ? "true" : "false";
+ $conf->LanguageCode = importPost( "LanguageCode", "en" );
+
+ ## Postgres specific:
+ $conf->DBport = importPost( "DBport", "5432" );
+ $conf->DBmwschema = importPost( "DBmwschema", "mediawiki" );
+ $conf->DBts2schema = importPost( "DBts2schema", "public" );
/* Check for validity */
$errs = array();
}
/* default values for installation */
-$conf->Email =importRequest("Email", "email_enabled");
-$conf->Emailuser=importRequest("Emailuser", "emailuser_enabled");
-$conf->Enotif =importRequest("Enotif", "enotif_allpages");
-$conf->Eauthent =importRequest("Eauthent", "eauthent_enabled");
+$conf->Email = importRequest("Email", "email_enabled");
+$conf->Emailuser = importRequest("Emailuser", "emailuser_enabled");
+$conf->Enotif = importRequest("Enotif", "enotif_allpages");
+$conf->Eauthent = importRequest("Eauthent", "eauthent_enabled");
if( $conf->posted && ( 0 == count( $errs ) ) ) {
do { /* So we can 'continue' to end prematurely */
$wgCommandLineMode = false;
chdir( ".." );
eval($local);
- if (!in_array($conf->DBtype, array("mysql", "oracle"))) {
- $errs["DBtype"] = "Unknown database type.";
+ $conf->DBtypename = '';
+ foreach (array_keys($ourdb) as $db) {
+ if ($conf->DBtype === $db)
+ $conf->DBtypename = $ourdb[$db]['fullname'];
+ }
+ if ( ! strlen($conf->DBtype)) {
+ $errs["DBpicktype"] = "Please choose a database type";
continue;
}
- print "<li>Database type: {$conf->DBtype}</li>\n";
+
+ if (! $conf->DBtypename) {
+ $errs["DBtype"] = "Unknown database type '$conf->DBtype'";
+ continue;
+ }
+ print "<li>Database type: {$conf->DBtypename}</li>\n";
$dbclass = 'Database'.ucfirst($conf->DBtype);
- require_once("$dbclass.php");
$wgDBtype = $conf->DBtype;
$wgDBadminuser = "root";
$wgDBadminpassword = $conf->RootPW;
+
+ ## Mysql specific:
$wgDBprefix = $conf->DBprefix;
+
+ ## Postgres specific:
+ $wgDBport = $conf->DBport;
+ $wgDBmwschema = $conf->DBmwschema;
+ $wgDBts2schema = $conf->DBts2schema;
+
$wgCommandLineMode = true;
- $wgUseDatabaseMessages = false; /* FIXME: For database failure */
+ $wgUseDatabaseMessages = false; /* FIXME: For database failure */
require_once( "includes/Setup.php" );
chdir( "config" );
require_once( "maintenance/InitialiseMessages.inc" );
$wgTitle = Title::newFromText( "Installation script" );
- $mysqlOldClient = version_compare( mysql_get_client_info(), "4.1.0", "lt" );
- if( $mysqlOldClient ) {
- print "<li><b>PHP is linked with old MySQL client libraries. If you are
- using a MySQL 4.1 server and have problems connecting to the database,
- see <a href='http://dev.mysql.com/doc/mysql/en/old-client.html'
- >http://dev.mysql.com/doc/mysql/en/old-client.html</a> for help.</b></li>\n";
- }
+ error_reporting( E_ALL );
+ print "<li>Loading class: $dbclass";
$dbc = new $dbclass;
-
+
if( $conf->DBtype == 'mysql' ) {
+ $mysqlOldClient = version_compare( mysql_get_client_info(), "4.1.0", "lt" );
+ if( $mysqlOldClient ) {
+ print "<li><b>PHP is linked with old MySQL client libraries. If you are
+ using a MySQL 4.1 server and have problems connecting to the database,
+ see <a href='http://dev.mysql.com/doc/mysql/en/old-client.html'
+ >http://dev.mysql.com/doc/mysql/en/old-client.html</a> for help.</b></li>\n";
+ }
$ok = true; # Let's be optimistic
# Decide if we're going to use the superuser or the regular database user
# Attempt to connect
echo( "<li>Attempting to connect to database server as $db_user..." );
$wgDatabase = Database::newFromParams( $wgDBserver, $db_user, $db_pass, '', 1 );
-
+
# Check the connection and respond to errors
if( $wgDatabase->isOpen() ) {
# Seems OK
$wgDBadminpassword = $db_pass;
echo( "success.</li>\n" );
$wgDatabase->ignoreErrors( true );
- $myver = mysql_get_server_info( $wgDatabase->mConn );
+ $myver = $wgDatabase->getServerVersion();
} else {
# There were errors, report them and back out
$ok = false;
if( !$ok ) { continue; }
} else /* not mysql */ {
- print "<li>Connecting to SQL server...";
+ error_reporting( E_ALL );
+ $wgSuperUser = '';
+ ## Possible connect as a superuser
+ if( $conf->RootPW != '-' and strlen($conf->RootPW)) {
+ $wgDBsuperuser = $conf->RootUser;
+ echo( "<li>Attempting to connect to database \"postgres\" as superuser \"$wgDBsuperuser\"..." );
+ $wgDatabase = $dbc->newFromParams($wgDBserver, $wgDBsuperuser, $conf->RootPW, "postgres", 1);
+ if (!$wgDatabase->isOpen()) {
+ print " error: " . $wgDatabase->lastError() . "</li>\n";
+ $errs["DBserver"] = "Could not connect to database as superuser";
+ $errs["RootUser"] = "Check username";
+ $errs["RootPW"] = "and password";
+ continue;
+ }
+ }
+ echo( "<li>Attempting to connect to database \"$wgDBname\" as \"$wgDBuser\"..." );
$wgDatabase = $dbc->newFromParams($wgDBserver, $wgDBuser, $wgDBpassword, $wgDBname, 1);
if (!$wgDatabase->isOpen()) {
print " error: " . $wgDatabase->lastError() . "</li>\n";
} else {
- $wgDatabase->ignoreErrors(true);
- $myver = get_db_version();
+ $myver = $wgDatabase->getServerVersion();
}
}
}
print "<li>Connected to $myver";
- if( version_compare( $myver, "4.0.0" ) < 0 ) {
- die( " -- mysql 4.0 or later required. Aborting." );
- }
- $mysqlNewAuth = version_compare( $myver, "4.1.0", "ge" );
- if( $mysqlNewAuth && $mysqlOldClient ) {
- print "; <b class='error'>You are using MySQL 4.1 server, but PHP is linked
- to old client libraries; if you have trouble with authentication, see
- <a href='http://dev.mysql.com/doc/mysql/en/old-client.html'
- >http://dev.mysql.com/doc/mysql/en/old-client.html</a> for help.</b>";
- }
- if( $wgDBmysql5 ) {
- if( $mysqlNewAuth ) {
- print "; enabling MySQL 4.1/5.0 charset mode";
- } else {
- print "; <b class='error'>MySQL 4.1/5.0 charset mode enabled,
- but older version detected; will likely fail.</b>";
+ if ($conf->DBtype == 'mysql') {
+ if( version_compare( $myver, "4.0.14" ) < 0 ) {
+ dieout( " -- mysql 4.0.14 or later required. Aborting." );
}
- }
- print "</li>\n";
+ $mysqlNewAuth = version_compare( $myver, "4.1.0", "ge" );
+ if( $mysqlNewAuth && $mysqlOldClient ) {
+ print "; <b class='error'>You are using MySQL 4.1 server, but PHP is linked
+ to old client libraries; if you have trouble with authentication, see
+ <a href='http://dev.mysql.com/doc/mysql/en/old-client.html'
+ >http://dev.mysql.com/doc/mysql/en/old-client.html</a> for help.</b>";
+ }
+ if( $wgDBmysql5 ) {
+ if( $mysqlNewAuth ) {
+ print "; enabling MySQL 4.1/5.0 charset mode";
+ } else {
+ print "; <b class='error'>MySQL 4.1/5.0 charset mode enabled,
+ but older version detected; will likely fail.</b>";
+ }
+ }
+ print "</li>\n";
- if ($conf->DBtype == 'mysql') {
- @$sel = mysql_select_db( $wgDBname, $wgDatabase->mConn );
+ @$sel = $wgDatabase->selectDB( $wgDBname );
if( $sel ) {
print "<li>Database <tt>" . htmlspecialchars( $wgDBname ) . "</tt> exists</li>\n";
} else {
}
$wgDatabase->selectDB( $wgDBname );
}
+ else if ($conf->DBtype == 'postgres') {
+ if( version_compare( $myver, "PostgreSQL 8.0" ) < 0 ) {
+ dieout( " <b>Postgres 8.0 or later is required</b>. Aborting.</li></ul>" );
+ }
+ }
if( $wgDatabase->tableExists( "cur" ) || $wgDatabase->tableExists( "revision" ) ) {
print "<li>There are already MediaWiki tables in this database. Checking if updates are needed...</li>\n";
- # Create user if required
- if ( $conf->Root ) {
- $conn = Database::newFromParams( $wgDBserver, $wgDBuser, $wgDBpassword, $wgDBname, 1 );
+ # Create user if required (todo: other databases)
+ if ( $conf->Root && $conf->DBtype == 'mysql') {
+ $conn = $dbc->newFromParams( $wgDBserver, $wgDBuser, $wgDBpassword, $wgDBname, 1 );
if ( $conn->isOpen() ) {
print "<li>DB user account ok</li>\n";
$conn->close();
flush();
do_all_updates();
chdir( "config" );
-
print "</pre>\n";
print "<li>Finished update checks.</li>\n";
} else {
dbsource( "../maintenance/tables.sql", $wgDatabase );
}
dbsource( "../maintenance/interwiki.sql", $wgDatabase );
- } else {
- dbsource( "../maintenance/oracle/tables.sql", $wgDatabase );
- dbsource( "../maintenance/oracle/interwiki.sql", $wgDatabase );
+ } else if ($conf->DBtype == 'postgres') {
+ $wgDatabase->setup_database();
+ }
+ else {
+ $errs["DBtype"] = "Do not know how to handle database type '$conf->DBtype'";
+ continue;
}
print " done.</li>\n";
print "<li>Initializing data...";
$wgDatabase->insert( 'site_stats',
- array( 'ss_row_id' => 1,
- 'ss_total_views' => 0,
- 'ss_total_edits' => 0,
- 'ss_good_articles' => 0 ) );
-
+ array ( 'ss_row_id' => 1,
+ 'ss_total_views' => 0,
+ 'ss_total_edits' => 0,
+ 'ss_good_articles' => 0 ) );
+
# Set up the "regular user" account *if we can, and if we need to*
- if( $conf->Root ) {
+ if( $conf->Root and $conf->DBtype == 'mysql') {
# See if we need to
- $wgDatabase2 = Database::newFromParams( $wgDBserver, $wgDBuser, $wgDBpassword, $wgDBname, 1 );
+ $wgDatabase2 = $dbc->newFromParams( $wgDBserver, $wgDBuser, $wgDBpassword, $wgDBname, 1 );
if( $wgDatabase2->isOpen() ) {
# Nope, just close the test connection and continue
$wgDatabase2->close();
echo( "success.</li>" );
}
}
-
+
if( $conf->SysopName ) {
$u = User::newFromName( $conf->getSysopName() );
if ( 0 == $u->idForName() ) {
$revid = $revision->insertOn( $wgDatabase );
$article->updateRevisionOn( $wgDatabase, $revision );
- print "<li><pre>";
- initialiseMessages();
- print "</pre></li>\n";
+ initialiseMessages( false, false, 'printListItem' );
}
/* Write out the config file now that all is well */
print "<p>Creating LocalSettings.php...</p>\n\n";
- $localSettings = "<" . "?php$endl$local$endl?" . ">";
+ $localSettings = "<" . "?php$endl$local$endl?" . ">\r\n";
// Fix up a common line-ending problem (due to CVS on Windows)
$localSettings = str_replace( "\r\n", "\n", $localSettings );
-
- if( version_compare( phpversion(), "4.3.2" ) >= 0 ) {
- $xt = "xt"; # Refuse to overwrite an existing file
- } else {
- $xt = "wt"; # 'x' is not available prior to PHP 4.3.2. We did check above, but race conditions blah blah
- }
- $f = fopen( "LocalSettings.php", $xt );
+ $f = fopen( "LocalSettings.php", 'xt' );
if( $f == false ) {
dieout( "<p>Couldn't write out LocalSettings.php. Check that the directory permissions are correct and that there isn't already a file of that name here...</p>\n" .
?>
</div>
<p class="config-desc">
- Preferably a short word without punctuation, i.e. "Wikipedia".<br>
+ Preferably a short word without punctuation, i.e. "Wikipedia".<br />
Will appear as the namespace name for "meta" pages, and throughout the interface.
</p>
<?php aField( $conf, "SysopPass2", "Password confirm:", "password" ) ?>
</div>
<p class="config-desc">
- An admin can lock/delete pages, block users from editing, and other maintenance tasks.<br>
+ An admin can lock/delete pages, block users from editing, and do other maintenance tasks.<br />
A new account will be added only when creating a new wiki database.
</p>
aField( $conf, "Shm", "Turck MMCache", "radio", "turck" );
echo "</li>";
}
- ?>
- <?php
+ if ( $conf->apc ) {
+ echo "<li>";
+ aField( $conf, "Shm", "APC", "radio", "apc" );
+ echo "</li>";
+ }
if ( $conf->eaccel ) {
echo "<li>";
aField( $conf, "Shm", "eAccelerator", "radio", "eaccel" );
<div style="clear:left"><?php aField( $conf, "MCServers", "Memcached servers:", "text" ) ?></div>
</div>
<p class="config-desc">
- Using a shared memory system such as Turck MMCache, eAccelerator, or Memcached will speed
- up MediaWiki significantly. Memcached is the best solution but needs to be
+ Using a shared memory system such as Turck MMCache, APC, eAccelerator, or Memcached
+ will speed up MediaWiki significantly. Memcached is the best solution but needs to be
installed. Specify the server addresses and ports in a comma-separted list. Only
use Turck shared memory if the wiki will be running on a single Apache server.
</p>
<div class="config-section">
<div class="config-input">
- <label class='column'>E-mail (general):</label>
+ <label class='column'>E-mail features (global):</label>
<ul class="plain">
<li><?php aField( $conf, "Email", "Enabled", "radio", "email_enabled" ); ?></li>
<li><?php aField( $conf, "Email", "Disabled", "radio", "email_disabled" ); ?></li>
</ul>
</div>
<p class="config-desc">
- Use this to disable all e-mail functions (send a password reminder, user-to-user e-mail and e-mail notification),
- if sending e-mails on your server doesn't work.
+ Use this to disable all e-mail functions (password reminders, user-to-user e-mail and e-mail notifications)
+ if sending mail doesn't work on your server.
</p>
+
<div class="config-input">
<label class='column'>User-to-user e-mail:</label>
<ul class="plain">
</ul>
</div>
<p class="config-desc">
- Use this to disable only the user-to-user e-mail function (EmailUser).
+ The user-to-user e-mail feature (Special:Emailuser) lets the wiki act as a relay to allow users to exchange e-mail without publicly advertising their e-mail address.
</p>
<div class="config-input">
- <label class='column'>E-mail notification:</label>
+ <label class='column'>E-mail notification about changes:</label>
<ul class="plain">
<li><?php aField( $conf, "Enotif", "Disabled", "radio", "enotif_disabled" ); ?></li>
- <li><?php aField( $conf, "Enotif", "Enabled for user_talk changes only", "radio", "enotif_usertalk" ); ?></li>
- <li><?php aField( $conf, "Enotif", "Enabled for user_talk and watch list changes (not recommended for large wikis)", "radio", "enotif_allpages" ); ?></li>
+ <li><?php aField( $conf, "Enotif", "Enabled for changes to user discussion pages only", "radio", "enotif_usertalk" ); ?></li>
+ <li><?php aField( $conf, "Enotif", "Enabled for changes to user discussion pages, and to pages on watchlists (not recommended for large wikis)", "radio", "enotif_allpages" ); ?></li>
</ul>
</div>
<div class="config-desc">
<p>
- E-mail notification sends a notification e-mail to a user, when the user_talk page is changed
- and/or when watch-listed pages are changed, depending on the above settings.
- When testing this feature, be reminded, that obviously an e-mail address must be present in your preferences
- and that your own changes never trigger notifications to be sent to yourself.</p>
+ For this feature to work, an e-mail address must be present for the user account, and the notification
+ options in the user's preferences must be enabled. Also note the
+ authentication option below. When testing the feature, keep in mind that your own changes will never trigger notifications to be sent to yourself.</p>
- <p>Users get corresponding options to select or deselect in their users' preferences.
- The user options are not shown on the preference page, if e-mail notification is disabled.</p>
-
- <p>There are additional options for fine tuning in /includes/DefaultSettings.php .</p>
+ <p>There are additional options for fine tuning in /includes/DefaultSettings.php; copy these to your LocalSettings.php and edit them there to change them.</p>
</div>
<div class="config-input">
- <label class='column'>E-mail authentication:</label>
+ <label class='column'>E-mail address authentication:</label>
<ul class="plain">
<li><?php aField( $conf, "Eauthent", "Disabled", "radio", "eauthent_disabled" ); ?></li>
<li><?php aField( $conf, "Eauthent", "Enabled", "radio", "eauthent_enabled" ); ?></li>
</ul>
</div>
<div class="config-desc">
- <p>E-mail address authentication uses a scheme to authenticate e-mail addresses of the users. The user who initially enters or changes his/her stored e-mail address
- gets a link with a token mailed to that address. The stored e-mail address is authenticated at the moment the user comes back to the wiki via the link.</p>
-
- <p>The e-mail address stays authenticated as long as the user does not change it; the time of authentication is indicated
- on the user preference page.</p>
-
- <p>If the option is enabled, only authenticated e-mail addresses can receive EmailUser mails and/or
- e-mail notification mails.</p>
+ <p>If this option is enabled, users have to confirm their e-mail address using a magic link sent to them whenever they set or change it, and only authenticated e-mail addresses can receive mails from other users and/or
+ change notification mails. Setting this option is <B>recommended</B> for public wikis because of potential abuse of the e-mail features above.</p>
</div>
</div>
<div class="config-section">
<div class="config-input">
<label class='column'>Database type:</label>
- <ul class='plain'>
- <li><?php aField( $conf, "DBtype", "MySQL", "radio", "mysql"); ?></li>
- <li><?php aField( $conf, "DBtype", "Oracle (experimental)", "radio", "oracle" ); ?></li>
- </ul>
+<?php if (isset($errs['DBpicktype'])) print "<span class='error'>$errs[DBpicktype]</span>\n"; ?>
+ <ul class='plain'><?php database_picker($conf) ?></ul>
</div>
<div class="config-input" style="clear:left"><?php
- aField( $conf, "DBserver", "SQL server host:" );
+ aField( $conf, "DBserver", "Database host:" );
?></div>
<p class="config-desc">
- If your database server isn't on your web server, enter the name
- or IP address here. MySQL only.
+ If your database server isn't on your web server, enter the name or IP address here.
</p>
<div class="config-input"><?php
aField( $conf, "DBname", "Database name:" );
?></div>
- <div class="config-desc">
- If using Oracle, set this to your connection identifier.
- </div>
<div class="config-input"><?php
aField( $conf, "DBuser", "DB username:" );
?></div>
<p class="config-desc">
If you only have a single user account and database available,
enter those here. If you have database root access (see below)
- you can specify new accounts/databases to be created.
- </p>
- <p>
- This account will not be created if it pre-exists. If this is the case, ensure that it
+ you can specify new accounts/databases to be created. This account
+ will not be created if it pre-exists. If this is the case, ensure that it
has SELECT, INSERT, UPDATE and DELETE permissions on the MediaWiki database.
</p>
+ <div class="config-input">
+ <?php
+ aField( $conf, "RootUser", "Superuser account:", "superuser" );
+ ?>
+ </div>
+ <div class="config-input">
+ <?php
+ aField( $conf, "RootPW", "Superuser password:", "password" );
+ ?>
+ </div>
+
+ <p class="config-desc">
+ If the database user specified above does not exist, or does not have access to create
+ the database (if needed) or tables within it, please provide details of a superuser account,
+ such as <strong>root</strong>, which does. Leave the password set to <strong>-</strong> if this is not needed.
+ </p>
+
+ <?php database_switcher('mysql'); ?>
<div class="config-input"><?php
aField( $conf, "DBprefix", "Database table prefix:" );
?></div>
cause things to break. <b>If upgrading an older installation, leave
in backwards-compatible mode.</b>
</p>
+ </div>
- <div class="config-input">
- <?php
- aField( $conf, "RootUser", "Superuser account:", "superuser" );
- ?>
+ <?php database_switcher('postgres'); ?>
+ <div class="config-input"><?php
+ aField( $conf, "DBport", "Database port:" );
+ ?></div>
+ <div class="config-input"><?php
+ aField( $conf, "DBmwschema", "Schema for mediawiki:" );
+ ?></div>
+ <div class="config-input"><?php
+ aField( $conf, "DBts2schema", "Schema for tsearch2:" );
+ ?></div>
+ <div class="config-desc">
+ <p>The username specified above will have it's search path set to the above schemas,
+ so it is recommended that you create a new user.</p>
</div>
- <div class="config-input">
- <?php
- aField( $conf, "RootPW", "Superuser password:", "password" );
- ?>
</div>
-
- <p class="config-desc">
- If the database user specified above does not exist, or does not have access to create
- the database (if needed) or tables within it, please provide details of a superuser account,
- such as <strong>root</strong>, which does. Leave the password set to <strong>-</strong> if this is not needed.
- </p>
<div class="config-input" style="padding:2em 0 3em">
<label class='column'> </label>
</div>
+<script type="text/javascript">
+window.onload = toggleDBarea('<?php echo $conf->DBtype; ?>',
+<?php
+ ## If they passed in a root user name, don't populate it on page load
+ echo strlen(importPost('RootUser', '')) ? 0 : 1;
+?>);
+</script>
+
</form>
<?php
it and uploading it again will hopefully change the ownership to a user ID specific to you.</p>
EOT;
} else {
- echo "<p>Installation successful! Move the config/LocalSettings.php file into the parent directory, then follow
- <a href='../index.php'>this link</a> to your wiki.</p>\n";
+ echo "<p><span style='font-weight:bold;color:green;font-size:110%'>Installation successful!</span> Move the <tt>config/LocalSettings.php</tt> file into the parent directory, then follow
+ <strong><a href='../index.php'>this link</a></strong> to your wiki.</p>\n";
}
}
$mcservers = var_export( $conf->MCServerArray, true );
break;
case 'turck':
+ case 'apc':
case 'eaccel':
$cacheType = 'CACHE_ACCEL';
$mcservers = 'array()';
$slconf['RightsIcon'] = $conf->RightsIcon;
}
- $sep = PATH_SEPARATOR;
$localsettings = "
# This file was automatically generated by the MediaWiki installer.
# If you make manual changes, please keep track in case you need to
}
\$path = array( \$IP, \"\$IP/includes\", \"\$IP/languages\" );
-set_include_path( implode( PATH_SEPARATOR, \$path ) );
+set_include_path( implode( PATH_SEPARATOR, \$path ) . PATH_SEPARATOR . get_include_path() );
require_once( \"includes/DefaultSettings.php\" );
\$wgSitename = \"{$slconf['Sitename']}\";
-\$wgScriptPath = \"{$slconf['ScriptPath']}\";
+\$wgScriptPath = \"{$slconf['ScriptPath']}\";
\$wgScript = \"\$wgScriptPath/index.php\";
\$wgRedirectScript = \"\$wgScriptPath/redirect.php\";
\$wgUploadPath = \"\$wgScriptPath/images\";
\$wgUploadDirectory = \"\$IP/images\";
-\$wgEnableEmail = $enableemail;
-\$wgEnableUserEmail = $enableuseremail;
+\$wgEnableEmail = $enableemail;
+\$wgEnableUserEmail = $enableuseremail;
\$wgEmergencyContact = \"{$slconf['EmergencyContact']}\";
-\$wgPasswordSender = \"{$slconf['PasswordSender']}\";
+\$wgPasswordSender = \"{$slconf['PasswordSender']}\";
## For a detailed description of the following switches see
## http://meta.wikimedia.org/Enotif and http://meta.wikimedia.org/Eauthent
\$wgDBpassword = \"{$slconf['DBpassword']}\";
\$wgDBprefix = \"{$slconf['DBprefix']}\";
\$wgDBtype = \"{$slconf['DBtype']}\";
+\$wgDBport = \"{$slconf['DBport']}\";
# Experimental charset support for MySQL 4.1/5.0.
\$wgDBmysql5 = {$conf->DBmysql5};
## To enable image uploads, make sure the 'images' directory
## is writable, then set this to true:
-\$wgEnableUploads = false;
-\$wgUseImageResize = {$conf->UseImageResize};
+\$wgEnableUploads = false;
+\$wgUseImageResize = {$conf->UseImageResize};
{$magic}\$wgUseImageMagick = true;
{$magic}\$wgImageMagickConvertCommand = \"{$convert}\";
## If you have the appropriate support software installed
## you can enable inline LaTeX equations:
-\$wgUseTeX = false;
+\$wgUseTeX = false;
\$wgMathPath = \"{\$wgUploadPath}/math\";
\$wgMathDirectory = \"{\$wgUploadDirectory}/math\";
\$wgTmpDirectory = \"{\$wgUploadDirectory}/tmp\";
# sure that cached pages are cleared.
\$configdate = gmdate( 'YmdHis', @filemtime( __FILE__ ) );
\$wgCacheEpoch = max( \$wgCacheEpoch, \$configdate );
-";
+ "; ## End of setting the $localsettings string
+
// Keep things in Unix line endings internally;
// the system will write out as local text type.
return str_replace( "\r\n", "\n", $localsettings );
$radioCount = 0;
-function aField( &$conf, $field, $text, $type = "text", $value = "" ) {
+function aField( &$conf, $field, $text, $type = "text", $value = "", $onclick = '' ) {
global $radioCount;
if( $type != "" ) {
$xtype = "type=\"$type\"";
$xtype = "";
}
- if(!(isset($id)) or ($id == "") ) $id = $field;
+ $id = $field;
$nolabel = ($type == "radio") || ($type == "hidden");
if ($type == 'radio')
} else {
$checked = "";
}
- echo "\t\t<input $xtype name=\"$field\" id=\"$id\" class=\"iput-$type\" $checked value=\"";
+ echo "\t\t<input $xtype name=\"$field\" id=\"$id\" class=\"iput-$type\" $checked ";
+ if ($onclick) {
+ echo " onclick='toggleDBarea(\"$value\",1)' " ;
+ }
+ echo "value=\"";
if( $type == "radio" ) {
echo htmlspecialchars( $value );
} else {
echo htmlspecialchars( $conf->$field );
}
+
+
echo "\" />\n";
if( $nolabel ) {
echo " $text</label>\n";
$codes = array();
- $d = opendir( "../languages" );
+ $d = opendir( "../languages/messages" );
+ /* In case we are called from the root directory */
+ if (!$d)
+ $d = opendir( "languages/messages");
while( false !== ($f = readdir( $d ) ) ) {
$m = array();
- if( preg_match( '/Language([A-Z][a-z_]+)\.php$/', $f, $m ) ) {
+ if( preg_match( '/Messages([A-Z][a-z_]+)\.php$/', $f, $m ) ) {
$code = str_replace( '_', '-', strtolower( $m[1] ) );
if( isset( $wgLanguageNames[$code] ) ) {
$name = $code . ' - ' . $wgLanguageNames[$code];
return false;
}
-function get_db_version() {
- global $wgDatabase, $conf;
- if ($conf->DBtype == 'mysql')
- return mysql_get_server_info( $wgDatabase->mConn );
- else if ($conf->DBtype == 'oracle')
- return oci_server_version($wgDatabase->mConn);
-}
-
# Test a memcached server
function testMemcachedServer( $server ) {
$hostport = explode(":", $server);
if ( !function_exists( 'fsockopen' ) ) {
$errstr = "Can't connect to memcached, fsockopen() not present";
}
- if ( !$errstr && count( $hostport ) != 2 ) {
+ if ( !$errstr && count( $hostport ) != 2 ) {
$errstr = 'Please specify host and port';
var_dump( $hostport );
}
}
return $errstr;
}
+
+function database_picker($conf) {
+ global $ourdb;
+ print "\n";
+ foreach(array_keys($ourdb) as $db) {
+ if ($ourdb[$db]['havedriver']) {
+ print "<li>";
+ aField( $conf, "DBtype", $ourdb[$db]['fullname'], 'radio', $db, 'onclick');
+ print "</li>\n";
+ }
+ }
+ print "\n";
+}
+
+function database_switcher($db) {
+ global $ourdb;
+ $color = $ourdb[$db]['bgcolor'];
+ $full = $ourdb[$db]['fullname'];
+ print "<div id='$db' style='display:none; background: $color'>\n";
+ print "<h3>$full specific options:</h3>\n";
+}
+
+function printListItem( $item ) {
+ print "<li>$item</li>";
+}
+
?>
<div class="license">
dépôts / lhc / web / wiklou.git / blobdiff