Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

API: Added various edit tokens to prop=info (except rollback - will be added to revisions)

Browse source
This commit is contained in:
Yuri Astrakhan 2007-08-01 22:46:22 +00:00
parent 12f3e5d28a
commit 9bf28ce7c9
2 changed files with 45 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
includes/api/ApiQueryBase.php
View file

@ -214,6 +214,17 @@ abstract class ApiQueryBase extends ApiBase {
return str_replace('_', ' ', $key);
}
public function getTokenFlag($tokenArr, $action) {
if (in_array($action, $tokenArr)) {
global $wgUser;
if ($wgUser->isAllowed($action))
return true;
else
$this->dieUsage("Action '$action' is not allowed for the current user", 'permissiondenied');
}
return false;
}
public static function getBaseVersion() {
return __CLASS__ . ': $Id$';
}

37
includes/api/ApiQueryInfo.php
View file

@ -50,12 +50,21 @@ class ApiQueryInfo extends ApiQueryBase {
public function execute() {
global $wgUser;
$params = $this->extractRequestParams();
$fld_protection = false;
if(!is_null($params['prop'])) {
$prop = array_flip($params['prop']);
$fld_protection = isset($prop['protection']);
}
if(!is_null($params['token'])) {
$token = $params['token'];
$tok_edit = $this->getTokenFlag($token, 'edit');
$tok_delete = $this->getTokenFlag($token, 'delete');
$tok_protect = $this->getTokenFlag($token, 'protect');
$tok_move = $this->getTokenFlag($token, 'move');
}
$pageSet = $this->getPageSet();
$titles = $pageSet->getGoodTitles();
@ -85,7 +94,7 @@ class ApiQueryInfo extends ApiQueryBase {
$db->freeResult($res);
}
foreach ( $titles as $pageid => $unused ) {
foreach ( $titles as $pageid => $title ) {
$pageInfo = array (
'touched' => wfTimestamp(TS_ISO_8601, $pageTouched[$pageid]),
'lastrevid' => intval($pageLatest[$pageid]),
@ -99,6 +108,18 @@ class ApiQueryInfo extends ApiQueryBase {
if ($pageIsNew[$pageid])
$pageInfo['new'] = '';
if (!is_null($token)) {
// Currently all tokens are generated the same way, but it might change
if ($tok_edit)
$pageInfo['edittoken'] = $wgUser->editToken();
if ($tok_delete)
$pageInfo['deletetoken'] = $wgUser->editToken();
if ($tok_protect)
$pageInfo['protecttoken'] = $wgUser->editToken();
if ($tok_move)
$pageInfo['movetoken'] = $wgUser->editToken();
}
if($fld_protection) {
if (isset($protections[$pageid])) {
$pageInfo['protection'] = $protections[$pageid];
@ -122,7 +143,16 @@ class ApiQueryInfo extends ApiQueryBase {
ApiBase :: PARAM_ISMULTI => true,
ApiBase :: PARAM_TYPE => array (
'protection'
))
)),
'token' => array (
ApiBase :: PARAM_DFLT => NULL,
ApiBase :: PARAM_ISMULTI => true,
ApiBase :: PARAM_TYPE => array (
'edit',
'delete',
'protect',
'move',
)),
);
}
@ -131,7 +161,8 @@ class ApiQueryInfo extends ApiQueryBase {
'prop' => array (
'Which additional properties to get:',
' "protection" - List the protection level of each page'
)
),
'token' => 'Request a token to perform a data-modifying action on a page',
);
}