X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FLogPage.php;h=647cc0115ce86631d47741aef73b1976b4a15901;hb=817fd9632c8765ac4c2e8c6243505380354c9feb;hp=cb57fd4e388a8d57caa8589fbbb0c2e6fcc6f72a;hpb=f6d61e295133e3d1087ac110da959ca7be6e63be;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/LogPage.php b/includes/LogPage.php index cb57fd4e38..647cc0115c 100644 --- a/includes/LogPage.php +++ b/includes/LogPage.php @@ -20,7 +20,7 @@ /** * Contain log classes - * + * @file */ /** @@ -30,8 +30,12 @@ * */ class LogPage { + const DELETED_ACTION = 1; + const DELETED_COMMENT = 2; + const DELETED_USER = 4; + const DELETED_RESTRICTED = 8; /* @access private */ - var $type, $action, $comment, $params, $target; + var $type, $action, $comment, $params, $target, $doer; /* @acess public */ var $updateRecentChanges; @@ -47,46 +51,55 @@ class LogPage { $this->updateRecentChanges = $rc; } - function saveContent() { - if( wfReadOnly() ) return false; - - global $wgUser; + protected function saveContent() { + global $wgUser, $wgLogRestrictions; $fname = 'LogPage::saveContent'; $dbw = wfGetDB( DB_MASTER ); - $uid = $wgUser->getID(); + $log_id = $dbw->nextSequenceValue( 'log_log_id_seq' ); $this->timestamp = $now = wfTimestampNow(); - $dbw->insert( 'logging', - array( - 'log_type' => $this->type, - 'log_action' => $this->action, - 'log_timestamp' => $dbw->timestamp( $now ), - 'log_user' => $uid, - 'log_namespace' => $this->target->getNamespace(), - 'log_title' => $this->target->getDBkey(), - 'log_comment' => $this->comment, - 'log_params' => $this->params - ), $fname + $data = array( + 'log_id' => $log_id, + 'log_type' => $this->type, + 'log_action' => $this->action, + 'log_timestamp' => $dbw->timestamp( $now ), + 'log_user' => $this->doer->getId(), + 'log_namespace' => $this->target->getNamespace(), + 'log_title' => $this->target->getDBkey(), + 'log_comment' => $this->comment, + 'log_params' => $this->params ); + $dbw->insert( 'logging', $data, $fname ); + $newId = !is_null($log_id) ? $log_id : $dbw->insertId(); + if( !($dbw->affectedRows() > 0) ) { + wfDebugLog( "logging", "LogPage::saveContent failed to insert row - Error {$dbw->lastErrno()}: {$dbw->lastError()}" ); + } # And update recentchanges - if ( $this->updateRecentChanges ) { - $titleObj = SpecialPage::getTitleFor( 'Log', $this->type ); - $rcComment = $this->actionText; - if( '' != $this->comment ) { - if ($rcComment == '') - $rcComment = $this->comment; - else - $rcComment .= ': ' . $this->comment; + if( $this->updateRecentChanges ) { + # Don't add private logs to RC! + if( !isset($wgLogRestrictions[$this->type]) || $wgLogRestrictions[$this->type]=='*' ) { + $titleObj = SpecialPage::getTitleFor( 'Log', $this->type ); + $rcComment = $this->getRcComment(); + RecentChange::notifyLog( $now, $titleObj, $this->doer, $rcComment, '', + $this->type, $this->action, $this->target, $this->comment, $this->params, $newId ); } - - RecentChange::notifyLog( $now, $titleObj, $wgUser, $rcComment, '', - $this->type, $this->action, $this->target, $this->comment, $this->params ); } return true; } + public function getRcComment() { + $rcComment = $this->actionText; + if( '' != $this->comment ) { + if ($rcComment == '') + $rcComment = $this->comment; + else + $rcComment .= ': ' . $this->comment; + } + return $rcComment; + } + /** * @static */ @@ -106,9 +119,10 @@ class LogPage { * @static */ public static function logName( $type ) { - global $wgLogNames; + global $wgLogNames, $wgMessageCache; if( isset( $wgLogNames[$type] ) ) { + $wgMessageCache->loadAllMessages(); return str_replace( '_', ' ', wfMsg( $wgLogNames[$type] ) ); } else { // Bogus log types? Perhaps an extension was removed. @@ -118,24 +132,28 @@ class LogPage { /** * @todo handle missing log types - * @static + * @param string $type logtype + * @return string Headertext of this logtype */ static function logHeader( $type ) { - global $wgLogHeaders; - return wfMsg( $wgLogHeaders[$type] ); + global $wgLogHeaders, $wgMessageCache; + $wgMessageCache->loadAllMessages(); + return wfMsgExt($wgLogHeaders[$type],array('parseinline')); } /** * @static + * @return HTML string */ - static function actionText( $type, $action, $title = NULL, $skin = NULL, $params = array(), $filterWikilinks=false, $translate=false ) { - global $wgLang, $wgContLang, $wgLogActions; + static function actionText( $type, $action, $title = NULL, $skin = NULL, $params = array(), $filterWikilinks=false ) { + global $wgLang, $wgContLang, $wgLogActions, $wgMessageCache; + $wgMessageCache->loadAllMessages(); $key = "$type/$action"; - + if( $key == 'patrol/patrol' ) return PatrolLog::makeActionText( $title, $params, $skin ); - + if( isset( $wgLogActions[$key] ) ) { if( is_null( $title ) ) { $rv=wfMsg( $wgLogActions[$key] ); @@ -144,21 +162,29 @@ class LogPage { switch( $type ) { case 'move': - $titleLink = $skin->makeLinkObj( $title, $title->getPrefixedText(), 'redirect=no' ); - $params[0] = $skin->makeLinkObj( Title::newFromText( $params[0] ), $params[0] ); + $titleLink = $skin->makeLinkObj( $title, htmlspecialchars( $title->getPrefixedText() ), 'redirect=no' ); + $params[0] = $skin->makeLinkObj( Title::newFromText( $params[0] ), htmlspecialchars( $params[0] ) ); break; case 'block': if( substr( $title->getText(), 0, 1 ) == '#' ) { $titleLink = $title->getText(); } else { - $titleLink = $skin->makeLinkObj( $title, $title->getText() ); - $titleLink .= ' (' . $skin->makeKnownLinkObj( SpecialPage::getTitleFor( 'Contributions', $title->getDBkey() ), wfMsg( 'contribslink' ) ) . ')'; + // TODO: Store the user identifier in the parameters + // to make this faster for future log entries + $id = User::idFromName( $title->getText() ); + $titleLink = $skin->userLink( $id, $title->getText() ) + . $skin->userToolLinks( $id, $title->getText(), false, Linker::TOOL_LINKS_NOBLOCK ); } break; case 'rights': $text = $wgContLang->ucfirst( $title->getText() ); $titleLink = $skin->makeLinkObj( Title::makeTitle( NS_USER, $text ) ); break; + case 'merge': + $titleLink = $skin->makeLinkObj( $title, $title->getPrefixedText(), 'redirect=no' ); + $params[0] = $skin->makeLinkObj( Title::newFromText( $params[0] ), htmlspecialchars( $params[0] ) ); + $params[1] = $wgLang->timeanddate( $params[1] ); + break; default: $titleLink = $skin->makeLinkObj( $title ); } @@ -169,6 +195,11 @@ class LogPage { if( $key == 'rights/rights' ) { if ($skin) { $rightsnone = wfMsg( 'rightsnone' ); + foreach ( $params as &$param ) { + $groupArray = array_map( 'trim', explode( ',', $param ) ); + $groupArray = array_map( array( 'User', 'getGroupName' ), $groupArray ); + $param = $wgLang->listToText( $groupArray ); + } } else { $rightsnone = wfMsgForContent( 'rightsnone' ); } @@ -185,20 +216,28 @@ class LogPage { } } else { array_unshift( $params, $titleLink ); - if ( $key == 'block/block' ) { - if ( $translate ) { - $params[1] = $wgLang->translateBlockExpiry( $params[1] ); + if ( $key == 'block/block' || $key == 'suppress/block' ) { + if ( $skin ) { + $params[1] = '' . $wgLang->translateBlockExpiry( $params[1] ) . ''; + } else { + $params[1] = $wgContLang->translateBlockExpiry( $params[1] ); } $params[2] = isset( $params[2] ) - ? self::formatBlockFlags( $params[2] ) + ? self::formatBlockFlags( $params[2], is_null( $skin ) ) : ''; } $rv = wfMsgReal( $wgLogActions[$key], $params, true, !$skin ); } } } else { - wfDebug( "LogPage::actionText - unknown action $key\n" ); - $rv = "$action"; + global $wgLogActionsHandlers; + if( isset( $wgLogActionsHandlers[$key] ) ) { + $args = func_get_args(); + $rv = call_user_func_array( $wgLogActionsHandlers[$key], $args ); + } else { + wfDebug( "LogPage::actionText - unknown action $key\n" ); + $rv = "$action"; + } } if( $filterWikilinks ) { $rv = str_replace( "[[", "", $rv ); @@ -213,8 +252,9 @@ class LogPage { * @param object &$target A title object. * @param string $comment Description associated * @param array $params Parameters passed later to wfMsg.* functions + * @param User $doer The user doing the action */ - function addEntry( $action, $target, $comment, $params = array() ) { + function addEntry( $action, $target, $comment, $params = array(), $doer = null ) { if ( !is_array( $params ) ) { $params = array( $params ); } @@ -223,6 +263,15 @@ class LogPage { $this->target = $target; $this->comment = $comment; $this->params = LogPage::makeParamBlob( $params ); + + if ($doer === null) { + global $wgUser; + $doer = $wgUser; + } elseif (!is_object( $doer ) ) { + $doer = User::newFromId( $doer ); + } + + $this->doer = $doer; $this->actionText = LogPage::actionText( $this->type, $action, $target, NULL, $params ); @@ -248,41 +297,53 @@ class LogPage { return explode( "\n", $blob ); } } - + /** * Convert a comma-delimited list of block log flags * into a more readable (and translated) form * * @param $flags Flags to format + * @param $forContent Whether to localize the message depending of the user + * language * @return string */ - public static function formatBlockFlags( $flags ) { + public static function formatBlockFlags( $flags, $forContent = false ) { $flags = explode( ',', trim( $flags ) ); if( count( $flags ) > 0 ) { for( $i = 0; $i < count( $flags ); $i++ ) - $flags[$i] = self::formatBlockFlag( $flags[$i] ); + $flags[$i] = self::formatBlockFlag( $flags[$i], $forContent ); return '(' . implode( ', ', $flags ) . ')'; } else { return ''; } } - + /** * Translate a block log flag if possible * * @param $flag Flag to translate + * @param $forContent Whether to localize the message depending of the user + * language * @return string */ - public static function formatBlockFlag( $flag ) { + public static function formatBlockFlag( $flag, $forContent = false ) { static $messages = array(); if( !isset( $messages[$flag] ) ) { $k = 'block-log-flags-' . $flag; - $msg = wfMsg( $k ); + if( $forContent ) + $msg = wfMsgForContent( $k ); + else + $msg = wfMsg( $k ); $messages[$flag] = htmlspecialchars( wfEmptyMsg( $k, $msg ) ? $flag : $msg ); } return $messages[$flag]; } - } -?> +/** + * Aliases for backwards compatibility with 1.6 + */ +define( 'MW_LOG_DELETED_ACTION', LogPage::DELETED_ACTION ); +define( 'MW_LOG_DELETED_USER', LogPage::DELETED_USER ); +define( 'MW_LOG_DELETED_COMMENT', LogPage::DELETED_COMMENT ); +define( 'MW_LOG_DELETED_RESTRICTED', LogPage::DELETED_RESTRICTED );