diff options
author | Pierre Schmitz <pierre@archlinux.de> | 2010-04-07 04:34:31 +0200 |
---|---|---|
committer | Pierre Schmitz <pierre@archlinux.de> | 2010-04-07 04:34:31 +0200 |
commit | acb4344b687e0ad771a90693ef4838d74799bca6 (patch) | |
tree | dd421c97252b1d0d17357513fb1e87f74ede78f7 /includes/api/ApiLogin.php | |
parent | 68d8f40ee713b12fefce5dfb93f6843717ccc951 (diff) | |
parent | 03e45da6f96fd9aa411e015554f559b3ee9a61da (diff) |
Merge branch 'master' into redesign
Diffstat (limited to 'includes/api/ApiLogin.php')
-rw-r--r-- | includes/api/ApiLogin.php | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/includes/api/ApiLogin.php b/includes/api/ApiLogin.php index bc477e1d..1d2c3436 100644 --- a/includes/api/ApiLogin.php +++ b/includes/api/ApiLogin.php @@ -60,6 +60,7 @@ class ApiLogin extends ApiBase { 'wpName' => $params['name'], 'wpPassword' => $params['password'], 'wpDomain' => $params['domain'], + 'wpLoginToken' => $params['token'], 'wpRemember' => '' )); @@ -88,6 +89,15 @@ class ApiLogin extends ApiBase { $result['cookieprefix'] = $wgCookiePrefix; $result['sessionid'] = session_id(); break; + + case LoginForm::NEED_TOKEN: + $result['result'] = 'NeedToken'; + $result['token'] = $loginForm->getLoginToken(); + break; + + case LoginForm::WRONG_TOKEN: + $result['result'] = 'WrongToken'; + break; case LoginForm :: NO_NAME : $result['result'] = 'NoName'; @@ -133,7 +143,8 @@ class ApiLogin extends ApiBase { return array ( 'name' => null, 'password' => null, - 'domain' => null + 'domain' => null, + 'token' => null, ); } @@ -141,7 +152,8 @@ class ApiLogin extends ApiBase { return array ( 'name' => 'User Name', 'password' => 'Password', - 'domain' => 'Domain (optional)' + 'domain' => 'Domain (optional)', + 'token' => 'Login token obtained in first request', ); } @@ -162,6 +174,6 @@ class ApiLogin extends ApiBase { } public function getVersion() { - return __CLASS__ . ': $Id: ApiLogin.php 48091 2009-03-06 13:49:44Z catrope $'; + return __CLASS__ . ': $Id: ApiLogin.php 64680 2010-04-07 00:13:46Z tstarling $'; } } |