dépôts
/
lhc
/
web
/
wiklou.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0a722f3
)
Handle the new LoginForm::CREATE_BLOCKED return value from authenticateUserData().
author
Tim Starling
<tstarling@users.mediawiki.org>
Sat, 17 May 2008 04:00:26 +0000
(
04:00
+0000)
committer
Tim Starling
<tstarling@users.mediawiki.org>
Sat, 17 May 2008 04:00:26 +0000
(
04:00
+0000)
includes/api/ApiLogin.php
patch
|
blob
|
history
diff --git
a/includes/api/ApiLogin.php
b/includes/api/ApiLogin.php
index
6ecf464
..
2b603b3
100644
(file)
--- a/
includes/api/ApiLogin.php
+++ b/
includes/api/ApiLogin.php
@@
-130,11
+130,15
@@
class ApiLogin extends ApiBase {
case LoginForm :: EMPTY_PASS :
$result['result'] = 'EmptyPass';
break;
case LoginForm :: EMPTY_PASS :
$result['result'] = 'EmptyPass';
break;
+ case LoginForm :: CREATE_BLOCKED :
+ $result['result'] = 'CreateBlocked';
+ $result['details'] = 'Your IP address is blocked from account creation';
+ break;
default :
ApiBase :: dieDebug(__METHOD__, 'Unhandled case value');
}
default :
ApiBase :: dieDebug(__METHOD__, 'Unhandled case value');
}
- if ($result['result'] != 'Success') {
+ if ($result['result'] != 'Success'
&& !isset( $result['details'] )
) {
$delay = $this->cacheBadLogin();
$result['wait'] = $delay;
$result['details'] = "Please wait " . $delay . " seconds before next log-in attempt";
$delay = $this->cacheBadLogin();
$result['wait'] = $delay;
$result['details'] = "Please wait " . $delay . " seconds before next log-in attempt";
@@
-219,7
+223,7
@@
class ApiLogin extends ApiBase {
return wfMemcKey( 'apilogin', 'badlogin', 'ip', wfGetIP() );
}
return wfMemcKey( 'apilogin', 'badlogin', 'ip', wfGetIP() );
}
- public function mustBePosted() { return true; }
+
//
public function mustBePosted() { return true; }
public function getAllowedParams() {
return array (
public function getAllowedParams() {
return array (