dépôts / lhc / web / wiklou.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Localisation updates from http://translatewiki.net.
[lhc/web/wiklou.git] / includes / installer / WebInstallerOutput.php
diff --git a/includes/installer/WebInstallerOutput.php b/includes/installer/WebInstallerOutput.php
index 9563ae8..9eb2c2c 100644 (file)
--- a/includes/installer/WebInstallerOutput.php
+++ b/includes/installer/WebInstallerOutput.php
@@ -39,6 +39,14 @@ class WebInstallerOutput {
 
        public $redirectTarget;
 
+       /**
+        * 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
@@ -88,29 +96,38 @@ class WebInstallerOutput {
                $skinDir = dirname( dirname( dirname( __FILE__ ) ) ) . '/skins';
                $vectorCssFile = "$skinDir/vector/screen.css";
                $configCssFile = "$skinDir/common/config.css";
+               $css = '';
                wfSuppressWarnings();
-               $css = file_get_contents( $vectorCssFile ) . "\n" . file_get_contents( $configCssFile );
+               $vectorCss = file_get_contents( $vectorCssFile );
+               $configCss = file_get_contents( $configCssFile );
                wfRestoreWarnings();
-               if( !$css ) {
-                       return "/** Your webserver cannot read $vectorCssFile or $configCssFile, please check file permissions */";
-               } elseif( $dir == 'rtl' ) {
+               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 str_replace( 'images/', '../skins/vector/images/', $css );
+               return $css;
        }
 
        /**
-        * URL for index.php?css=foobar
+        * <link> to index.php?css=foobar for the <head>
         * @return String
         */
        private function getCssUrl( ) {
-               return $_SERVER['PHP_SELF'] . '?css=' . $this->getDir();
+               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();
@@ -122,22 +139,33 @@ class WebInstallerOutput {
                }
        }
 
+       /**
+        * @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(),
@@ -157,7 +185,10 @@ class WebInstallerOutput {
                $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;
@@ -175,10 +206,9 @@ class WebInstallerOutput {
        <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( $this->getCssUrl() ) . "\n"; ?>
+       <?php echo $this->getCssUrl() . "\n"; ?>
        <?php echo Html::inlineScript(  "var dbTypes = " . Xml::encodeJsVar( $dbTypes ) ) . "\n"; ?>
        <?php echo $this->getJQuery() . "\n"; ?>
-       <?php echo $this->getJQueryTipsy() . "\n"; ?>
        <?php echo Html::linkedScript( '../skins/common/config.js' ) . "\n"; ?>
 </head>
 
@@ -205,21 +235,19 @@ class WebInstallerOutput {
 
 
 <div id="mw-panel">
-       <div class="portlet" id="p-logo">
+       <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
@@ -232,9 +260,8 @@ class WebInstallerOutput {
        <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( $this->getCssUrl() ) . "\n"; ?>
+       <?php echo $this->getCssUrl() . "\n"; ?>
        <?php echo $this->getJQuery(); ?>
-       <?php echo $this->getJQueryTipsy() . "\n"; ?>
        <?php echo Html::linkedScript( '../skins/common/config.js' ); ?>
 </head>
 
@@ -250,7 +277,4 @@ class WebInstallerOutput {
        public function getJQuery() {
                return Html::linkedScript( "../resources/jquery/jquery.js" );
        }
-       public function getJQueryTipsy() {
-               return Html::linkedScript( "../resources/jquery/jquery.tipsy.js" );
-       }
 }
Wiklou, le Wiki du Wiklou