<?php
if ( ! defined( 'MEDIAWIKI' ) )
- die();
+ die( -1 );
/**
*
# while code from www.php.net
while (false !== ($file = $skinDir->read())) {
- if(preg_match('/^([^.].*)\.php$/',$file, $matches)) {
+ // Skip non-PHP files, hidden files, and '.dep' includes
+ if(preg_match('/^([^.]*)\.php$/',$file, $matches)) {
$aSkin = $matches[1];
$wgValidSkinNames[strtolower($aSkin)] = $aSkin;
}
unset($matches);
/**
- * The main skin class that provide methods and properties for all other skins
- * including PHPTal skins.
+ * The main skin class that provide methods and properties for all other skins.
* This base class is also the "Standard" skin.
* @package MediaWiki
*/
class Skin extends Linker {
/**#@+
- * @access private
+ * @private
*/
var $lastdate, $lastline;
var $rc_cache ; # Cache for Enhanced Recent Changes
global $IP;
- # Grab the skin class and initialise it. Each skin checks for PHPTal
- # and will not load if it's not enabled.
+ # Grab the skin class and initialise it.
+ wfSuppressWarnings();
+ // Preload base classes to work around APC/PHP5 bug
+ include_once( $IP.'/skins/'.$skinName.'.deps.php' );
+ wfRestoreWarnings();
require_once( $IP.'/skins/'.$skinName.'.php' );
# Check if we got if not failback to default skin
# scripts and can cause a user account to be unrecoverable
# except by SQL manipulation if a previously valid skin name
# is no longer valid.
+ wfDebug( "Skin class does not exist: $className\n" );
$className = 'SkinStandard';
require_once( $IP.'/skins/Standard.php' );
}
}
function initPage( &$out ) {
+ global $wgFavicon;
+
$fname = 'Skin::initPage';
wfProfileIn( $fname );
- $out->addLink( array( 'rel' => 'shortcut icon', 'href' => '/favicon.ico' ) );
+ if( false !== $wgFavicon ) {
+ $out->addLink( array( 'rel' => 'shortcut icon', 'href' => $wgFavicon ) );
+ }
$this->addMetadataLinks($out);
$this->mRevisionId = $out->mRevisionId;
+
+ $this->preloadExistence();
wfProfileOut( $fname );
}
+ /**
+ * Preload the existence of three commonly-requested pages in a single query
+ */
+ function preloadExistence() {
+ global $wgUser, $wgTitle;
+
+ if ( $wgTitle->isTalkPage() ) {
+ $otherTab = $wgTitle->getSubjectPage();
+ } else {
+ $otherTab = $wgTitle->getTalkPage();
+ }
+ $lb = new LinkBatch( array(
+ $wgUser->getUserPage(),
+ $wgUser->getTalkPage(),
+ $otherTab
+ ));
+ $lb->execute();
+ }
+
function addMetadataLinks( &$out ) {
global $wgTitle, $wgEnableDublinCoreRdf, $wgEnableCreativeCommonsRdf;
global $wgRightsPage, $wgRightsUrl;
*
* @param string $action
* @return bool
- * @access private
+ * @private
*/
function userCanPreview( $action ) {
global $wgTitle, $wgRequest, $wgUser;
$wgRequest->getVal( 'wpEditToken' ) );
}
- # get the user/site-specific stylesheet, SkinPHPTal called from RawPage.php (settings are cached that way)
+ # get the user/site-specific stylesheet, SkinTemplate loads via RawPage.php (settings are cached that way)
function getUserStylesheet() {
- global $wgOut, $wgStylePath, $wgRequest, $wgContLang, $wgSquidMaxage;
+ global $wgStylePath, $wgRequest, $wgContLang, $wgSquidMaxage;
$sheet = $this->getStylesheet();
$action = $wgRequest->getText('action');
$s = "@import \"$wgStylePath/$sheet\";\n";
* Return html code that include User stylesheets
*/
function getUserStyles() {
- global $wgOut, $wgStylePath;
$s = "<style type='text/css'>\n";
$s .= "/*/*/ /*<![CDATA[*/\n"; # <-- Hide the styles from Netscape 4 without hiding them from IE/Mac
$s .= $this->getUserStylesheet();
/**
* Some styles that are set by user through the user settings interface.
+ * @todo undefined variables (bug #4940)
*/
function doGetUserStyles() {
- global $wgUser, $wgContLang, $wgUser, $wgRequest, $wgTitle, $wgAllowUserCss;
+ global $wgUser, $wgUser, $wgRequest, $wgTitle, $wgAllowUserCss;
$s = '';
if( $wgAllowUserCss && $wgUser->isLoggedIn() ) { # logged in
+ # FIXME: $action undefined, bug #4940
if($wgTitle->isCssSubpage() && $this->userCanPreview( $action ) ) {
$s .= $wgRequest->getText('wpTextbox1');
} else {
}
function doBeforeContent() {
- global $wgOut, $wgTitle, $wgContLang;
+ global $wgContLang;
$fname = 'Skin::doBeforeContent';
wfProfileIn( $fname );
if( count( $wgOut->mCategoryLinks ) == 0 ) return '';
+ # Separator
+ $sep = wfMsgHtml( 'catseparator' );
+
// Use Unicode bidi embedding override characters,
// to make sure links don't smash each other up in ugly ways.
$dir = $wgContLang->isRTL() ? 'rtl' : 'ltr';
$embed = "<span dir='$dir'>";
$pop = '</span>';
- $t = $embed . implode ( "$pop | $embed" , $wgOut->mCategoryLinks ) . $pop;
+ $t = $embed . implode ( "{$pop} {$sep} {$embed}" , $wgOut->mCategoryLinks ) . $pop;
- $msg = count( $wgOut->mCategoryLinks ) === 1 ? 'categories1' : 'categories';
+ $msg = wfMsgExt('categories', array('parsemag', 'escape'), count( $wgOut->mCategoryLinks ));
$s = $this->makeKnownLinkObj( Title::makeTitle( NS_SPECIAL, 'Categories' ),
- wfMsg( $msg ), 'article=' . urlencode( $wgTitle->getPrefixedDBkey() ) )
+ $msg, 'article=' . urlencode( $wgTitle->getPrefixedDBkey() ) )
. ': ' . $t;
# optional 'dmoz-like' category browser. Will be shown under the list
}
/** Render the array as a serie of links.
- * @param array $tree Categories tree returned by Title::getParentCategoryTree
- * @param object &skin Skin passed by reference
- * @return string separated by >, terminate with "\n"
+ * @param $tree Array: categories tree returned by Title::getParentCategoryTree
+ * @param &skin Object: skin passed by reference
+ * @return String separated by >, terminate with "\n"
*/
function drawCategoryBrowser($tree, &$skin) {
$return = '';
}
/**
- * This gets called immediately before the </body> tag.
- * @return string HTML to be put after </body> ???
+ * This gets called immediately before the \</body\> tag.
+ * @return String HTML to be put after \</body\> ???
*/
function afterContent() {
$printfooter = "<div class=\"printfooter\">\n" . $this->printFooter() . "</div>\n";
function doAfterContent() { }
function pageTitleLinks() {
- global $wgOut, $wgTitle, $wgUser, $wgContLang, $wgRequest;
+ global $wgOut, $wgTitle, $wgUser, $wgRequest;
extract( $wgRequest->getValues( 'oldid', 'diff' ) );
$action = $wgRequest->getText( 'action' );
# do not show "You have new messages" text when we are viewing our
# own talk page
if( !$wgTitle->equals( $wgUser->getTalkPage() ) ) {
- $tl = $this->makeKnownLinkObj( $wgUser->getTalkPage(), wfMsgHtml( 'newmessageslink' ) );
+ $tl = $this->makeKnownLinkObj( $wgUser->getTalkPage(), wfMsgHtml( 'newmessageslink' ), 'redirect=no' );
$dl = $this->makeKnownLinkObj( $wgUser->getTalkPage(), wfMsgHtml( 'newmessagesdifflink' ), 'diff=cur' );
$s.= ' | <strong>'. wfMsg( 'youhavenewmessages', $tl, $dl ) . '</strong>';
# disable caching
return wfMsg( $msg,
$this->makeKnownLink(
$wgContLang->SpecialPage( 'Undelete/' . $wgTitle->getPrefixedDBkey() ),
- wfMsg( 'restorelink' . ($n == 1 ? '1' : ''), $n ) ) );
+ wfMsgExt( 'restorelink', array( 'parsemag', 'escape' ), $n ) ) );
}
return '';
}
}
function pageTitle() {
- global $wgOut, $wgTitle, $wgUser;
-
+ global $wgOut;
$s = '<h1 class="pagetitle">' . htmlspecialchars( $wgOut->getPageTitle() ) . '</h1>';
return $s;
}
$c++;
if ($c<count($links)) {
$growinglink .= $link;
- $getlink = $this->makeLink( $growinglink, $link );
+ $getlink = $this->makeLink( $growinglink, htmlspecialchars( $link ) );
if(preg_match('/class="new"/i',$getlink)) { break; } # this is a hack, but it saves time
if ($c>1) {
$subpages .= ' | ';
if ( !$wgDisableCounters ) {
$count = $wgLang->formatNum( $wgArticle->getCount() );
if ( $count ) {
- $s = wfMsg( 'viewcount', $count );
+ $s = wfMsgExt( 'viewcount', array( 'parseinline' ), $count );
}
}
return $s . ' ' . $this->getCopyright();
}
- function getCopyright() {
+ function getCopyright( $type = 'detect' ) {
global $wgRightsPage, $wgRightsUrl, $wgRightsText, $wgRequest;
+ if ( $type == 'detect' ) {
+ $oldid = $wgRequest->getVal( 'oldid' );
+ $diff = $wgRequest->getVal( 'diff' );
- $oldid = $wgRequest->getVal( 'oldid' );
- $diff = $wgRequest->getVal( 'diff' );
+ if ( !is_null( $oldid ) && is_null( $diff ) && wfMsgForContent( 'history_copyright' ) !== '-' ) {
+ $type = 'history';
+ } else {
+ $type = 'normal';
+ }
+ }
- if ( !is_null( $oldid ) && is_null( $diff ) && wfMsgForContent( 'history_copyright' ) !== '-' ) {
+ if ( $type == 'history' ) {
$msg = 'history_copyright';
} else {
$msg = 'copyright';
}
function getCopyrightIcon() {
- global $wgRightsPage, $wgRightsUrl, $wgRightsText, $wgRightsIcon, $wgCopyrightIcon;
+ global $wgRightsUrl, $wgRightsText, $wgRightsIcon, $wgCopyrightIcon;
$out = '';
if ( isset( $wgCopyrightIcon ) && $wgCopyrightIcon ) {
$out = $wgCopyrightIcon;
* @TODO crash bug913. Need to be rewrote completly.
*/
function specialPagesList() {
- global $wgUser, $wgOut, $wgContLang, $wgServer, $wgRedirectScript, $wgAvailableRights;
+ global $wgUser, $wgContLang, $wgServer, $wgRedirectScript, $wgAvailableRights;
require_once('SpecialPage.php');
$a = array();
$pages = SpecialPage::getPages();
}
function editThisPage() {
- global $wgOut, $wgTitle, $wgRequest;
+ global $wgOut, $wgTitle;
if ( ! $wgOut->isArticleRelated() ) {
$s = wfMsg( 'protectedpage' );
* This may include an 'oldid' specifier, if the current page view is such.
*
* @return string
- * @access private
+ * @private
*/
function editUrlOptions() {
global $wgArticle;
}
function deleteThisPage() {
- global $wgUser, $wgOut, $wgTitle, $wgRequest;
+ global $wgUser, $wgTitle, $wgRequest;
$diff = $wgRequest->getVal( 'diff' );
if ( $wgTitle->getArticleId() && ( ! $diff ) && $wgUser->isAllowed('delete') ) {
}
function protectThisPage() {
- global $wgUser, $wgOut, $wgTitle, $wgRequest;
+ global $wgUser, $wgTitle, $wgRequest;
$diff = $wgRequest->getVal( 'diff' );
if ( $wgTitle->getArticleId() && ( ! $diff ) && $wgUser->isAllowed('protect') ) {
}
function watchThisPage() {
- global $wgUser, $wgOut, $wgTitle;
+ global $wgOut, $wgTitle;
if ( $wgOut->isArticleRelated() ) {
if ( $wgTitle->userIsWatching() ) {
}
function otherLanguages() {
- global $wgOut, $wgContLang, $wgTitle, $wgHideInterlanguageLinks;
+ global $wgOut, $wgContLang, $wgHideInterlanguageLinks;
if ( $wgHideInterlanguageLinks ) {
return '';
$text = wfMsg('userpage');
break;
case NS_PROJECT:
- $text = wfMsg('wikipediapage');
+ $text = wfMsg('projectpage');
break;
case NS_IMAGE:
$text = wfMsg('imagepage');
}
function commentLink() {
- global $wgContLang, $wgTitle;
+ global $wgTitle, $wgOut;
if ( $wgTitle->getNamespace() == NS_SPECIAL ) {
return '';
}
- return $this->makeKnownLinkObj( $wgTitle->getTalkPage(),
- wfMsg( 'postcomment' ), 'action=edit§ion=new' );
+
+ # __NEWSECTIONLINK___ changes behaviour here
+ # If it's present, the link points to this page, otherwise
+ # it points to the talk page
+ if( $wgTitle->isTalkPage() ) {
+ $title =& $wgTitle;
+ } elseif( $wgOut->showNewSectionLink() ) {
+ $title =& $wgTitle;
+ } else {
+ $title =& $wgTitle->getTalkPage();
+ }
+
+ return $this->makeKnownLinkObj( $title, wfMsg( 'postcomment' ), 'action=edit§ion=new' );
}
- /* these are used extensively in SkinPHPTal, but also some other places */
+ /* these are used extensively in SkinTemplate, but also some other places */
/*static*/ function makeSpecialUrl( $name, $urlaction='' ) {
$title = Title::makeTitle( NS_SPECIAL, $name );
return $title->getLocalURL( $urlaction );
* Build an array that represents the sidebar(s), the navigation bar among them
*
* @return array
- * @access private
+ * @private
*/
function buildSidebar() {
- global $wgTitle, $action;
+ global $wgDBname, $parserMemc, $wgEnableSidebarCache;
+ global $wgLanguageCode, $wgContLanguageCode;
$fname = 'SkinTemplate::buildSidebar';
- $pageurl = $wgTitle->getLocalURL();
+
wfProfileIn( $fname );
+ $key = "{$wgDBname}:sidebar";
+ $cacheSidebar = $wgEnableSidebarCache &&
+ ($wgLanguageCode == $wgContLanguageCode);
+
+ if ($cacheSidebar) {
+ $cachedsidebar = $parserMemc->get( $key );
+ if ($cachedsidebar!="") {
+ wfProfileOut($fname);
+ return $cachedsidebar;
+ }
+ }
+
$bar = array();
$lines = explode( "\n", wfMsgForContent( 'sidebar' ) );
foreach ($lines as $line) {
'text' => $text,
'href' => $href,
'id' => 'n-' . strtr($line[1], ' ', '-'),
- 'active' => $pageurl == $href
+ 'active' => false
);
} else { continue; }
}
}
-
+ if ($cacheSidebar)
+ $cachednotice = $parserMemc->set( $key, $bar, 86400 );
wfProfileOut( $fname );
return $bar;
}
dépôts / lhc / web / wiklou.git / blobdiff