Revert r34906, r34907, r34928 -- mixing high-level data into low-level storage functi...
[lhc/web/wiklou.git] / includes / SkinTemplate.php
index afa96c3..3422ee1 100644 (file)
@@ -32,8 +32,7 @@ class MediaWiki_I18N {
        }
 
        function translate($value) {
-               $fname = 'SkinTemplate-translate';
-               wfProfileIn( $fname );
+               wfProfileIn( __METHOD__ );
 
                // Hack for i18n:attributes in PHPTAL 1.0.0 dev version as of 2004-10-23
                $value = preg_replace( '/^string:/', '', $value );
@@ -48,7 +47,7 @@ class MediaWiki_I18N {
                        wfRestoreWarnings();
                        $value = str_replace($src, $varValue, $value);
                }
-               wfProfileOut( $fname );
+               wfProfileOut( __METHOD__ );
                return $value;
        }
 }
@@ -136,13 +135,12 @@ class SkinTemplate extends Skin {
                global $wgUseTrackbacks;
                global $wgArticlePath, $wgScriptPath, $wgServer, $wgLang, $wgCanonicalNamespaceNames;
 
-               $fname = 'SkinTemplate::outputPage';
-               wfProfileIn( $fname );
+               wfProfileIn( __METHOD__ );
 
                $oldid = $wgRequest->getVal( 'oldid' );
                $diff = $wgRequest->getVal( 'diff' );
 
-               wfProfileIn( "$fname-init" );
+               wfProfileIn( __METHOD__."-init" );
                $this->initPage( $out );
 
                $this->mTitle =& $wgTitle;
@@ -153,9 +151,9 @@ class SkinTemplate extends Skin {
                #if ( $wgUseDatabaseMessages ) { // uncomment this to fall back to GetText
                $tpl->setTranslator(new MediaWiki_I18N());
                #}
-               wfProfileOut( "$fname-init" );
+               wfProfileOut( __METHOD__."-init" );
 
-               wfProfileIn( "$fname-stuff" );
+               wfProfileIn( __METHOD__."-stuff" );
                $this->thispage = $this->mTitle->getPrefixedDbKey();
                $this->thisurl = $this->mTitle->getPrefixedURL();
                $this->loggedin = $wgUser->isLoggedIn();
@@ -177,9 +175,9 @@ class SkinTemplate extends Skin {
                $this->setupUserCss();
                $this->setupUserJs( $out->isUserJsAllowed() );
                $this->titletxt = $this->mTitle->getPrefixedText();
-               wfProfileOut( "$fname-stuff" );
+               wfProfileOut( __METHOD__."-stuff" );
 
-               wfProfileIn( "$fname-stuff2" );
+               wfProfileIn( __METHOD__."-stuff2" );
                $tpl->set( 'title', $wgOut->getPageTitle() );
                $tpl->set( 'pagetitle', $wgOut->getHTMLTitle() );
                $tpl->set( 'displaytitle', $wgOut->mPageLinkTitle );
@@ -269,6 +267,7 @@ class SkinTemplate extends Skin {
                $tpl->setRef( 'userpageurl', $this->userpageUrlDetails['href']);
                $tpl->set( 'userlang', $wgLang->getCode() );
                $tpl->set( 'pagecss', $this->setupPageCss() );
+               $tpl->set( 'printcss', $this->getPrintCss() );
                $tpl->setRef( 'usercss', $this->usercss);
                $tpl->setRef( 'userjs', $this->userjs);
                $tpl->setRef( 'userjsprev', $this->userjsprev);
@@ -316,9 +315,9 @@ class SkinTemplate extends Skin {
                } else {
                        $ntl = '';
                }
-               wfProfileOut( "$fname-stuff2" );
+               wfProfileOut( __METHOD__."-stuff2" );
 
-               wfProfileIn( "$fname-stuff3" );
+               wfProfileIn( __METHOD__."-stuff3" );
                $tpl->setRef( 'newtalk', $ntl );
                $tpl->setRef( 'skin', $this);
                $tpl->set( 'logo', $this->logoText() );
@@ -383,9 +382,9 @@ class SkinTemplate extends Skin {
                        $tpl->set('credits', false);
                        $tpl->set('numberofwatchingusers', false);
                }
-               wfProfileOut( "$fname-stuff3" );
+               wfProfileOut( __METHOD__."-stuff3" );
 
-               wfProfileIn( "$fname-stuff4" );
+               wfProfileIn( __METHOD__."-stuff4" );
                $tpl->set( 'copyrightico', $this->getCopyrightIcon() );
                $tpl->set( 'poweredbyico', $this->getPoweredBy() );
                $tpl->set( 'disclaimer', $this->disclaimerLink() );
@@ -422,7 +421,7 @@ class SkinTemplate extends Skin {
                } else {
                        $tpl->set('language_urls', false);
                }
-               wfProfileOut( "$fname-stuff4" );
+               wfProfileOut( __METHOD__."-stuff4" );
 
                # Personal toolbar
                $tpl->set('personal_urls', $this->buildPersonalUrls());
@@ -437,11 +436,7 @@ class SkinTemplate extends Skin {
                } else {
                        $tpl->set('body_ondblclick', false);
                }
-               if( $this->iseditable && $wgUser->getOption( 'editsectiononrightclick' ) ) {
-                       $tpl->set( 'body_onload', 'setupRightClickEdit()' );
-               } else {
-                       $tpl->set( 'body_onload', false );
-               }
+               $tpl->set( 'body_onload', false );
                $tpl->set( 'sidebar', $this->buildSidebar() );
                $tpl->set( 'nav_urls', $this->buildNavUrls() );
 
@@ -451,13 +446,13 @@ class SkinTemplate extends Skin {
                }
 
                // execute template
-               wfProfileIn( "$fname-execute" );
+               wfProfileIn( __METHOD__."-execute" );
                $res = $tpl->execute();
-               wfProfileOut( "$fname-execute" );
+               wfProfileOut( __METHOD__."-execute" );
 
                // result may be an error
                $this->printOrError( $res );
-               wfProfileOut( $fname );
+               wfProfileOut( __METHOD__ );
        }
 
        /**
@@ -480,9 +475,8 @@ class SkinTemplate extends Skin {
        function buildPersonalUrls() {
                global $wgTitle, $wgRequest;
 
-               $fname = 'SkinTemplate::buildPersonalUrls';
                $pageurl = $wgTitle->getLocalURL();
-               wfProfileIn( $fname );
+               wfProfileIn( __METHOD__ );
 
                /* set up the default links for the personal toolbar */
                $personal_urls = array();
@@ -512,14 +506,14 @@ class SkinTemplate extends Skin {
                                'href' => $href,
                                'active' => ( $href == $pageurl )
                        );
-                       
+
                        # We need to do an explicit check for Special:Contributions, as we
                        # have to match both the title, and the target (which could come
                        # from request values or be specified in "sub page" form. The plot
                        # thickens, because $wgTitle is altered for special pages, so doesn't
                        # contain the original alias-with-subpage.
                        $title = Title::newFromText( $wgRequest->getText( 'title' ) );
-                       if( $title instanceof Title && $title->getNamespace() == NS_SPECIAL ) {                 
+                       if( $title instanceof Title && $title->getNamespace() == NS_SPECIAL ) {
                                list( $spName, $spPar ) =
                                        SpecialPage::resolveAliasWithSubpage( $title->getText() );
                                $active = $spName == 'Contributions'
@@ -528,7 +522,7 @@ class SkinTemplate extends Skin {
                        } else {
                                $active = false;
                        }
-                       
+
                        $href = self::makeSpecialUrlSubpage( 'Contributions', $this->username );
                        $personal_urls['mycontris'] = array(
                                'text' => wfMsg( 'mycontris' ),
@@ -543,6 +537,10 @@ class SkinTemplate extends Skin {
                                'active' => false
                        );
                } else {
+                       global $wgUser;
+                       $loginlink = $wgUser->isAllowed( 'createaccount' )
+                               ? 'nav-login-createaccount'
+                               : 'login';
                        if( $this->showIPinHeader() ) {
                                $href = &$this->userpageUrlDetails['href'];
                                $personal_urls['anonuserpage'] = array(
@@ -560,14 +558,14 @@ class SkinTemplate extends Skin {
                                        'active' => ( $pageurl == $href )
                                );
                                $personal_urls['anonlogin'] = array(
-                                       'text' => wfMsg('userlogin'),
+                                       'text' => wfMsg( $loginlink ),
                                        'href' => self::makeSpecialUrl( 'Userlogin', 'returnto=' . $this->thisurl ),
                                        'active' => $wgTitle->isSpecial( 'Userlogin' )
                                );
                        } else {
 
                                $personal_urls['login'] = array(
-                                       'text' => wfMsg('userlogin'),
+                                       'text' => wfMsg( $loginlink ),
                                        'href' => self::makeSpecialUrl( 'Userlogin', 'returnto=' . $this->thisurl ),
                                        'active' => $wgTitle->isSpecial( 'Userlogin' )
                                );
@@ -575,7 +573,7 @@ class SkinTemplate extends Skin {
                }
 
                wfRunHooks( 'PersonalUrls', array( &$personal_urls, &$wgTitle ) );
-               wfProfileOut( $fname );
+               wfProfileOut( __METHOD__ );
                return $personal_urls;
        }
 
@@ -594,7 +592,7 @@ class SkinTemplate extends Skin {
                        global $wgContLang;
                        $text = $wgContLang->getFormattedNsText( MWNamespace::getSubject( $title->getNamespace() ) );
                }
-               
+
                $result = array();
                if( !wfRunHooks('SkinTemplateTabAction', array(&$this,
                                $title, $message, $selected, $checkEdit,
@@ -638,8 +636,7 @@ class SkinTemplate extends Skin {
         */
        function buildContentActionUrls () {
                global $wgContLang, $wgLang, $wgOut;
-               $fname = 'SkinTemplate::buildContentActionUrls';
-               wfProfileIn( $fname );
+               wfProfileIn( __METHOD__ );
 
                global $wgUser, $wgRequest;
                $action = $wgRequest->getText( 'action' );
@@ -667,7 +664,7 @@ class SkinTemplate extends Skin {
                                '',
                                true);
 
-                       wfProfileIn( "$fname-edit" );
+                       wfProfileIn( __METHOD__."-edit" );
                        if ( $this->mTitle->quickUserCan( 'edit' ) && ( $this->mTitle->exists() || $this->mTitle->quickUserCan( 'create' ) ) ) {
                                $istalk = $this->mTitle->isTalkPage();
                                $istalkclass = $istalk?' istalk':'';
@@ -693,9 +690,9 @@ class SkinTemplate extends Skin {
                                        'href' => $this->mTitle->getLocalUrl( $this->editUrlOptions() )
                                );
                        }
-                       wfProfileOut( "$fname-edit" );
+                       wfProfileOut( __METHOD__."-edit" );
 
-                       wfProfileIn( "$fname-live" );
+                       wfProfileIn( __METHOD__."-live" );
                        if ( $this->mTitle->getArticleId() ) {
 
                                $content_actions['history'] = array(
@@ -768,7 +765,7 @@ class SkinTemplate extends Skin {
                                }
                        }
 
-                       wfProfileOut( "$fname-live" );
+                       wfProfileOut( __METHOD__."-live" );
 
                        if( $this->loggedin ) {
                                if( !$this->mTitle->userIsWatching()) {
@@ -785,7 +782,7 @@ class SkinTemplate extends Skin {
                                        );
                                }
                        }
-                       
+
 
                        wfRunHooks( 'SkinTemplateTabs', array( &$this , &$content_actions ) )   ;
                } else {
@@ -822,7 +819,7 @@ class SkinTemplate extends Skin {
 
                wfRunHooks( 'SkinTemplateContentActions', array( &$content_actions ) );
 
-               wfProfileOut( $fname );
+               wfProfileOut( __METHOD__ );
                return $content_actions;
        }
 
@@ -837,8 +834,7 @@ class SkinTemplate extends Skin {
                global $wgUseTrackbacks, $wgTitle, $wgUser, $wgRequest;
                global $wgEnableUploads, $wgUploadNavigationUrl;
 
-               $fname = 'SkinTemplate::buildNavUrls';
-               wfProfileIn( $fname );
+               wfProfileIn( __METHOD__ );
 
                $action = $wgRequest->getText( 'action' );
 
@@ -876,7 +872,7 @@ class SkinTemplate extends Skin {
                                        'href' => $wgTitle->getLocalURL( "oldid=$this->mRevisionId" )
                                );
                        }
-                       
+
                        // Copy in case this undocumented, shady hook tries to mess with internals
                        $revid = $this->mRevisionId;
                        wfRunHooks( 'SkinTemplateBuildNavUrlsNav_urlsAfterPermalink', array( &$this, &$nav_urls, &$revid, &$revid ) );
@@ -913,7 +909,7 @@ class SkinTemplate extends Skin {
                        $nav_urls['contributions'] = array(
                                'href' => self::makeSpecialUrlSubpage( 'Contributions', $this->mTitle->getText() )
                        );
-                       
+
                        if( $id ) {
                                $logPage = SpecialPage::getTitleFor( 'Log' );
                                $nav_urls['log'] = array( 'href' => $logPage->getLocalUrl( 'user='
@@ -940,7 +936,7 @@ class SkinTemplate extends Skin {
                                'href' => self::makeSpecialUrlSubpage( 'Emailuser', $this->mTitle->getText() )
                        );
                }
-               wfProfileOut( $fname );
+               wfProfileOut( __METHOD__ );
                return $nav_urls;
        }
 
@@ -957,8 +953,7 @@ class SkinTemplate extends Skin {
         * @private
         */
        function setupUserCss() {
-               $fname = 'SkinTemplate::setupUserCss';
-               wfProfileIn( $fname );
+               wfProfileIn( __METHOD__ );
 
                global $wgRequest, $wgAllowUserCss, $wgUseSiteCss, $wgContLang, $wgSquidMaxage, $wgStylePath, $wgUser;
 
@@ -1010,15 +1005,14 @@ class SkinTemplate extends Skin {
                if ( !empty($sitecss) || !empty($usercss) ) {
                        $this->usercss = "/*<![CDATA[*/\n" . $sitecss . $usercss . '/*]]>*/';
                }
-               wfProfileOut( $fname );
+               wfProfileOut( __METHOD__ );
        }
 
        /**
         * @private
         */
        function setupUserJs( $allowUserJs ) {
-               $fname = 'SkinTemplate::setupUserJs';
-               wfProfileIn( $fname );
+               wfProfileIn( __METHOD__ );
 
                global $wgRequest, $wgJsMimeType;
                $action = $wgRequest->getText('action');
@@ -1031,7 +1025,7 @@ class SkinTemplate extends Skin {
                                $this->userjs = self::makeUrl($this->userpage.'/'.$this->skinname.'.js', 'action=raw&ctype='.$wgJsMimeType.'&dontcountme=s');
                        }
                }
-               wfProfileOut( $fname );
+               wfProfileOut( __METHOD__ );
        }
 
        /**
@@ -1041,30 +1035,37 @@ class SkinTemplate extends Skin {
         * @private
         */
        function setupPageCss() {
-               $fname = 'SkinTemplate::setupPageCss';
-               wfProfileIn( $fname );
+               wfProfileIn( __METHOD__ );
                $out = false;
                wfRunHooks( 'SkinTemplateSetupPageCss', array( &$out ) );
 
-               wfProfileOut( $fname );
+               wfProfileOut( __METHOD__ );
                return $out;
        }
 
        /**
         * returns css with user-specific options
-        * @public
         */
-
-       function getUserStylesheet() {
-               $fname = 'SkinTemplate::getUserStylesheet';
-               wfProfileIn( $fname );
+       public function getUserStylesheet() {
+               wfProfileIn( __METHOD__ );
 
                $s = "/* generated user stylesheet */\n";
                $s .= $this->reallyDoGetUserStyles();
-               wfProfileOut( $fname );
+               wfProfileOut( __METHOD__ );
                return $s;
        }
 
+       /**
+        * Returns the print stylesheet for this skin.  In all default skins this
+        * is just commonPrint.css, but third-party skins may want to modify it.
+        *
+        * @return string
+        */
+       protected function getPrintCss() {
+               global $wgStylePath;
+               return $wgStylePath . "/common/commonPrint.css";
+       }
+
        /**
         * This returns MediaWiki:Common.js and MediaWiki:[Skinname].js concate-
         * nated together.  For some bizarre reason, it does *not* return any
@@ -1078,8 +1079,7 @@ class SkinTemplate extends Skin {
         * @return string
         */
        public function getUserJs() {
-               $fname = 'SkinTemplate::getUserJs';
-               wfProfileIn( $fname );
+               wfProfileIn( __METHOD__ );
 
                $s = parent::getUserJs();
                $s .= "\n\n/* MediaWiki:".ucfirst($this->skinname).".js (deprecated; migrate to Common.js!) */\n";
@@ -1092,7 +1092,7 @@ class SkinTemplate extends Skin {
                        $s .= $userJS;
                }
 
-               wfProfileOut( $fname );
+               wfProfileOut( __METHOD__ );
                return $s;
        }
 }
@@ -1203,7 +1203,3 @@ class QuickTemplate {
                return ($msg != '-') && ($msg != ''); # ????
        }
 }
-
-
-
-