}
/**
- * A query module to list all external URLs found on a given set of pages.
+ * A module that allows for editing and creating pages.
*
- * @addtogroup API
+ * Currently, this wraps around the EditPage class in an ugly way,
+ * EditPage.php should be rewritten to provide a cleaner interface
+ * @ingroup API
*/
class ApiEditPage extends ApiBase {
$params = $this->extractRequestParams();
if(is_null($params['title']))
$this->dieUsageMsg(array('missingparam', 'title'));
- if(is_null($params['text']))
- $this->dieUsageMsg(array('missingparam', 'text'));
+ if(is_null($params['text']) && is_null($params['appendtext']) && is_null($params['prependtext']))
+ $this->dieUsageMsg(array('missingtext'));
if(is_null($params['token']))
$this->dieUsageMsg(array('missingparam', 'token'));
if(!$wgUser->matchEditToken($params['token']))
$this->dieUsageMsg(array('sessionfailure'));
-
+
$titleObj = Title::newFromText($params['title']);
if(!$titleObj)
$this->dieUsageMsg(array('invalidtitle', $params['title']));
if($params['createonly'] && $titleObj->exists())
$this->dieUsageMsg(array('createonly-exists'));
-
+ if($params['nocreate'] && !$titleObj->exists())
+ $this->dieUsageMsg(array('nocreate-missing'));
+
// Now let's check whether we're even allowed to do this
$errors = $titleObj->getUserPermissionsErrors('edit', $wgUser);
if(!$titleObj->exists())
$this->dieUsageMsg($errors[0]);
$articleObj = new Article($titleObj);
- $ep = new EditPage($articleObj);
+ $toMD5 = $params['text'];
+ if(!is_null($params['appendtext']) || !is_null($params['prependtext']))
+ {
+ $content = $articleObj->getContent();
+ $params['text'] = $params['prependtext'] . $content . $params['appendtext'];
+ $toMD5 = $params['prependtext'] . $params['appendtext'];
+ }
+ # See if the MD5 hash checks out
+ if(isset($params['md5']))
+ if(md5($toMD5) !== $params['md5'])
+ $this->dieUsageMsg(array('hashcheckfailed'));
+
+ $ep = new EditPage($articleObj);
// EditPage wants to parse its stuff from a WebRequest
// That interface kind of sucks, but it's workable
$reqArr = array('wpTextbox1' => $params['text'],
$reqArr['wpMinoredit'] = '';
if($params['recreate'])
$reqArr['wpRecreate'] = '';
- if(!is_null($params['captchaid']))
- $reqArr['wpCaptchaId'] = $params['captchaid'];
- if(!is_null($params['captchaword']))
- $reqArr['wpCaptchaWord'] = $params['captchaword'];
if(!is_null($params['section']))
{
$section = intval($params['section']);
$this->dieUsage("The section parameter must be set to an integer or 'new'", "invalidsection");
$reqArr['wpSection'] = $params['section'];
}
-
+
if($params['watch'])
$watch = true;
else if($params['unwatch'])
$ep->importFormData($req);
# Run hooks
- # We need to fake $wgRequest for some of them
+ # Handle CAPTCHA parameters
global $wgRequest;
- $oldRequest = $wgRequest;
- $wgRequest = $req;
+ if(isset($params['captchaid']))
+ $wgRequest->data['wpCaptchaId'] = $params['captchaid'];
+ if(isset($params['captchaword']))
+ $wgRequest->data['wpCaptchaWord'] = $params['captchaword'];
$r = array();
if(!wfRunHooks('APIEditBeforeSave', array(&$ep, $ep->textbox1, &$r)))
{
{
$r['result'] = "Failure";
$this->getResult()->addValue(null, $this->getModuleName(), $r);
- return;
- }
+ return;
+ }
else
$this->dieUsageMsg(array('hookaborted'));
}
- $wgRequest = $oldRequest;
-
+
# Do the actual save
$oldRevId = $articleObj->getRevIdFetched();
$result = null;
# but that breaks API mode detection through is_null($wgTitle)
global $wgTitle;
$wgTitle = null;
+ # Fake $wgRequest for some hooks inside EditPage
+ # FIXME: This interface SUCKS
+ $oldRequest = $wgRequest;
+ $wgRequest = $req;
+
$retval = $ep->internalAttemptSave($result, $wgUser->isAllowed('bot') && $params['bot']);
- $this->getMain()->scheduleCommit();
+ $wgRequest = $oldRequest;
switch($retval)
{
case EditPage::AS_HOOK_ERROR:
case EditPage::AS_CONFLICT_DETECTED:
$this->dieUsageMsg(array('editconflict'));
#case EditPage::AS_SUMMARY_NEEDED: Can't happen since we set wpIgnoreBlankSummary
- #case EditPage::AS_TEXTBOX_EMPTY: Can't happen since we don't do sections
+ case EditPage::AS_TEXTBOX_EMPTY:
+ $this->dieUsageMsg(array('emptynewsection'));
case EditPage::AS_END:
# This usually means some kind of race condition
# or DB weirdness occurred. Throw an unknown error here.
- $this->dieUsageMsg(array('unknownerror', 'AS_END'));
+ $this->dieUsageMsg(array('unknownerror'));
case EditPage::AS_SUCCESS_NEW_ARTICLE:
$r['new'] = '';
case EditPage::AS_SUCCESS_UPDATE:
$r['result'] = "Success";
$r['pageid'] = $titleObj->getArticleID();
$r['title'] = $titleObj->getPrefixedText();
- $newRevId = $titleObj->getLatestRevId();
+ # HACK: We create a new Article object here because getRevIdFetched()
+ # refuses to be run twice, and because Title::getLatestRevId()
+ # won't fetch from the master unless we select for update, which we
+ # don't want to do.
+ $newArticle = new Article($titleObj);
+ $newRevId = $newArticle->getRevIdFetched();
if($newRevId == $oldRevId)
$r['nochange'] = '';
else
$this->getResult()->addValue(null, $this->getModuleName(), $r);
}
+ public function mustBePosted() {
+ return true;
+ }
+
protected function getDescription() {
return 'Create and edit pages.';
}
'basetimestamp' => null,
'recreate' => false,
'createonly' => false,
+ 'nocreate' => false,
'captchaword' => null,
'captchaid' => null,
'watch' => false,
'unwatch' => false,
+ 'md5' => null,
+ 'prependtext' => null,
+ 'appendtext' => null,
);
}
'section' => 'Section number. 0 for the top section, \'new\' for a new section',
'text' => 'Page content',
'token' => 'Edit token. You can get one of these through prop=info',
- 'summary' => 'Edit summary',
+ 'summary' => 'Edit summary. Also section title when section=new',
'minor' => 'Minor edit',
'notminor' => 'Non-minor edit',
'bot' => 'Mark this edit as bot',
'Used to detect edit conflicts; leave unset to ignore conflicts.'
),
'recreate' => 'Override any errors about the article having been deleted in the meantime',
- 'createonly' => 'Don\'t create the page if it exists already',
+ 'createonly' => 'Don\'t edit the page if it exists already',
+ 'nocreate' => 'Throw an error if the page doesn\'t exist',
'watch' => 'Add the page to your watchlist',
'unwatch' => 'Remove the page from your watchlist',
'captchaid' => 'CAPTCHA ID from previous request',
'captchaword' => 'Answer to the CAPTCHA',
+ 'md5' => array( 'The MD5 hash of the text parameter, or the prependtext and appendtext parameters concatenated.',
+ 'If set, the edit won\'t be done unless the hash is correct'),
+ 'prependtext' => array( 'Add this text to the beginning of the page. Overrides text.',
+ 'Don\'t use together with section: that won\'t do what you expect.'),
+ 'appendtext' => 'Add this text to the end of the page. Overrides text',
);
}
dépôts / lhc / web / wiklou.git / blobdiff