http://www.mediawiki.org/wiki/Special:Code/MediaWiki/97864
Revision: 97864
Author: reedy
Date: 2011-09-22 22:22:50 +0000 (Thu, 22 Sep 2011)
Log Message:
-----------
Fix used constants, simplify some returns
Documentation
Remove unused global
Modified Paths:
--------------
trunk/extensions/SignupAPI/includes/ApiSignup.php
trunk/extensions/SignupAPI/includes/SpecialUserSignup.php
Modified: trunk/extensions/SignupAPI/includes/ApiSignup.php
===================================================================
--- trunk/extensions/SignupAPI/includes/ApiSignup.php 2011-09-22 22:16:58 UTC
(rev 97863)
+++ trunk/extensions/SignupAPI/includes/ApiSignup.php 2011-09-22 22:22:50 UTC
(rev 97864)
@@ -39,13 +39,13 @@
wfSetupSession();
}
- $signupForm = new SignupForm( $req );
+ $signupForm = new SpecialUserSignup( $req );
global $wgCookiePrefix, $wgUser;
$signupRes = $signupForm->addNewAccountInternal();
switch( $signupRes ) {
- case SignupForm::SUCCESS:
+ case SpecialUserSignup::SUCCESS:
//$signupForm->initUser($signupForm->mUser);
wfRunHooks( 'AddNewAccount', array( $wgUser,
false ) );
@@ -66,75 +66,75 @@
$result['sessionid'] = session_id();
break;
- case SignupForm::INVALID_DOMAIN:
+ case SpecialUserSignup::INVALID_DOMAIN:
$result['result'] = 'WrongPassword';
$result['domain']= $signupForm->mDomain;
break;
- case SignupForm::READ_ONLY_PAGE:
+ case SpecialUserSignup::READ_ONLY_PAGE:
$result['result'] = 'ReadOnlyPage';
break;
- case SignupForm::NO_COOKIES:
+ case SpecialUserSignup::NO_COOKIES:
$result['result'] = 'NoCookies';
break;
- case SignupForm::NEED_TOKEN:
+ case SpecialUserSignup::NEED_TOKEN:
$result['result'] = 'NeedToken';
$result['token'] =
$signupForm->getCreateaccountToken();
$result['cookieprefix'] = $wgCookiePrefix;
$result['sessionid'] = session_id();
break;
- case SignupForm::WRONG_TOKEN:
+ case SpecialUserSignup::WRONG_TOKEN:
$result['result'] = 'WrongToken';
break;
- case SignupForm::INSUFFICIENT_PERMISSION:
+ case SpecialUserSignup::INSUFFICIENT_PERMISSION:
$result['result'] = 'InsufficientPermission';
break;
- case SignupForm::CREATE_BLOCKED:
+ case SpecialUserSignup::CREATE_BLOCKED:
$result['result'] = 'CreateBlocked';
break;
- case SignupForm::IP_BLOCKED:
+ case SpecialUserSignup::IP_BLOCKED:
$result['result'] = 'IPBlocked';
break;
- case SignupForm::NO_NAME:
+ case SpecialUserSignup::NO_NAME:
$result['result'] = 'NoName';
break;
- case SignupForm::USER_EXISTS:
+ case SpecialUserSignup::USER_EXISTS:
$result['result'] = 'UserExists';
break;
- case SignupForm::WRONG_RETYPE:
+ case SpecialUserSignup::WRONG_RETYPE:
$result['result'] = 'WrongRetype';
break;
- case SignupForm::INVALID_PASS:
+ case SpecialUserSignup::INVALID_PASS:
$result['result'] = 'InvalidPass';
break;
- case SignupForm::NO_EMAIL:
+ case SpecialUserSignup::NO_EMAIL:
$result['result'] = 'NoEmail';
break;
- case SignupForm::INVALID_EMAIL:
+ case SpecialUserSignup::INVALID_EMAIL:
$result['result'] = 'InvalidEmail';
break;
- case SignupForm::BLOCKED_BY_HOOK:
+ case SpecialUserSignup::BLOCKED_BY_HOOK:
$result['result'] = 'BlockedByHook';
break;
- case SignupForm::EXTR_DB_ERROR:
+ case SpecialUserSignup::EXTR_DB_ERROR:
$result['result'] = 'ExternalDBError';
break;
- case SignupForm::THROTLLED:
+ case SpecialUserSignup::THROTLLED:
$result['result'] = 'Throttled';
break;
Modified: trunk/extensions/SignupAPI/includes/SpecialUserSignup.php
===================================================================
--- trunk/extensions/SignupAPI/includes/SpecialUserSignup.php 2011-09-22
22:16:58 UTC (rev 97863)
+++ trunk/extensions/SignupAPI/includes/SpecialUserSignup.php 2011-09-22
22:22:50 UTC (rev 97864)
@@ -53,7 +53,7 @@
var $mAction, $mCreateaccount, $mCreateaccountMail;
var $mRemember, $mEmail, $mDomain, $mLanguage;
var $mSkipCookieCheck, $mReturnToQuery, $mToken, $mStickHTTPS;
- var $mType, $mReason, $mRealName;
+ var $mType, $mReason, $mRealName, $mUsername;
var $abortError = '';
var $tempUser, $mConfirmationMailStatus, $mRunCookieRedirect,
$mRunCreationConfirmation;
var $mSourceAction, $mSourceNS, $msourceArticle;
@@ -198,9 +198,11 @@
/**
* @private
+ *
+ * @param $tempUser User
*/
- function addNewAccount($tempUser) {
- global $wgUser, $wgEmailAuthentication, $wgOut;
+ function addNewAccount( $tempUser ) {
+ global $wgUser, $wgEmailAuthentication;
# If we showed up language selection links, and one was in use,
be
# smart (and sensible) and save that language as the user's
preference
@@ -243,9 +245,9 @@
* @private
*/
function addNewAccountInternal() {
- global $wgUser, $wgOut;
+ global $wgUser;
global $wgMemc, $wgAccountCreationThrottle;
- global $wgAuth, $wgMinimalPasswordLength;
+ global $wgAuth;
global $wgEmailConfirmToEdit;
// If the user passes an invalid domain, something is fishy
@@ -266,7 +268,6 @@
}
if ( wfReadOnly() ) {
-
return self::READ_ONLY_PAGE;
}
@@ -646,7 +647,6 @@
return;
}
-
if ( $this->mUsername == '' ) {
if ( $wgUser->isLoggedIn() ) {
$this->mUsername = $wgUser->getName();
@@ -752,18 +752,12 @@
/**
* @private
*
- * @param $tempUserser User
+ * @param $tempUser User
*
* @return Boolean
*/
- function showCreateOrLoginLink( &$tempUserser ) {
- if( $this->mType == 'signup' ) {
- return true;
- } elseif( $tempUserser->isAllowed( 'createaccount' ) ) {
- return true;
- } else {
- return false;
- }
+ function showCreateOrLoginLink( $tempUser ) {
+ return $this->mType == 'signup' || $tempUser->isAllowed(
'createaccount' );
}
/**
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
