* Made OuputPage::showPermissionsErrorPage() show a different messages for 'read...
[lhc/web/wiklou.git] / includes / OutputPage.php
index c4c1a72..bad955c 100644 (file)
@@ -760,20 +760,11 @@ class OutputPage extends ContextSource {
         * @param $name string
         */
        public function setHTMLTitle( $name ) {
-               $this->mHTMLtitle = $name;
-       }
-
-       /**
-        * Same as setHTMLTitle(), but takes a message name and parameter instead
-        * of directly the string to display.
-        *
-        * @since 1.19
-        * @param $name String message name
-        * @param $args Array|String message parameters, if there's only one
-        *              parameter it can be passed directly as a string.
-        */
-       public function setHTMLTitleMsg( $name, $args = array() ) {
-               $this->setHTMLTitle( $this->msg( $name, $args )->text() );
+               if ( $name instanceof Message ) {
+                       $this->mHTMLtitle = $name->setContext( $this->getContext() )->text();
+               } else {
+                       $this->mHTMLtitle = $name;
+               }
        }
 
        /**
@@ -791,29 +782,20 @@ class OutputPage extends ContextSource {
         * This function automatically sets \<title\> to the same content as \<h1\> but with all tags removed.
         * Bad tags that were escaped in \<h1\> will still be escaped in \<title\>, and good tags like \<i\> will be dropped entirely.
         *
-        * @param $name string
+        * @param $name string|Message
         */
        public function setPageTitle( $name ) {
+               if ( $name instanceof Message ) {
+                       $name = $name->setContext( $this->getContext() )->text();
+               }
+
                # change "<script>foo&bar</script>" to "&lt;script&gt;foo&amp;bar&lt;/script&gt;"
                # but leave "<i>foobar</i>" alone
                $nameWithTags = Sanitizer::normalizeCharReferences( Sanitizer::removeHTMLtags( $name ) );
                $this->mPagetitle = $nameWithTags;
 
                # change "<i>foo&amp;bar</i>" to "foo&bar"
-               $this->setHTMLTitleMsg( 'pagetitle', Sanitizer::stripAllTags( $nameWithTags ) );
-       }
-
-       /**
-        * Same as setPageTitle(), but takes a message name and parameter instead
-        * of directly the string to display.
-        *
-        * @since 1.19
-        * @param $name String message name
-        * @param $args Array|String message parameters, if there's only one
-        *              parameter it can be passed directly as a string.
-        */
-       public function setPageTitleMsg( $name, $args = array() ) {
-               $this->setPageTitle( $this->msg( $name, $args )->text() );
+               $this->setHTMLTitle( $this->msg( 'pagetitle', Sanitizer::stripAllTags( $nameWithTags ) ) );
        }
 
        /**
@@ -1658,7 +1640,7 @@ class OutputPage extends ContextSource {
                                $this->mVaryHeader[$header] = $option;
                        }
                }
-               $this->mVaryHeader[$header] = array_unique( $this->mVaryHeader[$header] );
+               $this->mVaryHeader[$header] = array_unique( (array)$this->mVaryHeader[$header] );
        }
 
        /**
@@ -1942,6 +1924,32 @@ class OutputPage extends ContextSource {
                throw new UserBlockedError( $this->getUser()->mBlock );
        }
 
+       /**
+        * Prepare this object to display an error page; disable caching and
+        * indexing, clear the current text and redirect, set the page's title
+        * and optionally an custom HTML title (content of the <title> tag).
+        *
+        * @param $pageTitle String|Message will be passed directly to setPageTitle()
+        * @param $htmlTitle String|Message will be passed directly to setHTMLTitle();
+        *                   optional, if not passed the <title> attribute will be
+        *                   based on $pageTitle
+        */
+       public function prepareErrorPage( $pageTitle, $htmlTitle = false ) {
+               if ( $this->getTitle() ) {
+                       $this->mDebugtext .= 'Original title: ' . $this->getTitle()->getPrefixedText() . "\n";
+               }
+
+               $this->setPageTitle( $pageTitle );
+               if ( $htmlTitle !== false ) {
+                       $this->setHTMLTitle( $htmlTitle );
+               }
+               $this->setRobotPolicy( 'noindex,nofollow' );
+               $this->setArticleRelated( false );
+               $this->enableClientCache( false );
+               $this->mRedirect = '';
+               $this->clearHTML();
+       }
+
        /**
         * Output a standard error page
         *
@@ -1953,16 +1961,7 @@ class OutputPage extends ContextSource {
         * @param $params Array: message parameters; ignored if $msg is a Message object
         */
        public function showErrorPage( $title, $msg, $params = array() ) {
-               if ( $this->getTitle() ) {
-                       $this->mDebugtext .= 'Original title: ' . $this->getTitle()->getPrefixedText() . "\n";
-               }
-               $this->setPageTitleMsg( $title );
-               $this->setHTMLTitleMsg( 'errorpagetitle' );
-               $this->setRobotPolicy( 'noindex,nofollow' );
-               $this->setArticleRelated( false );
-               $this->enableClientCache( false );
-               $this->mRedirect = '';
-               $this->mBodytext = '';
+               $this->prepareErrorPage( $this->msg( $title ), $this->msg( 'errorpagetitle' ) );
 
                if ( $msg instanceof Message ){
                        $this->addHTML( $msg->parse() );
@@ -1980,16 +1979,64 @@ class OutputPage extends ContextSource {
         * @param $action String: action that was denied or null if unknown
         */
        public function showPermissionsErrorPage( $errors, $action = null ) {
-               $this->mDebugtext .= 'Original title: ' .
-               $this->getTitle()->getPrefixedText() . "\n";
-               $this->setPageTitleMsg( 'permissionserrors' );
-               $this->setHTMLTitleMsg( 'permissionserrors' );
-               $this->setRobotPolicy( 'noindex,nofollow' );
-               $this->setArticleRelated( false );
-               $this->enableClientCache( false );
-               $this->mRedirect = '';
-               $this->mBodytext = '';
-               $this->addWikiText( $this->formatPermissionsErrorMessage( $errors, $action ) );
+               global $wgGroupPermissions;
+
+               // For some action (read, edit, create and upload), display a "login to do this action"
+               // error if all of the following conditions are met:
+               // 1. the user is not logged in
+               // 2. the only error is insufficient permissions (i.e. no block or something else)
+               // 3. the error can be avoided simply by logging in
+               if ( in_array( $action, array( 'read', 'edit', 'createpage', 'createtalk', 'upload' ) )
+                       && $this->getUser()->isAnon() && count( $errors ) == 1 && isset( $errors[0][0] )
+                       && ( $errors[0][0] == 'badaccess-groups' || $errors[0][0] == 'badaccess-group0' )
+                       && ( ( isset( $wgGroupPermissions['user'][$action] ) && $wgGroupPermissions['user'][$action] )
+                       || ( isset( $wgGroupPermissions['autoconfirmed'][$action] ) && $wgGroupPermissions['autoconfirmed'][$action] ) )
+               ) {
+                       $displayReturnto = null;
+                       $returnto = $this->getTitle();
+                       if ( $action == 'edit' ) {
+                               $msg = 'whitelistedittext';
+                               $displayReturnto = $returnto;
+                       } elseif ( $action == 'createpage' || $action == 'createtalk' ) {
+                               $msg = 'nocreatetext';
+                       } elseif ( $action == 'upload' ) {
+                               $msg = 'uploadnologintext';
+                       } else { # Read
+                               $msg = 'loginreqpagetext';
+                               $displayReturnto = Title::newMainPage();
+                       }
+
+                       $query = array();
+                       if ( $returnto ) {
+                               $query['returnto'] = $returnto->getPrefixedText();
+                               $request = $this->getRequest();
+                               if ( !$request->wasPosted() ) {
+                                       $returntoquery = $request->getValues();
+                                       unset( $returntoquery['title'] );
+                                       unset( $returntoquery['returnto'] );
+                                       unset( $returntoquery['returntoquery'] );
+                                       $query['returntoquery'] = wfArrayToCGI( $returntoquery );
+                               }
+                       }
+                       $loginLink = Linker::linkKnown(
+                               SpecialPage::getTitleFor( 'Userlogin' ),
+                               $this->msg( 'loginreqlink' )->escaped(),
+                               array(),
+                               $query
+                       );
+
+                       $this->prepareErrorPage( $this->msg( 'loginreqtitle' ) );
+                       $this->addHTML( $this->msg( $msg )->rawParams( $loginLink )->parse() );
+
+                       # Don't return to a page the user can't read otherwise
+                       # we'll end up in a pointless loop
+                       if ( $displayReturnto && $displayReturnto->userCanRead() ) {
+                               $this->returnToMain( null, $displayReturnto );
+                       }
+               } else {
+                       $this->prepareErrorPage( $this->msg( 'permissionserrors' ) );
+                       $this->addWikiText( $this->formatPermissionsErrorMessage( $errors, $action ) );
+               }
        }
 
        /**
@@ -1999,11 +2046,7 @@ class OutputPage extends ContextSource {
         * @param $version Mixed: the version of MediaWiki needed to use the page
         */
        public function versionRequired( $version ) {
-               $this->setPageTitleMsg( 'versionrequired' );
-               $this->setHTMLTitleMsg( 'versionrequired', $version );
-               $this->setRobotPolicy( 'noindex,nofollow' );
-               $this->setArticleRelated( false );
-               $this->mBodytext = '';
+               $this->prepareErrorPage( $this->msg( 'versionrequired', $version ) );
 
                $this->addWikiMsg( 'versionrequiredtext', $version );
                $this->returnToMain();
@@ -2020,33 +2063,11 @@ class OutputPage extends ContextSource {
 
        /**
         * Produce the stock "please login to use the wiki" page
+        *
+        * @deprecated in 1.19; throw the exception directly
         */
        public function loginToUse() {
-               if( $this->getUser()->isLoggedIn() ) {
-                       throw new PermissionsError( 'read' );
-               }
-
-               $this->setPageTitleMsg( 'loginreqtitle' );
-               $this->setHTMLTitleMsg( 'errorpagetitle' );
-               $this->setRobotPolicy( 'noindex,nofollow' );
-               $this->setArticleRelated( false );
-
-               $loginTitle = SpecialPage::getTitleFor( 'Userlogin' );
-               $loginLink = Linker::linkKnown(
-                       $loginTitle,
-                       $this->msg( 'loginreqlink' )->escaped(),
-                       array(),
-                       array( 'returnto' => $this->getTitle()->getPrefixedText() )
-               );
-               $this->addHTML( $this->msg( 'loginreqpagetext' )->rawParams( $loginLink )->parse() .
-                       "\n<!--" . $this->getTitle()->getPrefixedUrl() . '-->' );
-
-               # Don't return to the main page if the user can't read it
-               # otherwise we'll end up in a pointless loop
-               $mainPage = Title::newMainPage();
-               if( $mainPage->userCanRead() ) {
-                       $this->returnToMain( null, $mainPage );
-               }
+               throw new PermissionsError( 'read' );
        }
 
        /**
@@ -2119,12 +2140,12 @@ class OutputPage extends ContextSource {
                if ( !empty( $reasons ) ) {
                        // Permissions error
                        if( $source ) {
-                               $this->setPageTitleMsg( 'viewsource' );
+                               $this->setPageTitle( $this->msg( 'viewsource' ) );
                                $this->setSubtitle(
                                        $this->msg( 'viewsourcefor', Linker::linkKnown( $this->getTitle() ) )->text()
                                );
                        } else {
-                               $this->setPageTitleMsg( 'badaccess' );
+                               $this->setPageTitle( $this->msg( 'badaccess' ) );
                        }
                        $this->addWikiText( $this->formatPermissionsErrorMessage( $reasons, $action ) );
                } else {
@@ -2194,12 +2215,9 @@ $templates
        }
 
        public function showFatalError( $message ) {
-               $this->setPageTitleMsg( 'internalerror' );
-               $this->setRobotPolicy( 'noindex,nofollow' );
-               $this->setArticleRelated( false );
-               $this->enableClientCache( false );
-               $this->mRedirect = '';
-               $this->mBodytext = $message;
+               $this->prepareErrorPage( $this->msg( 'internalerror' ) );
+
+               $this->addHTML( $message );
        }
 
        public function showUnexpectedValueError( $name, $val ) {
@@ -2286,7 +2304,7 @@ $templates
                $ret = Html::htmlHeader( array( 'lang' => $this->getLang()->getCode(), 'dir' => $userdir, 'class' => 'client-nojs' ) );
 
                if ( $this->getHTMLTitle() == '' ) {
-                       $this->setHTMLTitleMsg( 'pagetitle', $this->getPageTitle() );
+                       $this->setHTMLTitle( $this->msg( 'pagetitle', $this->getPageTitle() ) );
                }
 
                $openHead = Html::openElement( 'head' );
@@ -2711,7 +2729,7 @@ $templates
                // Use the 'ResourceLoaderGetConfigVars' hook if the variable is not
                // page-dependant but site-wide (without state).
                // Alternatively, you may want to use OutputPage->addJsConfigVars() instead.
-               wfRunHooks( 'MakeGlobalVariablesScript', array( &$vars, &$this ) );
+               wfRunHooks( 'MakeGlobalVariablesScript', array( &$vars, $this ) );
 
                // Merge in variables from addJsConfigVars last
                return array_merge( $vars, $this->mJsConfigVars );