Removed old comment and depreciated <tt> tags

[lhc/web/wiklou.git] / includes / Skin.php

diff --git a/includes/Skin.php b/includes/Skin.php
index 6440bf0..9118db9 100644 (file)
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -331,15 +331,17 @@ class Skin extends Linker {
        }
 
        static function makeVariablesScript( $data ) {
-               global $wgJsMimeType;
-
-               $r = array( "<script type=\"$wgJsMimeType\">/*<![CDATA[*/" );
-               foreach ( $data as $name => $value ) {
-                       $encValue = Xml::encodeJsVar( $value );
-                       $r[] = "var $name = $encValue;";
+               if( $data ) {
+                       $r = array();
+                       foreach ( $data as $name => $value ) {
+                               $encValue = Xml::encodeJsVar( $value );
+                               $r[] = "$name=$encValue";
+                       }
+                       $js = 'var ' . implode( ",\n", $r ) . ';';
+                       return Html::inlineScript( "\n$js\n" );
+               } else {
+                       return '';
                }
-               $r[] = "/*]]>*/</script>\n";
-               return implode( "\n\t\t", $r );
        }
 
        /**
@@ -354,7 +356,7 @@ class Skin extends Linker {
                        $skinName = $skinName['skinname'];
                }
                global $wgScript, $wgTitle, $wgStylePath, $wgUser;
-               global $wgArticlePath, $wgScriptPath, $wgServer, $wgContLang, $wgLang, $wgVariant;
+               global $wgArticlePath, $wgScriptPath, $wgServer, $wgContLang, $wgLang;
                global $wgCanonicalNamespaceNames, $wgOut, $wgArticle;
                global $wgBreakFrames, $wgRequest, $wgVariantArticlePath, $wgActionPaths;
                global $wgUseAjax, $wgAjaxWatch;
@@ -377,6 +379,7 @@ class Skin extends Linker {
                        implode( "\t", $digitTransTable ),
                );
 
+               $mainPage = Title::newFromText( wfMsgForContent( 'mainpage' ) );
                $vars = array(
                        'skin' => $skinName,
                        'stylepath' => $wgStylePath,
@@ -396,7 +399,6 @@ class Skin extends Linker {
                        'wgIsArticle' => $wgOut->isArticle(),
                        'wgUserName' => $wgUser->isAnon() ? NULL : $wgUser->getName(),
                        'wgUserGroups' => $wgUser->isAnon() ? NULL : $wgUser->getEffectiveGroups(),
-                       'wgUserVariant' => $wgVariant->getCode(),
                        'wgUserLanguage' => $wgLang->getCode(),
                        'wgContentLanguage' => $wgContLang->getCode(),
                        'wgBreakFrames' => $wgBreakFrames,
@@ -406,9 +408,10 @@ class Skin extends Linker {
                        'wgEnableWriteAPI' => $wgEnableWriteAPI,
                        'wgSeparatorTransformTable' => $compactSeparatorTransTable,
                        'wgDigitTransformTable' => $compactDigitTransTable,
+                       'wgMainPageTitle' => $mainPage ? $mainPage->getPrefixedText() : null,
                );
-               if ( !( $wgContLang->hasVariants() ) ) {
-                       unset( $vars['wgUserVariant'] );
+               if ( $wgContLang->hasVariants() ) {
+                       $vars['wgUserVariant'] = $wgContLang->getPreferredVariant();
                }
 
                //if on upload page output the extension list & js_upload
@@ -482,7 +485,7 @@ class Skin extends Linker {
                                'action=raw&ctype='.$wgJsMimeType );
                        $wgOut->addScriptFile( $userjs );
                }
-               return "\t" . $vars . "\t" . $out->mScripts;
+               return $vars . "\n" . $out->mScripts;
        }
 
        /**
@@ -503,7 +506,9 @@ class Skin extends Linker {
                        return false;
                if( !$wgRequest->wasPosted() )
                        return false;
-               if( !$this->mTitle->userCanEditCssJsSubpage() )
+               if( !$this->mTitle->userCanEditCssSubpage() )
+                       return false;
+               if( !$this->mTitle->userCanEditJsSubpage() )
                        return false;
                return $wgUser->matchEditToken(
                        $wgRequest->getVal( 'wpEditToken' ) );
@@ -602,6 +607,10 @@ END;
                if( !$wgUser->getOption( 'editsection' ) ) {
                        $s .= ".editsection { display: none; }\n";
                }
+               $fontstyle = $wgUser->getOption( 'editfont' );
+               if ( $fontstyle !== 'default' ) {
+                       $s .= "textarea { font-family: $fontstyle; }\n";
+               }
                return $s;
        }
 
@@ -622,8 +631,8 @@ END;
                );
 
                // Add any extension CSS
-               foreach( $out->getExtStyle() as $tag ) {
-                       $out->addStyle( $tag['href'] );
+               foreach ( $out->getExtStyle() as $url ) {
+                       $out->addStyle( $url );
                }
 
                // If we use the site's dynamic CSS, throw that in, too
@@ -703,7 +712,7 @@ END;
                $a['onload'] = $wgOut->getOnloadHandler();
                $a['class'] =
                        'mediawiki' .
-                       ' '.( $wgContLang->isRTL() ? 'rtl' : 'ltr' ).
+                       ' '.( $wgContLang->getDir() ).
                        ' '.$this->getPageClasses( $this->mTitle ) .
                        ' skin-'. Sanitizer::escapeClass( $this->getSkinName() );
                return $a;
@@ -767,13 +776,13 @@ END;
                } elseif( $left ) {
                        $s .= $this->getQuickbarCompensator( $rows );
                }
-               $l = $wgContLang->isRTL() ? 'right' : 'left';
+               $l = $wgContLang->alignStart();
                $s .= "<td {$borderhack} align='$l' valign='top'>\n";
 
                $s .= $this->topLinks();
                $s .= "<p class='subtitle'>" . $this->pageTitleLinks() . "</p>\n";
 
-               $r = $wgContLang->isRTL() ? 'left' : 'right';
+               $r = $wgContLang->alignEnd();
                $s .= "</td>\n<td {$borderhack} valign='top' align='$r' nowrap='nowrap'>";
                $s .= $this->nameAndLogin();
                $s .= "\n<br />" . $this->searchForm() . "</td>";
@@ -811,7 +820,7 @@ END;
 
                // Use Unicode bidi embedding override characters,
                // to make sure links don't smash each other up in ugly ways.
-               $dir = $wgContLang->isRTL() ? 'rtl' : 'ltr';
+               $dir = $wgContLang->getDir();
                $embed = "<span dir='$dir'>";
                $pop = '</span>';
 
@@ -890,14 +899,11 @@ END;
 
                $classes = 'catlinks';
 
-               if( strpos( $catlinks, '<div id="mw-normal-catlinks">' ) === false &&
-                       strpos( $catlinks, '<div id="mw-hidden-catlinks" class="mw-hidden-cats-hidden">' ) !== false ) {
+               if( strpos( $catlinks, '<div id="mw-normal-catlinks">' ) === false ) {
                        $classes .= ' catlinks-allhidden';
                }
 
-               if( !empty( $catlinks ) ){
-                       return "<div id='catlinks' class='$classes'>{$catlinks}</div>";
-               }
+               return "<div id='catlinks' class='$classes'>{$catlinks}</div>";
        }
 
        function getQuickbarCompensator( $rows = 1 ) {
@@ -968,8 +974,7 @@ END;
         * @return String HTML-wrapped JS code to be put before </body>
         */
        function bottomScripts() {
-               global $wgJsMimeType;
-               $bottomScriptText = "\n\t\t<script type=\"$wgJsMimeType\">if (window.runOnloadHook) runOnloadHook();</script>\n";
+               $bottomScriptText = "\n" . Html::inlineScript( 'if (window.runOnloadHook) runOnloadHook();' ) . "\n";
                wfRunHooks( 'SkinAfterBottomScripts', array( $this, &$bottomScriptText ) );
                return $bottomScriptText;
        }
@@ -1093,7 +1098,7 @@ END;
 
                $s = array();
 
-               if ( !$wgRequest->getBool( 'printable' ) ) {
+               if ( !$wgOut->isPrintable() ) {
                        $printurl = $wgRequest->escapeAppendQuery( 'printable=yes' );
                        $s[] = "<a href=\"$printurl\" rel=\"alternate\">" . wfMsg( 'printableversion' ) . '</a>';
                }
@@ -1485,7 +1490,7 @@ END;
                                $out .= '<a href="'.$url.'">';
                        }
                        $text = htmlspecialchars( $wgRightsText );
-                       $out .= "<img src=\"$icon\" alt='$text' />";
+                       $out .= "<img src=\"$icon\" alt=\"$text\" width=\"88\" height=\"31\" />";
                        if ( $wgRightsUrl ) {
                                $out .= '</a>';
                        }
@@ -1496,7 +1501,7 @@ END;
        function getPoweredBy() {
                global $wgStylePath;
                $url = htmlspecialchars( "$wgStylePath/common/images/poweredby_mediawiki_88x31.png" );
-               $img = '<a href="http://www.mediawiki.org/"><img src="'.$url.'" alt="Powered by MediaWiki" /></a>';
+               $img = '<a href="http://www.mediawiki.org/"><img src="'.$url.'" height="31" width="88" alt="Powered by MediaWiki" /></a>';
                return $img;
        }
 
@@ -1577,15 +1582,6 @@ END;
                return $s;
        }
 
-       function copyrightLink() {
-               $title = Title::newFromText( wfMsgForContent( 'copyrightpage' ) );
-               $s = $this->linkKnown(
-                       $title,
-                       wfMsg( 'copyrightpagename' )
-               );
-               return $s;
-       }
-
        private function footerLink ( $desc, $page ) {
                // if the link description has been set to "-" in the default language,
                if ( wfMsgForContent( $desc )  == '-') {
@@ -2086,4 +2082,4 @@ END;
        public function commonPrintStylesheet() {
                return true;
        }
-}
\ No newline at end of file
+}