Made suppress link bold

[lhc/web/wiklou.git] / includes / LogEventsList.php

diff --git a/includes/LogEventsList.php b/includes/LogEventsList.php
index 4e07cdb..37b5daf 100644 (file)
--- a/includes/LogEventsList.php
+++ b/includes/LogEventsList.php
@@ -39,7 +39,8 @@ class LogEventsList {
                // Precache various messages
                if( !isset( $this->message ) ) {
                        $messages = array( 'revertmerge', 'protect_change', 'unblocklink', 'change-blocklink',
-                               'revertmove', 'undeletelink', 'revdel-restore', 'rev-delundel', 'hist', 'pipe-separator' );
+                               'revertmove', 'undeletelink', 'revdel-restore', 'rev-delundel', 'hist', 'diff',
+                               'pipe-separator' );
                        foreach( $messages as $msg ) {
                                $this->message[$msg] = wfMsgExt( $msg, array( 'escapenoentities' ) );
                        }
@@ -169,7 +170,7 @@ class LogEventsList {
         * @return String: Formatted HTML
         */
        private function getUserInput( $user ) {
-               return Xml::inputLabel( wfMsg( 'specialloguserlabel' ), 'user', 'user', 15, $user );
+               return Xml::inputLabel( wfMsg( 'specialloguserlabel' ), 'user', 'mw-log-user', 15, $user );
        }
 
        /**
@@ -177,7 +178,7 @@ class LogEventsList {
         * @return String: Formatted HTML
         */
        private function getTitleInput( $title ) {
-               return Xml::inputLabel( wfMsg( 'speciallogtitlelabel' ), 'page', 'page', 20, $title );
+               return Xml::inputLabel( wfMsg( 'speciallogtitlelabel' ), 'page', 'mw-log-page', 20, $title );
        }
 
        /**
@@ -224,7 +225,7 @@ class LogEventsList {
                $paramArray = LogPage::extractParams( $row->log_params );
                $revert = $del = '';
                // Some user can hide log items and have review links
-               if( $wgUser->isAllowed( 'deleterevision' ) ) {
+               if( !($this->flags & self::NO_ACTION_LINK) && $wgUser->isAllowed( 'deleterevision' ) ) {
                        $del = $this->getShowHideLinks( $row ) . ' ';
                }
                // Add review links and such...
@@ -285,27 +286,32 @@ class LogEventsList {
                                $revdel = SpecialPage::getTitleFor( 'Revisiondelete' );
                                // Different revision types use different URL params...
                                $key = $paramArray[0];
-                               // Link to each hidden object ID, $paramArray[1] is the url param
+                               // $paramArray[1] is a CVS of the IDs
                                $Ids = explode( ',', $paramArray[1] );
-                               $revParams = '';
-                               foreach( $Ids as $n => $id ) {
-                                       $revParams .= '&' . urlencode($key) . '[]=' . urlencode($id);
+                               $query = urlencode($paramArray[1]);
+                               $revert = array();
+                               // Diff link for single rev deletions
+                               if( $key === 'oldid' && count($Ids) == 1 ) {
+                                       $token = urlencode( $wgUser->editToken( intval($Ids[0]) ) );
+                                       $revert[] = $this->skin->makeKnownLinkObj( $title, $this->message['diff'], 
+                                               'diff='.intval($Ids[0])."&unhide=1&token=$token" );
                                }
-                               $revert = '(' . $this->skin->makeKnownLinkObj( $revdel, $this->message['revdel-restore'], 
-                                       'target=' . $title->getPrefixedUrl() . $revParams ) . ')';
+                               // View/modify link...
+                               $revert[] = $this->skin->makeKnownLinkObj( $revdel, $this->message['revdel-restore'],
+                                       'target='.$title->getPrefixedUrl()."&$key=$query" );
+                               // Pipe links
+                               $revert = '(' . implode(' | ',$revert) . ')';
                        }
                // Hidden log items, give review link
                } else if( self::typeAction($row,array('delete','suppress'),'event','deleterevision') ) {
                        if( count($paramArray) == 1 ) {
                                $revdel = SpecialPage::getTitleFor( 'Revisiondelete' );
+                               // $paramArray[1] is a CVS of the IDs
                                $Ids = explode( ',', $paramArray[0] );
+                               $query = urlencode($paramArray[0]);
                                // Link to each hidden object ID, $paramArray[1] is the url param
-                               $logParams = '';
-                               foreach( $Ids as $n => $id ) {
-                                       $logParams .= '&logid[]=' . intval($id);
-                               }
                                $revert = '(' . $this->skin->makeKnownLinkObj( $revdel, $this->message['revdel-restore'], 
-                                       'target=' . $title->getPrefixedUrl() . $logParams ) . ')';
+                                       'target='.$title->getPrefixedUrl()."&logid=$query" ) . ')';
                        }
                // Self-created users
                } else if( self::typeAction($row,'newusers','create2') ) {
@@ -353,16 +359,17 @@ class LogEventsList {
                $revdel = SpecialPage::getTitleFor( 'Revisiondelete' );
                // If event was hidden from sysops
                if( !self::userCan( $row, LogPage::DELETED_RESTRICTED ) ) {
-                       $del = Xml::tags( 'span', array( 'class'=>'mw-revdelundel-link' ), '('.$this->message['rev-delundel'].')' );
+                       $del = Xml::tags( 'span', array( 'class'=>'mw-revdelundel-link' ),
+                               '('.$this->message['rev-delundel'].')' );
                } else if( $row->log_type == 'suppress' ) {
-                       // No one should be hiding from the oversight log
-                       $del = Xml::tags( 'span', array( 'class'=>'mw-revdelundel-link' ), '('.$this->message['rev-delundel'].')' );
+                       $del = ''; // No one should be hiding from the oversight log
                } else {
                        $target = SpecialPage::getTitleFor( 'Log', $row->log_type );
+                       $page = Title::makeTitle( $row->log_namespace, $row->log_title );
                        $query = array( 'target' => $target->getPrefixedDBkey(),
-                               'logid[]' => $row->log_id
-                       );
-                       $del = $this->skin->revDeleteLink( $query, self::isDeleted( $row, LogPage::DELETED_RESTRICTED ) );
+                               'logid' => $row->log_id, 'page' => $page->getPrefixedDBkey() );
+                       $del = $this->skin->revDeleteLink( $query,
+                               self::isDeleted( $row, LogPage::DELETED_RESTRICTED ) );
                }
                return $del;
        }
@@ -375,7 +382,8 @@ class LogEventsList {
         * @return bool
         */
        public static function typeAction( $row, $type, $action, $right='' ) {
-               $match = is_array($type) ? in_array($row->log_type,$type) : $row->log_type == $type;
+               $match = is_array($type) ?
+                       in_array($row->log_type,$type) : $row->log_type == $type;
                if( $match ) {
                        $match = is_array($action) ?
                                in_array($row->log_action,$action) : $row->log_action == $action;
@@ -645,7 +653,7 @@ class LogPager extends ReverseChronologicalPager {
                );
 
                ChangeTags::modifyDisplayQuery( $info['tables'], $info['fields'], $info['conds'],
-                       $info['join_conds'], $this->mTagFilter );
+                       $info['join_conds'], $info['options'], $this->mTagFilter );
 
                return $info;
        }