X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FLogPage.php;h=7c89df76824cd0fb34b1e3a074e504f1691d8345;hb=0495f90ebb83c0295f67b9da410ddf3b0534ca38;hp=d6df6464fc03cc4b7cc0cd0c73115182f231122e;hpb=93371357d4989633640154cb23ca90e040d80c65;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/LogPage.php b/includes/LogPage.php index d6df6464fc..7c89df7682 100644 --- a/includes/LogPage.php +++ b/includes/LogPage.php @@ -15,13 +15,12 @@ # # 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., -# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # http://www.gnu.org/copyleft/gpl.html /** * Contain log classes * - * @package MediaWiki */ /** @@ -29,7 +28,6 @@ * The logs are now kept in a table which is easier to manage and trim * than ever-growing wiki pages. * - * @package MediaWiki */ class LogPage { /* @access private */ @@ -44,160 +42,179 @@ class LogPage { * 'upload', 'move' * @param bool $rc Whether to update recent changes as well as the logging table */ - function LogPage( $type, $rc = true ) { + function __construct( $type, $rc = true ) { $this->type = $type; $this->updateRecentChanges = $rc; } function saveContent() { - if( wfReadOnly() ) return; + if( wfReadOnly() ) return false; global $wgUser; $fname = 'LogPage::saveContent'; - $dbw =& wfGetDB( DB_MASTER ); + $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_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 ); + # log_id doesn't exist on Wikimedia servers yet, and it's a tricky + # schema update to do. Hack it for now to ignore the field on MySQL. + if ( !is_null( $log_id ) ) { + $data['log_id'] = $log_id; + } + $dbw->insert( 'logging', $data, $fname ); + # And update recentchanges if ( $this->updateRecentChanges ) { - $titleObj = Title::makeTitle( NS_SPECIAL, 'Log/' . $this->type ); - $rcComment = $this->actionText; - if( '' != $this->comment ) { - if ($rcComment == '') - $rcComment = $this->comment; - else - $rcComment .= ': ' . $this->comment; - } - - RecentChange::notifyLog( $now, $titleObj, $wgUser, $rcComment ); + $titleObj = SpecialPage::getTitleFor( 'Log', $this->type ); + $rcComment = $this->getRcComment(); + 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 */ - function validTypes() { - static $types = array( '', 'block', 'protect', 'rights', 'delete', 'upload', 'move' ); - wfRunHooks( 'LogPageValidTypes', array( &$types ) ); - return $types; + public static function validTypes() { + global $wgLogTypes; + return $wgLogTypes; } /** * @static */ - function isLogType( $type ) { + public static function isLogType( $type ) { return in_array( $type, LogPage::validTypes() ); } /** * @static */ - function logName( $type ) { - static $typeText = array( - '' => 'log', - 'block' => 'blocklogpage', - 'protect' => 'protectlogpage', - 'rights' => 'bureaucratlog', - 'delete' => 'dellogpage', - 'upload' => 'uploadlogpage', - 'move' => 'movelogpage' - ); - wfRunHooks( 'LogPageLogName', array( &$typeText ) ); - - return str_replace( '_', ' ', wfMsg( $typeText[$type] ) ); + public static function logName( $type ) { + global $wgLogNames, $wgMessageCache; + + if( isset( $wgLogNames[$type] ) ) { + $wgMessageCache->loadAllMessages(); + return str_replace( '_', ' ', wfMsg( $wgLogNames[$type] ) ); + } else { + // Bogus log types? Perhaps an extension was removed. + return $type; + } } /** + * @todo handle missing log types * @static */ - function logHeader( $type ) { - static $headerText = array( - '' => 'alllogstext', - 'block' => 'blocklogtext', - 'protect' => 'protectlogtext', - 'rights' => 'rightslogtext', - 'delete' => 'dellogpagetext', - 'upload' => 'uploadlogpagetext', - 'move' => 'movelogpagetext' - ); - wfRunHooks( 'LogPageLogHeader', array( &$headerText ) ); - - return wfMsg( $headerText[$type] ); + static function logHeader( $type ) { + global $wgLogHeaders; + return wfMsg( $wgLogHeaders[$type] ); } /** * @static */ - function actionText( $type, $action, $title = NULL, $skin = NULL, $params = array(), $filterWikilinks=false, $translate=false ) { - global $wgLang; - static $actions = array( - 'block/block' => 'blocklogentry', - 'block/unblock' => 'unblocklogentry', - 'protect/protect' => 'protectedarticle', - 'protect/unprotect' => 'unprotectedarticle', - - // TODO: This whole section should be moved to extensions/Makesysop/SpecialMakesysop.php - 'rights/rights' => 'bureaucratlogentry', - 'rights/addgroup' => 'addgrouplogentry', - 'rights/rngroup' => 'renamegrouplogentry', - 'rights/chgroup' => 'changegrouplogentry', - - 'delete/delete' => 'deletedarticle', - 'delete/restore' => 'undeletedarticle', - 'upload/upload' => 'uploadedimage', - 'upload/revert' => 'uploadedimage', - 'move/move' => '1movedto2', - 'move/move_redir' => '1movedto2_redir' - ); - wfRunHooks( 'LogPageActionText', array( &$actions ) ); + static function actionText( $type, $action, $title = NULL, $skin = NULL, $params = array(), $filterWikilinks=false ) { + global $wgLang, $wgContLang, $wgLogActions; $key = "$type/$action"; - if( isset( $actions[$key] ) ) { + + if( $key == 'patrol/patrol' ) + return PatrolLog::makeActionText( $title, $params, $skin ); + + if( isset( $wgLogActions[$key] ) ) { if( is_null( $title ) ) { - $rv=wfMsg( $actions[$key] ); + $rv=wfMsg( $wgLogActions[$key] ); } else { if( $skin ) { - if ( $type == 'move' ) { - $titleLink = $skin->makeLinkObj( $title, $title->getPrefixedText(), 'redirect=no' ); - // Change $param[0] into a link to the title specified in $param[0] - $movedTo = Title::newFromText( $params[0] ); - $params[0] = $skin->makeLinkObj( $movedTo, $params[0] ); - } else { - # Bug 4359: red [[user:#id]] links generated in [[special:Log]] - # If it's an autoblock, don't do a link - if( $type == 'block' ) { - $titletext = $title->getText(); - $titleLink = ( ( substr( $titletext, 0, 1 ) == '#' ) ? $titletext : $skin->makeLinkObj( $title ) ); - } else { + + switch( $type ) { + case 'move': + $titleLink = $skin->makeLinkObj( $title, $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 { + // 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 ); - } } + } else { $titleLink = $title->getPrefixedText(); } + if( $key == 'rights/rights' ) { + if ($skin) { + $rightsnone = wfMsg( 'rightsnone' ); + } else { + $rightsnone = wfMsgForContent( 'rightsnone' ); + } + if( !isset( $params[0] ) || trim( $params[0] ) == '' ) + $params[0] = $rightsnone; + if( !isset( $params[1] ) || trim( $params[1] ) == '' ) + $params[1] = $rightsnone; + } if( count( $params ) == 0 ) { - $rv = wfMsg( $actions[$key], $titleLink ); + if ( $skin ) { + $rv = wfMsg( $wgLogActions[$key], $titleLink ); + } else { + $rv = wfMsgForContent( $wgLogActions[$key], $titleLink ); + } } else { array_unshift( $params, $titleLink ); - if ( $translate && $key == 'block/block' ) { - $params[1] = $wgLang->translateBlockExpiry($params[1]); + if ( $key == 'block/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] ) + : ''; } - $rv = wfMsgReal( $actions[$key], $params, true, false ); // FIXME: use wfMsgForContent() ? + $rv = wfMsgReal( $wgLogActions[$key], $params, true, !$skin ); } } } else { @@ -218,13 +235,13 @@ class LogPage { * @param string $comment Description associated * @param array $params Parameters passed later to wfMsg.* functions */ - function addEntry( $action, &$target, $comment, $params = array() ) { + function addEntry( $action, $target, $comment, $params = array() ) { if ( !is_array( $params ) ) { $params = array( $params ); } $this->action = $action; - $this->target =& $target; + $this->target = $target; $this->comment = $comment; $this->params = LogPage::makeParamBlob( $params ); @@ -237,7 +254,7 @@ class LogPage { * Create a blob from a parameter array * @static */ - function makeParamBlob( $params ) { + static function makeParamBlob( $params ) { return implode( "\n", $params ); } @@ -245,13 +262,48 @@ class LogPage { * Extract a parameter array from a blob * @static */ - function extractParams( $blob ) { + static function extractParams( $blob ) { if ( $blob === '' ) { return array(); } else { 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 + * @return string + */ + public static function formatBlockFlags( $flags ) { + $flags = explode( ',', trim( $flags ) ); + if( count( $flags ) > 0 ) { + for( $i = 0; $i < count( $flags ); $i++ ) + $flags[$i] = self::formatBlockFlag( $flags[$i] ); + return '(' . implode( ', ', $flags ) . ')'; + } else { + return ''; + } + } + + /** + * Translate a block log flag if possible + * + * @param $flag Flag to translate + * @return string + */ + public static function formatBlockFlag( $flag ) { + static $messages = array(); + if( !isset( $messages[$flag] ) ) { + $k = 'block-log-flags-' . $flag; + $msg = wfMsg( $k ); + $messages[$flag] = htmlspecialchars( wfEmptyMsg( $k, $msg ) ? $flag : $msg ); + } + return $messages[$flag]; + } + } -?> +