Commit stuff from my w/c

[lhc/web/wiklou.git] / includes / api / ApiQueryLogEvents.php

diff --git a/includes/api/ApiQueryLogEvents.php b/includes/api/ApiQueryLogEvents.php
index 9209789..34dcc59 100644 (file)
--- a/includes/api/ApiQueryLogEvents.php
+++ b/includes/api/ApiQueryLogEvents.php
@@ -1,9 +1,8 @@
 <?php
-
 /**
- * Created on Oct 16, 2006
  *
- * API for MediaWiki 1.8+
+ *
+ * Created on Oct 16, 2006
  *
  * Copyright © 2006 Yuri Astrakhan <Firstname><Lastname>@gmail.com
  *
@@ -21,6 +20,8 @@
  * 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
+ *
+ * @file
  */
 
 if ( !defined( 'MEDIAWIKI' ) ) {
@@ -39,6 +40,11 @@ class ApiQueryLogEvents extends ApiQueryBase {
                parent::__construct( $query, $moduleName, 'le' );
        }
 
+       private $fld_ids = false, $fld_title = false, $fld_type = false,
+               $fld_action = false, $fld_user = false, $fld_userid = false,
+               $fld_timestamp = false, $fld_comment = false, $fld_parsedcomment = false,
+               $fld_details = false, $fld_tags = false;
+
        public function execute() {
                $params = $this->extractRequestParams();
                $db = $this->getDB();
@@ -50,14 +56,13 @@ class ApiQueryLogEvents extends ApiQueryBase {
                $this->fld_type = isset( $prop['type'] );
                $this->fld_action = isset ( $prop['action'] );
                $this->fld_user = isset( $prop['user'] );
+               $this->fld_userid = isset( $prop['userid'] );
                $this->fld_timestamp = isset( $prop['timestamp'] );
                $this->fld_comment = isset( $prop['comment'] );
                $this->fld_parsedcomment = isset ( $prop['parsedcomment'] );
                $this->fld_details = isset( $prop['details'] );
                $this->fld_tags = isset( $prop['tags'] );
 
-               list( $tbl_logging, $tbl_page, $tbl_user ) = $db->tableNamesN( 'logging', 'page', 'user' );
-
                $hideLogs = LogEventsList::getExcludeClause( $db );
                if ( $hideLogs !== false ) {
                        $this->addWhere( $hideLogs );
@@ -85,6 +90,7 @@ class ApiQueryLogEvents extends ApiQueryBase {
                $this->addFieldsIf( 'page_id', $this->fld_ids );
                $this->addFieldsIf( 'log_user', $this->fld_user );
                $this->addFieldsIf( 'user_name', $this->fld_user );
+               $this->addFieldsIf( 'user_id', $this->fld_userid );
                $this->addFieldsIf( 'log_namespace', $this->fld_title || $this->fld_parsedcomment );
                $this->addFieldsIf( 'log_title', $this->fld_title || $this->fld_parsedcomment );
                $this->addFieldsIf( 'log_comment', $this->fld_comment || $this->fld_parsedcomment );
@@ -174,6 +180,15 @@ class ApiQueryLogEvents extends ApiQueryBase {
                $this->getResult()->setIndexedTagName_internal( array( 'query', $this->getModuleName() ), 'item' );
        }
 
+       /**
+        * @static
+        * @param $result ApiResult
+        * @param $vals
+        * @param $params
+        * @param $type
+        * @param $ts
+        * @return array
+        */
        public static function addLogParams( $result, &$vals, $params, $type, $ts ) {
                $params = explode( "\n", $params );
                switch ( $type ) {
@@ -206,7 +221,7 @@ class ApiQueryLogEvents extends ApiQueryBase {
                        case 'block':
                                $vals2 = array();
                                list( $vals2['duration'], $vals2['flags'] ) = $params;
-                               
+
                                // Indefinite blocks have no expiry time
                                if ( Block::parseExpiryInput( $params[0] ) !== Block::infinity() ) {
                                        $vals2['expiry'] = wfTimestamp( TS_ISO_8601,
@@ -242,7 +257,7 @@ class ApiQueryLogEvents extends ApiQueryBase {
                                ApiQueryBase::addTitleInfo( $vals, $title );
                        }
                }
-               
+
                if ( $this->fld_type || $this->fld_action ) {
                        $vals['type'] = $row->log_type;
                        $vals['action'] = $row->log_action;
@@ -260,11 +275,17 @@ class ApiQueryLogEvents extends ApiQueryBase {
                        }
                }
 
-               if ( $this->fld_user ) {
+               if ( $this->fld_user || $this->fld_userid ) {
                        if ( LogEventsList::isDeleted( $row, LogPage::DELETED_USER ) ) {
                                $vals['userhidden'] = '';
                        } else {
-                               $vals['user'] = $row->user_name;
+                               if ( $this->fld_user ) {
+                                       $vals['user'] = $row->user_name;
+                               }
+                               if ( $this->fld_userid ) {
+                                       $vals['userid'] = $row->user_id;
+                               }
+
                                if ( !$row->log_user ) {
                                        $vals['anon'] = '';
                                }
@@ -302,6 +323,15 @@ class ApiQueryLogEvents extends ApiQueryBase {
                return $vals;
        }
 
+       public function getCacheMode( $params ) {
+               if ( !is_null( $params['prop'] ) && in_array( 'parsedcomment', $params['prop'] ) ) {
+                       // formatComment() calls wfMsg() among other things
+                       return 'anon-public-user-private';
+               } else {
+                       return 'public';
+               }
+       }
+
        public function getAllowedParams() {
                global $wgLogTypes, $wgLogActions;
                return array(
@@ -313,6 +343,7 @@ class ApiQueryLogEvents extends ApiQueryBase {
                                        'title',
                                        'type',
                                        'user',
+                                       'userid',
                                        'timestamp',
                                        'comment',
                                        'parsedcomment',
@@ -356,10 +387,11 @@ class ApiQueryLogEvents extends ApiQueryBase {
                return array(
                        'prop' => array(
                                'Which properties to get',
-                               ' ids            - Adds the id of the log event',
+                               ' ids            - Adds the ID of the log event',
                                ' title          - Adds the title of the page for the log event',
                                ' type           - Adds the type of log event',
                                ' user           - Adds the user responsible for the log event',
+                               ' userid         - Adds the user ID who was responsible for the log event',
                                ' timestamp      - Adds the timestamp for the event',
                                ' comment        - Adds the comment of the event',
                                ' parsedcomment  - Adds the parsed comment of the event',