| Index: branches/new-installer/phase3/maintenance/language/messages.inc |
| — | — | @@ -3354,6 +3354,9 @@ |
| 3355 | 3355 | 'config-insecure-secretkey', |
| 3356 | 3356 | 'config-install-user', |
| 3357 | 3357 | 'config-install-localsettings', |
| | 3358 | + 'config-install-done', |
| | 3359 | + 'config-install-failed', |
| | 3360 | + 'config-upgrade-done', |
| 3358 | 3361 | ), |
| 3359 | 3362 | ); |
| 3360 | 3363 | |
| Index: branches/new-installer/phase3/includes/installer/WebInstaller.php |
| — | — | @@ -1461,6 +1461,10 @@ |
| 1462 | 1462 | class WebInstaller_Install extends WebInstallerPage { |
| 1463 | 1463 | |
| 1464 | 1464 | function execute() { |
| | 1465 | + if( $this->parent->request->wasPosted() ) { |
| | 1466 | + return 'continue'; |
| | 1467 | + } |
| | 1468 | + $this->startForm(); |
| 1465 | 1469 | $this->parent->output->addHTML("<ul>"); |
| 1466 | 1470 | |
| 1467 | 1471 | // Extensions |
| — | — | @@ -1526,6 +1530,10 @@ |
| 1527 | 1531 | $localSettings = new LocalSettings( $this->parent ); |
| 1528 | 1532 | $localSettings->writeLocalSettings(); |
| 1529 | 1533 | $this->endStage(); |
| | 1534 | + |
| | 1535 | + $this->parent->setVar( '_InstallStatus', 'installed' ); |
| | 1536 | + |
| | 1537 | + $this->endForm(); |
| 1530 | 1538 | } |
| 1531 | 1539 | |
| 1532 | 1540 | private function startStage( $msg ) { |
| — | — | @@ -1537,6 +1545,21 @@ |
| 1538 | 1546 | } |
| 1539 | 1547 | } |
| 1540 | 1548 | class WebInstaller_Complete extends WebInstallerPage { |
| | 1549 | + public function execute() { |
| | 1550 | + $status = $this->parent->getVar( '_InstallStatus' ); |
| | 1551 | + $this->startForm(); |
| | 1552 | + if( $status === 'installed' ) { |
| | 1553 | + $msg = 'config-install-done'; |
| | 1554 | + } elseif( $status === 'upgraded' ) { |
| | 1555 | + $msg = 'config-upgrade-done'; |
| | 1556 | + } else { |
| | 1557 | + $msg = 'config-install-failed'; |
| | 1558 | + } |
| | 1559 | + global $wgServer; |
| | 1560 | + $url = $wgServer . preg_replace( "/config\/[a-z\-]+\.php5?/i", '', $this->parent->getUrl() ); |
| | 1561 | + $this->parent->output->addWikiText( wfMsg( $msg, $url ) ); |
| | 1562 | + $this->endForm( false ); |
| | 1563 | + } |
| 1541 | 1564 | } |
| 1542 | 1565 | class WebInstaller_Restart extends WebInstallerPage { |
| 1543 | 1566 | function execute() { |
| Index: branches/new-installer/phase3/includes/installer/Installer.php |
| — | — | @@ -70,6 +70,7 @@ |
| 71 | 71 | '_CCDone' => false, |
| 72 | 72 | '_Extensions' => array(), |
| 73 | 73 | '_MemCachedServers' => '', |
| | 74 | + '_InstallStatus' => false, |
| 74 | 75 | ); |
| 75 | 76 | |
| 76 | 77 | /** |
| Index: branches/new-installer/phase3/languages/messages/MessagesEn.php |
| — | — | @@ -4456,7 +4456,20 @@ |
| 4457 | 4457 | 'config-insecure-secretkey' => 'Warning: Unable to create secure $wgSecretKey. Consider changing it manually.', |
| 4458 | 4458 | 'config-install-user' => 'Creating administrator user account', |
| 4459 | 4459 | 'config-install-localsettings' => 'Writing LocalSettings.php', |
| | 4460 | +'config-install-done' => "'''Congratulations''', you have successfully installed MediaWiki. |
| 4460 | 4461 | |
| | 4462 | +You will need to move it from <tt>./config/LocalSettings.php</tt> to <tt>./LocalSettings.php</tt> in order |
| | 4463 | +for MediaWiki to begin working. |
| | 4464 | + |
| | 4465 | +[$1 Link to your wiki]", |
| | 4466 | +'config-install-failed' => "'''Sorry''', something in the installation process seems to have gone horribly wrong.", |
| | 4467 | +'config-upgrade-done' => "'''Congratulations''', you have successfully upgraded MediaWiki. |
| | 4468 | + |
| | 4469 | +If you chose to overwrite your LocalSettings.php file, you will need to move it from <tt>./config/LocalSettings.php</tt> |
| | 4470 | +to <tt>./LocalSettings.php</tt>. |
| | 4471 | + |
| | 4472 | +[$1 Link to your wiki]", |
| | 4473 | + |
| 4461 | 4474 | # Special:Version |
| 4462 | 4475 | 'version' => 'Version', |
| 4463 | 4476 | 'version-extensions' => 'Installed extensions', |