X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FSkinTemplate.php;h=0178b86656f4c527343f581e65c94e6c91144e76;hb=3518d9bb74a5cf2962712d6f8ecccbf2a5cbd0fa;hp=3c85c6d3f8da3e2db1480617ef10bead0c226260;hpb=e2106c40360fcd59b4b5bdc69d8c23e025ed2797;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php index 3c85c6d3f8..0178b86656 100644 --- a/includes/SkinTemplate.php +++ b/includes/SkinTemplate.php @@ -1,6 +1,6 @@ getValues( 'oldid', 'diff' ) ); + // Hook that allows last minute changes to the output page, e.g. + // adding of CSS or Javascript by extensions. + wfRunHooks( 'BeforePageDisplay', array( &$out ) ); + + $oldid = $wgRequest->getVal( 'oldid' ); + $diff = $wgRequest->getVal( 'diff' ); wfProfileIn( "$fname-init" ); $this->initPage( $out ); @@ -171,16 +170,16 @@ class SkinTemplate extends Skin { $this->userpage = $userPage->getPrefixedText(); if ( $wgUser->isLoggedIn() || $this->showIPinHeader() ) { - $this->userpageUrlDetails = $this->makeUrlDetails($this->userpage); + $this->userpageUrlDetails = self::makeUrlDetails( $this->userpage ); } else { # This won't be used in the standard skins, but we define it to preserve the interface # To save time, we check for existence - $this->userpageUrlDetails = $this->makeKnownUrlDetails($this->userpage); + $this->userpageUrlDetails = self::makeKnownUrlDetails( $this->userpage ); } $this->usercss = $this->userjs = $this->userjsprev = false; $this->setupUserCss(); - $this->setupUserJs(); + $this->setupUserJs( $out->isUserJsAllowed() ); $this->titletxt = $this->mTitle->getPrefixedText(); wfProfileOut( "$fname-stuff" ); @@ -188,6 +187,20 @@ class SkinTemplate extends Skin { $tpl->set( 'title', $wgOut->getPageTitle() ); $tpl->set( 'pagetitle', $wgOut->getHTMLTitle() ); $tpl->set( 'displaytitle', $wgOut->mPageLinkTitle ); + $tpl->set( 'pageclass', Sanitizer::escapeClass( 'page-'.$this->mTitle->getPrefixedText() ) ); + + $nsname = isset( $wgCanonicalNamespaceNames[ $this->mTitle->getNamespace() ] ) ? + $wgCanonicalNamespaceNames[ $this->mTitle->getNamespace() ] : + $this->mTitle->getNsText(); + + $tpl->set( 'nscanonical', $nsname ); + $tpl->set( 'nsnumber', $this->mTitle->getNamespace() ); + $tpl->set( 'titleprefixeddbkey', $this->mTitle->getPrefixedDBKey() ); + $tpl->set( 'titletext', $this->mTitle->getText() ); + $tpl->set( 'articleid', $this->mTitle->getArticleId() ); + $tpl->set( 'currevisionid', isset( $wgArticle ) ? $wgArticle->getLatest() : 0 ); + + $tpl->set( 'isarticle', $wgOut->isArticle() ); $tpl->setRef( "thispage", $this->thispage ); $subpagestr = $this->subPageSubtitle(); @@ -206,19 +219,23 @@ class SkinTemplate extends Skin { $tpl->set( 'catlinks', $this->getCategories()); if( $wgOut->isSyndicated() ) { $feeds = array(); - foreach( $wgFeedClasses as $format => $class ) { + foreach( $wgOut->getSyndicationLinks() as $format => $link ) { $feeds[$format] = array( - 'text' => $format, - 'href' => $wgRequest->appendQuery( "feed=$format" ) - ); + 'text' => wfMsg( "feed-$format" ), + 'href' => $link ); } $tpl->setRef( 'feeds', $feeds ); } else { $tpl->set( 'feeds', false ); } - if ($wgUseTrackbacks && $out->isArticleRelated()) - $tpl->set( 'trackbackhtml', $wgTitle->trackbackRDF()); + if ($wgUseTrackbacks && $out->isArticleRelated()) { + $tpl->set( 'trackbackhtml', $wgTitle->trackbackRDF() ); + } else { + $tpl->set( 'trackbackhtml', null ); + } + $tpl->setRef( 'xhtmldefaultnamespace', $wgXhtmlDefaultNamespace ); + $tpl->set( 'xhtmlnamespaces', $wgXhtmlNamespaces ); $tpl->setRef( 'mimetype', $wgMimeType ); $tpl->setRef( 'jsmimetype', $wgJsMimeType ); $tpl->setRef( 'charset', $wgOutputEncoding ); @@ -226,6 +243,7 @@ class SkinTemplate extends Skin { $tpl->set('headscripts', $out->getScript() ); $tpl->setRef( 'wgScript', $wgScript ); $tpl->setRef( 'skinname', $this->skinname ); + $tpl->set( 'skinclass', get_class( $this ) ); $tpl->setRef( 'stylename', $this->stylename ); $tpl->set( 'printable', $wgRequest->getBool( 'printable' ) ); $tpl->setRef( 'loggedin', $this->loggedin ); @@ -241,32 +259,36 @@ class SkinTemplate extends Skin { $tpl->set( 'searchaction', $this->escapeSearchLink() ); $tpl->set( 'search', trim( $wgRequest->getVal( 'search' ) ) ); $tpl->setRef( 'stylepath', $wgStylePath ); + $tpl->setRef( 'articlepath', $wgArticlePath ); + $tpl->setRef( 'scriptpath', $wgScriptPath ); + $tpl->setRef( 'serverurl', $wgServer ); $tpl->setRef( 'logopath', $wgLogo ); $tpl->setRef( "lang", $wgContLanguageCode ); $tpl->set( 'dir', $wgContLang->isRTL() ? "rtl" : "ltr" ); $tpl->set( 'rtl', $wgContLang->isRTL() ); $tpl->set( 'langname', $wgContLang->getLanguageName( $wgContLanguageCode ) ); $tpl->set( 'showjumplinks', $wgUser->getOption( 'showjumplinks' ) ); - $tpl->setRef( 'username', $this->username ); + $tpl->set( 'username', $wgUser->isAnon() ? NULL : $this->username ); $tpl->setRef( 'userpage', $this->userpage); $tpl->setRef( 'userpageurl', $this->userpageUrlDetails['href']); + $tpl->set( 'userlang', $wgLang->getCode() ); $tpl->set( 'pagecss', $this->setupPageCss() ); $tpl->setRef( 'usercss', $this->usercss); $tpl->setRef( 'userjs', $this->userjs); $tpl->setRef( 'userjsprev', $this->userjsprev); global $wgUseSiteJs; if ($wgUseSiteJs) { - if($this->loggedin) { - $tpl->set( 'jsvarurl', $this->makeUrl('-','action=raw&smaxage=0&gen=js') ); - } else { - $tpl->set( 'jsvarurl', $this->makeUrl('-','action=raw&gen=js') ); - } + $jsCache = $this->loggedin ? '&smaxage=0' : ''; + $tpl->set( 'jsvarurl', + self::makeUrl('-', + "action=raw$jsCache&gen=js&useskin=" . + urlencode( $this->getSkinName() ) ) ); } else { $tpl->set('jsvarurl', false); } $newtalks = $wgUser->getNewMessageLinks(); - if (count($newtalks) == 1 && $newtalks[0]["wiki"] === $wgDBname) { + if (count($newtalks) == 1 && $newtalks[0]["wiki"] === wfWikiID() ) { $usertitle = $this->mUser->getUserPage(); $usertalktitle = $usertitle->getTalkPage(); if( !$usertalktitle->equals( $this->mTitle ) ) { @@ -304,11 +326,13 @@ class SkinTemplate extends Skin { $tpl->setRef( 'newtalk', $ntl ); $tpl->setRef( 'skin', $this); $tpl->set( 'logo', $this->logoText() ); - if ( $wgOut->isArticle() and (!isset( $oldid ) or isset( $diff )) and 0 != $wgArticle->getID() ) { + if ( $wgOut->isArticle() and (!isset( $oldid ) or isset( $diff )) and + $wgArticle and 0 != $wgArticle->getID() ) + { if ( !$wgDisableCounters ) { $viewcount = $wgLang->formatNum( $wgArticle->getCount() ); if ( $viewcount ) { - $tpl->set('viewcount', wfMsg( "viewcount", $viewcount )); + $tpl->set('viewcount', wfMsgExt( 'viewcount', array( 'parseinline' ), $viewcount ) ); } else { $tpl->set('viewcount', false); } @@ -317,16 +341,19 @@ class SkinTemplate extends Skin { } if ($wgPageShowWatchingUsers) { - $dbr =& wfGetDB( DB_SLAVE ); - extract( $dbr->tableNames( 'watchlist' ) ); + $dbr = wfGetDB( DB_SLAVE ); + $watchlist = $dbr->tableName( 'watchlist' ); $sql = "SELECT COUNT(*) AS n FROM $watchlist - WHERE wl_title='" . $dbr->strencode($this->mTitle->getDBKey()) . + WHERE wl_title='" . $dbr->strencode($this->mTitle->getDBkey()) . "' AND wl_namespace=" . $this->mTitle->getNamespace() ; $res = $dbr->query( $sql, 'SkinTemplate::outputPage'); $x = $dbr->fetchObject( $res ); $numberofwatchingusers = $x->n; if ($numberofwatchingusers > 0) { - $tpl->set('numberofwatchingusers', wfMsg('number_of_watching_users_pageview', $numberofwatchingusers)); + $tpl->set('numberofwatchingusers', + wfMsgExt('number_of_watching_users_pageview', array('parseinline'), + $wgLang->formatNum($numberofwatchingusers)) + ); } else { $tpl->set('numberofwatchingusers', false); } @@ -372,6 +399,7 @@ class SkinTemplate extends Skin { $tpl->setRef( 'debug', $out->mDebugtext ); $tpl->set( 'reporttime', $out->reportTime() ); $tpl->set( 'sitenotice', wfGetSiteNotice() ); + $tpl->set( 'bottomscripts', $this->bottomScripts() ); $printfooter = "
\n" . $this->printSource() . "
\n"; $out->mBodytext .= $printfooter ; @@ -408,7 +436,8 @@ class SkinTemplate extends Skin { // XXX: attach this from javascript, same with section editing if($this->iseditable && $wgUser->getOption("editondblclick") ) { - $tpl->set('body_ondblclick', 'document.location = "' .$content_actions['edit']['href'] .'";'); + $encEditUrl = wfEscapeJsString( $this->mTitle->getLocalUrl( $this->editUrlOptions() ) ); + $tpl->set('body_ondblclick', 'document.location = "' . $encEditUrl . '";'); } else { $tpl->set('body_ondblclick', false); } @@ -420,6 +449,11 @@ class SkinTemplate extends Skin { $tpl->set( 'sidebar', $this->buildSidebar() ); $tpl->set( 'nav_urls', $this->buildNavUrls() ); + // original version by hansm + if( !wfRunHooks( 'SkinTemplateOutputPageBeforeExec', array( &$this, &$tpl ) ) ) { + wfDebug( __METHOD__ . ': Hook SkinTemplateOutputPageBeforeExec broke outputPage execution!' ); + } + // execute template wfProfileIn( "$fname-execute" ); $res = $tpl->execute(); @@ -436,19 +470,19 @@ class SkinTemplate extends Skin { * For the base class, assume strings all around. * * @param mixed $str - * @access private + * @private */ - function printOrError( &$str ) { + function printOrError( $str ) { echo $str; } /** * build array of urls for personal toolbar * @return array - * @access private + * @private */ function buildPersonalUrls() { - global $wgTitle, $wgShowIPinHeader; + global $wgTitle, $wgRequest; $fname = 'SkinTemplate::buildPersonalUrls'; $pageurl = $wgTitle->getLocalURL(); @@ -470,32 +504,50 @@ class SkinTemplate extends Skin { 'class' => $usertalkUrlDetails['exists']?false:'new', 'active' => ( $usertalkUrlDetails['href'] == $pageurl ) ); - $href = $this->makeSpecialUrl('Preferences'); + $href = self::makeSpecialUrl( 'Preferences' ); $personal_urls['preferences'] = array( - 'text' => wfMsg('preferences'), - 'href' => $this->makeSpecialUrl('Preferences'), + 'text' => wfMsg( 'mypreferences' ), + 'href' => $href, 'active' => ( $href == $pageurl ) ); - $href = $this->makeSpecialUrl('Watchlist'); + $href = self::makeSpecialUrl( 'Watchlist' ); $personal_urls['watchlist'] = array( - 'text' => wfMsg('watchlist'), + 'text' => wfMsg( 'mywatchlist' ), 'href' => $href, 'active' => ( $href == $pageurl ) ); - $href = $this->makeSpecialUrl("Contributions/$this->username"); + + # 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 ) { + list( $spName, $spPar ) = + SpecialPage::resolveAliasWithSubpage( $title->getText() ); + $active = $spName == 'Contributions' + && ( ( $spPar && $spPar == $this->username ) + || $wgRequest->getText( 'target' ) == $this->username ); + } else { + $active = false; + } + + $href = self::makeSpecialUrlSubpage( 'Contributions', $this->username ); $personal_urls['mycontris'] = array( - 'text' => wfMsg('mycontris'), - 'href' => $href - # FIXME # 'active' => ( $href == $pageurl . '/' . $this->username ) + 'text' => wfMsg( 'mycontris' ), + 'href' => $href, + 'active' => $active ); $personal_urls['logout'] = array( - 'text' => wfMsg('userlogout'), - 'href' => $this->makeSpecialUrl( 'Userlogout', - $wgTitle->getNamespace() === NS_SPECIAL && $wgTitle->getText() === 'Preferences' ? '' : "returnto={$this->thisurl}" - ) + 'text' => wfMsg( 'userlogout' ), + 'href' => self::makeSpecialUrl( 'Userlogout', + $wgTitle->isSpecial( 'Preferences' ) ? '' : "returnto={$this->thisurl}" + ), + 'active' => false ); } else { - if( $wgShowIPinHeader && isset( $_COOKIE[ini_get("session.name")] ) ) { + if( $this->showIPinHeader() ) { $href = &$this->userpageUrlDetails['href']; $personal_urls['anonuserpage'] = array( 'text' => $this->username, @@ -513,44 +565,45 @@ class SkinTemplate extends Skin { ); $personal_urls['anonlogin'] = array( 'text' => wfMsg('userlogin'), - 'href' => $this->makeSpecialUrl('Userlogin', 'returnto=' . $this->thisurl ), - 'active' => ( NS_SPECIAL == $wgTitle->getNamespace() && 'Userlogin' == $wgTitle->getDBkey() ) + 'href' => self::makeSpecialUrl( 'Userlogin', 'returnto=' . $this->thisurl ), + 'active' => $wgTitle->isSpecial( 'Userlogin' ) ); } else { $personal_urls['login'] = array( 'text' => wfMsg('userlogin'), - 'href' => $this->makeSpecialUrl('Userlogin', 'returnto=' . $this->thisurl ), - 'active' => ( NS_SPECIAL == $wgTitle->getNamespace() && 'Userlogin' == $wgTitle->getDBkey() ) + 'href' => self::makeSpecialUrl( 'Userlogin', 'returnto=' . $this->thisurl ), + 'active' => $wgTitle->isSpecial( 'Userlogin' ) ); } } + + wfRunHooks( 'PersonalUrls', array( &$personal_urls, &$wgTitle ) ); wfProfileOut( $fname ); return $personal_urls; } - /** - * Returns true if the IP should be shown in the header - */ - function showIPinHeader() { - global $wgShowIPinHeader; - return $wgShowIPinHeader && isset( $_COOKIE[ini_get("session.name")] ); - } - function tabAction( $title, $message, $selected, $query='', $checkEdit=false ) { $classes = array(); if( $selected ) { $classes[] = 'selected'; } - if( $checkEdit && $title->getArticleId() == 0 ) { + if( $checkEdit && !$title->isAlwaysKnown() && $title->getArticleId() == 0 ) { $classes[] = 'new'; $query = 'action=edit'; } $text = wfMsg( $message ); - if ( $text == "<$message>" ) { + if ( wfEmptyMsg( $message, $text ) ) { global $wgContLang; - $text = $wgContLang->getNsText( Namespace::getSubject( $title->getNamespace() ) ); + $text = $wgContLang->getFormattedNsText( Namespace::getSubject( $title->getNamespace() ) ); + } + + $result = array(); + if( !wfRunHooks('SkinTemplateTabAction', array(&$this, + $title, $message, $selected, $checkEdit, + &$classes, &$query, &$text, &$result)) ) { + return $result; } return array( @@ -559,33 +612,36 @@ class SkinTemplate extends Skin { 'href' => $title->getLocalUrl( $query ) ); } - function makeTalkUrlDetails( $name, $urlaction='' ) { + function makeTalkUrlDetails( $name, $urlaction = '' ) { $title = Title::newFromText( $name ); + if( !is_object($title) ) { + throw new MWException( __METHOD__." given invalid pagename $name" ); + } $title = $title->getTalkPage(); - $this->checkTitle($title, $name); + self::checkTitle( $title, $name ); return array( 'href' => $title->getLocalURL( $urlaction ), - 'exists' => $title->getArticleID() != 0?true:false + 'exists' => $title->getArticleID() != 0 ? true : false ); } - function makeArticleUrlDetails( $name, $urlaction='' ) { + function makeArticleUrlDetails( $name, $urlaction = '' ) { $title = Title::newFromText( $name ); $title= $title->getSubjectPage(); - $this->checkTitle($title, $name); + self::checkTitle( $title, $name ); return array( 'href' => $title->getLocalURL( $urlaction ), - 'exists' => $title->getArticleID() != 0?true:false + 'exists' => $title->getArticleID() != 0 ? true : false ); } /** * an array of edit links by default used for the tabs * @return array - * @access private + * @private */ function buildContentActionUrls () { - global $wgContLang; + global $wgContLang, $wgLang, $wgOut; $fname = 'SkinTemplate::buildContentActionUrls'; wfProfileIn( $fname ); @@ -616,7 +672,7 @@ class SkinTemplate extends Skin { true); wfProfileIn( "$fname-edit" ); - if ( $this->mTitle->userCanEdit() ) { + if ( $this->mTitle->quickUserCan( 'edit' ) && ( $this->mTitle->exists() || $this->mTitle->quickUserCan( 'create' ) ) ) { $istalk = $this->mTitle->isTalkPage(); $istalkclass = $istalk?' istalk':''; $content_actions['edit'] = array( @@ -625,14 +681,14 @@ class SkinTemplate extends Skin { 'href' => $this->mTitle->getLocalUrl( $this->editUrlOptions() ) ); - if ( $istalk ) { + if ( $istalk || $wgOut->showNewSectionLink() ) { $content_actions['addsection'] = array( 'class' => $section == 'new'?'selected':false, 'text' => wfMsg('addsection'), 'href' => $this->mTitle->getLocalUrl( 'action=edit§ion=new' ) ); } - } else { + } elseif ( $this->mTitle->exists() || $this->mTitle->isAlwaysKnown() ) { $content_actions['viewsource'] = array( 'class' => ($action == 'edit') ? 'selected' : false, 'text' => wfMsg('viewsource'), @@ -650,6 +706,22 @@ class SkinTemplate extends Skin { 'href' => $this->mTitle->getLocalUrl( 'action=history') ); + if($wgUser->isAllowed('delete')){ + $content_actions['delete'] = array( + 'class' => ($action == 'delete') ? 'selected' : false, + 'text' => wfMsg('delete'), + 'href' => $this->mTitle->getLocalUrl( 'action=delete' ) + ); + } + if ( $this->mTitle->quickUserCan( 'move' ) ) { + $moveTitle = SpecialPage::getTitleFor( 'Movepage', $this->thispage ); + $content_actions['move'] = array( + 'class' => $this->mTitle->isSpecial( 'Movepage' ) ? 'selected' : false, + 'text' => wfMsg('move'), + 'href' => $moveTitle->getLocalUrl() + ); + } + if ( $this->mTitle->getNamespace() !== NS_MEDIAWIKI && $wgUser->isAllowed( 'protect' ) ) { if(!$this->mTitle->isProtected()){ $content_actions['protect'] = array( @@ -666,32 +738,38 @@ class SkinTemplate extends Skin { ); } } - if($wgUser->isAllowed('delete')){ - $content_actions['delete'] = array( - 'class' => ($action == 'delete') ? 'selected' : false, - 'text' => wfMsg('delete'), - 'href' => $this->mTitle->getLocalUrl( 'action=delete' ) - ); - } - if ( $this->mTitle->userCanMove()) { - $content_actions['move'] = array( - 'class' => ($this->mTitle->getDbKey() == 'Movepage' and $this->mTitle->getNamespace == NS_SPECIAL) ? 'selected' : false, - 'text' => wfMsg('move'), - 'href' => $this->makeSpecialUrl("Movepage/$this->thispage" ) - ); - } } else { //article doesn't exist or is deleted - if($wgUser->isAllowed('delete')){ + if( $wgUser->isAllowed( 'deletedhistory' ) && $wgUser->isAllowed( 'undelete' ) ) { if( $n = $this->mTitle->isDeleted() ) { + $undelTitle = SpecialPage::getTitleFor( 'Undelete' ); $content_actions['undelete'] = array( 'class' => false, - 'text' => ($n == 1) ? wfMsg( 'undelete_short1' ) : wfMsg('undelete_short', $n ), - 'href' => $this->makeSpecialUrl("Undelete/$this->thispage") + 'text' => wfMsgExt( 'undelete_short', array( 'parsemag' ), $wgLang->formatNum($n) ), + 'href' => $undelTitle->getLocalUrl( 'target=' . urlencode( $this->thispage ) ) + #'href' => self::makeSpecialUrl( "Undelete/$this->thispage" ) + ); + } + } + + if ( $this->mTitle->getNamespace() !== NS_MEDIAWIKI && $wgUser->isAllowed( 'protect' ) ) { + if( !$this->mTitle->getRestrictions( 'create' ) ) { + $content_actions['protect'] = array( + 'class' => ($action == 'protect') ? 'selected' : false, + 'text' => wfMsg('protect'), + 'href' => $this->mTitle->getLocalUrl( 'action=protect' ) + ); + + } else { + $content_actions['unprotect'] = array( + 'class' => ($action == 'unprotect') ? 'selected' : false, + 'text' => wfMsg('unprotect'), + 'href' => $this->mTitle->getLocalUrl( 'action=unprotect' ) ); } } } + wfProfileOut( "$fname-live" ); if( $this->loggedin ) { @@ -709,14 +787,15 @@ class SkinTemplate extends Skin { ); } } + wfRunHooks( 'SkinTemplateTabs', array( &$this , &$content_actions ) ) ; } else { /* show special page tab */ - $content_actions['article'] = array( + $content_actions[$this->mTitle->getNamespaceKey()] = array( 'class' => 'selected', - 'text' => wfMsg('specialpage'), + 'text' => wfMsg('nstab-special'), 'href' => $wgRequest->getRequestURL(), // @bug 2457, 2510 ); @@ -728,9 +807,6 @@ class SkinTemplate extends Skin { $variants = $wgContLang->getVariants(); if( !$wgDisableLangConversion && sizeof( $variants ) > 1 ) { $preferred = $wgContLang->getPreferredVariant(); - $actstr = ''; - if( $action ) - $actstr = 'action=' . $action . '&'; $vcount=0; foreach( $variants as $code ) { $varname = $wgContLang->getVariantname( $code ); @@ -740,7 +816,7 @@ class SkinTemplate extends Skin { $content_actions['varlang-' . $vcount] = array( 'class' => $selected, 'text' => $varname, - 'href' => $this->mTitle->getLocalUrl( $actstr . 'variant=' . $code ) + 'href' => $this->mTitle->getLocalURL('',$code) ); $vcount ++; } @@ -757,7 +833,7 @@ class SkinTemplate extends Skin { /** * build array of common navigation links * @return array - * @access private + * @private */ function buildNavUrls () { global $wgUseTrackbacks, $wgTitle, $wgArticle; @@ -769,61 +845,59 @@ class SkinTemplate extends Skin { global $wgEnableUploads, $wgUploadNavigationUrl; $action = $wgRequest->getText( 'action' ); - $oldid = $wgRequest->getVal( 'oldid' ); - $diff = $wgRequest->getVal( 'diff' ); $nav_urls = array(); - $nav_urls['mainpage'] = array('href' => $this->makeI18nUrl('mainpage')); + $nav_urls['mainpage'] = array( 'href' => self::makeMainPageUrl() ); if( $wgEnableUploads ) { if ($wgUploadNavigationUrl) { - $nav_urls['upload'] = array('href' => $wgUploadNavigationUrl ); + $nav_urls['upload'] = array( 'href' => $wgUploadNavigationUrl ); } else { - $nav_urls['upload'] = array('href' => $this->makeSpecialUrl('Upload')); + $nav_urls['upload'] = array( 'href' => self::makeSpecialUrl( 'Upload' ) ); } } else { if ($wgUploadNavigationUrl) - $nav_urls['upload'] = array('href' => $wgUploadNavigationUrl ); + $nav_urls['upload'] = array( 'href' => $wgUploadNavigationUrl ); else $nav_urls['upload'] = false; } - $nav_urls['specialpages'] = array('href' => $this->makeSpecialUrl('Specialpages')); + $nav_urls['specialpages'] = array( 'href' => self::makeSpecialUrl( 'Specialpages' ) ); + // default permalink to being off, will override it as required below. + $nav_urls['permalink'] = false; // A print stylesheet is attached to all pages, but nobody ever // figures that out. :) Add a link... if( $this->iscontent && ($action == '' || $action == 'view' || $action == 'purge' ) ) { - $revid = $wgArticle->getLatest(); - if ( !( $revid == 0 ) ) - $nav_urls['print'] = array( - 'text' => wfMsg( 'printableversion' ), - 'href' => $wgRequest->appendQuery( 'printable=yes' ) - ); + $nav_urls['print'] = array( + 'text' => wfMsg( 'printableversion' ), + 'href' => $wgRequest->appendQuery( 'printable=yes' ) + ); // Also add a "permalink" while we're at it - if ( (int)$oldid ) { + if ( $this->mRevisionId ) { $nav_urls['permalink'] = array( 'text' => wfMsg( 'permalink' ), - 'href' => '' + 'href' => $wgTitle->getLocalURL( "oldid=$this->mRevisionId" ) ); - } else { - if ( !( $revid == 0 ) ) - $nav_urls['permalink'] = array( - 'text' => wfMsg( 'permalink' ), - 'href' => $wgTitle->getLocalURL( "oldid=$revid" ) - ); } - - wfRunHooks( 'SkinTemplateBuildNavUrlsNav_urlsAfterPermalink', array( &$this, &$nav_urls, &$oldid, &$revid ) ); + + // Copy in case this undocumented, shady hook tries to mess with internals + $revid = $this->mRevisionId; + wfRunHooks( 'SkinTemplateBuildNavUrlsNav_urlsAfterPermalink', array( &$this, &$nav_urls, &$revid, &$revid ) ); } - if( $this->mTitle->getNamespace() != NS_SPECIAL) { + if( $this->mTitle->getNamespace() != NS_SPECIAL ) { + $wlhTitle = SpecialPage::getTitleFor( 'Whatlinkshere', $this->thispage ); $nav_urls['whatlinkshere'] = array( - 'href' => $this->makeSpecialUrl("Whatlinkshere/$this->thispage") + 'href' => $wlhTitle->getLocalUrl() ); if( $this->mTitle->getArticleId() ) { + $rclTitle = SpecialPage::getTitleFor( 'Recentchangeslinked', $this->thispage ); $nav_urls['recentchangeslinked'] = array( - 'href' => $this->makeSpecialUrl("Recentchangeslinked/$this->thispage") + 'href' => $rclTitle->getLocalUrl() ); + } else { + $nav_urls['recentchangeslinked'] = false; } if ($wgUseTrackbacks) $nav_urls['trackbacklink'] = array( @@ -839,21 +913,35 @@ class SkinTemplate extends Skin { $ip = false; } - if($id || $ip) { # both anons and non-anons have contri list + if($id || $ip) { # both anons and non-anons have contribs list $nav_urls['contributions'] = array( - 'href' => $this->makeSpecialUrl('Contributions/' . $this->mTitle->getText() ) + 'href' => self::makeSpecialUrlSubpage( 'Contributions', $this->mTitle->getText() ) ); - if ( $wgUser->isAllowed( 'block' ) ) + + if( $id ) { + $logPage = SpecialPage::getTitleFor( 'Log' ); + $nav_urls['log'] = array( 'href' => $logPage->getLocalUrl( 'user=' + . $this->mTitle->getPartialUrl() ) ); + } else { + $nav_urls['log'] = false; + } + + if ( $wgUser->isAllowed( 'block' ) ) { $nav_urls['blockip'] = array( - 'href' => $this->makeSpecialUrl( 'Blockip/' . $this->mTitle->getText() ) + 'href' => self::makeSpecialUrlSubpage( 'Blockip', $this->mTitle->getText() ) ); + } else { + $nav_urls['blockip'] = false; + } } else { $nav_urls['contributions'] = false; + $nav_urls['log'] = false; + $nav_urls['blockip'] = false; } $nav_urls['emailuser'] = false; if( $this->showEmailUser( $id ) ) { $nav_urls['emailuser'] = array( - 'href' => $this->makeSpecialUrl('Emailuser/' . $this->mTitle->getText() ) + 'href' => self::makeSpecialUrlSubpage( 'Emailuser', $this->mTitle->getText() ) ); } wfProfileOut( $fname ); @@ -863,14 +951,14 @@ class SkinTemplate extends Skin { /** * Generate strings used for xml 'id' names * @return string - * @access private + * @private */ function getNameSpaceKey () { return $this->mTitle->getNamespaceKey(); } /** - * @access private + * @private */ function setupUserCss() { $fname = 'SkinTemplate::setupUserCss'; @@ -881,6 +969,11 @@ class SkinTemplate extends Skin { $sitecss = ''; $usercss = ''; $siteargs = '&maxage=' . $wgSquidMaxage; + if( $this->loggedin ) { + // Ensure that logged-in users' generated CSS isn't clobbered + // by anons' publicly cacheable generated CSS. + $siteargs .= '&smaxage=0'; + } # Add user-specific code if this is a user and we allow that kind of thing @@ -893,21 +986,27 @@ class SkinTemplate extends Skin { $usercss = $wgRequest->getText('wpTextbox1'); } else { $usercss = '@import "' . - $this->makeUrl($this->userpage . '/'.$this->skinname.'.css', + self::makeUrl($this->userpage . '/'.$this->skinname.'.css', 'action=raw&ctype=text/css') . '";' ."\n"; } $siteargs .= '&ts=' . $wgUser->mTouched; } - if ($wgContLang->isRTL()) $sitecss .= '@import "' . $wgStylePath . '/' . $this->stylename . '/rtl.css";' . "\n"; + if( $wgContLang->isRTL() ) { + global $wgStyleVersion; + $sitecss .= "@import \"$wgStylePath/$this->stylename/rtl.css?$wgStyleVersion\";\n"; + } # If we use the site's dynamic CSS, throw that in, too if ( $wgUseSiteCss ) { - $query = "action=raw&ctype=text/css&smaxage=$wgSquidMaxage"; - $sitecss .= '@import "' . $this->makeNSUrl('Common.css', $query, NS_MEDIAWIKI) . '";' . "\n"; - $sitecss .= '@import "' . $this->makeNSUrl(ucfirst($this->skinname) . '.css', $query, NS_MEDIAWIKI) . '";' . "\n"; - $sitecss .= '@import "' . $this->makeUrl('-','action=raw&gen=css' . $siteargs) . '";' . "\n"; + $query = "usemsgcache=yes&action=raw&ctype=text/css&smaxage=$wgSquidMaxage"; + $skinquery = ''; + if (($us = $wgRequest->getVal('useskin', '')) !== '') + $skinquery = "&useskin=$us"; + $sitecss .= '@import "' . self::makeNSUrl( 'Common.css', $query, NS_MEDIAWIKI) . '";' . "\n"; + $sitecss .= '@import "' . self::makeNSUrl( ucfirst( $this->skinname ) . '.css', $query, NS_MEDIAWIKI ) . '";' . "\n"; + $sitecss .= '@import "' . self::makeUrl( '-', "action=raw&gen=css$siteargs$skinquery" ) . '";' . "\n"; } # If we use any dynamic CSS, make a little CDATA block out of it. @@ -919,21 +1018,21 @@ class SkinTemplate extends Skin { } /** - * @access private + * @private */ - function setupUserJs() { + function setupUserJs( $allowUserJs ) { $fname = 'SkinTemplate::setupUserJs'; wfProfileIn( $fname ); - global $wgRequest, $wgAllowUserJs, $wgJsMimeType; + global $wgRequest, $wgJsMimeType; $action = $wgRequest->getText('action'); - if( $wgAllowUserJs && $this->loggedin ) { + if( $allowUserJs && $this->loggedin ) { if( $this->mTitle->isJsSubpage() and $this->userCanPreview( $action ) ) { # XXX: additional security check/prompt? $this->userjsprev = '/*getText('wpTextbox1') . ' /*]]>*/'; } else { - $this->userjs = $this->makeUrl($this->userpage.'/'.$this->skinname.'.js', 'action=raw&ctype='.$wgJsMimeType.'&dontcountme=s'); + $this->userjs = self::makeUrl($this->userpage.'/'.$this->skinname.'.js', 'action=raw&ctype='.$wgJsMimeType.'&dontcountme=s'); } } wfProfileOut( $fname ); @@ -943,21 +1042,21 @@ class SkinTemplate extends Skin { * Code for extensions to hook into to provide per-page CSS, see * extensions/PageCSS/PageCSS.php for an implementation of this. * - * @access private + * @private */ function setupPageCss() { $fname = 'SkinTemplate::setupPageCss'; wfProfileIn( $fname ); $out = false; wfRunHooks( 'SkinTemplateSetupPageCss', array( &$out ) ); - + wfProfileOut( $fname ); return $out; } /** * returns css with user-specific options - * @access public + * @public */ function getUserStylesheet() { @@ -971,22 +1070,29 @@ class SkinTemplate extends Skin { } /** - * @access public + * This returns MediaWiki:Common.js and MediaWiki:[Skinname].js concate- + * nated together. For some bizarre reason, it does *not* return any + * custom user JS from subpages. Huh? + * + * There's absolutely no reason to have separate Monobook/Common JSes. + * Any JS that cares can just check the skin variable generated at the + * top. For now Monobook.js will be maintained, but it should be consi- + * dered deprecated. + * + * @return string */ - function getUserJs() { + public function getUserJs() { $fname = 'SkinTemplate::getUserJs'; wfProfileIn( $fname ); - global $wgStylePath; - $s = '/* generated javascript */'; - $s .= "var skin = '{$this->skinname}';\nvar stylepath = '{$wgStylePath}';"; - $s .= '/* MediaWiki:'.ucfirst($this->skinname)." */\n"; + $s = parent::getUserJs(); + $s .= "\n\n/* MediaWiki:".ucfirst($this->skinname).".js (deprecated; migrate to Common.js!) */\n"; // avoid inclusion of non defined user JavaScript (with custom skins only) // by checking for default message content $msgKey = ucfirst($this->skinname).'.js'; - $userJS = wfMsg($msgKey); - if ('<'.$msgKey.'>' != $userJS) { + $userJS = wfMsgForContent($msgKey); + if ( !wfEmptyMsg( $msgKey, $userJS ) ) { $s .= $userJS; } @@ -998,12 +1104,11 @@ class SkinTemplate extends Skin { /** * Generic wrapper for template functions, with interface * compatible with what we use of PHPTAL 0.7. - * @package MediaWiki - * @subpackage Skins + * @addtogroup Skins */ class QuickTemplate { /** - * @access public + * @public */ function QuickTemplate() { $this->data = array(); @@ -1011,28 +1116,28 @@ class QuickTemplate { } /** - * @access public + * @public */ function set( $name, $value ) { $this->data[$name] = $value; } /** - * @access public + * @public */ function setRef($name, &$value) { $this->data[$name] =& $value; } /** - * @access public + * @public */ function setTranslator( &$t ) { $this->translator = &$t; } /** - * @access public + * @public */ function execute() { echo "Override this function."; @@ -1040,28 +1145,35 @@ class QuickTemplate { /** - * @access private + * @private */ function text( $str ) { echo htmlspecialchars( $this->data[$str] ); } /** - * @access private + * @private + */ + function jstext( $str ) { + echo Xml::escapeJsString( $this->data[$str] ); + } + + /** + * @private */ function html( $str ) { echo $this->data[$str]; } /** - * @access private + * @private */ function msg( $str ) { echo htmlspecialchars( $this->translator->translate( $str ) ); } /** - * @access private + * @private */ function msgHtml( $str ) { echo $this->translator->translate( $str ); @@ -1069,30 +1181,33 @@ class QuickTemplate { /** * An ugly, ugly hack. - * @access private + * @private */ function msgWiki( $str ) { global $wgParser, $wgTitle, $wgOut; $text = $this->translator->translate( $str ); $parserOutput = $wgParser->parse( $text, $wgTitle, - $wgOut->mParserOptions, true ); + $wgOut->parserOptions(), true ); echo $parserOutput->getText(); } /** - * @access private + * @private */ function haveData( $str ) { - return $this->data[$str]; + return isset( $this->data[$str] ); } /** - * @access private + * @private */ function haveMsg( $str ) { $msg = $this->translator->translate( $str ); return ($msg != '-') && ($msg != ''); # ???? } } -?> + + + +