diff options
Diffstat (limited to 'CheckUser/api/ApiQueryCheckUser.php')
| -rw-r--r-- | CheckUser/api/ApiQueryCheckUser.php | 66 |
1 files changed, 49 insertions, 17 deletions
diff --git a/CheckUser/api/ApiQueryCheckUser.php b/CheckUser/api/ApiQueryCheckUser.php index ffd88eb1..9624a821 100644 --- a/CheckUser/api/ApiQueryCheckUser.php +++ b/CheckUser/api/ApiQueryCheckUser.php @@ -70,10 +70,15 @@ class ApiQueryCheckUser extends ApiQueryBase { } CheckUser::addLogEntry( 'userips', 'user', $target, $reason, $user_id ); - $result->addValue( array( + $result->addValue( array( 'query', $this->getModuleName() ), 'userips', $resultIPs ); - $result->setIndexedTagName_internal( array( - 'query', $this->getModuleName(), 'userips' ), 'ip' ); + if ( defined( 'ApiResult::META_CONTENT' ) ) { + $result->addIndexedTagName( array( + 'query', $this->getModuleName(), 'userips' ), 'ip' ); + } else { + $result->setIndexedTagName_internal( array( + 'query', $this->getModuleName(), 'userips' ), 'ip' ); + } break; case 'edits': @@ -99,9 +104,9 @@ class ApiQueryCheckUser extends ApiQueryBase { $log_type = array( 'useredits', 'user' ); } - $this->addFields( array( + $this->addFields( array( 'cuc_namespace', 'cuc_title', 'cuc_user_text', 'cuc_actiontext', - 'cuc_comment', 'cuc_minor', 'cuc_timestamp', 'cuc_ip', 'cuc_xff', 'cuc_agent' + 'cuc_comment', 'cuc_minor', 'cuc_timestamp', 'cuc_ip', 'cuc_xff', 'cuc_agent' ) ); $res = $this->select( __METHOD__ ); @@ -131,12 +136,17 @@ class ApiQueryCheckUser extends ApiQueryBase { $edits[] = $edit; } - CheckUser::addLogEntry( $log_type[0], $log_type[1], + CheckUser::addLogEntry( $log_type[0], $log_type[1], $target, $reason, isset($user_id) ? $user_id : '0' ); - $result->addValue( array( + $result->addValue( array( 'query', $this->getModuleName() ), 'edits', $edits ); - $result->setIndexedTagName_internal( array( - 'query', $this->getModuleName(), 'edits' ), 'action' ); + if ( defined( 'ApiResult::META_CONTENT' ) ) { + $result->addIndexedTagName( array( + 'query', $this->getModuleName(), 'edits' ), 'action' ); + } else { + $result->setIndexedTagName_internal( array( + 'query', $this->getModuleName(), 'edits' ), 'action' ); + } break; case 'ipusers': @@ -151,7 +161,7 @@ class ApiQueryCheckUser extends ApiQueryBase { $this->dieUsage( 'IP or range is invalid', 'invalidip' ); } - $this->addFields( array( + $this->addFields( array( 'cuc_user_text', 'cuc_timestamp', 'cuc_ip', 'cuc_agent' ) ); $res = $this->select( __METHOD__ ); @@ -190,10 +200,15 @@ class ApiQueryCheckUser extends ApiQueryBase { } CheckUser::addLogEntry( $log_type, 'ip', $target, $reason ); - $result->addValue( array( + $result->addValue( array( 'query', $this->getModuleName() ), 'ipusers', $resultUsers ); - $result->setIndexedTagName_internal( array( - 'query', $this->getModuleName(), 'ipusers' ), 'user' ); + if ( defined( 'ApiResult::META_CONTENT' ) ) { + $result->addIndexedTagName( array( + 'query', $this->getModuleName(), 'ipusers' ), 'user' ); + } else { + $result->setIndexedTagName_internal( array( + 'query', $this->getModuleName(), 'ipusers' ), 'user' ); + } break; default: @@ -241,6 +256,9 @@ class ApiQueryCheckUser extends ApiQueryBase { ); } + /** + * @deprecated since MediaWiki core 1.25 + */ public function getParamDescription() { return array( 'request' => array( @@ -257,10 +275,16 @@ class ApiQueryCheckUser extends ApiQueryBase { ); } + /** + * @deprecated since MediaWiki core 1.25 + */ public function getDescription() { return 'Allows check which IPs are used by a given username and which usernames are used by a given IP'; } + /** + * @deprecated since MediaWiki core 1.25 + */ public function getExamples() { return array( 'api.php?action=query&list=checkuser&curequest=userips&cutarget=Jimbo_Wales', @@ -268,12 +292,20 @@ class ApiQueryCheckUser extends ApiQueryBase { ); } - public function getHelpUrls() { - return 'http://www.mediawiki.org/wiki/Extension:CheckUser#API'; + /** + * @see ApiBase::getExamplesMessages() + */ + protected function getExamplesMessages() { + return array( + 'action=query&list=checkuser&curequest=userips&cutarget=Jimbo_Wales' + => 'apihelp-query+checkuser-example-1', + 'action=query&list=checkuser&curequest=edits&cutarget=127.0.0.1/16&xff=1&cureason=Some_check' + => 'apihelp-query+checkuser-example-2', + ); } - public function getVersion() { - return __CLASS__ . ': $Id$'; + public function getHelpUrls() { + return 'https://www.mediawiki.org/wiki/Extension:CheckUser#API'; } public function getTokenSalt() { |