From: Aaron Schulz Date: Wed, 2 Apr 2008 17:43:57 +0000 (+0000) Subject: proper name X-Git-Tag: 1.31.0-rc.0~48660 X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dmes_infos.php?a=commitdiff_plain;h=cbf29d43ddc8e4cc4c6d97efba84f23f31a14b90;p=lhc%2Fweb%2Fwiklou.git proper name --- diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php index 904f62055d..ffc1351885 100644 --- a/includes/AutoLoader.php +++ b/includes/AutoLoader.php @@ -135,9 +135,9 @@ function __autoload($className) { 'LoadBalancer' => 'includes/LoadBalancer.php', 'LoginForm' => 'includes/SpecialUserlogin.php', 'LogPage' => 'includes/LogPage.php', - 'LogEventList' => 'includes/LogEventList.php', - 'LogReader' => 'includes/LogEventList.php', - 'LogViewer' => 'includes/LogEventList.php', + 'LogEventsList' => 'includes/LogEventsList.php', + 'LogReader' => 'includes/LogEventsList.php', + 'LogViewer' => 'includes/LogEventsList.php', 'LonelyPagesPage' => 'includes/SpecialLonelypages.php', 'LongPagesPage' => 'includes/SpecialLongpages.php', 'MacBinary' => 'includes/MacBinary.php', diff --git a/includes/LogEventList.php b/includes/LogEventList.php deleted file mode 100644 index f16a16a75b..0000000000 --- a/includes/LogEventList.php +++ /dev/null @@ -1,583 +0,0 @@ -, 2008 Aaron Schulz -# http://www.mediawiki.org/ -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# http://www.gnu.org/copyleft/gpl.html - -class LogEventList { - const NO_ACTION_LINK = 1; - private $skin; - public $flags; - - function __construct( &$skin, $flags = 0 ) { - $this->skin =& $skin; - $this->flags = $flags; - $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 - */ - private function preCacheMessages() { - // Precache various messages - if( !isset( $this->message ) ) { - foreach( explode(' ', 'viewpagelogs revhistory filehist rev-delundel' ) as $msg ) { - $this->message[$msg] = wfMsgExt( $msg, array( 'escape') ); - } - } - } - - /** - * Set page title and show header for this log type - * @param OutputPage $out where to send output - * @param strin $type - */ - public function showHeader( $out, $type ) { - if( LogPage::isLogType( $type ) ) { - $out->setPageTitle( LogPage::logName( $type ) ); - $out->addWikiText( LogPage::logHeader( $type ) ); - } - } - - /** - * Show options for the log list - * @param OutputPage $out where to send output - * @param string $type, - * @param string $user, - * @param string $page, - * @param string $pattern - */ - public function showOptions( $out, $type, $user, $page, $pattern ) { - global $wgScript, $wgMiserMode; - $action = htmlspecialchars( $wgScript ); - $title = SpecialPage::getTitleFor( 'Log' ); - $special = htmlspecialchars( $title->getPrefixedDBkey() ); - $out->addHTML( "
" . - Xml::element( 'legend', array(), wfMsg( 'log' ) ) . - Xml::hidden( 'title', $special ) . "\n" . - $this->getTypeMenu( $type ) . "\n" . - $this->getUserInput( $user ) . "\n" . - $this->getTitleInput( $page ) . "\n" . - ( !$wgMiserMode ? ($this->getTitlePattern( $pattern )."\n") : "" ) . - Xml::submitButton( wfMsg( 'allpagessubmit' ) ) . "\n" . - "
" ); - } - - /** - * @return string Formatted HTML - */ - private function getTypeMenu( $queryType ) { - global $wgLogRestrictions, $wgUser; - - $out = "'; - return $out; - } - - /** - * @return string Formatted HTML - */ - private function getUserInput( $user ) { - return Xml::inputLabel( wfMsg( 'specialloguserlabel' ), 'user', 'user', 12, $user ); - } - - /** - * @return string Formatted HTML - */ - private function getTitleInput( $title ) { - return Xml::inputLabel( wfMsg( 'speciallogtitlelabel' ), 'page', 'page', 20, $title ); - } - - /** - * @return boolean Checkbox - */ - private function getTitlePattern( $pattern ) { - return Xml::checkLabel( wfMsg( 'log-title-wildcard' ), 'pattern', 'pattern', $pattern ); - } - - public function beginLogEventList() { - return "\n"; - } - - /** - * @param Row $row a single row from the result set - * @return string Formatted HTML list item - * @private - */ - public function logLine( $row ) { - global $wgLang, $wgUser, $wgContLang; - $skin = $wgUser->getSkin(); - $title = Title::makeTitle( $row->log_namespace, $row->log_title ); - $time = $wgLang->timeanddate( wfTimestamp(TS_MW, $row->log_timestamp), true ); - // Enter the existence or non-existence of this page into the link cache, - // for faster makeLinkObj() in LogPage::actionText() - $linkCache =& LinkCache::singleton(); - $linkCache->addLinkObj( $title ); - // User links - if( self::isDeleted($row,LogPage::DELETED_USER) ) { - $userLink = '' . wfMsgHtml( 'rev-deleted-user' ) . ''; - } else { - $userLink = $this->skin->userLink( $row->log_user, $row->user_name ) . - $this->skin->userToolLinksRedContribs( $row->log_user, $row->user_name ); - } - // Comment - if( $row->log_action == 'create2' ) { - $comment = ''; // Suppress from old account creations, useless and can contain incorrect links - } else if( self::isDeleted($row,LogPage::DELETED_COMMENT) ) { - $comment = '' . wfMsgHtml('rev-deleted-comment') . ''; - } else { - $comment = $wgContLang->getDirMark() . $this->skin->commentBlock( $row->log_comment ); - } - // Extract extra parameters - $paramArray = LogPage::extractParams( $row->log_params ); - $revert = $del = ''; - // Some user can hide log items and have review links - if( $wgUser->isAllowed( 'deleterevision' ) ) { - $del = $this->showhideLinks( $row ) . ' '; - } - // Add review links and such... - if( !($this->flags & self::NO_ACTION_LINK) && !($row->log_deleted & LogPage::DELETED_ACTION) ) { - if( $row->log_type == 'move' && isset( $paramArray[0] ) && $wgUser->isAllowed( 'move' ) ) { - $destTitle = Title::newFromText( $paramArray[0] ); - if( $destTitle ) { - $revert = '(' . $this->skin->makeKnownLinkObj( SpecialPage::getTitleFor( 'Movepage' ), - wfMsg( 'revertmove' ), - 'wpOldTitle=' . urlencode( $destTitle->getPrefixedDBkey() ) . - '&wpNewTitle=' . urlencode( $title->getPrefixedDBkey() ) . - '&wpReason=' . urlencode( wfMsgForContent( 'revertmove' ) ) . - '&wpMovetalk=0' ) . ')'; - } - // Show undelete link - } else if( $row->log_action == 'delete' && $wgUser->isAllowed( 'delete' ) ) { - $revert = '(' . $this->skin->makeKnownLinkObj( SpecialPage::getTitleFor( 'Undelete' ), - wfMsg( 'undeletelink' ) , - 'target='. urlencode( $title->getPrefixedDBkey() ) ) . ')'; - // Show unblock link - } else if( $row->log_action == 'block' && $wgUser->isAllowed( 'block' ) ) { - $revert = '(' . $this->skin->makeKnownLinkObj( SpecialPage::getTitleFor( 'Ipblocklist' ), - wfMsg( 'unblocklink' ), - 'action=unblock&ip=' . urlencode( $row->log_title ) ) . ')'; - // Show change protection link - } else if( ( $row->log_action == 'protect' || $row->log_action == 'modify' ) && $wgUser->isAllowed( 'protect' ) ) { - $revert = '(' . $this->skin->makeKnownLinkObj( $title, wfMsg( 'protect_change' ), 'action=unprotect' ) . ')'; - // Show unmerge link - } else if ( $row->log_action == 'merge' ) { - $merge = SpecialPage::getTitleFor( 'Mergehistory' ); - $revert = '(' . $this->skin->makeKnownLinkObj( $merge, wfMsg('revertmerge'), - wfArrayToCGI( - array('target' => $paramArray[0], 'dest' => $title->getPrefixedText(), 'mergepoint' => $paramArray[1] ) - ) - ) . ')'; - // If an edit was hidden from a page give a review link to the history - } else if( $row->log_action == 'revision' && $wgUser->isAllowed( 'deleterevision' ) ) { - $revdel = SpecialPage::getTitleFor( 'Revisiondelete' ); - // Different revision types use different URL params... - $subtype = isset($paramArray[2]) ? $paramArray[1] : ''; - // Link to each hidden object ID, $paramArray[1] is the url param. List if several... - $Ids = explode( ',', $paramArray[2] ); - if( count($Ids) == 1 ) { - $revert = $this->skin->makeKnownLinkObj( $revdel, wfMsgHtml('revdel-restore'), - wfArrayToCGI( array('target' => $paramArray[0], $paramArray[1] => $Ids[0] ) ) ); - } else { - $revert .= wfMsgHtml('revdel-restore').':'; - foreach( $Ids as $n => $id ) { - $revert .= ' '.$this->skin->makeKnownLinkObj( $revdel, '#'.($n+1), - wfArrayToCGI( array('target' => $paramArray[0], $paramArray[1] => $id ) ) ); - } - } - $revert = "($revert)"; - // Hidden log items, give review link - } else if( $row->log_action == 'event' && $wgUser->isAllowed( 'deleterevision' ) ) { - $revdel = SpecialPage::getTitleFor( 'Revisiondelete' ); - $revert .= wfMsgHtml('revdel-restore'); - $Ids = explode( ',', $paramArray[0] ); - // Link to each hidden object ID, $paramArray[1] is the url param. List if several... - if( count($Ids) == 1 ) { - $revert = $this->skin->makeKnownLinkObj( $revdel, wfMsgHtml('revdel-restore'), - wfArrayToCGI( array('logid' => $Ids[0] ) ) ); - } else { - foreach( $Ids as $n => $id ) { - $revert .= $this->skin->makeKnownLinkObj( $revdel, '#'.($n+1), - wfArrayToCGI( array('logid' => $id ) ) ); - } - } - $revert = "($revert)"; - } else { - wfRunHooks( 'LogLine', array( $row->log_type, $row->log_action, $title, $paramArray, - &$comment, &$revert, $row->log_timestamp ) ); - // wfDebug( "Invoked LogLine hook for " $row->log_type . ", " . $row->log_action . "\n" ); - // Do nothing. The implementation is handled by the hook modifiying the passed-by-ref parameters. - } - } - // Event description - if( $row->log_deleted & LogPage::DELETED_ACTION ) { - $action = '' . wfMsgHtml('rev-deleted-event') . ''; - } else { - $action = LogPage::actionText( $row->log_type, $row->log_action, $title, $this->skin, $paramArray, true ); - } - - return "
  • $del$time $userLink $action $comment $revert
    • \n"; - } - - /** - * @param Row $row - * @private - */ - private function showhideLinks( $row ) { - global $wgAllowLogDeletion; - - if( !$wgAllowLogDeletion ) - return ""; - - $revdel = SpecialPage::getTitleFor( 'Revisiondelete' ); - // If event was hidden from sysops - if( !self::userCan( $row, LogPage::DELETED_RESTRICTED ) ) { - $del = $this->message['rev-delundel']; - } else if( $row->log_type == 'suppress' ) { - // No one should be hiding from the oversight log - $del = $this->message['rev-delundel']; - } else { - $del = $this->skin->makeKnownLinkObj( $revdel, $this->message['rev-delundel'], 'logid='.$row->log_id ); - // Bolden oversighted content - if( self::isDeleted( $row, LogPage::DELETED_RESTRICTED ) ) - $del = "$del"; - } - return "($del)"; - } - - /** - * SQL clause to skip forbidden log types for this user - * @param Database $db - * @returns mixed (string or false) - */ - public static function getExcludeClause( $db ) { - global $wgLogRestrictions, $wgUser; - // Reset the array, clears extra "where" clauses when $par is used - $hiddenLogs = array(); - // Don't show private logs to unpriviledged users - foreach( $wgLogRestrictions as $logtype => $right ) { - if( !$wgUser->isAllowed($right) ) { - $safetype = $db->strencode( $logtype ); - $hiddenLogs[] = "'$safetype'"; - } - } - if( !empty($hiddenLogs) ) { - return 'log_type NOT IN(' . implode(',',$hiddenLogs) . ')'; - } - return false; - } - - /** - * Determine if the current user is allowed to view a particular - * field of this log row, if it's marked as deleted. - * @param Row $row - * @param int $field - * @return bool - */ - public static function userCan( $row, $field ) { - if( ( $row->log_deleted & $field ) == $field ) { - global $wgUser; - $permission = ( $row->log_deleted & LogPage::DELETED_RESTRICTED ) == LogPage::DELETED_RESTRICTED - ? 'hiderevision' - : 'deleterevision'; - wfDebug( "Checking for $permission due to $field match on $row->log_deleted\n" ); - return $wgUser->isAllowed( $permission ); - } else { - return true; - } - } - - /** - * @param Row $row - * @param int $field one of DELETED_* bitfield constants - * @return bool - */ - public static function isDeleted( $row, $field ) { - return ($row->log_deleted & $field) == $field; - } -} - -/** - * @addtogroup Pager - */ -class LogPager extends ReverseChronologicalPager { - private $type = '', $user = '', $title = '', $pattern = ''; - public $mLogEventList; - /** - * constructor - * @param LogEventList $loglist, - * @param string $type, - * @param string $user, - * @param string $page, - * @param string $pattern - * @param array $conds - */ - function __construct( $loglist, $type, $user, $title, $pattern, $conds = array() ) { - parent::__construct(); - $this->mConds = $conds; - - $this->mLogEventList = $loglist; - - $this->limitType( $type ); - $this->limitUser( $user ); - $this->limitTitle( $title, $pattern ); - } - - /** - * Set the log reader to return only entries of the given type. - * Type restrictions enforced here - * @param string $type A log type ('upload', 'delete', etc) - * @private - */ - private function limitType( $type ) { - // Don't show private logs to unpriviledged users - $hideLogs = LogEventList::getExcludeClause( $this->mDb ); - if( $hideLogs !== false ) { - $this->mConds[] = $hideLogs; - } - if( empty($type) ) { - return false; - } - $this->type = $type; - $this->mConds['log_type'] = $type; - } - - /** - * Set the log reader to return only entries by the given user. - * @param string $name (In)valid user name - * @private - */ - function limitUser( $name ) { - if( $name == '' ) { - return false; - } - $usertitle = Title::makeTitleSafe( NS_USER, $name ); - if( is_null($usertitle) ) { - return false; - } - $this->user = $usertitle->getText(); - /* Fetch userid at first, if known, provides awesome query plan afterwards */ - $userid = User::idFromName( $this->user ); - if( !$userid ) { - /* It should be nicer to abort query at all, - but for now it won't pass anywhere behind the optimizer */ - $this->mConds[] = "NULL"; - } else { - $this->mConds['log_user'] = $userid; - } - } - - /** - * Set the log reader to return only entries affecting the given page. - * (For the block and rights logs, this is a user page.) - * @param string $page Title name as text - * @private - */ - function limitTitle( $page, $pattern ) { - global $wgMiserMode; - - $title = Title::newFromText( $page ); - if( strlen($page) == 0 || !$title instanceof Title ) - return false; - - $this->title = $title->getPrefixedText(); - $this->pattern = $pattern; - $ns = $title->getNamespace(); - 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%'"; - } else { - $this->mConds['log_namespace'] = $ns; - $this->mConds['log_title'] = $title->getDBkey(); - } - } - - function getQueryInfo() { - $this->mConds[] = 'user_id = log_user'; - # Hack this until live - global $wgAllowLogDeletion; - $log_id = $wgAllowLogDeletion ? 'log_id' : '0 AS log_id'; - return array( - 'tables' => array( 'logging', 'user' ), - 'fields' => array( 'log_type', 'log_action', 'log_user', 'log_namespace', 'log_title', - 'log_params', 'log_comment', $log_id, 'log_deleted', 'log_timestamp', 'user_name' ), - 'conds' => $this->mConds, - 'options' => array() - ); - } - - function getIndexField() { - return 'log_timestamp'; - } - - function formatRow( $row ) { - return $this->mLogEventList->logLine( $row ); - } - - public function getType() { - return $this->type; - } - - public function getUser() { - return $this->user; - } - - public function getPage() { - return $this->title; - } - - public function getPattern() { - return $this->pattern; - } -} - -/** - * - * @addtogroup SpecialPage - */ -class LogReader { - var $db, $joinClauses, $whereClauses; - var $type = '', $user = '', $title = null, $pattern = false; - /** - * @param WebRequest $request For internal use use a FauxRequest object to pass arbitrary parameters. - */ - function __construct( $request ) { - global $wgUser; - # Get parameters - $type = $request->getVal( 'type' ); - $user = $request->getText( 'user' ); - $title = $request->getText( 'page' ); - $pattern = $request->getBool( 'pattern' ); - - $loglist = new LogEventList( $wgUser->getSkin() ); - $this->pager = new LogPager( $loglist, $type, $user, $title, $pattern ); - } - - /** - * Is there at least one row? - * @return bool - */ - public function hasRows() { - return isset($this->pager) ? ($this->pager->getNumRows() > 0) : false; - } -} - -/** - * - * @addtogroup SpecialPage - */ -class LogViewer { - const NO_ACTION_LINK = 1; - /** - * @var LogReader $reader - */ - var $reader; - var $numResults = 0; - var $flags = 0; - - /** - * @param LogReader &$reader where to get our data from - * @param integer $flags Bitwise combination of flags: - * LogEventList::NO_ACTION_LINK Don't show restore/unblock/block links - */ - function __construct( &$reader, $flags = 0 ) { - global $wgUser; - $this->skin = $wgUser->getSkin(); - $this->reader =& $reader; - $this->reader->pager->mLogEventList->flags = $flags; - # Aliases for shorter code... - $this->pager =& $this->reader->pager; - $this->logEventList =& $this->reader->pager->mLogEventList; - } - - /** - * Take over the whole output page in $wgOut with the log display. - */ - public function show() { - global $wgOut; - # Set title and add header - $this->logEventList->showHeader( $wgOut, $pager->getType() ); - # Show form options - $this->logEventList->showOptions( $wgOut, $this->pager->getType(), $this->pager->getUser(), - $this->pager->getPage(), $this->pager->getPattern() ); - # Insert list - $logBody = $this->pager->getBody(); - if( $logBody ) { - $wgOut->addHTML( - $this->pager->getNavigationBar() . - $this->logEventList->beginLogEventList() . - $logBody . - $this->logEventList->endLogEventList() . - $this->pager->getNavigationBar() - ); - } else { - $wgOut->addWikiMsg( 'logempty' ); - } - } - - /** - * Output just the list of entries given by the linked LogReader, - * with extraneous UI elements. Use for displaying log fragments in - * another page (eg at Special:Undelete) - * @param OutputPage $out where to send output - */ - public function showList( &$out ) { - $logBody = $this->pager->getBody(); - if( $logBody ) { - $out->addHTML( - $this->logEventList->beginLogEventList() . - $logBody . - $this->logEventList->endLogEventList() - ); - } else { - $out->addWikiMsg( 'logempty' ); - } - } -} - diff --git a/includes/LogEventsList.php b/includes/LogEventsList.php new file mode 100644 index 0000000000..a5f82ba475 --- /dev/null +++ b/includes/LogEventsList.php @@ -0,0 +1,583 @@ +, 2008 Aaron Schulz +# http://www.mediawiki.org/ +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# http://www.gnu.org/copyleft/gpl.html + +class LogEventsList { + const NO_ACTION_LINK = 1; + private $skin; + public $flags; + + function __construct( &$skin, $flags = 0 ) { + $this->skin =& $skin; + $this->flags = $flags; + $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 + */ + private function preCacheMessages() { + // Precache various messages + if( !isset( $this->message ) ) { + foreach( explode(' ', 'viewpagelogs revhistory filehist rev-delundel' ) as $msg ) { + $this->message[$msg] = wfMsgExt( $msg, array( 'escape') ); + } + } + } + + /** + * Set page title and show header for this log type + * @param OutputPage $out where to send output + * @param strin $type + */ + public function showHeader( $out, $type ) { + if( LogPage::isLogType( $type ) ) { + $out->setPageTitle( LogPage::logName( $type ) ); + $out->addWikiText( LogPage::logHeader( $type ) ); + } + } + + /** + * Show options for the log list + * @param OutputPage $out where to send output + * @param string $type, + * @param string $user, + * @param string $page, + * @param string $pattern + */ + public function showOptions( $out, $type, $user, $page, $pattern ) { + global $wgScript, $wgMiserMode; + $action = htmlspecialchars( $wgScript ); + $title = SpecialPage::getTitleFor( 'Log' ); + $special = htmlspecialchars( $title->getPrefixedDBkey() ); + $out->addHTML( "
    " . + Xml::element( 'legend', array(), wfMsg( 'log' ) ) . + Xml::hidden( 'title', $special ) . "\n" . + $this->getTypeMenu( $type ) . "\n" . + $this->getUserInput( $user ) . "\n" . + $this->getTitleInput( $page ) . "\n" . + ( !$wgMiserMode ? ($this->getTitlePattern( $pattern )."\n") : "" ) . + Xml::submitButton( wfMsg( 'allpagessubmit' ) ) . "\n" . + "
    " ); + } + + /** + * @return string Formatted HTML + */ + private function getTypeMenu( $queryType ) { + global $wgLogRestrictions, $wgUser; + + $out = "'; + return $out; + } + + /** + * @return string Formatted HTML + */ + private function getUserInput( $user ) { + return Xml::inputLabel( wfMsg( 'specialloguserlabel' ), 'user', 'user', 12, $user ); + } + + /** + * @return string Formatted HTML + */ + private function getTitleInput( $title ) { + return Xml::inputLabel( wfMsg( 'speciallogtitlelabel' ), 'page', 'page', 20, $title ); + } + + /** + * @return boolean Checkbox + */ + private function getTitlePattern( $pattern ) { + return Xml::checkLabel( wfMsg( 'log-title-wildcard' ), 'pattern', 'pattern', $pattern ); + } + + public function beginLogEventsList() { + return "\n"; + } + + /** + * @param Row $row a single row from the result set + * @return string Formatted HTML list item + * @private + */ + public function logLine( $row ) { + global $wgLang, $wgUser, $wgContLang; + $skin = $wgUser->getSkin(); + $title = Title::makeTitle( $row->log_namespace, $row->log_title ); + $time = $wgLang->timeanddate( wfTimestamp(TS_MW, $row->log_timestamp), true ); + // Enter the existence or non-existence of this page into the link cache, + // for faster makeLinkObj() in LogPage::actionText() + $linkCache =& LinkCache::singleton(); + $linkCache->addLinkObj( $title ); + // User links + if( self::isDeleted($row,LogPage::DELETED_USER) ) { + $userLink = '' . wfMsgHtml( 'rev-deleted-user' ) . ''; + } else { + $userLink = $this->skin->userLink( $row->log_user, $row->user_name ) . + $this->skin->userToolLinksRedContribs( $row->log_user, $row->user_name ); + } + // Comment + if( $row->log_action == 'create2' ) { + $comment = ''; // Suppress from old account creations, useless and can contain incorrect links + } else if( self::isDeleted($row,LogPage::DELETED_COMMENT) ) { + $comment = '' . wfMsgHtml('rev-deleted-comment') . ''; + } else { + $comment = $wgContLang->getDirMark() . $this->skin->commentBlock( $row->log_comment ); + } + // Extract extra parameters + $paramArray = LogPage::extractParams( $row->log_params ); + $revert = $del = ''; + // Some user can hide log items and have review links + if( $wgUser->isAllowed( 'deleterevision' ) ) { + $del = $this->showhideLinks( $row ) . ' '; + } + // Add review links and such... + if( !($this->flags & self::NO_ACTION_LINK) && !($row->log_deleted & LogPage::DELETED_ACTION) ) { + if( $row->log_type == 'move' && isset( $paramArray[0] ) && $wgUser->isAllowed( 'move' ) ) { + $destTitle = Title::newFromText( $paramArray[0] ); + if( $destTitle ) { + $revert = '(' . $this->skin->makeKnownLinkObj( SpecialPage::getTitleFor( 'Movepage' ), + wfMsg( 'revertmove' ), + 'wpOldTitle=' . urlencode( $destTitle->getPrefixedDBkey() ) . + '&wpNewTitle=' . urlencode( $title->getPrefixedDBkey() ) . + '&wpReason=' . urlencode( wfMsgForContent( 'revertmove' ) ) . + '&wpMovetalk=0' ) . ')'; + } + // Show undelete link + } else if( $row->log_action == 'delete' && $wgUser->isAllowed( 'delete' ) ) { + $revert = '(' . $this->skin->makeKnownLinkObj( SpecialPage::getTitleFor( 'Undelete' ), + wfMsg( 'undeletelink' ) , + 'target='. urlencode( $title->getPrefixedDBkey() ) ) . ')'; + // Show unblock link + } else if( $row->log_action == 'block' && $wgUser->isAllowed( 'block' ) ) { + $revert = '(' . $this->skin->makeKnownLinkObj( SpecialPage::getTitleFor( 'Ipblocklist' ), + wfMsg( 'unblocklink' ), + 'action=unblock&ip=' . urlencode( $row->log_title ) ) . ')'; + // Show change protection link + } else if( ( $row->log_action == 'protect' || $row->log_action == 'modify' ) && $wgUser->isAllowed( 'protect' ) ) { + $revert = '(' . $this->skin->makeKnownLinkObj( $title, wfMsg( 'protect_change' ), 'action=unprotect' ) . ')'; + // Show unmerge link + } else if ( $row->log_action == 'merge' ) { + $merge = SpecialPage::getTitleFor( 'Mergehistory' ); + $revert = '(' . $this->skin->makeKnownLinkObj( $merge, wfMsg('revertmerge'), + wfArrayToCGI( + array('target' => $paramArray[0], 'dest' => $title->getPrefixedText(), 'mergepoint' => $paramArray[1] ) + ) + ) . ')'; + // If an edit was hidden from a page give a review link to the history + } else if( $row->log_action == 'revision' && $wgUser->isAllowed( 'deleterevision' ) ) { + $revdel = SpecialPage::getTitleFor( 'Revisiondelete' ); + // Different revision types use different URL params... + $subtype = isset($paramArray[2]) ? $paramArray[1] : ''; + // Link to each hidden object ID, $paramArray[1] is the url param. List if several... + $Ids = explode( ',', $paramArray[2] ); + if( count($Ids) == 1 ) { + $revert = $this->skin->makeKnownLinkObj( $revdel, wfMsgHtml('revdel-restore'), + wfArrayToCGI( array('target' => $paramArray[0], $paramArray[1] => $Ids[0] ) ) ); + } else { + $revert .= wfMsgHtml('revdel-restore').':'; + foreach( $Ids as $n => $id ) { + $revert .= ' '.$this->skin->makeKnownLinkObj( $revdel, '#'.($n+1), + wfArrayToCGI( array('target' => $paramArray[0], $paramArray[1] => $id ) ) ); + } + } + $revert = "($revert)"; + // Hidden log items, give review link + } else if( $row->log_action == 'event' && $wgUser->isAllowed( 'deleterevision' ) ) { + $revdel = SpecialPage::getTitleFor( 'Revisiondelete' ); + $revert .= wfMsgHtml('revdel-restore'); + $Ids = explode( ',', $paramArray[0] ); + // Link to each hidden object ID, $paramArray[1] is the url param. List if several... + if( count($Ids) == 1 ) { + $revert = $this->skin->makeKnownLinkObj( $revdel, wfMsgHtml('revdel-restore'), + wfArrayToCGI( array('logid' => $Ids[0] ) ) ); + } else { + foreach( $Ids as $n => $id ) { + $revert .= $this->skin->makeKnownLinkObj( $revdel, '#'.($n+1), + wfArrayToCGI( array('logid' => $id ) ) ); + } + } + $revert = "($revert)"; + } else { + wfRunHooks( 'LogLine', array( $row->log_type, $row->log_action, $title, $paramArray, + &$comment, &$revert, $row->log_timestamp ) ); + // wfDebug( "Invoked LogLine hook for " $row->log_type . ", " . $row->log_action . "\n" ); + // Do nothing. The implementation is handled by the hook modifiying the passed-by-ref parameters. + } + } + // Event description + if( $row->log_deleted & LogPage::DELETED_ACTION ) { + $action = '' . wfMsgHtml('rev-deleted-event') . ''; + } else { + $action = LogPage::actionText( $row->log_type, $row->log_action, $title, $this->skin, $paramArray, true ); + } + + return "
  • $del$time $userLink $action $comment $revert
    • \n"; + } + + /** + * @param Row $row + * @private + */ + private function showhideLinks( $row ) { + global $wgAllowLogDeletion; + + if( !$wgAllowLogDeletion ) + return ""; + + $revdel = SpecialPage::getTitleFor( 'Revisiondelete' ); + // If event was hidden from sysops + if( !self::userCan( $row, LogPage::DELETED_RESTRICTED ) ) { + $del = $this->message['rev-delundel']; + } else if( $row->log_type == 'suppress' ) { + // No one should be hiding from the oversight log + $del = $this->message['rev-delundel']; + } else { + $del = $this->skin->makeKnownLinkObj( $revdel, $this->message['rev-delundel'], 'logid='.$row->log_id ); + // Bolden oversighted content + if( self::isDeleted( $row, LogPage::DELETED_RESTRICTED ) ) + $del = "$del"; + } + return "($del)"; + } + + /** + * SQL clause to skip forbidden log types for this user + * @param Database $db + * @returns mixed (string or false) + */ + public static function getExcludeClause( $db ) { + global $wgLogRestrictions, $wgUser; + // Reset the array, clears extra "where" clauses when $par is used + $hiddenLogs = array(); + // Don't show private logs to unpriviledged users + foreach( $wgLogRestrictions as $logtype => $right ) { + if( !$wgUser->isAllowed($right) ) { + $safetype = $db->strencode( $logtype ); + $hiddenLogs[] = "'$safetype'"; + } + } + if( !empty($hiddenLogs) ) { + return 'log_type NOT IN(' . implode(',',$hiddenLogs) . ')'; + } + return false; + } + + /** + * Determine if the current user is allowed to view a particular + * field of this log row, if it's marked as deleted. + * @param Row $row + * @param int $field + * @return bool + */ + public static function userCan( $row, $field ) { + if( ( $row->log_deleted & $field ) == $field ) { + global $wgUser; + $permission = ( $row->log_deleted & LogPage::DELETED_RESTRICTED ) == LogPage::DELETED_RESTRICTED + ? 'hiderevision' + : 'deleterevision'; + wfDebug( "Checking for $permission due to $field match on $row->log_deleted\n" ); + return $wgUser->isAllowed( $permission ); + } else { + return true; + } + } + + /** + * @param Row $row + * @param int $field one of DELETED_* bitfield constants + * @return bool + */ + public static function isDeleted( $row, $field ) { + return ($row->log_deleted & $field) == $field; + } +} + +/** + * @addtogroup Pager + */ +class LogPager extends ReverseChronologicalPager { + private $type = '', $user = '', $title = '', $pattern = ''; + public $mLogEventsList; + /** + * constructor + * @param LogEventsList $loglist, + * @param string $type, + * @param string $user, + * @param string $page, + * @param string $pattern + * @param array $conds + */ + function __construct( $loglist, $type, $user, $title, $pattern, $conds = array() ) { + parent::__construct(); + $this->mConds = $conds; + + $this->mLogEventsList = $loglist; + + $this->limitType( $type ); + $this->limitUser( $user ); + $this->limitTitle( $title, $pattern ); + } + + /** + * Set the log reader to return only entries of the given type. + * Type restrictions enforced here + * @param string $type A log type ('upload', 'delete', etc) + * @private + */ + private function limitType( $type ) { + // Don't show private logs to unpriviledged users + $hideLogs = LogEventsList::getExcludeClause( $this->mDb ); + if( $hideLogs !== false ) { + $this->mConds[] = $hideLogs; + } + if( empty($type) ) { + return false; + } + $this->type = $type; + $this->mConds['log_type'] = $type; + } + + /** + * Set the log reader to return only entries by the given user. + * @param string $name (In)valid user name + * @private + */ + function limitUser( $name ) { + if( $name == '' ) { + return false; + } + $usertitle = Title::makeTitleSafe( NS_USER, $name ); + if( is_null($usertitle) ) { + return false; + } + $this->user = $usertitle->getText(); + /* Fetch userid at first, if known, provides awesome query plan afterwards */ + $userid = User::idFromName( $this->user ); + if( !$userid ) { + /* It should be nicer to abort query at all, + but for now it won't pass anywhere behind the optimizer */ + $this->mConds[] = "NULL"; + } else { + $this->mConds['log_user'] = $userid; + } + } + + /** + * Set the log reader to return only entries affecting the given page. + * (For the block and rights logs, this is a user page.) + * @param string $page Title name as text + * @private + */ + function limitTitle( $page, $pattern ) { + global $wgMiserMode; + + $title = Title::newFromText( $page ); + if( strlen($page) == 0 || !$title instanceof Title ) + return false; + + $this->title = $title->getPrefixedText(); + $this->pattern = $pattern; + $ns = $title->getNamespace(); + 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%'"; + } else { + $this->mConds['log_namespace'] = $ns; + $this->mConds['log_title'] = $title->getDBkey(); + } + } + + function getQueryInfo() { + $this->mConds[] = 'user_id = log_user'; + # Hack this until live + global $wgAllowLogDeletion; + $log_id = $wgAllowLogDeletion ? 'log_id' : '0 AS log_id'; + return array( + 'tables' => array( 'logging', 'user' ), + 'fields' => array( 'log_type', 'log_action', 'log_user', 'log_namespace', 'log_title', + 'log_params', 'log_comment', $log_id, 'log_deleted', 'log_timestamp', 'user_name' ), + 'conds' => $this->mConds, + 'options' => array() + ); + } + + function getIndexField() { + return 'log_timestamp'; + } + + function formatRow( $row ) { + return $this->mLogEventsList->logLine( $row ); + } + + public function getType() { + return $this->type; + } + + public function getUser() { + return $this->user; + } + + public function getPage() { + return $this->title; + } + + public function getPattern() { + return $this->pattern; + } +} + +/** + * + * @addtogroup SpecialPage + */ +class LogReader { + var $db, $joinClauses, $whereClauses; + var $type = '', $user = '', $title = null, $pattern = false; + /** + * @param WebRequest $request For internal use use a FauxRequest object to pass arbitrary parameters. + */ + function __construct( $request ) { + global $wgUser; + # Get parameters + $type = $request->getVal( 'type' ); + $user = $request->getText( 'user' ); + $title = $request->getText( 'page' ); + $pattern = $request->getBool( 'pattern' ); + + $loglist = new LogEventsList( $wgUser->getSkin() ); + $this->pager = new LogPager( $loglist, $type, $user, $title, $pattern ); + } + + /** + * Is there at least one row? + * @return bool + */ + public function hasRows() { + return isset($this->pager) ? ($this->pager->getNumRows() > 0) : false; + } +} + +/** + * + * @addtogroup SpecialPage + */ +class LogViewer { + const NO_ACTION_LINK = 1; + /** + * @var LogReader $reader + */ + var $reader; + var $numResults = 0; + var $flags = 0; + + /** + * @param LogReader &$reader where to get our data from + * @param integer $flags Bitwise combination of flags: + * LogEventsList::NO_ACTION_LINK Don't show restore/unblock/block links + */ + function __construct( &$reader, $flags = 0 ) { + global $wgUser; + $this->skin = $wgUser->getSkin(); + $this->reader =& $reader; + $this->reader->pager->mLogEventsList->flags = $flags; + # Aliases for shorter code... + $this->pager =& $this->reader->pager; + $this->logEventsList =& $this->reader->pager->mLogEventsList; + } + + /** + * Take over the whole output page in $wgOut with the log display. + */ + public function show() { + global $wgOut; + # Set title and add header + $this->logEventsList->showHeader( $wgOut, $pager->getType() ); + # Show form options + $this->logEventsList->showOptions( $wgOut, $this->pager->getType(), $this->pager->getUser(), + $this->pager->getPage(), $this->pager->getPattern() ); + # Insert list + $logBody = $this->pager->getBody(); + if( $logBody ) { + $wgOut->addHTML( + $this->pager->getNavigationBar() . + $this->logEventsList->beginLogEventsList() . + $logBody . + $this->logEventsList->endLogEventsList() . + $this->pager->getNavigationBar() + ); + } else { + $wgOut->addWikiMsg( 'logempty' ); + } + } + + /** + * Output just the list of entries given by the linked LogReader, + * with extraneous UI elements. Use for displaying log fragments in + * another page (eg at Special:Undelete) + * @param OutputPage $out where to send output + */ + public function showList( &$out ) { + $logBody = $this->pager->getBody(); + if( $logBody ) { + $out->addHTML( + $this->logEventsList->beginLogEventsList() . + $logBody . + $this->logEventsList->endLogEventsList() + ); + } else { + $out->addWikiMsg( 'logempty' ); + } + } +} + diff --git a/includes/SpecialLog.php b/includes/SpecialLog.php index 349a6d1bb2..dea3ef9d90 100644 --- a/includes/SpecialLog.php +++ b/includes/SpecialLog.php @@ -32,9 +32,9 @@ function wfSpecialLog( $par = '' ) { $user = $wgRequest->getText( 'user' ); $title = $wgRequest->getText( 'page' ); $pattern = $wgRequest->getBool( 'pattern' ); - # Create a LogPager item to get the results and a LogEventList + # Create a LogPager item to get the results and a LogEventsList # item to format them... - $loglist = new LogEventList( $wgUser->getSkin() ); + $loglist = new LogEventsList( $wgUser->getSkin() ); $pager = new LogPager( $loglist, $type, $user, $title, $pattern ); # Set title and add header $loglist->showHeader( $wgOut, $pager->getType() ); @@ -45,9 +45,9 @@ function wfSpecialLog( $par = '' ) { if( $logBody ) { $wgOut->addHTML( $pager->getNavigationBar() . - $loglist->beginLogEventList() . + $loglist->beginLogEventsList() . $logBody . - $loglist->endLogEventList() . + $loglist->endLogEventsList() . $pager->getNavigationBar() ); } else { diff --git a/includes/SpecialRevisiondelete.php b/includes/SpecialRevisiondelete.php index f3a4ee12c1..bb0f9a7ab0 100644 --- a/includes/SpecialRevisiondelete.php +++ b/includes/SpecialRevisiondelete.php @@ -469,7 +469,7 @@ class RevisionDeleteForm { if( !isset( $logRows[$logid] ) || $logRows[$logid]->log_type=='suppress' ) { $wgOut->showErrorPage( 'revdelete-nooldid-title', 'revdelete-nooldid-text' ); return; - } else if( !LogEventList::userCan( $logRows[$logid],Revision::DELETED_RESTRICTED) ) { + } else if( !LogEventsList::userCan( $logRows[$logid],Revision::DELETED_RESTRICTED) ) { // If an event is hidden from sysops if( $action != 'submit') { $wgOut->permissionRequired( 'hiderevision' ); @@ -629,7 +629,7 @@ class RevisionDeleteForm { $loglink = $this->skin->makeKnownLinkObj( $logtitle, wfMsgHtml( 'log' ), wfArrayToCGI( array( 'page' => $title->getPrefixedUrl() ) ) ); // Action text - if( !LogEventList::userCan($row,LogPage::DELETED_ACTION) ) { + if( !LogEventsList::userCan($row,LogPage::DELETED_ACTION) ) { $action = '' . wfMsgHtml('rev-deleted-event') . ''; } else { $action = LogPage::actionText( $row->log_type, $row->log_action, $title, @@ -639,12 +639,12 @@ class RevisionDeleteForm { } // User links $userLink = $this->skin->userLink( $row->log_user, User::WhoIs($row->log_user) ); - if( LogEventList::isDeleted($row,LogPage::DELETED_USER) ) { + if( LogEventsList::isDeleted($row,LogPage::DELETED_USER) ) { $userLink = '' . $userLink . ''; } // Comment $comment = $wgContLang->getDirMark() . $this->skin->commentBlock( $row->log_comment ); - if( LogEventList::isDeleted($row,LogPage::DELETED_COMMENT) ) { + if( LogEventsList::isDeleted($row,LogPage::DELETED_COMMENT) ) { $comment = '' . $comment . ''; } return "
  • ($loglink) $date $userLink $action $comment
    • "; @@ -1080,7 +1080,7 @@ class RevisionDeleter { if( !isset($logRows[$logid]) ) { $success = false; continue; // Must exist - } else if( !LogEventList::userCan($logRows[$logid], Revision::DELETED_RESTRICTED) + } else if( !LogEventsList::userCan($logRows[$logid], Revision::DELETED_RESTRICTED) || $logRows[$logid]->log_type == 'suppress' ) { // Don't hide from oversight log!!! $userAllowedAll=false; diff --git a/includes/api/ApiQueryLogEvents.php b/includes/api/ApiQueryLogEvents.php index 164a2ff5bd..9f688cfea0 100644 --- a/includes/api/ApiQueryLogEvents.php +++ b/includes/api/ApiQueryLogEvents.php @@ -54,7 +54,7 @@ class ApiQueryLogEvents extends ApiQueryBase { list($tbl_logging, $tbl_page, $tbl_user) = $db->tableNamesN('logging', 'page', 'user'); - $hideLogs = LogEventList::getExcludeClause($db); + $hideLogs = LogEventsList::getExcludeClause($db); if($hideLogs !== false) $this->addWhere($hideLogs);