| Index: trunk/phase3/includes/installer/WebInstallerPage.php |
| — | — | @@ -69,7 +69,8 @@ |
| 70 | 70 | if ( $continue ) { |
| 71 | 71 | // Fake submit button for enter keypress (bug 26267) |
| 72 | 72 | $s .= Xml::submitButton( wfMsg( "config-$continue" ), |
| 73 | | - array( 'name' => "enter-$continue", 'style' => 'visibility:hidden;overflow:hidden;width:1px;margin:0' ) ) . "\n"; |
| | 73 | + array( 'name' => "enter-$continue", 'style' => |
| | 74 | + 'visibility:hidden;overflow:hidden;width:1px;margin:0' ) ) . "\n"; |
| 74 | 75 | } |
| 75 | 76 | |
| 76 | 77 | if ( $back ) { |
| — | — | @@ -133,9 +134,11 @@ |
| 134 | 135 | */ |
| 135 | 136 | protected function startLiveBox() { |
| 136 | 137 | $this->addHTML( |
| 137 | | - '<div id="config-spinner" style="display:none;"><img src="../skins/common/images/ajax-loader.gif" /></div>' . |
| | 138 | + '<div id="config-spinner" style="display:none;">' . |
| | 139 | + '<img src="../skins/common/images/ajax-loader.gif" /></div>' . |
| 138 | 140 | '<script>jQuery( "#config-spinner" ).show();</script>' . |
| 139 | | - '<div id="config-live-log"><textarea name="LiveLog" rows="10" cols="30" readonly="readonly">' |
| | 141 | + '<div id="config-live-log">' . |
| | 142 | + '<textarea name="LiveLog" rows="10" cols="30" readonly="readonly">' |
| 140 | 143 | ); |
| 141 | 144 | $this->parent->output->flush(); |
| 142 | 145 | } |
| — | — | @@ -190,7 +193,8 @@ |
| 191 | 194 | } elseif ( $this->parent->showSessionWarning ) { |
| 192 | 195 | # The user was knocked back from another page to the start |
| 193 | 196 | # This probably indicates a session expiry |
| 194 | | - $this->parent->showError( 'config-session-expired', $wgLang->formatTimePeriod( $lifetime ) ); |
| | 197 | + $this->parent->showError( 'config-session-expired', |
| | 198 | + $wgLang->formatTimePeriod( $lifetime ) ); |
| 195 | 199 | } |
| 196 | 200 | |
| 197 | 201 | $this->parent->setSession( 'test', true ); |
| — | — | @@ -203,8 +207,10 @@ |
| 204 | 208 | } |
| 205 | 209 | $this->startForm(); |
| 206 | 210 | $s = Html::hidden( 'LanguageRequestTime', time() ) . |
| 207 | | - $this->getLanguageSelector( 'UserLang', 'config-your-language', $userLang, $this->parent->getHelpBox( 'config-your-language-help' ) ) . |
| 208 | | - $this->getLanguageSelector( 'ContLang', 'config-wiki-language', $contLang, $this->parent->getHelpBox( 'config-wiki-language-help' ) ); |
| | 211 | + $this->getLanguageSelector( 'UserLang', 'config-your-language', $userLang, |
| | 212 | + $this->parent->getHelpBox( 'config-your-language-help' ) ) . |
| | 213 | + $this->getLanguageSelector( 'ContLang', 'config-wiki-language', $contLang, |
| | 214 | + $this->parent->getHelpBox( 'config-wiki-language-help' ) ); |
| 209 | 215 | $this->addHTML( $s ); |
| 210 | 216 | $this->endForm( 'continue', false ); |
| 211 | 217 | } |
| — | — | @@ -223,7 +229,8 @@ |
| 224 | 230 | |
| 225 | 231 | $s = $helpHtml; |
| 226 | 232 | |
| 227 | | - $s .= Html::openElement( 'select', array( 'id' => $name, 'name' => $name, 'tabindex' => $this->parent->nextTabIndex() ) ) . "\n"; |
| | 233 | + $s .= Html::openElement( 'select', array( 'id' => $name, 'name' => $name, |
| | 234 | + 'tabindex' => $this->parent->nextTabIndex() ) ) . "\n"; |
| 228 | 235 | |
| 229 | 236 | $languages = Language::getLanguageNames(); |
| 230 | 237 | ksort( $languages ); |
| — | — | @@ -340,7 +347,8 @@ |
| 341 | 348 | */ |
| 342 | 349 | protected function handleExistingUpgrade( $vars ) { |
| 343 | 350 | // Check $wgDBtype |
| 344 | | - if ( !isset( $vars['wgDBtype'] ) || !in_array( $vars['wgDBtype'], Installer::getDBTypes() ) ) { |
| | 351 | + if ( !isset( $vars['wgDBtype'] ) || |
| | 352 | + !in_array( $vars['wgDBtype'], Installer::getDBTypes() ) ) { |
| 345 | 353 | return Status::newFatal( 'config-localsettings-connection-error', '' ); |
| 346 | 354 | } |
| 347 | 355 | |
| — | — | @@ -451,7 +459,8 @@ |
| 452 | 460 | "</li>\n"; |
| 453 | 461 | |
| 454 | 462 | $settings .= |
| 455 | | - Html::openElement( 'div', array( 'id' => 'DB_wrapper_' . $type, 'class' => 'dbWrapper' ) ) . |
| | 463 | + Html::openElement( 'div', array( 'id' => 'DB_wrapper_' . $type, |
| | 464 | + 'class' => 'dbWrapper' ) ) . |
| 456 | 465 | Html::element( 'h3', array(), wfMsg( 'config-header-' . $type ) ) . |
| 457 | 466 | $installer->getConnectForm() . |
| 458 | 467 | "</div>\n"; |
| — | — | @@ -624,7 +633,8 @@ |
| 625 | 634 | 'label' => 'config-project-namespace', |
| 626 | 635 | 'itemLabelPrefix' => 'config-ns-', |
| 627 | 636 | 'values' => array( 'site-name', 'generic', 'other' ), |
| 628 | | - 'commonAttribs' => array( 'class' => 'enableForOther', 'rel' => 'config_wgMetaNamespace' ), |
| | 637 | + 'commonAttribs' => array( 'class' => 'enableForOther', |
| | 638 | + 'rel' => 'config_wgMetaNamespace' ), |
| 629 | 639 | 'help' => $this->parent->getHelpBox( 'config-project-namespace-help' ) |
| 630 | 640 | ) ) . |
| 631 | 641 | $this->parent->getTextBox( array( |
| — | — | @@ -1180,10 +1190,12 @@ |
| 1181 | 1191 | // Pop up a dialog box, to make it difficult for the user to forget |
| 1182 | 1192 | // to download the file |
| 1183 | 1193 | $lsUrl = $this->getVar( 'wgServer' ) . $this->parent->getURL( array( 'localsettings' => 1 ) ); |
| 1184 | | - if ( isset( $_SERVER['HTTP_USER_AGENT'] ) && strpos( $_SERVER['HTTP_USER_AGENT'], 'MSIE' ) !== false ) { |
| | 1194 | + if ( isset( $_SERVER['HTTP_USER_AGENT'] ) && |
| | 1195 | + strpos( $_SERVER['HTTP_USER_AGENT'], 'MSIE' ) !== false ) { |
| 1185 | 1196 | // JS appears the only method that works consistently with IE7+ |
| 1186 | | - $this->addHtml( "\n<script type=\"" . $GLOBALS['wgJsMimeType'] . '">jQuery( document ).ready( function() { document.location=' |
| 1187 | | - . Xml::encodeJsVar( $lsUrl) . "; } );</script>\n" ); |
| | 1197 | + $this->addHtml( "\n<script type=\"" . $GLOBALS['wgJsMimeType'] . |
| | 1198 | + '">jQuery( document ).ready( function() { document.location=' . |
| | 1199 | + Xml::encodeJsVar( $lsUrl) . "; } );</script>\n" ); |
| 1188 | 1200 | } else { |
| 1189 | 1201 | $this->parent->request->response()->header( "Refresh: 0;url=$lsUrl" ); |
| 1190 | 1202 | } |