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 {
}
// Set the relevant variables from LocalSettings.php
- $requiredVars = array( 'wgDBtype', 'wgDBuser', 'wgDBpassword' );
+ $requiredVars = array( 'wgDBtype' );
$status = $this->importVariables( $requiredVars , $vars );
$installer = $this->parent->getDBInstaller();
$status->merge( $this->importVariables( $installer->getGlobalNames(), $vars ) );
}
$this->parent->output->addWikiText( wfMsgNoTrans( 'config-welcome' ) );
$status = $this->parent->doEnvironmentChecks();
- if ( $status ) {
+ if ( $status->isGood() ) {
+ $this->parent->output->addHTML( '<span class="success-message">' .
+ wfMsgHtml( 'config-env-good' ) . '</span>' );
$this->parent->output->addWikiText( wfMsgNoTrans( 'config-copyright',
SpecialVersion::getCopyrightAndAuthorList() ) );
$this->startForm();
$this->endForm();
+ } else {
+ $this->parent->showStatusMessage( $status );
}
}
$r = $this->parent->request;
if ( $r->wasPosted() ) {
$status = $this->submit();
+
if ( $status->isGood() ) {
$this->setVar( '_UpgradeDone', false );
return 'continue';
$dbSupport = '';
foreach( $this->parent->getDBTypes() as $type ) {
- $db = 'Database' . ucfirst( $type );
- $dbSupport .= wfMsgNoTrans( "config-support-$type",
- call_user_func( array( $db, 'getSoftwareLink' ) ) ) . "\n";
+ $link = DatabaseBase::newFromType( $type )->getSoftwareLink();
+ $dbSupport .= wfMsgNoTrans( "config-support-$type", $link ) . "\n";
}
$this->addHTML( $this->parent->getInfoBox(
wfMsg( 'config-support-info', $dbSupport ) ) );
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->generateKeys();
+ }
$this->setVar( '_UpgradeDone', true );
$this->showDoneMessage();
return 'output';
$this->startForm();
- if ( $this->getVar( 'wgSitename' ) == $GLOBALS['wgSitename'] ) {
+ // Encourage people to not name their site 'MediaWiki' by blanking the
+ // field. I think that was the intent with the original $GLOBALS['wgSitename']
+ // but these two always were the same so had the effect of making the
+ // installer forget $wgSitename when navigating back to this page.
+ if ( $this->getVar( 'wgSitename' ) == 'MediaWiki' ) {
$this->setVar( 'wgSitename', '' );
}
$retVal = true;
$this->parent->setVarsFromRequest( array( 'wgSitename', '_NamespaceType',
'_AdminName', '_AdminPassword', '_AdminPassword2', '_AdminEmail',
- '_Subscribe', '_SkipOptional' ) );
+ '_Subscribe', '_SkipOptional', 'wgMetaNamespace' ) );
// Validate site name
if ( strval( $this->getVar( 'wgSitename' ) ) === '' ) {
$this->parent->showError( 'config-ns-invalid', $name );
$retVal = false;
}
+
+ // Make sure it won't conflict with any existing namespaces
+ global $wgContLang;
+ $nsIndex = $wgContLang->getNsIndex( $name );
+ if( $nsIndex !== false && $nsIndex !== NS_PROJECT ) {
+ $this->parent->showError( 'config-ns-conflict', $name );
+ $retVal = false;
+ }
+
$this->setVar( 'wgMetaNamespace', $name );
// Validate username for creation
$msg = $valid;
}
if ( $msg !== false ) {
- $this->parent->showError( $msg );
+ call_user_func_array( array( $this->parent, 'showError' ), (array)$msg );
$this->setVar( '_AdminPassword', '' );
$this->setVar( '_AdminPassword2', '' );
$retVal = false;
}
}
+ $emailwrapperStyle = $this->getVar( 'wgEnableEmail' ) ? '' : 'display: none';
$this->startForm();
$this->addHTML(
# User Rights
'itemLabelPrefix' => 'config-profile-',
'values' => array_keys( $this->parent->rightsProfiles ),
) ) .
- $this->parent->getHelpBox( 'config-profile-help' ) .
+ $this->parent->getInfoBox( wfMsgNoTrans( 'config-profile-help' ) ) .
# Licensing
$this->parent->getRadioSet( array(
'attribs' => array( 'class' => 'showHideRadio', 'rel' => 'emailwrapper' ),
) ) .
$this->parent->getHelpBox( 'config-enable-email-help' ) .
- "<div id=\"emailwrapper\">" .
+ "<div id=\"emailwrapper\" style=\"$emailwrapperStyle\">" .
$this->parent->getTextBox( array(
'var' => 'wgPasswordSender',
'label' => 'config-email-sender'
$this->addHTML( $extHtml );
}
+ // Having / in paths in Windows looks funny :)
+ $this->setVar( 'wgDeletedDirectory',
+ str_replace(
+ '/', DIRECTORY_SEPARATOR,
+ $this->getVar( 'wgDeletedDirectory' )
+ )
+ );
+
+ $uploadwrapperStyle = $this->getVar( 'wgEnableUploads' ) ? '' : 'display: none';
$this->addHTML(
# Uploading
$this->getFieldSetStart( 'config-upload-settings' ) .
'attribs' => array( 'class' => 'showHideRadio', 'rel' => 'uploadwrapper' ),
'help' => $this->parent->getHelpBox( 'config-upload-help' )
) ) .
- '<div id="uploadwrapper" style="display: none;">' .
+ '<div id="uploadwrapper" style="' . $uploadwrapperStyle . '">' .
$this->parent->getTextBox( array(
'var' => 'wgDeletedDirectory',
'label' => 'config-upload-deleted',
) ) .
$this->parent->getHelpBox( 'config-cache-help' ) .
'<div id="config-memcachewrapper">' .
- $this->parent->getTextBox( array(
+ $this->parent->getTextArea( array(
'var' => '_MemCachedServers',
'label' => 'config-memcached-servers',
'help' => $this->parent->getHelpBox( 'config-memcached-help' )
} else {
$iframeAttribs['src'] = $this->getCCPartnerUrl();
}
+ $wrapperStyle = ($this->getVar('_LicenseCode') == 'cc-choose') ? '' : 'display: none';
return
- "<div class=\"config-cc-wrapper\" id=\"config-cc-wrapper\" style=\"display: none;\">\n" .
+ "<div class=\"config-cc-wrapper\" id=\"config-cc-wrapper\" style=\"$wrapperStyle\">\n" .
Html::element( 'iframe', $iframeAttribs, '', false /* not short */ ) .
"</div>\n";
}
}
}
$this->parent->setVar( '_Extensions', $extsToInstall );
+
+ if( $this->getVar( 'wgMainCacheType' ) == 'memcached' ) {
+ $memcServers = explode( "\n", $this->getVar( '_MemCachedServers' ) );
+ if( !$memcServers ) {
+ $this->parent->showError( 'config-memcache-needservers' );
+ return false;
+ }
+
+ foreach( $memcServers as $server ) {
+ $memcParts = explode( ":", $server );
+ if( !IP::isValid( $memcParts[0] ) ) {
+ $this->parent->showError( 'config-memcache-badip', $memcParts[0] );
+ return false;
+ } elseif( !isset( $memcParts[1] ) ) {
+ $this->parent->showError( 'config-memcache-noport', $memcParts[0] );
+ return false;
+ } elseif( $memcParts[1] < 1 || $memcParts[1] > 65535 ) {
+ $this->parent->showError( 'config-memcache-badport', 1, 65535 );
+ return false;
+ }
+ }
+ }
return true;
}
class WebInstaller_Install extends WebInstallerPage {
public function execute() {
- if( $this->parent->request->wasPosted() ) {
- return 'continue';
- } elseif( $this->getVar( '_InstallDone' ) ) {
- $this->startForm();
- $status = new Status();
- $status->warning( 'config-install-alreadydone' );
- $this->parent->showStatusBox( $status );
- } elseif( $this->getVar( '_UpgradeDone' ) ) {
+ if( $this->getVar( '_UpgradeDone' ) ) {
return 'skip';
- } else {
+ } elseif( $this->getVar( '_InstallDone' ) ) {
+ return 'continue';
+ } elseif( $this->parent->request->wasPosted() ) {
$this->startForm();
$this->addHTML("<ul>");
- $this->parent->performInstallation(
+ $results = $this->parent->performInstallation(
array( $this, 'startStage'),
array( $this, 'endStage' )
);
$this->addHTML("</ul>");
+ // PerformInstallation bails on a fatal, so make sure the last item
+ // completed before giving 'next.' Likewise, only provide back on failure
+ $lastStep = end( $results );
+ $continue = $lastStep->isOK() ? 'continue' : false;
+ $back = $lastStep->isOK() ? false : 'back';
+ $this->endForm( $continue, $back );
+ } else {
+ $this->startForm();
+ $this->addHTML( $this->parent->getInfoBox( wfMsgNoTrans( 'config-install-begin' ) ) );
+ $this->endForm();
}
- $this->endForm();
return true;
}
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() ) {
// Pop up a dialog box, to make it difficult for the user to forget
// to download the file
$lsUrl = $GLOBALS['wgServer'] . $this->parent->getURL( array( 'localsettings' => 1 ) );
- $this->parent->request->response()->header( "Refresh: 0;url=$lsUrl" );
+ if ( isset( $_SERVER['HTTP_USER_AGENT'] ) && strpos( $_SERVER['HTTP_USER_AGENT'], 'MSIE' ) !== false ) {
+ // JS appears the only method that works consistently with IE7+
+ $this->addHtml( "\n<script type=\"" . $GLOBALS['wgJsMimeType'] . '">jQuery( document ).ready( function() { document.location='
+ . Xml::encodeJsVar( $lsUrl) . "; } );</script>\n" );
+ } else {
+ $this->parent->request->response()->header( "Refresh: 0;url=$lsUrl" );
+ }
$this->startForm();
$this->parent->disableLinkPopups();
if ( $r->wasPosted() ) {
$really = $r->getVal( 'submit-restart' );
if ( $really ) {
- $this->parent->session = array();
- $this->parent->happyPages = array();
- $this->parent->settings = array();
+ $this->parent->reset();
}
return 'continue';
}
dépôts / lhc / web / wiklou.git / blobdiff