From 03e45da6f96fd9aa411e015554f559b3ee9a61da Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Wed, 7 Apr 2010 04:33:59 +0200
Subject: update to MediaWiki 1.15.3

---
 includes/api/ApiLogin.php | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

(limited to 'includes/api')

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 $';
 	}
 }
-- 
cgit v1.2.2