From 8f416baead93a48e5799e44b8bd2e2c4859f4e04 Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Fri, 14 Sep 2007 13:18:58 +0200 Subject: auf Version 1.11 aktualisiert; Login-Bug behoben --- includes/OutputPage.php | 281 +++++++++++++++++++++++++++++++++++------------- 1 file changed, 206 insertions(+), 75 deletions(-) (limited to 'includes/OutputPage.php') diff --git a/includes/OutputPage.php b/includes/OutputPage.php index 03e832a4..06467157 100644 --- a/includes/OutputPage.php +++ b/includes/OutputPage.php @@ -15,6 +15,7 @@ class OutputPage { var $mLastModified, $mETag, $mCategoryLinks; var $mScripts, $mLinkColours, $mPageLinkTitle; + var $mAllowUserJs; var $mSuppressQuickbar; var $mOnloadHandler; var $mDoNothing; @@ -27,12 +28,15 @@ class OutputPage { var $mNewSectionLink = false; var $mNoGallery = false; + var $mPageTitleActionText = ''; /** * Constructor * Initialise private variables */ function __construct() { + global $wgAllowUserJs; + $this->mAllowUserJs = $wgAllowUserJs; $this->mMetatags = $this->mKeywords = $this->mLinktags = array(); $this->mHTMLtitle = $this->mPagetitle = $this->mBodytext = $this->mRedirect = $this->mLastModified = @@ -51,6 +55,7 @@ class OutputPage { $this->mETag = false; $this->mRevisionId = null; $this->mNewSectionLink = false; + $this->mTemplateIds = array(); } public function redirect( $url, $responsecode = '302' ) { @@ -71,6 +76,13 @@ class OutputPage { function addMeta( $name, $val ) { array_push( $this->mMetatags, array( $name, $val ) ); } function addKeyword( $text ) { array_push( $this->mKeywords, $text ); } function addScript( $script ) { $this->mScripts .= "\t\t".$script; } + function addStyle( $style ) { + global $wgStylePath, $wgStyleVersion; + $this->addLink( + array( + 'rel' => 'stylesheet', + 'href' => $wgStylePath . '/' . $style . '?' . $wgStyleVersion ) ); + } /** * Add a self-contained script tag with the given contents @@ -97,6 +109,10 @@ class OutputPage { $this->mHeadItems[$name] = $value; } + function hasHeadItem( $name ) { + return isset( $this->mHeadItems[$name] ); + } + function setETag($tag) { $this->mETag = $tag; } function setArticleBodyOnly($only) { $this->mArticleBodyOnly = $only; } function getArticleBodyOnly($only) { return $this->mArticleBodyOnly; } @@ -146,7 +162,11 @@ class OutputPage { # Wed, 20 Aug 2003 06:51:19 GMT; length=5202 # this breaks strtotime(). $modsince = preg_replace( '/;.*$/', '', $_SERVER["HTTP_IF_MODIFIED_SINCE"] ); + + wfSuppressWarnings(); // E_STRICT system time bitching $modsinceTime = strtotime( $modsince ); + wfRestoreWarnings(); + $ismodsince = wfTimestamp( TS_MW, $modsinceTime ? $modsinceTime : 1 ); wfDebug( "$fname: -- client send If-Modified-Since: " . $modsince . "\n", false ); wfDebug( "$fname: -- we might send Last-Modified : $lastmod\n", false ); @@ -174,26 +194,13 @@ class OutputPage { } } + function setPageTitleActionText( $text ) { + $this->mPageTitleActionText = $text; + } + function getPageTitleActionText () { - global $action; - switch($action) { - case 'edit': - case 'delete': - case 'protect': - case 'unprotect': - case 'watch': - case 'unwatch': - // Display title is already customized - return ''; - case 'history': - return wfMsg('history_short'); - case 'submit': - // FIXME: bug 2735; not correct for special pages etc - return wfMsg('preview'); - case 'info': - return wfMsg('info_short'); - default: - return ''; + if ( isset( $this->mPageTitleActionText ) ) { + return $this->mPageTitleActionText; } } @@ -283,6 +290,9 @@ class OutputPage { public function suppressQuickbar() { $this->mSuppressQuickbar = true; } public function isQuickbarSuppressed() { return $this->mSuppressQuickbar; } + public function disallowUserJs() { $this->mAllowUserJs = false; } + public function isUserJsAllowed() { return $this->mAllowUserJs; } + public function addHTML( $text ) { $this->mBodytext .= $text; } public function clearHTML() { $this->mBodytext = ''; } public function getHTML() { return $this->mBodytext; } @@ -363,14 +373,24 @@ class OutputPage { if ( $parserOutput->getCacheTime() == -1 ) { $this->enableClientCache( false ); } - if ( $parserOutput->mHTMLtitle != "" ) { - $this->mPagetitle = $parserOutput->mHTMLtitle ; - } - if ( $parserOutput->mSubtitle != '' ) { - $this->mSubtitle .= $parserOutput->mSubtitle ; - } $this->mNoGallery = $parserOutput->getNoGallery(); $this->mHeadItems = array_merge( $this->mHeadItems, (array)$parserOutput->mHeadItems ); + // Versioning... + $this->mTemplateIds += (array)$parserOutput->mTemplateIds; + + # Display title + if( ( $dt = $parserOutput->getDisplayTitle() ) !== false ) + $this->setPageTitle( $dt ); + + # Hooks registered in the object + global $wgParserOutputHooks; + foreach ( $parserOutput->getOutputHooks() as $hookInfo ) { + list( $hookName, $data ) = $hookInfo; + if ( isset( $wgParserOutputHooks[$hookName] ) ) { + call_user_func( $wgParserOutputHooks[$hookName], $this, $parserOutput, $data ); + } + } + wfRunHooks( 'OutputPageParserOutput', array( &$this, $parserOutput ) ); } @@ -730,27 +750,51 @@ class OutputPage { * @return nothing */ function blockedPage( $return = true ) { - global $wgUser, $wgContLang, $wgTitle; + global $wgUser, $wgContLang, $wgTitle, $wgLang; $this->setPageTitle( wfMsg( 'blockedtitle' ) ); $this->setRobotpolicy( 'noindex,nofollow' ); $this->setArticleRelated( false ); - $id = $wgUser->blockedBy(); + $name = User::whoIs( $wgUser->blockedBy() ); $reason = $wgUser->blockedFor(); + $blockTimestamp = $wgLang->timeanddate( wfTimestamp( TS_MW, $wgUser->mBlock->mTimestamp ), true ); $ip = wfGetIP(); - if ( is_numeric( $id ) ) { - $name = User::whoIs( $id ); - } else { - $name = $id; - } $link = '[[' . $wgContLang->getNsText( NS_USER ) . ":{$name}|{$name}]]"; $blockid = $wgUser->mBlock->mId; - $this->addWikiText( wfMsg( 'blockedtext', $link, $reason, $ip, $name, $blockid ) ); - + $blockExpiry = $wgUser->mBlock->mExpiry; + if ( $blockExpiry == 'infinity' ) { + // Entry in database (table ipblocks) is 'infinity' but 'ipboptions' uses 'infinite' or 'indefinite' + // Search for localization in 'ipboptions' + $scBlockExpiryOptions = wfMsg( 'ipboptions' ); + foreach ( explode( ',', $scBlockExpiryOptions ) as $option ) { + if ( strpos( $option, ":" ) === false ) + continue; + list( $show, $value ) = explode( ":", $option ); + if ( $value == 'infinite' || $value == 'indefinite' ) { + $blockExpiry = $show; + break; + } + } + } else { + $blockExpiry = $wgLang->timeanddate( wfTimestamp( TS_MW, $blockExpiry ), true ); + } + + if ( $wgUser->mBlock->mAuto ) { + $msg = 'autoblockedtext'; + } else { + $msg = 'blockedtext'; + } + + /* $ip returns who *is* being blocked, $intended contains who was meant to be blocked. + * This could be a username, an ip range, or a single ip. */ + $intended = $wgUser->mBlock->mAddress; + + $this->addWikiText( wfMsg( $msg, $link, $reason, $ip, $name, $blockid, $blockExpiry, $intended, $blockTimestamp ) ); + # Don't auto-return to special pages if( $return ) { $return = $wgTitle->getNamespace() > -1 ? $wgTitle->getPrefixedText() : NULL; @@ -759,13 +803,13 @@ class OutputPage { } /** - * Outputs a pretty page to explain why the request exploded. + * Output a standard error page * - * @param string $title Message key for page title. - * @param string $msg Message key for page text. - * @return nothing + * @param string $title Message key for page title + * @param string $msg Message key for page text + * @param array $params Message parameters */ - public function showErrorPage( $title, $msg ) { + public function showErrorPage( $title, $msg, $params = array() ) { global $wgTitle; $this->mDebugtext .= 'Original title: ' . @@ -776,12 +820,36 @@ class OutputPage { $this->setArticleRelated( false ); $this->enableClientCache( false ); $this->mRedirect = ''; - $this->mBodytext = ''; - $this->addWikiText( wfMsg( $msg ) ); + + array_unshift( $params, 'parse' ); + array_unshift( $params, $msg ); + $this->addHtml( call_user_func_array( 'wfMsgExt', $params ) ); + $this->returnToMain( false ); } + /** + * Output a standard permission error page + * + * @param array $errors Error message keys + */ + public function showPermissionsErrorPage( $errors ) + { + global $wgTitle; + + $this->mDebugtext .= 'Original title: ' . + $wgTitle->getPrefixedText() . "\n"; + $this->setPageTitle( wfMsg( 'permissionserrors' ) ); + $this->setHTMLTitle( wfMsg( 'permissionserrors' ) ); + $this->setRobotpolicy( 'noindex,nofollow' ); + $this->setArticleRelated( false ); + $this->enableClientCache( false ); + $this->mRedirect = ''; + $this->mBodytext = ''; + $this->addWikiText( $this->formatPermissionsErrorMessage( $errors ) ); + } + /** @deprecated */ public function errorpage( $title, $msg ) { throw new ErrorPageError( $title, $msg ); @@ -897,39 +965,76 @@ class OutputPage { throw new MWException( "OutputPage::databaseError is obsolete\n" ); } + /** + * @param array $errors An array of arrays returned by Title::getUserPermissionsErrors + * @return string The error-messages, formatted into a list. + */ + public function formatPermissionsErrorMessage( $errors ) { + $text = ''; + + if (sizeof( $errors ) > 1) { + + $text .= wfMsgExt( 'permissionserrorstext', array( 'parse' ), count( $errors ) ) . "\n"; + $text .= ''; + } else { + $text .= call_user_func_array( 'wfMsg', $errors[0]); + } + + return $text; + } + /** * @todo document * @param bool $protected Is the reason the page can't be reached because it's protected? * @param mixed $source + * @param bool $protected, page is protected? + * @param array $reason, array of arrays( msg, args ) */ - public function readOnlyPage( $source = null, $protected = false ) { + public function readOnlyPage( $source = null, $protected = false, $reasons = array() ) { global $wgUser, $wgReadOnlyFile, $wgReadOnly, $wgTitle; $skin = $wgUser->getSkin(); $this->setRobotpolicy( 'noindex,nofollow' ); $this->setArticleRelated( false ); - - if( $protected ) { + + if ( !empty($reasons) ) { $this->setPageTitle( wfMsg( 'viewsource' ) ); $this->setSubtitle( wfMsg( 'viewsourcefor', $skin->makeKnownLinkObj( $wgTitle ) ) ); - list( $cascadeSources, $restrictions ) = $wgTitle->getCascadeProtectionSources(); + $this->addWikiText( $this->formatPermissionsErrorMessage( $reasons ) ); + } else if( $protected ) { + $this->setPageTitle( wfMsg( 'viewsource' ) ); + $this->setSubtitle( wfMsg( 'viewsourcefor', $skin->makeKnownLinkObj( $wgTitle ) ) ); + list( $cascadeSources, /* $restrictions */ ) = $wgTitle->getCascadeProtectionSources(); - # Determine if protection is due to the page being a system message - # and show an appropriate explanation + // Show an appropriate explanation depending upon the reason + // for the protection...all of these should be moved to the + // callers if( $wgTitle->getNamespace() == NS_MEDIAWIKI ) { + // User isn't allowed to edit the interface $this->addWikiText( wfMsg( 'protectedinterface' ) ); - } if ( $cascadeSources && count($cascadeSources) > 0 ) { - $titles = ''; - - foreach ( $cascadeSources as $title ) { - $titles .= '* [[:' . $title->getPrefixedText() . "]]\n"; - } - - $notice = wfMsgExt( 'cascadeprotected', array('parsemag'), count($cascadeSources) ) . "\n$titles"; - - $this->addWikiText( $notice ); + } elseif( $cascadeSources && ( $count = count( $cascadeSources ) ) > 0 ) { + // Cascading protection + $titles = ''; + foreach( $cascadeSources as $title ) + $titles .= "* [[:" . $title->getPrefixedText() . "]]\n"; + $this->addWikiText( wfMsgExt( 'cascadeprotected', 'parsemag', $count ) . "\n{$titles}" ); + } elseif( !$wgTitle->isProtected( 'edit' ) && $wgTitle->isNamespaceProtected() ) { + // Namespace protection + $ns = $wgTitle->getNamespace() == NS_MAIN + ? wfMsg( 'nstab-main' ) + : $wgTitle->getNsText(); + $this->addWikiText( wfMsg( 'namespaceprotected', $ns ) ); } else { + // Standard protection $this->addWikiText( wfMsg( 'protectedpagetext' ) ); } } else { @@ -950,8 +1055,8 @@ class OutputPage { htmlspecialchars( $source ) . "\n"; $this->addHTML( $text ); } - $article = new Article($wgTitle); - $this->addHTML( $skin->formatTemplates($article->getUsedTemplates()) ); + $article = new Article( $wgTitle ); + $this->addHTML( $skin->formatTemplates( $article->getUsedTemplates() ) ); $this->returnToMain( false ); } @@ -1016,12 +1121,25 @@ class OutputPage { } /** - * return from error messages or notes - * @param $auto automatically redirect the user after 10 seconds - * @param $returnto page title to return to. Default is Main Page. + * Add a "return to" link pointing to a specified title + * + * @param Title $title Title to link + */ + public function addReturnTo( $title ) { + global $wgUser; + $link = wfMsg( 'returnto', $wgUser->getSkin()->makeLinkObj( $title ) ); + $this->addHtml( "

{$link}

\n" ); + } + + /** + * Add a "return to" link pointing to a specified title, + * or the title indicated in the request, or else the main page + * + * @param null $unused No longer used + * @param Title $returnto Title to return to */ - public function returnToMain( $auto = true, $returnto = NULL ) { - global $wgUser, $wgOut, $wgRequest; + public function returnToMain( $unused = null, $returnto = NULL ) { + global $wgRequest; if ( $returnto == NULL ) { $returnto = $wgRequest->getText( 'returnto' ); @@ -1040,14 +1158,7 @@ class OutputPage { $titleObj = Title::newMainPage(); } - $sk = $wgUser->getSkin(); - $link = $sk->makeLinkObj( $titleObj, '' ); - - $r = wfMsg( 'returnto', $link ); - if ( $auto ) { - $wgOut->addMeta( 'http:Refresh', '10;url=' . $titleObj->escapeFullURL() ); - } - $wgOut->addHTML( "\n

$r

\n" ); + $this->addReturnTo( $titleObj ); } /** @@ -1114,7 +1225,7 @@ class OutputPage { $ret .= "\n"; $sk = $wgUser->getSkin(); - $ret .= $sk->getHeadScripts(); + $ret .= $sk->getHeadScripts( $this->mAllowUserJs ); $ret .= $this->mScripts; $ret .= $sk->getUserStyles(); $ret .= $this->getHeadItems(); @@ -1191,10 +1302,30 @@ class OutputPage { /** * Show an "add new section" link? * - * @return bool True if the parser output instructs us to add one + * @return bool */ public function showNewSectionLink() { return $this->mNewSectionLink; } + + /** + * Show a warning about slave lag + * + * If the lag is higher than $wgSlaveLagCritical seconds, + * then the warning is a bit more obvious. If the lag is + * lower than $wgSlaveLagWarning, then no warning is shown. + * + * @param int $lag Slave lag + */ + public function showLagWarning( $lag ) { + global $wgSlaveLagWarning, $wgSlaveLagCritical; + if( $lag >= $wgSlaveLagWarning ) { + $message = $lag < $wgSlaveLagCritical + ? 'lag-warn-normal' + : 'lag-warn-high'; + $warning = wfMsgExt( $message, 'parse', $lag ); + $this->addHtml( "
\n{$warning}\n
\n" ); + } + } + } -?> -- cgit v1.2.3-54-g00ecf