class ApiMove extends ApiBase {\r
\r
public function __construct($main, $action) {\r
- parent :: __construct($main, $action);\r
+ parent :: __construct($main, $action);\r
}\r
\r
public function execute() {\r
$this->getMain()->requestWriteMode();\r
$params = $this->extractRequestParams();\r
if(is_null($params['reason']))\r
- $params['reason'] = '';\r
- \r
+ $params['reason'] = '';\r
+ \r
$titleObj = NULL;\r
if(!isset($params['from']))\r
- $this->dieUsage('The from parameter must be set', 'nofrom');\r
+ $this->dieUsage('The from parameter must be set', 'nofrom');\r
if(!isset($params['to']))\r
- $this->dieUsage('The to parameter must be set', 'noto');\r
+ $this->dieUsage('The to parameter must be set', 'noto');\r
if(!isset($params['token']))\r
- $this->dieUsage('The token parameter must be set', 'notoken');\r
+ $this->dieUsage('The token parameter must be set', 'notoken');\r
if(!$wgUser->matchEditToken($params['token']))\r
- $this->dieUsage('Invalid token', 'badtoken');\r
+ $this->dieUsage('Invalid token', 'badtoken');\r
\r
if($wgUser->isBlocked())\r
- $this->dieUsage('You have been blocked from editing', 'blocked');\r
+ $this->dieUsage('You have been blocked from editing', 'blocked');\r
if(wfReadOnly())\r
- $this->dieUsage('The wiki is in read-only mode', 'readonly');\r
+ $this->dieUsage('The wiki is in read-only mode', 'readonly');\r
if($params['noredirect'] && !$wgUser->isAllowed('suppressredirect'))\r
- $this->dieUsage("You don't have permission to suppress redirect creation", 'nosuppress');\r
+ $this->dieUsage("You don't have permission to suppress redirect creation", 'nosuppress');\r
\r
$fromTitle = Title::newFromText($params['from']);\r
if(!$fromTitle)\r
- $this->dieUsage("Bad title ``{$params['from']}''", 'invalidtitle');\r
+ $this->dieUsage("Bad title ``{$params['from']}''", 'invalidtitle');\r
if(!$fromTitle->exists())\r
- $this->dieUsage("``{$params['from']}'' doesn't exist", 'missingtitle');\r
+ $this->dieUsage("``{$params['from']}'' doesn't exist", 'missingtitle');\r
$fromTalk = $fromTitle->getTalkPage();\r
\r
- \r
+ \r
$toTitle = Title::newFromText($params['to']);\r
if(!$toTitle)\r
- $this->dieUsage("Bad title ``{$params['to']}''", 'invalidtitle');\r
+ $this->dieUsage("Bad title ``{$params['to']}''", 'invalidtitle');\r
$toTalk = $toTitle->getTalkPage();\r
\r
$dbw = wfGetDB(DB_MASTER);\r
- $dbw->begin(); \r
+ $dbw->begin(); \r
$retval = $fromTitle->moveTo($toTitle, true, $params['reason'], !$params['noredirect']);\r
if($retval !== true)\r
- switch($retval)\r
- {\r
- // case 'badtitletext': Can't happen\r
- // case 'badarticleerror': Can't happen\r
- case 'selfmove':\r
- $this->dieUsage("Can't move ``{$params['from']}'' to itself", 'selfmove');\r
- case 'immobile_namespace':\r
- if($fromTitle->isMovable())\r
- $this->dieUsage("Pages in the ``{$fromTitle->getNsText()}'' namespace can't be moved", 'immobilenamespace-from');\r
- $this->dieUsage("Pages in the ``{$toTitle->getNsText()}'' namespace can't be moved", 'immobilenamespace-to');\r
- case 'articleexists':\r
- $this->dieUsage("``{$toTitle->getPrefixedText()}'' already exists and is not a redirect to ``{$fromTitle->getPrefixedText()}''", 'targetexists');\r
- case 'protectedpage':\r
- $this->dieUsage("You don't have permission to move ``{$fromTitle->getPrefixedText()}'' to ``{$toTitle->getPrefixedText()}''", 'permissiondenied');\r
- default:\r
- throw new MWException( "Title::moveTo: Unknown return value ``{$retval}''" );\r
- }\r
+ switch($retval)\r
+ {\r
+ // case 'badtitletext': Can't happen\r
+ // case 'badarticleerror': Can't happen\r
+ case 'selfmove':\r
+ $this->dieUsage("Can't move ``{$params['from']}'' to itself", 'selfmove');\r
+ case 'immobile_namespace':\r
+ if($fromTitle->isMovable())\r
+ $this->dieUsage("Pages in the ``{$fromTitle->getNsText()}'' namespace can't be moved", 'immobilenamespace-from');\r
+ $this->dieUsage("Pages in the ``{$toTitle->getNsText()}'' namespace can't be moved", 'immobilenamespace-to');\r
+ case 'articleexists':\r
+ $this->dieUsage("``{$toTitle->getPrefixedText()}'' already exists and is not a redirect to ``{$fromTitle->getPrefixedText()}''", 'targetexists');\r
+ case 'protectedpage':\r
+ $this->dieUsage("You don't have permission to move ``{$fromTitle->getPrefixedText()}'' to ``{$toTitle->getPrefixedText()}''", 'permissiondenied');\r
+ default:\r
+ throw new MWException( "Title::moveTo: Unknown return value ``{$retval}''" );\r
+ }\r
$r = array('from' => $fromTitle->getPrefixedText(), 'to' => $toTitle->getPrefixedText(), 'reason' => $params['reason']);\r
if(!$params['noredirect'])\r
- $r['redirectcreated'] = '';\r
- \r
+ $r['redirectcreated'] = '';\r
+ \r
if($params['movetalk'] && $fromTalk->exists() && !$fromTitle->isTalkPage())\r
{\r
- // We need to move the talk page as well\r
- $toTalk = $toTitle->getTalkPage();\r
- $retval = $fromTalk->moveTo($toTalk, true, $params['reason'], !$params['noredirect']);\r
- if($retval === true)\r
+ // We need to move the talk page as well\r
+ $toTalk = $toTitle->getTalkPage();\r
+ $retval = $fromTalk->moveTo($toTalk, true, $params['reason'], !$params['noredirect']);\r
+ if($retval === true)\r
+ {\r
+ $r['talkfrom'] = $fromTalk->getPrefixedText();\r
+ $r['talkto'] = $toTalk->getPrefixedText();\r
+ }\r
+ // We're not gonna dieUsage() on failure, since we already changed something\r
+ else\r
+ switch($retval)\r
{\r
- $r['talkfrom'] = $fromTalk->getPrefixedText();\r
- $r['talkto'] = $toTalk->getPrefixedText();\r
- }\r
- // We're not gonna dieUsage() on failure, since we already changed something\r
- else\r
- switch($retval)\r
+ case 'immobile_namespace':\r
+ if($fromTalk->isMovable())\r
{\r
- case 'immobile_namespace':\r
- if($fromTalk->isMovable())\r
- {\r
- $r['talkmove-error-code'] = 'immobilenamespace-from';\r
- $r['talkmove-error-info'] = "Pages in the ``{$fromTalk->getNsText()}'' namespace can't be moved";\r
- }\r
- else\r
- {\r
- $r['talkmove-error-code'] = 'immobilenamespace-to';\r
- $r['talkmove-error-info'] = "Pages in the ``{$toTalk->getNsText()}'' namespace can't be moved";\r
- }\r
- break;\r
- case 'articleexists':\r
- $r['talkmove-error-code'] = 'targetexists';\r
- $r['talkmove-error-info'] = "``{$toTalk->getPrefixedText()}'' already exists and is not a redirect to ``{$fromTalk->getPrefixedText()}''";\r
- break;\r
- case 'protectedpage':\r
- $r['talkmove-error-code'] = 'permissiondenied';\r
- $r['talkmove-error-info'] = "You don't have permission to move ``{$fromTalk->getPrefixedText()}'' to ``{$toTalk->getPrefixedText()}''";\r
- default:\r
- $r['talkmove-error-code'] = 'unknownerror';\r
- $r['talkmove-error-info'] = "Unknown error ``$retval''";\r
- } \r
+ $r['talkmove-error-code'] = 'immobilenamespace-from';\r
+ $r['talkmove-error-info'] = "Pages in the ``{$fromTalk->getNsText()}'' namespace can't be moved";\r
+ }\r
+ else\r
+ {\r
+ $r['talkmove-error-code'] = 'immobilenamespace-to';\r
+ $r['talkmove-error-info'] = "Pages in the ``{$toTalk->getNsText()}'' namespace can't be moved";\r
+ }\r
+ break;\r
+ case 'articleexists':\r
+ $r['talkmove-error-code'] = 'targetexists';\r
+ $r['talkmove-error-info'] = "``{$toTalk->getPrefixedText()}'' already exists and is not a redirect to ``{$fromTalk->getPrefixedText()}''";\r
+ break;\r
+ case 'protectedpage':\r
+ $r['talkmove-error-code'] = 'permissiondenied';\r
+ $r['talkmove-error-info'] = "You don't have permission to move ``{$fromTalk->getPrefixedText()}'' to ``{$toTalk->getPrefixedText()}''";\r
+ default:\r
+ $r['talkmove-error-code'] = 'unknownerror';\r
+ $r['talkmove-error-info'] = "Unknown error ``$retval''";\r
+ } \r
}\r
$dbw->commit(); // Make sure all changes are really written to the DB\r
$this->getResult()->addValue(null, $this->getModuleName(), $r);\r
return __CLASS__ . ': $Id$';\r
}\r
}\r
-\r
global $wgUser;\r
// Before doing anything at all, let's check permissions\r
if(!$wgUser->isAllowed('deletedhistory'))\r
- $this->dieUsage('You don\'t have permission to view deleted revisions information', 'permissiondenied');\r
-\r
- $db = $this->getDB();\r
- $params = $this->extractRequestParams();\r
- $prop = array_flip($params['prop']);\r
- $fld_revid = isset($prop['revid']);\r
- $fld_user = isset($prop['user']);\r
- $fld_comment = isset($prop['comment']);\r
- $fld_minor = isset($prop['minor']);\r
- $fld_len = isset($prop['len']);\r
- $fld_content = isset($prop['content']);\r
- $fld_token = isset($prop['token']);\r
-\r
- $result = $this->getResult();\r
- $pageSet = $this->getPageSet();\r
- $titles = $pageSet->getTitles();\r
- $data = array();\r
-\r
- $this->addTables('archive');\r
- $this->addFields(array('ar_title', 'ar_namespace', 'ar_timestamp'));\r
+ $this->dieUsage('You don\'t have permission to view deleted revisions', 'permissiondenied');\r
+\r
+ $db = $this->getDB();\r
+ $params = $this->extractRequestParams();\r
+ $prop = array_flip($params['prop']);\r
+ $fld_revid = isset($prop['revid']);\r
+ $fld_user = isset($prop['user']);\r
+ $fld_comment = isset($prop['comment']);\r
+ $fld_minor = isset($prop['minor']);\r
+ $fld_len = isset($prop['len']);\r
+ $fld_content = isset($prop['content']);\r
+ $fld_token = isset($prop['token']);\r
+\r
+ $result = $this->getResult();\r
+ $pageSet = $this->getPageSet();\r
+ $titles = $pageSet->getTitles();\r
+ $data = array();\r
+\r
+ $this->addTables('archive');\r
+ $this->addFields(array('ar_title', 'ar_namespace', 'ar_timestamp'));\r
+ if($fld_revid)\r
+ $this->addFields('ar_rev_id');\r
+ if($fld_user)\r
+ $this->addFields('ar_user_text');\r
+ if($fld_comment)\r
+ $this->addFields('ar_comment');\r
+ if($fld_minor)\r
+ $this->addFields('ar_minor_edit');\r
+ if($fld_len)\r
+ $this->addFields('ar_len');\r
+ if($fld_content)\r
+ {\r
+ $this->addTables('text');\r
+ $this->addFields(array('ar_text', 'ar_text_id', 'old_text', 'old_flags'));\r
+ $this->addWhere('ar_text_id = old_id');\r
+\r
+ // This also means stricter limits\r
+ $userMax = 50;\r
+ $botMax = 200;\r
+ $this->validateLimit('limit', $params['limit'], 1, $userMax, $botMax);\r
+ }\r
+ if($fld_token)\r
+ // Undelete tokens are identical for all pages, so we cache one here\r
+ $token = $wgUser->editToken();\r
+\r
+ // We need a custom WHERE clause that matches all titles.\r
+ if(count($titles) > 0)\r
+ {\r
+ $lb = new LinkBatch($titles);\r
+ $where = $lb->constructSet('ar', $db);\r
+ $this->addWhere($where);\r
+ }\r
+\r
+ $this->addOption('LIMIT', $params['limit'] + 1);\r
+ $this->addWhereRange('ar_timestamp', $params['dir'], $params['start'], $params['end']);\r
+ if(isset($params['namespace']))\r
+ $this->addWhereFld('ar_namespace', $params['namespace']);\r
+ $res = $this->select(__METHOD__);\r
+ $pages = array();\r
+ $count = 0;\r
+ // First populate the $pages array\r
+ while($row = $db->fetchObject($res))\r
+ {\r
+ if($count++ == $params['limit'])\r
+ {\r
+ // We've had enough\r
+ $this->setContinueEnumParameter('start', wfTimestamp(TS_ISO_8601, $row->ar_timestamp));\r
+ break;\r
+ }\r
+\r
+ $rev = array();\r
+ $rev['timestamp'] = wfTimestamp(TS_ISO_8601, $row->ar_timestamp);\r
if($fld_revid)\r
- $this->addFields('ar_rev_id');\r
+ $rev['revid'] = $row->ar_rev_id;\r
if($fld_user)\r
- $this->addFields('ar_user_text');\r
+ $rev['user'] = $row->ar_user_text;\r
if($fld_comment)\r
- $this->addFields('ar_comment');\r
+ $rev['comment'] = $row->ar_comment;\r
if($fld_minor)\r
- $this->addFields('ar_minor_edit');\r
+ if($row->ar_minor_edit == 1)\r
+ $rev['minor'] = '';\r
if($fld_len)\r
- $this->addFields('ar_len');\r
+ $rev['len'] = $row->ar_len;\r
if($fld_content)\r
- {\r
- $this->addTables('text');\r
- $this->addFields(array('ar_text', 'ar_text_id', 'old_text', 'old_flags'));\r
- $this->addWhere('ar_text_id = old_id');\r
-\r
- // This also means stricter limits\r
- $userMax = 50;\r
- $botMax = 200;\r
- $this->validateLimit('limit', $params['limit'], 1, $userMax, $botMax);\r
-\r
- // And also stricter restrictions\r
- if(!$wgUser->isAllowed('delete')) {\r
- $this->dieUsage('You don\'t have permission to view deleted revisions content', 'permissiondeniedcontent');\r
- }\r
- }\r
- if($fld_token)\r
- // Undelete tokens are identical for all pages, so we cache one here\r
- $token = $wgUser->editToken();\r
-\r
- // We need a custom WHERE clause that matches all titles.\r
- if(count($titles) > 0)\r
- {\r
- $lb = new LinkBatch($titles);\r
- $where = $lb->constructSet('ar', $db);\r
- $this->addWhere($where);\r
- }\r
+ ApiResult::setContent($rev, Revision::getRevisionText($row));\r
\r
- $this->addOption('LIMIT', $params['limit'] + 1);\r
- $this->addWhereRange('ar_timestamp', $params['dir'], $params['start'], $params['end']);\r
- if(isset($params['namespace']))\r
- $this->addWhereFld('ar_namespace', $params['namespace']);\r
- $res = $this->select(__METHOD__);\r
- $pages = array();\r
- $count = 0;\r
- // First populate the $pages array\r
- while($row = $db->fetchObject($res))\r
+ $t = Title::makeTitle($row->ar_namespace, $row->ar_title);\r
+ if(!isset($pages[$t->getPrefixedText()]))\r
{\r
- if($count++ == $params['limit'])\r
- {\r
- // We've had enough\r
- $this->setContinueEnumParameter('start', wfTimestamp(TS_ISO_8601, $row->ar_timestamp));\r
- break;\r
- }\r
-\r
- $rev = array();\r
- $rev['timestamp'] = wfTimestamp(TS_ISO_8601, $row->ar_timestamp);\r
- if($fld_revid)\r
- $rev['revid'] = $row->ar_rev_id;\r
- if($fld_user)\r
- $rev['user'] = $row->ar_user_text;\r
- if($fld_comment)\r
- $rev['comment'] = $row->ar_comment;\r
- if($fld_minor)\r
- if($row->ar_minor_edit == 1)\r
- $rev['minor'] = '';\r
- if($fld_len)\r
- $rev['len'] = $row->ar_len;\r
- if($fld_content)\r
- ApiResult::setContent($rev, Revision::getRevisionText($row));\r
-\r
- $t = Title::makeTitle($row->ar_namespace, $row->ar_title);\r
- if(!isset($pages[$t->getPrefixedText()]))\r
- {\r
- $pages[$t->getPrefixedText()] = array(\r
- 'title' => $t->getPrefixedText(),\r
- 'ns' => intval($row->ar_namespace),\r
- 'revisions' => array($rev)\r
- );\r
- if($fld_token)\r
- $pages[$t->getPrefixedText()]['token'] = $token;\r
- }\r
- else\r
- $pages[$t->getPrefixedText()]['revisions'][] = $rev;\r
+ $pages[$t->getPrefixedText()] = array(\r
+ 'title' => $t->getPrefixedText(),\r
+ 'ns' => intval($row->ar_namespace),\r
+ 'revisions' => array($rev)\r
+ );\r
+ if($fld_token)\r
+ $pages[$t->getPrefixedText()]['token'] = $token;\r
}\r
- $db->freeResult($res);\r
+ else\r
+ $pages[$t->getPrefixedText()]['revisions'][] = $rev;\r
+ }\r
+ $db->freeResult($res);\r
\r
- // We don't want entire pagenames as keys, so let's make this array indexed\r
- foreach($pages as $page)\r
- {\r
- $result->setIndexedTagName($page['revisions'], 'rev');\r
- $data[] = $page;\r
- }\r
- $result->setIndexedTagName($data, 'page');\r
- $result->addValue('query', $this->getModuleName(), $data);\r
+ // We don't want entire pagenames as keys, so let's make this array indexed\r
+ foreach($pages as $page)\r
+ {\r
+ $result->setIndexedTagName($page['revisions'], 'rev');\r
+ $data[] = $page;\r
+ }\r
+ $result->setIndexedTagName($data, 'page');\r
+ $result->addValue('query', $this->getModuleName(), $data);\r
}\r
\r
protected function getAllowedParams() {\r
- return array (\r
- 'start' => array(\r
- ApiBase :: PARAM_TYPE => 'timestamp'\r
- ),\r
- 'end' => array(\r
- ApiBase :: PARAM_TYPE => 'timestamp',\r
+ return array (\r
+ 'start' => array(\r
+ ApiBase :: PARAM_TYPE => 'timestamp'\r
+ ),\r
+ 'end' => array(\r
+ ApiBase :: PARAM_TYPE => 'timestamp',\r
+ ),\r
+ 'dir' => array(\r
+ ApiBase :: PARAM_TYPE => array(\r
+ 'newer',\r
+ 'older'\r
+ ),\r
+ ApiBase :: PARAM_DFLT => 'older'\r
+ ),\r
+ 'namespace' => array(\r
+ ApiBase :: PARAM_ISMULTI => true,\r
+ ApiBase :: PARAM_TYPE => 'namespace'\r
+ ),\r
+ 'limit' => array(\r
+ ApiBase :: PARAM_DFLT => 10,\r
+ ApiBase :: PARAM_TYPE => 'limit',\r
+ ApiBase :: PARAM_MIN => 1,\r
+ ApiBase :: PARAM_MAX => ApiBase :: LIMIT_BIG1,\r
+ ApiBase :: PARAM_MAX2 => ApiBase :: LIMIT_BIG2\r
+ ),\r
+ 'prop' => array(\r
+ ApiBase :: PARAM_DFLT => 'user|comment',\r
+ ApiBase :: PARAM_TYPE => array(\r
+ 'revid',\r
+ 'user',\r
+ 'comment',\r
+ 'minor',\r
+ 'len',\r
+ 'content',\r
+ 'token'\r
),\r
- 'dir' => array(\r
- ApiBase :: PARAM_TYPE => array(\r
- 'newer',\r
- 'older'\r
- ),\r
- ApiBase :: PARAM_DFLT => 'older'\r
- ),\r
- 'namespace' => array(\r
- ApiBase :: PARAM_ISMULTI => true,\r
- ApiBase :: PARAM_TYPE => 'namespace'\r
- ),\r
- 'limit' => array(\r
- ApiBase :: PARAM_DFLT => 10,\r
- ApiBase :: PARAM_TYPE => 'limit',\r
- ApiBase :: PARAM_MIN => 1,\r
- ApiBase :: PARAM_MAX => ApiBase :: LIMIT_BIG1,\r
- ApiBase :: PARAM_MAX2 => ApiBase :: LIMIT_BIG2\r
- ),\r
- 'prop' => array(\r
- ApiBase :: PARAM_DFLT => 'user|comment',\r
- ApiBase :: PARAM_TYPE => array(\r
- 'revid',\r
- 'user',\r
- 'comment',\r
- 'minor',\r
- 'len',\r
- 'content',\r
- 'token'\r
- ),\r
- ApiBase :: PARAM_ISMULTI => true\r
- )\r
- );\r
+ ApiBase :: PARAM_ISMULTI => true\r
+ )\r
+ );\r
}\r
\r
protected function getParamDescription() {\r
- return array (\r
- 'start' => 'The timestamp to start enumerating from',\r
- 'end' => 'The timestamp to stop enumerating at',\r
- 'dir' => 'The direction in which to enumerate',\r
- 'namespace' => 'The namespaces to search in',\r
- 'limit' => 'The maximum amount of revisions to list',\r
- 'prop' => 'Which properties to get'\r
- );\r
+ return array (\r
+ 'start' => 'The timestamp to start enumerating from',\r
+ 'end' => 'The timestamp to stop enumerating at',\r
+ 'dir' => 'The direction in which to enumerate',\r
+ 'namespace' => 'The namespaces to search in',\r
+ 'limit' => 'The maximum amount of revisions to list',\r
+ 'prop' => 'Which properties to get'\r
+ );\r
}\r
\r
protected function getDescription() {\r
- return 'List deleted revisions.';\r
+ return 'List deleted revisions.';\r
}\r
\r
protected function getExamples() {\r
- return array (\r
- 'List the first 50 deleted revisions in the Category and Category talk namespaces',\r
- ' api.php?action=query&list=deletedrevs&drdir=newer&drlimit=50&drnamespace=14|15',\r
- 'List the last deleted revisions of Main Page and Talk:Main Page, with content:',\r
- ' api.php?action=query&list=deletedrevs&titles=Main%20Page|Talk:Main%20Page&drprop=user|comment|content'\r
- );\r
+ return array (\r
+ 'List the first 50 deleted revisions in the Category and Category talk namespaces',\r
+ ' api.php?action=query&list=deletedrevs&drdir=newer&drlimit=50&drnamespace=14|15',\r
+ 'List the last deleted revisions of Main Page and Talk:Main Page, with content:',\r
+ ' api.php?action=query&list=deletedrevs&titles=Main%20Page|Talk:Main%20Page&drprop=user|comment|content'\r
+ );\r
}\r
\r
public function getVersion() {\r
- return __CLASS__ . ': $Id: ApiQueryDeletedrevs.php 23531 2007-06-30 01:19:14Z simetrical $';\r
+ return __CLASS__ . ': $Id: ApiQueryDeletedrevs.php 23531 2007-06-30 01:19:14Z simetrical $';\r
}\r
}\r
dépôts / lhc / web / wiklou.git / commitdiff