<?php
+/**
+ * Output handler for the web installer.
+ *
+ * @file
+ * @ingroup Deployment
+ */
/**
* Output class modelled on OutputPage.
*
- * I've opted to use a distinct class rather than derive from OutputPage here in
- * the interests of separation of concerns: if we used a subclass, there would be
- * quite a lot of things you could do in OutputPage that would break the installer,
- * that wouldn't be immediately obvious.
+ * I've opted to use a distinct class rather than derive from OutputPage here in
+ * the interests of separation of concerns: if we used a subclass, there would be
+ * quite a lot of things you could do in OutputPage that would break the installer,
+ * that wouldn't be immediately obvious.
+ *
+ * @ingroup Deployment
+ * @since 1.17
*/
class WebInstallerOutput {
-
/**
* The WebInstaller object this WebInstallerOutput is used by.
- *
+ *
* @var WebInstaller
- */
+ */
public $parent;
-
- public $contents = '';
- public $warnings = '';
- public $headerDone = false;
+
+ /**
+ * Buffered contents that haven't been output yet
+ * @var String
+ */
+ private $contents = '';
+
+ /**
+ * Has the header (or short header) been output?
+ * @var bool
+ */
+ private $headerDone = false;
+
public $redirectTarget;
- public $debug = true;
- public $useShortHeader = false;
+
+ /**
+ * Does the current page need to allow being used as a frame?
+ * If not, X-Frame-Options will be output to forbid it.
+ *
+ * @var bool
+ */
+ public $allowFrames = false;
+
+ /**
+ * Whether to use the limited header (used during CC license callbacks)
+ * @var bool
+ */
+ private $useShortHeader = false;
/**
* Constructor.
- *
- * @param WebInstaller $parent
+ *
+ * @param $parent WebInstaller
*/
public function __construct( WebInstaller $parent ) {
$this->parent = $parent;
$this->contents .= $html;
}
- public function addWarning( $msg ) {
- $this->warnings .= "<p>$msg</p>\n";
- }
-
- public function addWarningMsg( $msg /*, ... */ ) {
- $params = func_get_args();
- array_shift( $params );
- $this->addWarning( wfMsg( $msg, $params ) );
- }
-
public function redirect( $url ) {
if ( $this->headerDone ) {
throw new MWException( __METHOD__ . ' called after sending headers' );
$this->outputFooter();
}
+ /**
+ * Get the raw vector CSS, flipping if needed
+ * @param $dir String 'ltr' or 'rtl'
+ * @return String
+ */
+ public function getCSS( $dir ) {
+ $skinDir = dirname( dirname( dirname( __FILE__ ) ) ) . '/skins';
+ $vectorCssFile = "$skinDir/vector/screen.css";
+ $configCssFile = "$skinDir/common/config.css";
+ $css = '';
+ wfSuppressWarnings();
+ $vectorCss = file_get_contents( $vectorCssFile );
+ $configCss = file_get_contents( $configCssFile );
+ wfRestoreWarnings();
+ if( !$vectorCss || !$configCss ) {
+ $css = "/** Your webserver cannot read $vectorCssFile or $configCssFile, please check file permissions */";
+ }
+
+ $css .= str_replace( 'images/', '../skins/vector/images/', $vectorCss ) . "\n" . str_replace( 'images/', '../skins/common/images/', $configCss );
+ if( $dir == 'rtl' ) {
+ $css = CSSJanus::transform( $css, true );
+ }
+ return $css;
+ }
+
+ /**
+ * <link> to index.php?css=foobar for the <head>
+ * @return String
+ */
+ private function getCssUrl( ) {
+ return Html::linkedStyle( $_SERVER['PHP_SELF'] . '?css=' . $this->getDir() );
+ }
+
public function useShortHeader( $use = true ) {
$this->useShortHeader = $use;
}
+ public function allowFrames( $allow = true ) {
+ $this->allowFrames = $allow;
+ }
+
public function flush() {
if ( !$this->headerDone ) {
$this->outputHeader();
}
if ( !$this->redirectTarget && strlen( $this->contents ) ) {
echo $this->contents;
- ob_flush();
flush();
$this->contents = '';
}
}
+ /**
+ * @return string
+ */
public function getDir() {
global $wgLang;
- if( !is_object( $wgLang ) || !$wgLang->isRtl() )
+ if( !is_object( $wgLang ) || !$wgLang->isRtl() ) {
return 'ltr';
- else
+ } else {
return 'rtl';
+ }
}
+ /**
+ * @return string
+ */
public function getLanguageCode() {
global $wgLang;
- if( !is_object( $wgLang ) )
+ if( !is_object( $wgLang ) ) {
return 'en';
- else
+ } else {
return $wgLang->getCode();
+ }
}
+ /**
+ * @return array
+ */
public function getHeadAttribs() {
return array(
'dir' => $this->getDir(),
);
}
+ /**
+ * Get whether the header has been output
+ * @return bool
+ */
public function headerDone() {
return $this->headerDone;
}
$this->headerDone = true;
$dbTypes = $this->parent->getDBTypes();
- $this->parent->request->response()->header("Content-Type: text/html; charset=utf-8");
+ $this->parent->request->response()->header( 'Content-Type: text/html; charset=utf-8' );
+ if (!$this->allowFrames) {
+ $this->parent->request->response()->header( 'X-Frame-Options: DENY' );
+ }
if ( $this->redirectTarget ) {
$this->parent->request->response()->header( 'Location: '.$this->redirectTarget );
return;
<meta http-equiv="Content-type" content="text/html; charset=utf-8" />
<title><?php $this->outputTitle(); ?></title>
<?php echo Html::linkedStyle( '../skins/common/shared.css' ) . "\n"; ?>
- <?php echo Html::linkedStyle( '../skins/monobook/main.css' ) . "\n"; ?>
- <?php echo Html::linkedStyle( '../skins/common/config.css' ) . "\n"; ?>
+ <?php echo $this->getCssUrl() . "\n"; ?>
<?php echo Html::inlineScript( "var dbTypes = " . Xml::encodeJsVar( $dbTypes ) ) . "\n"; ?>
- <?php $this->outputJQuery() . "\n"; ?>
+ <?php echo $this->getJQuery() . "\n"; ?>
<?php echo Html::linkedScript( '../skins/common/config.js' ) . "\n"; ?>
</head>
<?php echo Html::openElement( 'body', array( 'class' => $this->getDir() ) ) . "\n"; ?>
-<noscript>
-<style type="text/css">
-.config-help-message { display: block; }
-.config-show-help { display: none; }
-</style>
-</noscript>
-<div id="globalWrapper">
-<div id="column-content">
+<div id="mw-page-base"></div>
+<div id="mw-head-base"></div>
<div id="content">
<div id="bodyContent">
}
public function outputFooter() {
- $this->outputWarnings();
-
if ( $this->useShortHeader ) {
?>
</body></html>
}
?>
-</div></div></div>
+</div></div>
-<div id="column-one">
- <div class="portlet" id="p-logo">
+<div id="mw-panel">
+ <div class="portal" id="p-logo">
<a style="background-image: url(../skins/common/images/mediawiki.png);"
- href="http://www.mediawiki.org/"
- title="Main Page"></a>
+ href="http://www.mediawiki.org/"
+ title="Main Page"></a>
</div>
<script type="text/javascript"> if (window.isMSIE55) fixalpha(); </script>
- <div class='portlet'><div class='pBody'>
+ <div class="portal"><div class="body">
<?php
echo $this->parent->parse( wfMsgNoTrans( 'config-sidebar' ), true );
?>
</div></div>
</div>
-</div>
-
</body>
</html>
<?php
<meta http-equiv="Content-type" content="text/html; charset=utf-8" />
<meta name="robots" content="noindex, nofollow" />
<title><?php $this->outputTitle(); ?></title>
- <?php echo Html::linkedStyle( '../skins/monobook/main.css' ) . "\n"; ?>
- <?php echo Html::linkedStyle( '../skins/common/config.css' ) . "\n"; ?>
- <?php $this->outputJQuery(); ?>
+ <?php echo $this->getCssUrl() . "\n"; ?>
+ <?php echo $this->getJQuery(); ?>
<?php echo Html::linkedScript( '../skins/common/config.js' ); ?>
</head>
echo htmlspecialchars( wfMsg( 'config-title', $wgVersion ) );
}
- public function outputJQuery() {
- global $wgJQueryVersion;
- echo Html::linkedScript( "../skins/common/jquery-$wgJQueryVersion.min.js" );
- }
-
- public function outputWarnings() {
- $this->addHTML( $this->warnings );
- $this->warnings = '';
+ public function getJQuery() {
+ return Html::linkedScript( "../resources/jquery/jquery.js" );
}
-
-}
\ No newline at end of file
+}
dépôts / lhc / web / wiklou.git / blobdiff