API:

* Refactored ApiProtect. No need for core modifications this time :)
* Added permissions check to ApiMove to protect against messages with arguments getting none. moveTo()'s return value should really be modified, see also comment

diff --git a/includes/api/ApiBase.php b/includes/api/ApiBase.php
index 74e20d7..cf5b3a6 100644 (file)
--- a/includes/api/ApiBase.php
+++ b/includes/api/ApiBase.php
@@ -597,7 +597,11 @@ abstract class ApiBase {
                // API-specific messages
                'missingparam' => array('code' => 'no$1', 'info' => "The \$1 parameter must be set"),
                'invalidtitle' => array('code' => 'invalidtitle', 'info' => "Bad title ``\$1''"),
-               'invaliduser' => array('code' => 'invaliduser', 'info' => "Invalid username ``\$1''")
+               'invaliduser' => array('code' => 'invaliduser', 'info' => "Invalid username ``\$1''"),
+               'invalidexpiry' => array('code' => 'invalidexpiry', 'info' => "Invalid expiry time"),
+               'pastexpiry' => array('code' => 'pastexpiry', 'info' => "Expiry time is in the past"),
+               'create-titleexists' => array('code' => 'create-titleexists', 'info' => "Existing titles can't be protected with 'create'"),
+               'missingtitle-createonly' => array('code' => 'missingtitle-createonly', 'info' => "Missing titles can only be protected with 'create'"),
        );
        
        /**

diff --git a/includes/api/ApiMove.php b/includes/api/ApiMove.php
index 2c6146e..77f21b3 100644 (file)
--- a/includes/api/ApiMove.php
+++ b/includes/api/ApiMove.php
@@ -61,12 +61,24 @@ class ApiMove extends ApiBase {
                        $this->dieUsageMsg(array('notanarticle'));
                $fromTalk = $fromTitle->getTalkPage();
 
-               
                $toTitle = Title::newFromText($params['to']);
                if(!$toTitle)
                        $this->dieUsageMsg(array('invalidtitle', $params['to']));
                $toTalk = $toTitle->getTalkPage();
 
+               // Run getUserPermissionsErrors() here so we get message arguments too,
+               // rather than just a message key. The latter is troublesome for messages
+               // that use arguments.
+               // FIXME: moveTo() should really return an array, requires some 
+               //        refactoring of other code, though (mainly SpecialMovepage.php)
+               $errors = array_merge($fromTitle->getUserPermissionsErrors('move', $wgUser),
+                                       $fromTitle->getUserPermissionsErrors('edit', $wgUser),
+                                       $toTitle->getUserPermissionsErrors('move', $wgUser),
+                                       $toTitle->getUserPermissionsErrors('edit', $wgUser));
+               if(!empty($errors))
+                       // We don't care about multiple errors, just report one of them
+                       $this->dieUsageMsg(current($errors));
+
                $dbw = wfGetDB(DB_MASTER);
                $dbw->begin();          
                $retval = $fromTitle->moveTo($toTitle, true, $params['reason'], !$params['noredirect']);

diff --git a/includes/api/ApiProtect.php b/includes/api/ApiProtect.php
index bd9acaf..04e2752 100644 (file)
--- a/includes/api/ApiProtect.php
+++ b/includes/api/ApiProtect.php
@@ -43,24 +43,23 @@ class ApiProtect extends ApiBase {
                
                $titleObj = NULL;
                if(!isset($params['title']))
-                       $this->dieUsage('The title parameter must be set', 'notitle');
+                       $this->dieUsageMsg(array('missingparam', 'title'));
                if(!isset($params['token']))
-                       $this->dieUsage('The token parameter must be set', 'notoken');
+                       $this->dieUsageMsg(array('missingparam', 'token'));
                if(!isset($params['protections']) || empty($params['protections']))
-                       $this->dieUsage('The protections parameter must be set', 'noprotections');
+                       $this->dieUsageMsg(array('missingparam', 'protections'));
 
-               if($wgUser->isBlocked())
-                       $this->dieUsage('You have been blocked from editing', 'blocked');
-               if(wfReadOnly())
-                       $this->dieUsage('The wiki is in read-only mode', 'readonly');
                if(!$wgUser->matchEditToken($params['token']))
-                       $this->dieUsage('Invalid token', 'badtoken');
+                       $this->dieUsageMsg(array('sessionfailure'));
 
                $titleObj = Title::newFromText($params['title']);
                if(!$titleObj)
-                       $this->dieUsage("Bad title ``{$params['title']}''", 'invalidtitle');
-               if(!$titleObj->userCan('protect'))
-                       $this->dieUsage('You don\'t have permission to change protection levels', 'permissiondenied');
+                       $this->dieUsageMsg(array('invalidtitle', $params['title']));
+                       
+               $errors = $titleObj->getUserPermissionsErrors('protect', $wgUser);
+               if(!empty($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();
@@ -68,11 +67,11 @@ class ApiProtect extends ApiBase {
                {
                        $expiry = strtotime($params['expiry']);
                        if($expiry < 0 || $expiry == false)
-                               $this->dieUsage('Invalid expiry time', 'invalidexpiry');
+                               $this->dieUsageMsg(array('invalidexpiry'));
                        
                        $expiry = wfTimestamp(TS_MW, $expiry);
                        if($expiry < wfTimestampNow())
-                               $this->dieUsage('Expiry time is in the past', 'pastexpiry');
+                               $this->dieUsageMsg(array('pastexpiry'));
                }
 
                $protections = array();
@@ -81,9 +80,9 @@ class ApiProtect extends ApiBase {
                        $p = explode('=', $prot);
                        $protections[$p[0]] = ($p[1] == 'all' ? '' : $p[1]);
                        if($titleObj->exists() && $p[0] == 'create')
-                               $this->dieUsage("Existing titles can't be protected with 'create'", 'create-titleexists');
+                               $this->dieUsageMsg(array('create-titleexists'));
                        if(!$titleObj->exists() && $p[0] != 'create')
-                               $this->dieUsage("Missing titles can only be protected with 'create'", 'missingtitle');
+                               $this->dieUsageMsg(array('missingtitles-createonly'));
                }
 
                $dbw = wfGetDb(DB_MASTER);
@@ -95,9 +94,15 @@ class ApiProtect extends ApiBase {
                        $ok = $titleObj->updateTitleProtection($protections['create'], $params['reason'], $expiry);
                if(!$ok)
                        // This is very weird. Maybe the article was deleted or the user was blocked/desysopped in the meantime?
-                       $this->dieUsage('Unknown error', 'unknownerror');
+                       // Just throw an unknown error in this case, as it's very likely to be a race condition
+                       $this->dieUsageMsg(array());
                $dbw->commit();
-               $res = array('title' => $titleObj->getPrefixedText(), 'reason' => $params['reason'], 'expiry' => wfTimestamp(TS_ISO_8601, $expiry));
+               $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'])
                        $res['cascade'] = '';
                $res['protections'] = $protections;