X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2Finstaller%2FWebInstallerPage.php;h=d35046d720bb34031d7ac1b374b7acaf2ab1003a;hb=253d3b7d6a5c5ea7ab74b69490b48674d828c5e9;hp=ef35b247aa493f4bf61fb4053915b91c2e71456d;hpb=15aa72fbd7fd1f7e236e44771033d7f6052f2e5c;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/installer/WebInstallerPage.php b/includes/installer/WebInstallerPage.php
index ef35b247aa..d35046d720 100644
--- a/includes/installer/WebInstallerPage.php
+++ b/includes/installer/WebInstallerPage.php
@@ -103,6 +103,8 @@ abstract class WebInstallerPage {
 	 * Get the starting tags of a fieldset.
 	 *
 	 * @param $legend String: message name
+	 *
+	 * @return string
 	 */
 	protected function getFieldsetStart( $legend ) {
 		return "\n<fieldset><legend>" . wfMsgHtml( $legend ) . "</legend>\n";
@@ -110,10 +112,33 @@ abstract class WebInstallerPage {
 
 	/**
 	 * Get the end tag of a fieldset.
+	 *
+	 * @returns string
 	 */
 	protected function getFieldsetEnd() {
 		return "</fieldset>\n";
 	}
+
+	/**
+	 * Opens a textarea used to display the progress of a long operation
+	 */
+	protected function startLiveBox() {
+		$this->addHTML(
+			'<div id="config-spinner" style="display:none;"><img src="../skins/common/images/ajax-loader.gif" /></div>' .
+			'<script>jQuery( "#config-spinner" ).show();</script>' .
+			'<textarea id="config-live-log" name="LiveLog" rows="10" cols="30" readonly="readonly">'
+		);
+		$this->parent->output->flush();
+	}
+
+	/**
+	 * Opposite to startLiveBox()
+	 */
+	protected function endLiveBox() {
+		$this->addHTML( '</textarea>
+<script>jQuery( "#config-spinner" ).hide()</script>' );
+		$this->parent->output->flush();
+	}
 }
 
 class WebInstaller_Language extends WebInstallerPage {
@@ -177,6 +202,8 @@ class WebInstaller_Language extends WebInstallerPage {
 
 	/**
 	 * Get a <select> for selecting languages.
+	 *
+	 * @return string
 	 */
 	public function getLanguageSelector( $name, $label, $selectedCode ) {
 		global $wgDummyLanguageCodes;
@@ -223,7 +250,9 @@ class WebInstaller_ExistingWiki extends WebInstallerPage {
 		// If there is no $wgUpgradeKey, tell the user to add one to LocalSettings.php
 		if ( $vars['wgUpgradeKey'] === false ) {
 			if ( $this->getVar( 'wgUpgradeKey', false ) === false ) {
-				$this->parent->generateUpgradeKey();
+				$secretKey = $this->getVar( 'wgSecretKey' ); // preserve $wgSecretKey
+				$this->parent->generateKeys();
+				$this->setVar( 'wgSecretKey', $secretKey );
 				$this->setVar( '_UpgradeKeySupplied', true );
 			}
 			$this->startForm();
@@ -464,22 +493,16 @@ class WebInstaller_Upgrade extends WebInstallerPage {
 
 		if ( $this->parent->request->wasPosted() ) {
 			$installer->preUpgrade();
-			$this->addHTML(
-				'<div id="config-spinner" style="display:none;"><img src="../skins/common/images/ajax-loader.gif" /></div>' .
-				'<script>jQuery( "#config-spinner" )[0].style.display = "block";</script>' .
-				'<textarea id="config-update-log" name="UpdateLog" rows="10" readonly="readonly">'
-			);
-			$this->parent->output->flush();
+
+			$this->startLiveBox();
 			$result = $installer->doUpgrade();
-			$this->addHTML( '</textarea>
-<script>jQuery( "#config-spinner" )[0].style.display = "none";</script>' );
-			$this->parent->output->flush();
+			$this->endLiveBox();
+
 			if ( $result ) {
 				// If they're going to possibly regenerate LocalSettings, we
 				// need to create the upgrade/secret keys. Bug 26481
 				if( !$this->getVar( '_ExistingDBSettings' ) ) {
-					$this->parent->generateSecretKey();
-					$this->parent->generateUpgradeKey();
+					$this->parent->generateKeys();
 				}
 				$this->setVar( '_UpgradeDone', true );
 				$this->showDoneMessage();
@@ -1082,9 +1105,15 @@ class WebInstaller_Install extends WebInstallerPage {
 
 	public function startStage( $step ) {
 		$this->addHTML( "<li>" . wfMsgHtml( "config-install-$step" ) . wfMsg( 'ellipsis') );
+		if ( $step == 'extension-tables' ) {
+			$this->startLiveBox();
+		}
 	}
 
 	public function endStage( $step, $status ) {
+		if ( $step == 'extension-tables' ) {
+			$this->endLiveBox();
+		}
 		$msg = $status->isOk() ? 'config-install-step-done' : 'config-install-step-failed';
 		$html = wfMsgHtml( 'word-separator' ) . wfMsgHtml( $msg );
 		if ( !$status->isOk() ) {