| Index: trunk/phase3/includes/api/ApiLogin.php |
| — | — | @@ -92,30 +92,39 @@ |
| 93 | 93 | case LoginForm :: NO_NAME : |
| 94 | 94 | $result['result'] = 'NoName'; |
| 95 | 95 | break; |
| | 96 | + |
| 96 | 97 | case LoginForm :: ILLEGAL : |
| 97 | 98 | $result['result'] = 'Illegal'; |
| 98 | 99 | break; |
| | 100 | + |
| 99 | 101 | case LoginForm :: WRONG_PLUGIN_PASS : |
| 100 | 102 | $result['result'] = 'WrongPluginPass'; |
| 101 | 103 | break; |
| | 104 | + |
| 102 | 105 | case LoginForm :: NOT_EXISTS : |
| 103 | 106 | $result['result'] = 'NotExists'; |
| 104 | 107 | break; |
| | 108 | + |
| | 109 | + case LoginForm :: RESET_PASS : //bug 20223 - Treat a temporary password as wrong. Per SpecialUserLogin - "The e-mailed temporary password should not be used for actual logins;" |
| 105 | 110 | case LoginForm :: WRONG_PASS : |
| 106 | 111 | $result['result'] = 'WrongPass'; |
| 107 | 112 | break; |
| | 113 | + |
| 108 | 114 | case LoginForm :: EMPTY_PASS : |
| 109 | 115 | $result['result'] = 'EmptyPass'; |
| 110 | 116 | break; |
| | 117 | + |
| 111 | 118 | case LoginForm :: CREATE_BLOCKED : |
| 112 | 119 | $result['result'] = 'CreateBlocked'; |
| 113 | 120 | $result['details'] = 'Your IP address is blocked from account creation'; |
| 114 | 121 | break; |
| | 122 | + |
| 115 | 123 | case LoginForm :: THROTTLED : |
| 116 | 124 | global $wgPasswordAttemptThrottle; |
| 117 | 125 | $result['result'] = 'Throttled'; |
| 118 | 126 | $result['wait'] = intval($wgPasswordAttemptThrottle['seconds']); |
| 119 | 127 | break; |
| | 128 | + |
| 120 | 129 | default : |
| 121 | 130 | ApiBase :: dieDebug(__METHOD__, "Unhandled case value: {$authRes}"); |
| 122 | 131 | } |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -755,6 +755,7 @@ |
| 756 | 756 | * (bug 21945) Add chomp control in YAML |
| 757 | 757 | * Expand the thumburl to an absolute url to make it consistent with url and |
| 758 | 758 | descriptionurl |
| | 759 | +* (bug 20233) ApiLogin::execute() doesn't handle LoginForm :: RESET_PASS |
| 759 | 760 | |
| 760 | 761 | === Languages updated in 1.16 === |
| 761 | 762 | |