| Index: trunk/phase3/config/Installer.php |
| — | — | @@ -193,7 +193,7 @@ |
| 194 | 194 | font-size: 85%; |
| 195 | 195 | padding-top: 3em; |
| 196 | 196 | } |
| 197 | | - |
| | 197 | + |
| 198 | 198 | span.success-message { |
| 199 | 199 | font-weight: bold; |
| 200 | 200 | font-size: 110%; |
| — | — | @@ -208,7 +208,7 @@ |
| 209 | 209 | <script type="text/javascript"> |
| 210 | 210 | <!-- |
| 211 | 211 | <?php echo 'var databases = ' . FormatJson::encode( $ourdb ) . ';'; ?> |
| 212 | | - |
| | 212 | + |
| 213 | 213 | function show(id, showOrHide) { |
| 214 | 214 | var i = document.getElementById(id); |
| 215 | 215 | if (i) i.style.display = showOrHide ? 'block' : 'none'; |
| — | — | @@ -269,7 +269,7 @@ |
| 270 | 270 | cd <i>" . htmlspecialchars( dirname( dirname( __FILE__ ) ) ) . "</i> |
| 271 | 271 | chmod a+w config |
| 272 | 272 | </pre> |
| 273 | | - |
| | 273 | + |
| 274 | 274 | <p>Afterwards retry to start the <a href=\"\">setup</a>.</p>" ); |
| 275 | 275 | } |
| 276 | 276 | |
| — | — | @@ -634,22 +634,22 @@ |
| 635 | 635 | $conf->LanguageCode = importPost( "LanguageCode", "en" ); |
| 636 | 636 | ## MySQL specific: |
| 637 | 637 | $conf->DBprefix = importPost( "DBprefix" ); |
| 638 | | - $conf->setSchema( |
| 639 | | - importPost( "DBschema", "mysql5-binary" ), |
| | 638 | + $conf->setSchema( |
| | 639 | + importPost( "DBschema", "mysql5-binary" ), |
| 640 | 640 | importPost( "DBengine", "InnoDB" ) ); |
| 641 | 641 | |
| 642 | 642 | ## Postgres specific: |
| 643 | 643 | $conf->DBport = importPost( "DBport", "5432" ); |
| 644 | 644 | $conf->DBts2schema = importPost( "DBts2schema", "public" ); |
| 645 | 645 | $conf->DBpgschema = importPost( "DBpgschema", "mediawiki" ); |
| 646 | | - |
| | 646 | + |
| 647 | 647 | ## SQLite specific |
| 648 | 648 | $conf->SQLiteDataDir = importPost( "SQLiteDataDir", "" ); |
| 649 | | - |
| | 649 | + |
| 650 | 650 | ## MSSQL specific |
| 651 | 651 | // We need a second field so it doesn't overwrite the MySQL one |
| 652 | 652 | $conf->DBprefix2 = importPost( "DBprefix2" ); |
| 653 | | - |
| | 653 | + |
| 654 | 654 | ## DB2 specific: |
| 655 | 655 | // New variable in order to have a different default port number |
| 656 | 656 | $conf->DBport_db2 = importPost( "DBport_db2", "50000" ); |
| — | — | @@ -792,7 +792,7 @@ |
| 793 | 793 | $local = writeLocalSettings( $conf ); |
| 794 | 794 | echo "<li style=\"list-style: none\">\n"; |
| 795 | 795 | echo "<p><b>Generating configuration file...</b></p>\n"; |
| 796 | | - echo "</li>\n"; |
| | 796 | + echo "</li>\n"; |
| 797 | 797 | |
| 798 | 798 | $wgCommandLineMode = false; |
| 799 | 799 | chdir( ".." ); |
| — | — | @@ -848,14 +848,14 @@ |
| 849 | 849 | |
| 850 | 850 | ## DB2 specific: |
| 851 | 851 | $wgDBcataloged = $conf->DBcataloged; |
| 852 | | - |
| | 852 | + |
| 853 | 853 | $wgCommandLineMode = true; |
| 854 | 854 | if (! defined ( 'STDERR' ) ) |
| 855 | 855 | define( 'STDERR', fopen("php://stderr", "wb")); |
| 856 | 856 | $wgUseDatabaseMessages = false; /* FIXME: For database failure */ |
| 857 | 857 | require_once( "$IP/includes/Setup.php" ); |
| 858 | 858 | Language::getLocalisationCache()->disableBackend(); |
| 859 | | - |
| | 859 | + |
| 860 | 860 | chdir( "config" ); |
| 861 | 861 | |
| 862 | 862 | $wgTitle = Title::newFromText( "Installation script" ); |
| — | — | @@ -937,14 +937,14 @@ |
| 938 | 938 | $db_user = $wgDBuser; |
| 939 | 939 | $db_pass = $wgDBpassword; |
| 940 | 940 | } |
| 941 | | - |
| 942 | | - echo( "<li>Attempting to connect to database \"" . htmlspecialchars( $wgDBname ) . |
| | 941 | + |
| | 942 | + echo( "<li>Attempting to connect to database \"" . htmlspecialchars( $wgDBname ) . |
| 943 | 943 | "\" as \"" . htmlspecialchars( $db_user ) . "\"..." ); |
| 944 | 944 | $wgDatabase = $dbc->newFromParams($wgDBserver, $db_user, $db_pass, $wgDBname, 1); |
| 945 | 945 | // enable extra debug messages |
| 946 | 946 | $dbc->setMode(DatabaseIbm_db2::INSTALL_MODE); |
| 947 | 947 | $wgDatabase->setMode(DatabaseIbm_db2::INSTALL_MODE); |
| 948 | | - |
| | 948 | + |
| 949 | 949 | if (!$wgDatabase->isOpen()) { |
| 950 | 950 | print " error: " . htmlspecialchars( $wgDatabase->lastError() ) . "</li>\n"; |
| 951 | 951 | } else { |
| — | — | @@ -956,7 +956,7 @@ |
| 957 | 957 | if ("$wgSQLiteDataDir" == '') { |
| 958 | 958 | $wgSQLiteDataDir = dirname($_SERVER['DOCUMENT_ROOT']).'/data'; |
| 959 | 959 | } |
| 960 | | - echo '<li>Attempting to connect to SQLite database at "' . |
| | 960 | + echo '<li>Attempting to connect to SQLite database at "' . |
| 961 | 961 | htmlspecialchars( $wgSQLiteDataDir ) . '": '; |
| 962 | 962 | if ( !is_dir( $wgSQLiteDataDir ) ) { |
| 963 | 963 | if ( is_writable( dirname( $wgSQLiteDataDir ) ) ) { |
| — | — | @@ -996,7 +996,7 @@ |
| 997 | 997 | echo 'error: ' . htmlspecialchars( $ex->getMessage() ) . "</li>\n"; |
| 998 | 998 | continue; |
| 999 | 999 | } |
| 1000 | | - |
| | 1000 | + |
| 1001 | 1001 | if (!$wgDatabase->isOpen()) { |
| 1002 | 1002 | print "error: " . htmlspecialchars( $wgDatabase->lastError() ) . "</li>\n"; |
| 1003 | 1003 | $errs['SQLiteDataDir'] = 'Could not connect to database'; |
| — | — | @@ -1056,7 +1056,7 @@ |
| 1057 | 1057 | // Changed !mysql to postgres check since it seems to only apply to postgres |
| 1058 | 1058 | if( $useRoot && $conf->DBtype == 'postgres' ) { |
| 1059 | 1059 | $wgDBsuperuser = $conf->RootUser; |
| 1060 | | - echo( "<li>Attempting to connect to database \"postgres\" as superuser \"" . |
| | 1060 | + echo( "<li>Attempting to connect to database \"postgres\" as superuser \"" . |
| 1061 | 1061 | htmlspecialchars( $wgDBsuperuser ) . "\"..." ); |
| 1062 | 1062 | $wgDatabase = $dbc->newFromParams($wgDBserver, $wgDBsuperuser, $conf->RootPW, "postgres", 1); |
| 1063 | 1063 | if (!$wgDatabase->isOpen()) { |
| — | — | @@ -1068,7 +1068,7 @@ |
| 1069 | 1069 | } |
| 1070 | 1070 | $wgDatabase->initial_setup($conf->RootPW, 'postgres'); |
| 1071 | 1071 | } |
| 1072 | | - echo( "<li>Attempting to connect to database \"" . htmlspecialchars( $wgDBname ) . |
| | 1072 | + echo( "<li>Attempting to connect to database \"" . htmlspecialchars( $wgDBname ) . |
| 1073 | 1073 | "\" as \"" . htmlspecialchars( $wgDBuser ) . "\"..." ); |
| 1074 | 1074 | $wgDatabase = $dbc->newFromParams($wgDBserver, $wgDBuser, $wgDBpassword, $wgDBname, 1); |
| 1075 | 1075 | if (!$wgDatabase->isOpen()) { |
| — | — | @@ -1081,7 +1081,7 @@ |
| 1082 | 1082 | $myver = $wgDatabase->getServerVersion(); |
| 1083 | 1083 | } |
| 1084 | 1084 | if (is_callable(array($wgDatabase, 'initial_setup'))) $wgDatabase->initial_setup('', $wgDBname); |
| 1085 | | - } |
| | 1085 | + } |
| 1086 | 1086 | |
| 1087 | 1087 | if ( !$wgDatabase->isOpen() ) { |
| 1088 | 1088 | $errs["DBserver"] = "Couldn't connect to database"; |
| — | — | @@ -1178,7 +1178,7 @@ |
| 1179 | 1179 | $encExisting = htmlspecialchars( $existingSchema ); |
| 1180 | 1180 | $encRequested = htmlspecialchars( $conf->DBschema ); |
| 1181 | 1181 | print "<li><strong>Warning:</strong> you requested the $encRequested schema, " . |
| 1182 | | - "but the existing database has the $encExisting schema. This upgrade script ". |
| | 1182 | + "but the existing database has the $encExisting schema. This upgrade script ". |
| 1183 | 1183 | "can't convert it, so it will remain $encExisting.</li>\n"; |
| 1184 | 1184 | $conf->setSchema( $existingSchema, $conf->DBengine ); |
| 1185 | 1185 | } |
| — | — | @@ -1229,7 +1229,7 @@ |
| 1230 | 1230 | } |
| 1231 | 1231 | $wgDatabase->freeResult( $res ); |
| 1232 | 1232 | if ( !$found && $conf->DBengine != 'MyISAM' ) { |
| 1233 | | - echo "<li><strong>Warning:</strong> " . htmlspecialchars( $conf->DBengine ) . |
| | 1233 | + echo "<li><strong>Warning:</strong> " . htmlspecialchars( $conf->DBengine ) . |
| 1234 | 1234 | " storage engine not available, " . |
| 1235 | 1235 | "using MyISAM instead</li>\n"; |
| 1236 | 1236 | $conf->setSchema( $conf->DBschema, 'MyISAM' ); |
| — | — | @@ -1250,8 +1250,8 @@ |
| 1251 | 1251 | } |
| 1252 | 1252 | |
| 1253 | 1253 | print " done.</li>\n"; |
| 1254 | | - |
| 1255 | | - |
| | 1254 | + |
| | 1255 | + |
| 1256 | 1256 | if ( $conf->DBtype == 'ibm_db2' ) { |
| 1257 | 1257 | // Now that table creation is done, make sure everything is committed |
| 1258 | 1258 | // Do this before doing inserts through API |
| — | — | @@ -1496,7 +1496,7 @@ |
| 1497 | 1497 | MediaWiki can also detect and support eAccelerator, Turck MMCache, APC, and XCache, but |
| 1498 | 1498 | these should not be used if the wiki will be running on multiple application servers. |
| 1499 | 1499 | <br /><br /> |
| 1500 | | - DBA (Berkeley-style DB) is generally slower than using no cache at all, and is only |
| | 1500 | + DBA (Berkeley-style DB) is generally slower than using no cache at all, and is only |
| 1501 | 1501 | recommended for testing. |
| 1502 | 1502 | </p> |
| 1503 | 1503 | </div> |
| — | — | @@ -1537,7 +1537,7 @@ |
| 1538 | 1538 | <div class="config-desc"> |
| 1539 | 1539 | <p> |
| 1540 | 1540 | For this feature to work, an e-mail address must be present for the user account, and the notification |
| 1541 | | - options in the user's preferences must be enabled. Also note the |
| | 1541 | + options in the user's preferences must be enabled. Also note the |
| 1542 | 1542 | authentication option below. When testing the feature, keep in mind that your own changes will never trigger notifications to be sent to yourself.</p> |
| 1543 | 1543 | |
| 1544 | 1544 | <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> |
| — | — | @@ -1562,13 +1562,13 @@ |
| 1563 | 1563 | <div class="config-section"> |
| 1564 | 1564 | <div class="config-input"> |
| 1565 | 1565 | <label class='column'>Database type:</label> |
| 1566 | | -<?php |
| | 1566 | +<?php |
| 1567 | 1567 | if (isset($errs['DBpicktype'])) { |
| 1568 | 1568 | print "\t<span class='error'>" . htmlspecialchars( $errs['DBpicktype'] ) . "</span>\n"; |
| 1569 | 1569 | } |
| 1570 | 1570 | ?> |
| 1571 | | - <ul class='plain'><?php |
| 1572 | | - database_picker($conf); |
| | 1571 | + <ul class='plain'><?php |
| | 1572 | + database_picker($conf); |
| 1573 | 1573 | ?></ul> |
| 1574 | 1574 | </div> |
| 1575 | 1575 | |
| — | — | @@ -1589,7 +1589,7 @@ |
| 1590 | 1590 | <p class="config-desc"> |
| 1591 | 1591 | If you only have a single user account and database available, |
| 1592 | 1592 | enter those here. If you have database root access (see below) |
| 1593 | | - you can specify new accounts/databases to be created. This account |
| | 1593 | + you can specify new accounts/databases to be created. This account |
| 1594 | 1594 | will not be created if it pre-exists. If this is the case, ensure that it |
| 1595 | 1595 | has SELECT, INSERT, UPDATE, and DELETE permissions on the MediaWiki database. |
| 1596 | 1596 | </p> |
| — | — | @@ -1627,8 +1627,8 @@ |
| 1628 | 1628 | </ul> |
| 1629 | 1629 | </div> |
| 1630 | 1630 | <p class="config-desc"> |
| 1631 | | - InnoDB is best for public web installations, since it has good concurrency |
| 1632 | | - support. MyISAM may be faster in single-user installations. MyISAM databases |
| | 1631 | + InnoDB is best for public web installations, since it has good concurrency |
| | 1632 | + support. MyISAM may be faster in single-user installations. MyISAM databases |
| 1633 | 1633 | tend to get corrupted more often than InnoDB databases. |
| 1634 | 1634 | </p> |
| 1635 | 1635 | <div class="config-input"><label class="column">Database character set</label> |
| — | — | @@ -1640,7 +1640,7 @@ |
| 1641 | 1641 | </ul> |
| 1642 | 1642 | </div> |
| 1643 | 1643 | <p class="config-desc"> |
| 1644 | | - This option is ignored on upgrade, the same character set will be kept. |
| | 1644 | + This option is ignored on upgrade, the same character set will be kept. |
| 1645 | 1645 | <br /><br /> |
| 1646 | 1646 | <b>WARNING:</b> If you use <b>backwards-compatible UTF-8</b> on MySQL 4.1+, and subsequently back up the database with <tt>mysqldump</tt>, it may destroy all non-ASCII characters, irreversibly corrupting your backups!. |
| 1647 | 1647 | <br /><br /> |
| — | — | @@ -1653,8 +1653,8 @@ |
| 1654 | 1654 | <div class="config-input"><?php aField( $conf, "DBpgschema", "Schema for mediawiki:" ); ?></div> |
| 1655 | 1655 | <div class="config-input"><?php aField( $conf, "DBts2schema", "Schema for tsearch2:" ); ?></div> |
| 1656 | 1656 | <div class="config-desc"> |
| 1657 | | - <p>The username specified above (at "DB username") will have its search path set to the above schemas, |
| 1658 | | - so it is recommended that you create a new user. The above schemas are generally correct: |
| | 1657 | + <p>The username specified above (at "DB username") will have its search path set to the above schemas, |
| | 1658 | + so it is recommended that you create a new user. The above schemas are generally correct: |
| 1659 | 1659 | only change them if you are sure you need to.</p> |
| 1660 | 1660 | </div> |
| 1661 | 1661 | </fieldset> |
| — | — | @@ -1667,7 +1667,7 @@ |
| 1668 | 1668 | <p>SQLite stores table data into files in the filesystem. |
| 1669 | 1669 | If you do not provide an explicit path, a "data" directory in |
| 1670 | 1670 | the parent of your document root will be used.</p> |
| 1671 | | - |
| | 1671 | + |
| 1672 | 1672 | <p>This directory must exist and be writable by the web server.</p> |
| 1673 | 1673 | </div> |
| 1674 | 1674 | </fieldset> |
| — | — | @@ -1684,7 +1684,7 @@ |
| 1685 | 1685 | <p>Avoid exotic characters; something like <tt>mw_</tt> is good.</p> |
| 1686 | 1686 | </div> |
| 1687 | 1687 | </fieldset> |
| 1688 | | - |
| | 1688 | + |
| 1689 | 1689 | <?php database_switcher('ibm_db2'); ?> |
| 1690 | 1690 | <div class="config-input"><?php |
| 1691 | 1691 | aField( $conf, "DBport_db2", "Database port:" ); |
| — | — | @@ -1944,7 +1944,7 @@ |
| 1945 | 1945 | \$wgScriptPath = \"{$slconf['ScriptPath']}\"; |
| 1946 | 1946 | \$wgScriptExtension = \"{$slconf['ScriptExtension']}\"; |
| 1947 | 1947 | |
| 1948 | | -## The relative URL path to the skins directory |
| | 1948 | +## The relative URL path to the skins directory |
| 1949 | 1949 | \$wgStylePath = \"\$wgScriptPath/skins\"; |
| 1950 | 1950 | |
| 1951 | 1951 | ## The relative URL path to the logo. Make sure you change this from the default, |