(bug 12120) Unescaped quote in YAML output
[lhc/web/wiklou.git] / includes / PageHistory.php
index df711c8..dd3f2f5 100644 (file)
@@ -37,6 +37,20 @@ class PageHistory {
                $this->mTitle =& $article->mTitle;
                $this->mNotificationTimestamp = NULL;
                $this->mSkin = $wgUser->getSkin();
+               $this->preCacheMessages();
+       }
+       
+       /**
+        * As we use the same small set of messages in various methods and that
+        * they are called often, we call them once and save them in $this->message
+        */
+       function preCacheMessages() {
+               // Precache various messages
+               if( !isset( $this->message ) ) {
+                       foreach( explode(' ', 'cur last rev-delundel' ) as $msg ) {
+                               $this->message[$msg] = wfMsgExt( $msg, array( 'escape') );
+                       }
+               }
        }
 
        /**
@@ -55,8 +69,7 @@ class PageHistory {
                        /* Client cache fresh and headers sent, nothing more to do. */
                        return;
 
-               $fname = 'PageHistory::history';
-               wfProfileIn( $fname );
+               wfProfileIn( __METHOD__ );
 
                /*
                 * Setup page variables.
@@ -67,16 +80,15 @@ class PageHistory {
                $wgOut->setArticleRelated( true );
                $wgOut->setRobotpolicy( 'noindex,nofollow' );
                $wgOut->setSyndicated( true );
+               $wgOut->setFeedAppendQuery( 'action=history' );
 
                $logPage = SpecialPage::getTitleFor( 'Log' );
                $logLink = $this->mSkin->makeKnownLinkObj( $logPage, wfMsgHtml( 'viewpagelogs' ), 'page=' . $this->mTitle->getPrefixedUrl() );
-
-               $subtitle = wfMsgHtml( 'revhistory' ) . '<br />' . $logLink;
-               $wgOut->setSubtitle( $subtitle );
+               $wgOut->setSubtitle( $logLink );
 
                $feedType = $wgRequest->getVal( 'feed' );
                if( $feedType ) {
-                       wfProfileOut( $fname );
+                       wfProfileOut( __METHOD__ );
                        return $this->feed( $feedType );
                }
 
@@ -84,12 +96,11 @@ class PageHistory {
                 * Fail if article doesn't exist.
                 */
                if( !$this->mTitle->exists() ) {
-                       $wgOut->addWikiText( wfMsg( 'nohistory' ) );
-                       wfProfileOut( $fname );
+                       $wgOut->addWikiMsg( 'nohistory' );
+                       wfProfileOut( __METHOD__ );
                        return;
                }
 
-               
                /*
                 * "go=first" means to jump to the last (earliest) history page.
                 * This is deprecated, it no longer appears in the user interface
@@ -99,7 +110,7 @@ class PageHistory {
                        $wgOut->redirect( $wgTitle->getLocalURL( "action=history&limit={$limit}&dir=prev" ) );
                        return;
                }
-               
+
                wfRunHooks( 'PageHistoryBeforeList', array( &$this->mArticle ) );
 
                /** 
@@ -114,10 +125,14 @@ class PageHistory {
                        $this->endHistoryList() .
                        $pager->getNavigationBar()
                );
-               wfProfileOut( $fname );
+               wfProfileOut( __METHOD__ );
        }
 
-       /** @todo document */
+       /**
+        * Creates begin of history list with a submit button
+        *
+        * @return string HTML output
+        */
        function beginHistoryList() {
                global $wgTitle;
                $this->lastdate = '';
@@ -143,7 +158,11 @@ class PageHistory {
                return $s;
        }
 
-       /** @todo document */
+       /**
+        * Creates end of history list with a submit button
+        *
+        * @return string HTML output
+        */
        function endHistoryList() {
                $s = '</ul>';
                $s .= $this->submitButton( array( 'id' => 'historysubmit' ) );
@@ -151,18 +170,25 @@ class PageHistory {
                return $s;
        }
 
-       /** @todo document */
+       /**
+        * Creates a submit button
+        *
+        * @param array $bits optional CSS ID
+        * @return string HTML output for the submit button
+        */
        function submitButton( $bits = array() ) {
-               return ( $this->linesonpage > 0 )
-                       ? wfElement( 'input', array_merge( $bits,
-                               array(
+               # Disable submit button if history has 1 revision only
+               if ( $this->linesonpage > 1 ) {
+                       return Xml::submitButton( wfMsg( 'compareselectedversions' ),
+                               $bits + array(
                                        'class'     => 'historysubmit',
-                                       'type'      => 'submit',
                                        'accesskey' => wfMsg( 'accesskey-compareselectedversions' ),
-                                       'title'     => wfMsg( 'tooltip-compareselectedversions' ).' ['.wfMsg( 'accesskey-compareselectedversions' ).']',
-                                       'value'     => wfMsg( 'compareselectedversions' ),
-                               ) ) )
-                       : '';
+                                       'title'     => wfMsg( 'tooltip-compareselectedversions' ),
+                                       )
+                               );
+               } else {
+                       return '';
+               }
        }
 
        /**
@@ -189,78 +215,72 @@ class PageHistory {
                $arbitrary = $this->diffButtons( $rev, $firstInList, $counter );
                $link = $this->revLink( $rev );
                
-               $user = $this->mSkin->userLink( $rev->getUser(), $rev->getUserText() )
-                               . $this->mSkin->userToolLinks( $rev->getUser(), $rev->getUserText() );
-               
                $s .= "($curlink) ($lastlink) $arbitrary";
                
                if( $wgUser->isAllowed( 'deleterevision' ) ) {
                        $revdel = SpecialPage::getTitleFor( 'Revisiondelete' );
                        if( $firstInList ) {
-                               // We don't currently handle well changing the top revision's settings
-                               $del = wfMsgHtml( 'rev-delundel' );
+                       // We don't currently handle well changing the top revision's settings
+                               $del = $this->message['rev-delundel'];
                        } else if( !$rev->userCan( Revision::DELETED_RESTRICTED ) ) {
                        // If revision was hidden from sysops
-                               $del = wfMsgHtml( 'rev-delundel' );                     
+                               $del = $this->message['rev-delundel'];  
                        } else {
                                $del = $this->mSkin->makeKnownLinkObj( $revdel,
-                                       wfMsg( 'rev-delundel' ),
+                                       $this->message['rev-delundel'],
                                        'target=' . urlencode( $this->mTitle->getPrefixedDbkey() ) .
                                        '&oldid=' . urlencode( $rev->getId() ) );
+                               // Bolden oversighted content
+                               if( $rev->isDeleted( Revision::DELETED_RESTRICTED ) )
+                                       $del = "<strong>$del</strong>";
                        }
-                       $s .= " (<small>$del</small>) ";
+                       $s .= " <tt>(<small>$del</small>)</tt> ";
                }
                
                $s .= " $link";
-               #getUser is safe, but this avoids making the invalid untargeted contribs links
-               if( $row->rev_deleted & Revision::DELETED_USER ) {
-                       $user = '<span class="history-deleted">' . wfMsg('rev-deleted-user') . '</span>';
-               }
-               $s .= " <span class='history-user'>$user</span>";
+               $s .= " <span class='history-user'>" . $this->mSkin->revUserTools( $rev, true ) . "</span>";
 
                if( $row->rev_minor_edit ) {
-                       $s .= ' ' . wfElement( 'span', array( 'class' => 'minor' ), wfMsg( 'minoreditletter') );
+                       $s .= ' ' . Xml::element( 'span', array( 'class' => 'minor' ), wfMsg( 'minoreditletter') );
                }
 
-               if (!is_null($size = $rev->getSize())) {
-                       if ($size == 0)
-                               $stxt = wfMsgHtml('historyempty');
+               if ( !is_null( $size = $rev->getSize() ) && $rev->userCan( Revision::DELETED_TEXT ) ) {
+                       if ( $size == 0 )
+                               $stxt = wfMsgHtml( 'historyempty' );
                        else
-                               $stxt = wfMsgHtml('historysize', $wgLang->formatNum( $size ) );
+                               $stxt = wfMsgExt( 'historysize', array( 'parsemag' ), $wgLang->formatNum( $size ) );
                        $s .= " <span class=\"history-size\">$stxt</span>";
                }
 
-               #getComment is safe, but this is better formatted
-               if( $rev->isDeleted( Revision::DELETED_COMMENT ) ) {
-                       $s .= " <span class=\"history-deleted\"><span class=\"comment\">" .
-                       wfMsgHtml( 'rev-deleted-comment' ) . "</span></span>";
-               } else {
-                       $s .= $this->mSkin->revComment( $rev );
-               }
+               $s .= $this->mSkin->revComment( $rev, false, true );
                
                if ($notificationtimestamp && ($row->rev_timestamp >= $notificationtimestamp)) {
                        $s .= ' <span class="updatedmarker">' .  wfMsgHtml( 'updatedmarker' ) . '</span>';
                }
                #add blurb about text having been deleted
-               if( $row->rev_deleted & Revision::DELETED_TEXT ) {
-                       $s .= ' ' . wfMsgHtml( 'deletedrev' );
+               if( $rev->isDeleted( Revision::DELETED_TEXT ) ) {
+                       $s .= ' <tt>' . wfMsgHtml( 'deletedrev' ) . '</tt>';
                }
                
                $tools = array();
                
                if ( !is_null( $next ) && is_object( $next ) ) {
-                       if( $wgUser->isAllowed( 'rollback' ) && $latest ) {
+                       if( !$this->mTitle->getUserPermissionsErrors( 'rollback', $wgUser )
+                       && !$this->mTitle->getUserPermissionsErrors( 'edit', $wgUser )
+                       && $latest ) {
                                $tools[] = '<span class="mw-rollback-link">'
                                        . $this->mSkin->buildRollbackLink( $rev )
                                        . '</span>';
                        }
 
-                       $undolink = $this->mSkin->makeKnownLinkObj(
-                               $this->mTitle,
-                               wfMsgHtml( 'editundo' ),
-                               'action=edit&undoafter=' . $next->rev_id . '&undo=' . $rev->getId()
-                       );
-                       $tools[] = "<span class=\"mw-history-undo\">{$undolink}</span>";
+                       if( $this->mTitle->quickUserCan( 'edit' ) ) {
+                               $undolink = $this->mSkin->makeKnownLinkObj(
+                                       $this->mTitle,
+                                       wfMsgHtml( 'editundo' ),
+                                       'action=edit&undoafter=' . $next->rev_id . '&undo=' . $rev->getId()
+                               );
+                               $tools[] = "<span class=\"mw-history-undo\">{$undolink}</span>";
+                       }
                }
                
                if( $tools ) {
@@ -292,7 +312,7 @@ class PageHistory {
 
        /** @todo document */
        function curLink( $rev, $latest ) {
-               $cur = wfMsgExt( 'cur', array( 'escape') );
+               $cur = $this->message['cur'];
                if( $latest || !$rev->userCan( Revision::DELETED_TEXT ) ) {
                        return $cur;
                } else {
@@ -305,7 +325,7 @@ class PageHistory {
 
        /** @todo document */
        function lastLink( $rev, $next, $counter ) {
-               $last = wfMsgExt( 'last', array( 'escape' ) );
+               $last = $this->message['last'];
                if ( is_null( $next ) ) {
                        # Probably no next row
                        return $last;
@@ -329,14 +349,19 @@ class PageHistory {
                }
        }
 
-       /** @todo document */
+       /**
+        * Create radio buttons for page history
+        *
+        * @param object $rev Revision
+        * @param bool $firstInList Is this version the first one?
+        * @param int $counter A counter of what row number we're at, counted from the top row = 1.
+        * @return string HTML output for the radio buttons
+        */
        function diffButtons( $rev, $firstInList, $counter ) {
                if( $this->linesonpage > 1) {
                        $radio = array(
                                'type'  => 'radio',
                                'value' => $rev->getId(),
-# do we really need to flood this on every item?
-#                              'title' => wfMsgHtml( 'selectolderversionfordiff' )
                        );
 
                        if( !$rev->userCan( Revision::DELETED_TEXT ) ) {
@@ -345,7 +370,7 @@ class PageHistory {
 
                        /** @todo: move title texts to javascript */
                        if ( $firstInList ) {
-                               $first = wfElement( 'input', array_merge(
+                               $first = Xml::element( 'input', array_merge(
                                        $radio,
                                        array(
                                                'style' => 'visibility:hidden',
@@ -357,13 +382,13 @@ class PageHistory {
                                } else {
                                        $checkmark = array();
                                }
-                               $first = wfElement( 'input', array_merge(
+                               $first = Xml::element( 'input', array_merge(
                                        $radio,
                                        $checkmark,
                                        array( 'name'  => 'oldid' ) ) );
                                $checkmark = array();
                        }
-                       $second = wfElement( 'input', array_merge(
+                       $second = Xml::element( 'input', array_merge(
                                $radio,
                                $checkmark,
                                array( 'name'  => 'diff' ) ) );
@@ -377,11 +402,11 @@ class PageHistory {
        function getLatestId() {
                if( is_null( $this->mLatestId ) ) {
                        $id = $this->mTitle->getArticleID();
-                       $db = wfGetDB(DB_SLAVE);
+                       $db = wfGetDB( DB_SLAVE );
                        $this->mLatestId = $db->selectField( 'page',
                                "page_latest",
                                array( 'page_id' => $id ),
-                               'PageHistory::getLatestID' );
+                               __METHOD__ );
                }
                return $this->mLatestId;
        }
@@ -392,8 +417,6 @@ class PageHistory {
         * used by the main UI but that's now handled by the pager.
         */
        function fetchRevisions($limit, $offset, $direction) {
-               $fname = 'PageHistory::fetchRevisions';
-
                $dbr = wfGetDB( DB_SLAVE );
 
                if ($direction == PageHistory::DIR_PREV)
@@ -412,7 +435,7 @@ class PageHistory {
                        'revision',
                        Revision::selectFields(),
                        array_merge(array("rev_page=$page_id"), $offsets),
-                       $fname,
+                       __METHOD__,
                        array('ORDER BY' => "rev_timestamp $dirs",
                                'USE INDEX' => 'page_timestamp', 'LIMIT' => $limit)
                        );
@@ -427,7 +450,6 @@ class PageHistory {
        /** @todo document */
        function getNotificationTimestamp() {
                global $wgUser, $wgShowUpdatedMarker;
-               $fname = 'PageHistory::getNotficationTimestamp';
 
                if ($this->mNotificationTimestamp !== NULL)
                        return $this->mNotificationTimestamp;
@@ -444,7 +466,7 @@ class PageHistory {
                                'wl_title' => $this->mTitle->getDBkey(),
                                'wl_user' => $wgUser->getID()
                        ),
-                       $fname);
+                       __METHOD__ );
                
                // Don't use the special value reserved for telling whether the field is filled
                if ( is_null( $this->mNotificationTimestamp ) ) {
@@ -461,10 +483,17 @@ class PageHistory {
        function feed( $type ) {
                require_once 'SpecialRecentchanges.php';
                
-               global $wgFeedClasses;
+               global $wgFeed, $wgFeedClasses;
+               
+               if ( !$wgFeed ) {
+                       global $wgOut;
+                       $wgOut->addWikiMsg( 'feed-unavailable' );
+                       return;
+               }
+               
                if( !isset( $wgFeedClasses[$type] ) ) {
                        global $wgOut;
-                       $wgOut->addWikiText( wfMsg( 'feed-invalid' ) );
+                       $wgOut->addWikiMsg( 'feed-invalid' );
                        return;
                }