// Precache various messages
if( !isset( $this->message ) ) {
$messages = array( 'revertmerge', 'protect_change', 'unblocklink', 'change-blocklink',
- 'revertmove', 'undeletelink', 'undeleteviewlink', 'revdel-restore', 'rev-delundel', 'hist', 'diff',
+ 'revertmove', 'undeletelink', 'undeleteviewlink', 'revdel-restore', 'hist', 'diff',
'pipe-separator' );
foreach( $messages as $msg ) {
$this->message[$msg] = wfMsgExt( $msg, array( 'escapenoentities' ) );
$month = '', $filter = null, $tagFilter='' )
{
global $wgScript, $wgMiserMode;
-
+
$action = $wgScript;
$title = SpecialPage::getTitleFor( 'Log' );
$special = $title->getPrefixedDBkey();
-
+
// For B/C, we take strings, but make sure they are converted...
$types = ($types === '') ? array() : (array)$types;
$tagSelector = ChangeTags::buildTagFilterSelector( $tagFilter );
-
+
$html = '';
$html .= Xml::hidden( 'title', $special );
-
+
// Basic selectors
$html .= $this->getTypeMenu( $types ) . "\n";
$html .= $this->getUserInput( $user ) . "\n";
if (!$wgMiserMode) {
$html .= $this->getTitlePattern( $pattern ) . "\n";
}
-
+
// date menu
$html .= Xml::tags( 'p', null, Xml::dateMenu( $year, $month ) );
-
+
// Tag filter
if ($tagSelector) {
$html .= Xml::tags( 'p', null, implode( ' ', $tagSelector ) );
}
-
+
// Filter links
if ($filter) {
$html .= Xml::tags( 'p', null, $this->getFilterLinks( $filter ) );
}
-
+
// Submit button
$html .= Xml::submitButton( wfMsg( 'allpagessubmit' ) );
-
+
// Fieldset
$html = Xml::fieldset( wfMsg( 'log' ), $html );
-
+
// Form wrapping
$html = Xml::tags( 'form', array( 'action' => $action, 'method' => 'get' ), $html );
$this->out->addHTML( $html );
}
-
+
/**
* @param $filter Array
* @return String: Formatted HTML
// Build links
return '<small>'.$wgLang->pipeList( $links ) . '</small>' . $hiddens;
}
-
+
private function getDefaultQuery() {
if ( !isset( $this->mDefaultQuery ) ) {
$this->mDefaultQuery = $_GET;
// First pass to load the log names
foreach( $validTypes as $type ) {
$text = LogPage::logName( $type );
- $typesByName[$text] = $type;
+ $typesByName[$type] = $text;
}
// Second pass to sort by name
- ksort($typesByName);
+ asort($typesByName);
// Note the query type
$queryType = count($queryTypes) == 1 ? $queryTypes[0] : '';
// Third pass generates sorted XHTML content
- foreach( $typesByName as $text => $type ) {
+ foreach( $typesByName as $type => $text ) {
$selected = ($type == $queryType);
// Restricted types
if ( isset($wgLogRestrictions[$type]) ) {
* @return String: Formatted HTML
*/
private function getUserInput( $user ) {
- return Xml::inputLabel( wfMsg( 'specialloguserlabel' ), 'user', 'mw-log-user', 15, $user );
+ return '<span style="white-space: nowrap">' .
+ Xml::inputLabel( wfMsg( 'specialloguserlabel' ), 'user', 'mw-log-user', 15, $user ) .
+ '</span>';
}
/**
* @return String: Formatted HTML
*/
private function getTitleInput( $title ) {
- return Xml::inputLabel( wfMsg( 'speciallogtitlelabel' ), 'page', 'mw-log-page', 20, $title );
+ return '<span style="white-space: nowrap">' .
+ Xml::inputLabel( wfMsg( 'speciallogtitlelabel' ), 'page', 'mw-log-page', 20, $title ) .
+ '</span>';
}
/**
Xml::checkLabel( wfMsg( 'log-title-wildcard' ), 'pattern', 'pattern', $pattern ) .
'</span>';
}
-
+
private function getExtraInputs( $types ) {
global $wgRequest;
+ $offender = $wgRequest->getVal('offender');
+ $user = User::newFromName( $offender, false );
+ if( !$user || ($user->getId() == 0 && !IP::isIPAddress($offender) ) ) {
+ $offender = ''; // Blank field if invalid
+ }
if( count($types) == 1 && $types[0] == 'suppress' ) {
return Xml::inputLabel( wfMsg('revdelete-offender'), 'offender',
- 'mw-log-offender', 20, $wgRequest->getVal('offender') );
+ 'mw-log-offender', 20, $offender );
}
return '';
}
$title = Title::makeTitle( $row->log_namespace, $row->log_title );
$classes = array( "mw-logline-{$row->log_type}" );
- $time = $wgLang->timeanddate( wfTimestamp(TS_MW, $row->log_timestamp), true );
+ $time = $wgLang->timeanddate( wfTimestamp( TS_MW, $row->log_timestamp ), true );
// User links
- if( self::isDeleted($row,LogPage::DELETED_USER) ) {
+ if( self::isDeleted( $row, LogPage::DELETED_USER ) ) {
$userLink = '<span class="history-deleted">' . wfMsgHtml( 'rev-deleted-user' ) . '</span>';
} else {
$userLink = $this->skin->userLink( $row->log_user, $row->user_name ) .
$this->skin->userToolLinks( $row->log_user, $row->user_name, true, 0, $row->user_editcount );
}
// Comment
- if( self::isDeleted($row,LogPage::DELETED_COMMENT) ) {
- $comment = '<span class="history-deleted">' . wfMsgHtml('rev-deleted-comment') . '</span>';
+ if( self::isDeleted( $row, LogPage::DELETED_COMMENT ) ) {
+ $comment = '<span class="history-deleted">' . wfMsgHtml( 'rev-deleted-comment' ) . '</span>';
} else {
$comment = $wgContLang->getDirMark() . $this->skin->commentBlock( $row->log_comment );
}
$paramArray = LogPage::extractParams( $row->log_params );
$revert = $del = '';
// Some user can hide log items and have review links
- if( !($this->flags & self::NO_ACTION_LINK) && $wgUser->isAllowed( 'deletedrevision' ) ) {
+ if( !( $this->flags & self::NO_ACTION_LINK ) && $wgUser->isAllowed( 'deletedhistory' ) ) {
// Don't show useless link to people who cannot hide revisions
if( $row->log_deleted || $wgUser->isAllowed( 'deleterevision' ) ) {
$del = $this->getShowHideLinks( $row ) . ' ';
}
}
// Add review links and such...
- if( ($this->flags & self::NO_ACTION_LINK) || ($row->log_deleted & LogPage::DELETED_ACTION) ) {
+ if( ( $this->flags & self::NO_ACTION_LINK ) || ( $row->log_deleted & LogPage::DELETED_ACTION ) ) {
// Action text is suppressed...
- } else if( self::typeAction($row,'move','move','move') && !empty($paramArray[0]) ) {
+ } else if( self::typeAction( $row, 'move', 'move', 'move' ) && !empty( $paramArray[0] ) ) {
$destTitle = Title::newFromText( $paramArray[0] );
if( $destTitle ) {
$revert = '(' . $this->skin->link(
) . ')';
}
// Show undelete link
- } else if( self::typeAction($row,array('delete','suppress'),'delete','deletedhistory') ) {
+ } else if( self::typeAction( $row, array( 'delete', 'suppress' ), 'delete', 'deletedhistory' ) ) {
if( !$wgUser->isAllowed( 'undelete' ) ) {
$viewdeleted = $this->message['undeleteviewlink'];
} else {
array( 'known', 'noclasses' )
) . ')';
// Show unblock/change block link
- } else if( self::typeAction($row,array('block','suppress'),array('block','reblock'),'block') ) {
+ } else if( self::typeAction( $row, array( 'block', 'suppress' ), array( 'block', 'reblock' ), 'block' ) ) {
$revert = '(' .
$this->skin->link(
SpecialPage::getTitleFor( 'Ipblocklist' ),
')';
// Show change protection link
} else if( self::typeAction( $row, 'protect', array( 'modify', 'protect', 'unprotect' ) ) ) {
- $revert .= ' (' .
+ $revert .= ' (' .
$this->skin->link( $title,
$this->message['hist'],
array(),
}
$revert .= ')';
// Show unmerge link
- } else if( self::typeAction($row,'merge','merge','mergehistory') ) {
+ } else if( self::typeAction( $row, 'merge', 'merge', 'mergehistory' ) ) {
$merge = SpecialPage::getTitleFor( 'Mergehistory' );
- $revert = '(' . $this->skin->link(
+ $revert = '(' . $this->skin->link(
$merge,
$this->message['revertmerge'],
array(),
array(
'target' => $paramArray[0],
- 'dest' => $title->getPrefixedDBkey(),
+ 'dest' => $title->getPrefixedDBkey(),
'mergepoint' => $paramArray[1]
),
array( 'known', 'noclasses' )
) . ')';
// If an edit was hidden from a page give a review link to the history
- } else if( self::typeAction($row,array('delete','suppress'),'revision','deletedrevision') ) {
+ } else if( self::typeAction( $row, array( 'delete', 'suppress' ), 'revision', 'deletedhistory' ) ) {
if( count($paramArray) >= 2 ) {
// Different revision types use different URL params...
$key = $paramArray[0];
// Diff link for single rev deletions
if( count($Ids) == 1 ) {
// Live revision diffs...
- if( in_array($key, array('oldid','revision')) ) {
+ if( in_array( $key, array( 'oldid', 'revision' ) ) ) {
$revert[] = $this->skin->link(
$title,
- $this->message['diff'],
+ $this->message['diff'],
array(),
array(
'diff' => intval( $Ids[0] ),
array( 'known', 'noclasses' )
);
// Deleted revision diffs...
- } else if( in_array($key, array('artimestamp','archive')) ) {
+ } else if( in_array( $key, array( 'artimestamp','archive' ) ) ) {
$revert[] = $this->skin->link(
SpecialPage::getTitleFor( 'Undelete' ),
$this->message['diff'],
$revert = wfMsg( 'parentheses', $wgLang->pipeList( $revert ) );
}
// Hidden log items, give review link
- } else if( self::typeAction($row,array('delete','suppress'),'event','deletedrevision') ) {
+ } else if( self::typeAction( $row, array( 'delete', 'suppress' ), 'event', 'deletedhistory' ) ) {
if( count($paramArray) >= 1 ) {
$revdel = SpecialPage::getTitleFor( 'Revisiondelete' );
// $paramArray[1] is a CSV of the IDs
) . ')';
}
// Self-created users
- } else if( self::typeAction($row,'newusers','create2') ) {
+ } else if( self::typeAction( $row, 'newusers', 'create2' ) ) {
if( isset( $paramArray[0] ) ) {
$revert = $this->skin->userToolLinks( $paramArray[0], $title->getDBkey(), true );
} else {
&$comment, &$revert, $row->log_timestamp ) );
}
// Event description
- if( self::isDeleted($row,LogPage::DELETED_ACTION) ) {
- $action = '<span class="history-deleted">' . wfMsgHtml('rev-deleted-event') . '</span>';
+ if( self::isDeleted( $row, LogPage::DELETED_ACTION ) ) {
+ $action = '<span class="history-deleted">' . wfMsgHtml( 'rev-deleted-event' ) . '</span>';
} else {
$action = LogPage::actionText( $row->log_type, $row->log_action, $title,
$this->skin, $paramArray, true );
}
// Any tags...
- list($tagDisplay, $newClasses) = ChangeTags::formatSummaryRow( $row->ts_tags, 'logevent' );
+ list( $tagDisplay, $newClasses ) = ChangeTags::formatSummaryRow( $row->ts_tags, 'logevent' );
$classes = array_merge( $classes, $newClasses );
if( $revert != '' ) {
* @return string
*/
private function getShowHideLinks( $row ) {
+ global $wgUser;
+ if( $row->log_type == 'suppress' ) {
+ return ''; // No one can hide items from the oversight log
+ }
+ $canHide = $wgUser->isAllowed( 'deleterevision' );
// 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'].')' );
- } else if( $row->log_type == 'suppress' ) {
- $del = ''; // No one should be hiding from the oversight log
+ $del = $this->skin->revDeleteLinkDisabled( $canHide );
} else {
$target = SpecialPage::getTitleFor( 'Log', $row->log_type );
$page = Title::makeTitle( $row->log_namespace, $row->log_title );
- $query = array(
+ $query = array(
'target' => $target->getPrefixedDBkey(),
- 'type' => 'logging',
- 'ids' => $row->log_id,
+ 'type' => 'logging',
+ 'ids' => $row->log_id,
);
$del = $this->skin->revDeleteLink( $query,
- self::isDeleted( $row, LogPage::DELETED_RESTRICTED ) );
+ self::isDeleted( $row, LogPage::DELETED_RESTRICTED ), $canHide );
}
return $del;
}
*/
public static function typeAction( $row, $type, $action, $right='' ) {
$match = is_array($type) ?
- in_array($row->log_type,$type) : $row->log_type == $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;
+ $match = is_array( $action ) ?
+ in_array( $row->log_action, $action ) : $row->log_action == $action;
if( $match && $right ) {
global $wgUser;
$match = $wgUser->isAllowed( $right );
* @return Boolean
*/
public static function userCan( $row, $field ) {
- if( ( $row->log_deleted & $field ) == $field ) {
+ return self::userCanBitfield( $row->log_deleted, $field );
+ }
+
+ /**
+ * Determine if the current user is allowed to view a particular
+ * field of this log row, if it's marked as deleted.
+ * @param $bitfield Integer (current field)
+ * @param $field Integer
+ * @return Boolean
+ */
+ public static function userCanBitfield( $bitfield, $field ) {
+ if( $bitfield & $field ) {
global $wgUser;
- $permission = ( $row->log_deleted & LogPage::DELETED_RESTRICTED ) == LogPage::DELETED_RESTRICTED
- ? 'suppressrevision'
- : 'deletedrevision';
- wfDebug( "Checking for $permission due to $field match on $row->log_deleted\n" );
+ $permission = '';
+ if ( $bitfield & LogPage::DELETED_RESTRICTED ) {
+ $permission = 'suppressrevision';
+ } else {
+ $permission = 'deletedhistory';
+ }
+ wfDebug( "Checking for $permission due to $field match on $bitfield\n" );
return $wgUser->isAllowed( $permission );
} else {
return true;
* @return Boolean
*/
public static function isDeleted( $row, $field ) {
- return ($row->log_deleted & $field) == $field;
+ return ( $row->log_deleted & $field ) == $field;
}
/**
* @param $page String The page title to show log entries for
* @param $user String The user who made the log entries
* @param $param Associative Array with the following additional options:
- * lim Integer Limit of items to show, default is 50
- * conds Array Extra conditions for the query (e.g. "log_action != 'revision'")
- * showIfEmpty boolean Set to false if you don't want any output in case the loglist is empty
- * if set to true (default), "No matching items in log" is displayed if loglist is empty
- * msgKey Array If you want a nice box with a message, set this
- * to the key of the message. First element is the message
- * key, additional optional elements are parameters for the
- * key that are processed with wgMsgExt and option 'parse'
- * offset Set to overwrite offset parameter in $wgRequest
- * set to '' to unset offset
+ * - lim Integer Limit of items to show, default is 50
+ * - conds Array Extra conditions for the query (e.g. "log_action != 'revision'")
+ * - showIfEmpty boolean Set to false if you don't want any output in case the loglist is empty
+ * if set to true (default), "No matching items in log" is displayed if loglist is empty
+ * - msgKey Array If you want a nice box with a message, set this to the key of the message.
+ * First element is the message key, additional optional elements are parameters for the key
+ * that are processed with wgMsgExt and option 'parse'
+ * - offset Set to overwrite offset parameter in $wgRequest
+ * set to '' to unset offset
+ * - wrap String: Wrap the message in html (usually something like "<div ...>$1</div>").
* @return Integer Number of total log items (not limited by $lim)
*/
public static function showLogExtract( &$out, $types=array(), $page='', $user='',
$param = array() ) {
$defaultParameters = array(
- 'lim' => 0,
+ 'lim' => 25,
'conds' => array(),
'showIfEmpty' => true,
- 'msgKey' => array('')
+ 'msgKey' => array(''),
+ 'wrap' => "$1"
);
# The + operator appends elements of remaining keys from the right
$conds = $param['conds'];
$showIfEmpty = $param['showIfEmpty'];
$msgKey = $param['msgKey'];
- if ( !is_array($msgKey) )
+ $wrap = $param['wrap'];
+ if ( !is_array( $msgKey ) )
$msgKey = array( $msgKey );
# Insert list of top 50 (or top $lim) items
$loglist = new LogEventsList( $wgUser->getSkin(), $wgOut, 0 );
$s = '<div class="mw-warning-with-logexcerpt">';
if ( count( $msgKey ) == 1 ) {
- $s .= wfMsgExt( $msgKey[0], array('parse') );
+ $s .= wfMsgExt( $msgKey[0], array( 'parse' ) );
} else { // Process additional arguments
$args = $msgKey;
array_shift( $args );
- $s .= wfMsgExt( $msgKey[0], array('parse'), $args );
+ $s .= wfMsgExt( $msgKey[0], array( 'parse' ), $args );
}
}
$s .= $loglist->beginLogEventsList() .
$loglist->endLogEventsList();
} else {
if ( $showIfEmpty )
- $s = wfMsgExt( 'logempty', array('parse') );
+ $s = Html::rawElement( 'div', array( 'class' => 'mw-warning-logempty' ),
+ wfMsgExt( 'logempty', array( 'parseinline' ) ) );
}
if( $pager->getNumRows() > $pager->mLimit ) { # Show "Full log" link
$urlParam = array();
if ( $logBody && $msgKey[0] )
$s .= '</div>';
+ if ( $wrap!='' ) { // Wrap message in html
+ $s = str_replace( '$1', $s, $wrap );
+ }
+
+ // $out can be either an OutputPage object or a String-by-reference
if( $out instanceof OutputPage ){
$out->addHTML( $s );
} else {
$types = ($types === '') ? array() : (array)$types;
// Don't even show header for private logs; don't recognize it...
foreach ( $types as $type ) {
- if( isset( $wgLogRestrictions[$type] ) && !$wgUser->isAllowed($wgLogRestrictions[$type]) ) {
+ if( isset( $wgLogRestrictions[$type] )
+ && !$wgUser->isAllowed($wgLogRestrictions[$type])
+ ) {
$types = array_diff( $types, array( $type ) );
}
}
+ $this->types = $types;
// Don't show private logs to unprivileged users.
// Also, only show them upon specific request to avoid suprises.
$audience = $types ? 'user' : 'public';
$this->mConds[] = $hideLogs;
}
if( count($types) ) {
- $this->types = $types;
$this->mConds['log_type'] = $types;
// Set typeCGI; used in url param for paging
if( count($types) == 1 ) $this->typeCGI = $types[0];
global $wgUser;
$this->mConds['log_user'] = $userid;
// Paranoia: avoid brute force searches (bug 17342)
- if( !$wgUser->isAllowed( 'deletedrevision' ) ) {
+ if( !$wgUser->isAllowed( 'deletedhistory' ) ) {
$this->mConds[] = $this->mDb->bitAnd('log_deleted', LogPage::DELETED_USER) . ' = 0';
} else if( !$wgUser->isAllowed( 'suppressrevision' ) ) {
$this->mConds[] = $this->mDb->bitAnd('log_deleted', LogPage::SUPPRESSED_USER) .
global $wgMiserMode, $wgUser;
$title = Title::newFromText( $page );
- if( strlen($page) == 0 || !$title instanceof Title )
+ if( strlen( $page ) == 0 || !$title instanceof Title )
return false;
$this->title = $title->getPrefixedText();
$ns = $title->getNamespace();
+ $db = $this->mDb;
+
# Using the (log_namespace, log_title, log_timestamp) index with a
# range scan (LIKE) on the first two parts, instead of simple equality,
# makes it unusable for sorting. Sorted retrieval using another index
# log entries for even the busiest pages, so it can be safely scanned
# in full to satisfy an impossible condition on user or similar.
if( $pattern && !$wgMiserMode ) {
- # use escapeLike to avoid expensive search patterns like 't%st%'
- $safetitle = $this->mDb->escapeLike( $title->getDBkey() );
$this->mConds['log_namespace'] = $ns;
- $this->mConds[] = "log_title LIKE '$safetitle%'";
+ $this->mConds[] = 'log_title ' . $db->buildLike( $title->getDBkey(), $db->anyString() );
$this->pattern = $pattern;
} else {
$this->mConds['log_namespace'] = $ns;
$this->mConds['log_title'] = $title->getDBkey();
}
// Paranoia: avoid brute force searches (bug 17342)
- if( !$wgUser->isAllowed( 'deletedrevision' ) ) {
- $this->mConds[] = $this->mDb->bitAnd('log_deleted', LogPage::DELETED_ACTION) . ' = 0';
+ if( !$wgUser->isAllowed( 'deletedhistory' ) ) {
+ $this->mConds[] = $db->bitAnd('log_deleted', LogPage::DELETED_ACTION) . ' = 0';
} else if( !$wgUser->isAllowed( 'suppressrevision' ) ) {
- $this->mConds[] = $this->mDb->bitAnd('log_deleted', LogPage::SUPPRESSED_ACTION) .
+ $this->mConds[] = $db->bitAnd('log_deleted', LogPage::SUPPRESSED_ACTION) .
' != ' . LogPage::SUPPRESSED_ACTION;
}
}
public function getQueryInfo() {
+ global $wgOut;
$tables = array( 'logging', 'user' );
$this->mConds[] = 'user_id = log_user';
- $groupBy = false;
+ $index = array();
+ $options = array();
# Add log_search table if there are conditions on it
if( array_key_exists('ls_field',$this->mConds) ) {
$tables[] = 'log_search';
- $index = array( 'log_search' => 'ls_field_val', 'logging' => 'PRIMARY' );
- $groupBy = 'ls_log_id';
- # Don't use the wrong logging index
+ $index['log_search'] = 'ls_field_val';
+ $index['logging'] = 'PRIMARY';
+ $options[] = 'DISTINCT';
+ # Avoid usage of the wrong index by limiting
+ # the choices of available indexes. This mainly
+ # avoids site-breaking filesorts.
} else if( $this->title || $this->pattern || $this->user ) {
- $index = array( 'logging' => array('page_time','user_time') );
- } else if( $this->types ) {
- $index = array( 'logging' => 'type_time' );
+ $index['logging'] = array( 'page_time', 'user_time' );
+ if( count($this->types) == 1 ) {
+ $index['logging'][] = 'log_user_type_time';
+ }
+ } else if( count($this->types) == 1 ) {
+ $index['logging'] = 'type_time';
} else {
- $index = array( 'logging' => 'times' );
+ $index['logging'] = 'times';
}
- $options = array( 'USE INDEX' => $index );
+ $options['USE INDEX'] = $index;
# Don't show duplicate rows when using log_search
- if( $groupBy ) $options['GROUP BY'] = $groupBy;
$info = array(
'tables' => $tables,
'fields' => array( 'log_type', 'log_action', 'log_user', 'log_namespace',
'log_timestamp', 'user_name', 'user_editcount' ),
'conds' => $this->mConds,
'options' => $options,
- 'join_conds' => array(
+ 'join_conds' => array(
'user' => array( 'INNER JOIN', 'user_id=log_user' ),
'log_search' => array( 'INNER JOIN', 'ls_log_id=log_id' )
)
# Add ChangeTags filter query
ChangeTags::modifyDisplayQuery( $info['tables'], $info['fields'], $info['conds'],
$info['join_conds'], $info['options'], $this->mTagFilter );
-
return $info;
}
dépôts / lhc / web / wiklou.git / blobdiff