Re-establishing validation feature (the beginnings)

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

diff --git a/includes/LogPage.php b/includes/LogPage.php
index 3f7fb0b..0684f84 100644 (file)
--- a/includes/LogPage.php
+++ b/includes/LogPage.php
@@ -1,5 +1,4 @@
 <?php
-#$Id$
 #
 # Copyright (C) 2002, 2004 Brion Vibber <brion@pobox.com>
 # http://www.mediawiki.org/
@@ -33,11 +32,11 @@
  * @package MediaWiki
  */
 class LogPage {
-       /* private */ var $type, $action, $comment;
+       /* private */ var $type, $action, $comment, $params;
        var $updateRecentChanges = true;
 
        function LogPage( $type ) {
-               # Type is one of 'block', 'protect', 'rights', 'delete', 'upload'
+               # Type is one of 'block', 'protect', 'rights', 'delete', 'upload', 'move'
                $this->type = $type;
        }
 
@@ -51,7 +50,7 @@ class LogPage {
                $uid = $wgUser->getID();
 
                $this->timestamp = $now = wfTimestampNow();
-               $dbw->insertArray( 'logging',
+               $dbw->insert( 'logging',
                        array(
                                'log_type' => $this->type,
                                'log_action' => $this->action,
@@ -59,7 +58,8 @@ class LogPage {
                                'log_user' => $uid,
                                'log_namespace' => $this->target->getNamespace(),
                                'log_title' => $this->target->getDBkey(),
-                               'log_comment' => $this->comment
+                               'log_comment' => $this->comment,
+                               'log_params' => $this->params
                        ), $fname
                );
                
@@ -79,7 +79,7 @@ class LogPage {
         * @static
         */
        function validTypes() {
-               static $types = array( '', 'block', 'protect', 'rights', 'delete', 'upload' );
+               static $types = array( '', 'block', 'protect', 'rights', 'delete', 'upload', 'move' );
                return $types;
        }
        
@@ -93,7 +93,8 @@ class LogPage {
                        'protect' => array( 'protect', 'unprotect' ),
                        'rights' => array( 'rights' ),
                        'delete' => array( 'delete', 'restore' ),
-                       'upload' => array( 'upload' )
+                       'upload' => array( 'upload' ),
+                       'move' => array( 'move' )
                );
                return $actions[$type];
        }
@@ -116,6 +117,7 @@ class LogPage {
                        'rights'  => 'bureaucratlog',
                        'delete'  => 'dellogpage',
                        'upload'  => 'uploadlogpage',
+                       'move'    => 'movelogpage'
                );
                return str_replace( '_', ' ', wfMsg( $typeText[$type] ) );
        }
@@ -128,9 +130,10 @@ class LogPage {
                        ''        => 'alllogstext',
                        'block'   => 'blocklogtext',
                        'protect' => 'protectlogtext',
-                       'rights'  => '',
+                       'rights'  => 'rightslogtext',
                        'delete'  => 'dellogpagetext',
-                       'upload'  => 'uploadlogpagetext'
+                       'upload'  => 'uploadlogpagetext',
+                       'move'    => 'movelogpagetext'
                );
                return wfMsg( $headerText[$type] );
        }
@@ -138,10 +141,10 @@ class LogPage {
        /**
         * @static
         */
-       function actionText( $type, $action, $titleLink = NULL ) {
+       function actionText( $type, $action, $titleLink = NULL, $params = array() ) {
                static $actions = array(
                        'block/block' => 'blocklogentry',
-                       'block/unblock' => 'blocklogentry',
+                       'block/unblock' => 'unblocklogentry',
                        'protect/protect' => 'protectedarticle',
                        'protect/unprotect' => 'unprotectedarticle',
                        'rights/rights' => 'bureaucratlogentry',
@@ -149,31 +152,70 @@ class LogPage {
                        'delete/restore' => 'undeletedarticle',
                        'upload/upload' => 'uploadedimage',
                        'upload/revert' => 'uploadedimage',
+                       'move/move' => '1movedto2',
+                       'move/move_redir' => '1movedto2_redir'
                );
                $key = "$type/$action";
                if( isset( $actions[$key] ) ) {
                        if( is_null( $titleLink ) ) {
-                               return wfMsg( $actions[$key] );
+                               return wfMsgForContent( $actions[$key] );
+                       } elseif ( count( $params ) == 0 ) {
+                               return wfMsgForContent( $actions[$key], $titleLink );
                        } else {
-                               return wfMsg( $actions[$key], $titleLink );
+                               array_unshift( $params, $titleLink );
+                               return wfMsgReal( $actions[$key], $params, true, true );
                        }
                } else {
                        wfDebug( "LogPage::actionText - unknown action $key\n" );
                        return "$action $titleLink";
                }
        }
-       
-       function addEntry( $action, &$target, $comment ) {
+
+       /**
+        * Add a log entry
+        * @param string $action one of 'block', 'protect', 'rights', 'delete', 'upload'
+        * @param object &$target A title object.
+        * @param string $comment Description associated
+        * @param array $params Parameters passed later to wfMsg.* functions
+        */
+       function addEntry( $action, &$target, $comment, $params = array() ) {
                global $wgLang, $wgUser;
                
+               if ( !is_array( $params ) ) {
+                       $params = array( $params );
+               }
+               
                $this->action = $action;
                $this->target =& $target;
                $this->comment = $comment;
-               $this->actionText = LogPage::actionText( $this->type, $action,
-                       $target->getPrefixedText() );
-                               
+               $this->params = LogPage::makeParamBlob( $params );
+               
+               $this->actionText = LogPage::actionText( $this->type, $action, 
+                 $target->getPrefixedText(), $params );
                return $this->saveContent();
        }
+
+       /** 
+        * Create a blob from a parameter array
+        * @static
+        */
+       function makeParamBlob( $params )
+       {
+               return implode( "\n", $params );
+       }
+
+       /**
+        * Extract a parameter array from a blob
+        * @static
+        */
+       function extractParams( $blob )
+       {
+               if ( $blob === '' ) {
+                       return array();
+               } else {
+                       return explode( "\n", $blob );
+               }
+       }
 }
 
 ?>