From b9b85843572bf283f48285001e276ba7e61b63f6 Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Sun, 22 Feb 2009 13:37:51 +0100 Subject: updated to MediaWiki 1.14.0 --- includes/api/ApiProtect.php | 83 +++++++++++++++++++++++++++++---------------- 1 file changed, 53 insertions(+), 30 deletions(-) (limited to 'includes/api/ApiProtect.php') diff --git a/includes/api/ApiProtect.php b/includes/api/ApiProtect.php index 30bcfdbc..522d02b2 100644 --- a/includes/api/ApiProtect.php +++ b/includes/api/ApiProtect.php @@ -37,7 +37,7 @@ class ApiProtect extends ApiBase { } public function execute() { - global $wgUser; + global $wgUser, $wgRestrictionTypes, $wgRestrictionLevels; $this->getMain()->requestWriteMode(); $params = $this->extractRequestParams(); @@ -46,7 +46,7 @@ class ApiProtect extends ApiBase { $this->dieUsageMsg(array('missingparam', 'title')); if(!isset($params['token'])) $this->dieUsageMsg(array('missingparam', 'token')); - if(!isset($params['protections']) || empty($params['protections'])) + if(empty($params['protections'])) $this->dieUsageMsg(array('missingparam', 'protections')); if(!$wgUser->matchEditToken($params['token'])) @@ -57,25 +57,23 @@ class ApiProtect extends ApiBase { $this->dieUsageMsg(array('invalidtitle', $params['title'])); $errors = $titleObj->getUserPermissionsErrors('protect', $wgUser); - if(!empty($errors)) + if($errors) // We don't care about multiple errors, just report one of them $this->dieUsageMsg(current($errors)); - if(in_array($params['expiry'], array('infinite', 'indefinite', 'never'))) - $expiry = Block::infinity(); - else + $expiry = (array)$params['expiry']; + if(count($expiry) != count($params['protections'])) { - $expiry = strtotime($params['expiry']); - if($expiry < 0 || $expiry == false) - $this->dieUsageMsg(array('invalidexpiry')); - - $expiry = wfTimestamp(TS_MW, $expiry); - if($expiry < wfTimestampNow()) - $this->dieUsageMsg(array('pastexpiry')); + if(count($expiry) == 1) + $expiry = array_fill(0, count($params['protections']), $expiry[0]); + else + $this->dieUsageMsg(array('toofewexpiries', count($expiry), count($params['protections']))); } - + $protections = array(); - foreach($params['protections'] as $prot) + $expiryarray = array(); + $resultProtections = array(); + foreach($params['protections'] as $i => $prot) { $p = explode('=', $prot); $protections[$p[0]] = ($p[1] == 'all' ? '' : $p[1]); @@ -83,26 +81,45 @@ class ApiProtect extends ApiBase { $this->dieUsageMsg(array('create-titleexists')); if(!$titleObj->exists() && $p[0] != 'create') $this->dieUsageMsg(array('missingtitles-createonly')); + if(!in_array($p[0], $wgRestrictionTypes) && $p[0] != 'create') + $this->dieUsageMsg(array('protect-invalidaction', $p[0])); + if(!in_array($p[1], $wgRestrictionLevels) && $p[1] != 'all') + $this->dieUsageMsg(array('protect-invalidlevel', $p[1])); + + if(in_array($expiry[$i], array('infinite', 'indefinite', 'never'))) + $expiryarray[$p[0]] = Block::infinity(); + else + { + $exp = strtotime($expiry[$i]); + if($exp < 0 || $exp == false) + $this->dieUsageMsg(array('invalidexpiry', $expiry[$i])); + + $exp = wfTimestamp(TS_MW, $exp); + if($exp < wfTimestampNow()) + $this->dieUsageMsg(array('pastexpiry', $expiry[$i])); + $expiryarray[$p[0]] = $exp; + } + $resultProtections[] = array($p[0] => $protections[$p[0]], + 'expiry' => ($expiryarray[$p[0]] == Block::infinity() ? + 'infinite' : + wfTimestamp(TS_ISO_8601, $expiryarray[$p[0]]))); } + $cascade = $params['cascade']; if($titleObj->exists()) { $articleObj = new Article($titleObj); - $ok = $articleObj->updateRestrictions($protections, $params['reason'], $params['cascade'], $expiry); + $ok = $articleObj->updateRestrictions($protections, $params['reason'], $cascade, $expiryarray); } else - $ok = $titleObj->updateTitleProtection($protections['create'], $params['reason'], $expiry); + $ok = $titleObj->updateTitleProtection($protections['create'], $params['reason'], $expiryarray['create']); if(!$ok) // This is very weird. Maybe the article was deleted or the user was blocked/desysopped in the meantime? // Just throw an unknown error in this case, as it's very likely to be a race condition $this->dieUsageMsg(array()); $res = array('title' => $titleObj->getPrefixedText(), 'reason' => $params['reason']); - if($expiry == Block::infinity()) - $res['expiry'] = 'infinity'; - else - $res['expiry'] = wfTimestamp(TS_ISO_8601, $expiry); - - if($params['cascade']) + if($cascade) $res['cascade'] = ''; - $res['protections'] = $protections; + $res['protections'] = $resultProtections; + $this->getResult()->setIndexedTagName($res['protections'], 'protection'); $this->getResult()->addValue(null, $this->getModuleName(), $res); } @@ -115,7 +132,11 @@ class ApiProtect extends ApiBase { 'protections' => array( ApiBase :: PARAM_ISMULTI => true ), - 'expiry' => 'infinite', + 'expiry' => array( + ApiBase :: PARAM_ISMULTI => true, + ApiBase :: PARAM_ALLOW_DUPLICATES => true, + ApiBase :: PARAM_DFLT => 'infinite', + ), 'reason' => '', 'cascade' => false ); @@ -123,12 +144,14 @@ class ApiProtect extends ApiBase { public function getParamDescription() { return array ( - 'title' => 'Title of the page you want to restore.', + 'title' => 'Title of the page you want to (un)protect.', 'token' => 'A protect token previously retrieved through prop=info', 'protections' => 'Pipe-separated list of protection levels, formatted action=group (e.g. edit=sysop)', - 'expiry' => 'Expiry timestamp. If set to \'infinite\', \'indefinite\' or \'never\', the protection will never expire.', + 'expiry' => array('Expiry timestamps. If only one timestamp is set, it\'ll be used for all protections.', + 'Use \'infinite\', \'indefinite\' or \'never\', for a neverexpiring protection.'), 'reason' => 'Reason for (un)protecting (optional)', - 'cascade' => 'Enable cascading protection (i.e. protect pages included in this page)' + 'cascade' => array('Enable cascading protection (i.e. protect pages included in this page)', + 'Ignored if not all protection levels are \'sysop\' or \'protect\''), ); } @@ -140,12 +163,12 @@ class ApiProtect extends ApiBase { protected function getExamples() { return array ( - 'api.php?action=protect&title=Main%20Page&token=123ABC&protections=edit=sysop|move=sysop&cascade&expiry=20070901163000', + 'api.php?action=protect&title=Main%20Page&token=123ABC&protections=edit=sysop|move=sysop&cascade&expiry=20070901163000|never', 'api.php?action=protect&title=Main%20Page&token=123ABC&protections=edit=all|move=all&reason=Lifting%20restrictions' ); } public function getVersion() { - return __CLASS__ . ': $Id: ApiProtect.php 35098 2008-05-20 17:13:28Z ialex $'; + return __CLASS__ . ': $Id: ApiProtect.php 44426 2008-12-10 22:39:41Z catrope $'; } } -- cgit v1.2.2