" .
$this->parent->getTextBox( array(
'var' => 'wgPasswordSender',
'label' => 'config-email-sender'
@@ -686,22 +836,31 @@ class WebInstaller_Options extends WebInstallerPage {
);
$extensions = $this->parent->findExtensions();
-
+
if( $extensions ) {
$extHtml = $this->getFieldSetStart( 'config-extensions' );
-
+
foreach( $extensions as $ext ) {
$extHtml .= $this->parent->getCheckBox( array(
'var' => "ext-$ext",
'rawtext' => $ext,
) );
}
-
+
$extHtml .= $this->parent->getHelpBox( 'config-extensions-help' ) .
$this->getFieldSetEnd();
$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' ) .
@@ -709,28 +868,26 @@ class WebInstaller_Options extends WebInstallerPage {
'var' => 'wgEnableUploads',
'label' => 'config-upload-enable',
'attribs' => array( 'class' => 'showHideRadio', 'rel' => 'uploadwrapper' ),
- 'help' => $this->parent->getHelpBox( 'config-upload-help' )
+ 'help' => $this->parent->getHelpBox( 'config-upload-help' )
) ) .
- '
' .
+ '
' .
$this->parent->getTextBox( array(
'var' => 'wgDeletedDirectory',
'label' => 'config-upload-deleted',
- 'help' => $this->parent->getHelpBox( 'config-upload-deleted-help' )
+ 'help' => $this->parent->getHelpBox( 'config-upload-deleted-help' )
) ) .
'
' .
$this->parent->getTextBox( array(
'var' => 'wgLogo',
'label' => 'config-logo',
- 'help' => $this->parent->getHelpBox( 'config-logo-help' )
+ 'help' => $this->parent->getHelpBox( 'config-logo-help' )
) )
);
- $canUse = $this->getVar( '_ExternalHTTP' ) ?
- 'config-instantcommons-good' : 'config-instantcommons-bad';
$this->addHTML(
$this->parent->getCheckBox( array(
'var' => 'wgUseInstantCommons',
'label' => 'config-instantcommons',
- 'help' => $this->parent->getHelpBox( 'config-instantcommons-help', wfMsgNoTrans( $canUse ) )
+ 'help' => $this->parent->getHelpBox( 'config-instantcommons-help' )
) ) .
$this->getFieldSetEnd()
);
@@ -754,7 +911,7 @@ class WebInstaller_Options extends WebInstallerPage {
) ) .
$this->parent->getHelpBox( 'config-cache-help' ) .
'
' .
- $this->parent->getTextBox( array(
+ $this->parent->getTextArea( array(
'var' => '_MemCachedServers',
'label' => 'config-memcached-servers',
'help' => $this->parent->getHelpBox( 'config-memcached-help' )
@@ -801,9 +958,10 @@ class WebInstaller_Options extends WebInstallerPage {
} else {
$iframeAttribs['src'] = $this->getCCPartnerUrl();
}
+ $wrapperStyle = ($this->getVar('_LicenseCode') == 'cc-choose') ? '' : 'display: none';
return
- "
\n" .
+ "
\n" .
Html::element( 'iframe', $iframeAttribs, '', false /* not short */ ) .
"
\n";
}
@@ -889,41 +1047,73 @@ class WebInstaller_Options extends WebInstallerPage {
}
}
$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("
");
- $this->parent->performInstallation(
+ $results = $this->parent->performInstallation(
array( $this, 'startStage'),
array( $this, 'endStage' )
);
$this->addHTML("
");
+ // 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( "
" . 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() ) {
@@ -934,37 +1124,49 @@ class WebInstaller_Install extends WebInstallerPage {
$this->parent->showStatusBox( $status );
}
}
-
+
}
class WebInstaller_Complete extends WebInstallerPage {
-
+
public function execute() {
+ // 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 ) );
+ 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\n" );
+ } else {
+ $this->parent->request->response()->header( "Refresh: 0;url=$lsUrl" );
+ }
+
$this->startForm();
+ $this->parent->disableLinkPopups();
$this->addHTML(
$this->parent->getInfoBox(
wfMsgNoTrans( 'config-install-done',
- $GLOBALS['wgServer'] . $this->parent->getURL( array( 'localsettings' => 1 ) ),
+ $lsUrl,
$GLOBALS['wgServer'] .
$this->getVar( 'wgScriptPath' ) . '/index' .
- $this->getVar( 'wgScriptExtension' )
+ $this->getVar( 'wgScriptExtension' ),
+ ''
), 'tick-32.png'
)
);
- $this->endForm( false );
+ $this->parent->restoreLinkPopups();
+ $this->endForm( false, false );
}
}
class WebInstaller_Restart extends WebInstallerPage {
-
+
public function execute() {
$r = $this->parent->request;
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';
}
@@ -974,11 +1176,11 @@ class WebInstaller_Restart extends WebInstallerPage {
$this->addHTML( $s );
$this->endForm( 'restart' );
}
-
+
}
abstract class WebInstaller_Document extends WebInstallerPage {
-
+
protected abstract function getFileName();
public function execute() {
@@ -1021,7 +1223,7 @@ abstract class WebInstaller_Document extends WebInstallerPage {
return '[http://www.mediawiki.org/wiki/Manual:' .
$matches[1] . ' ' . $matches[1] . ']';
}
-
+
}
class WebInstaller_Readme extends WebInstaller_Document {
