http://www.mediawiki.org/wiki/Special:Code/MediaWiki/98637
Revision: 98637
Author: reedy
Date: 2011-10-01 22:43:43 +0000 (Sat, 01 Oct 2011)
Log Message:
-----------
Update some deprecated stuff
Fixed missing $dbr
Modified Paths:
--------------
trunk/extensions/ConfirmAccount/business/AccountRequestSubmission.php
trunk/extensions/ConfirmAccount/dataclasses/ConfirmAccount.class.php
Modified: trunk/extensions/ConfirmAccount/business/AccountRequestSubmission.php
===================================================================
--- trunk/extensions/ConfirmAccount/business/AccountRequestSubmission.php
2011-10-01 22:38:46 UTC (rev 98636)
+++ trunk/extensions/ConfirmAccount/business/AccountRequestSubmission.php
2011-10-01 22:43:43 UTC (rev 98637)
@@ -93,7 +93,7 @@
return array( 'acct_request_skipped_tos', wfMsgHtml(
'requestaccount-agree' ) );
}
# Validate email address
- if ( !$u->isValidEmailAddr( $this->email ) ) {
+ if ( !Sanitizer::validateEmail( $this->email ) ) {
return array( 'acct_request_invalid_email', wfMsgHtml(
'invalidemailaddress' ) );
}
# Check if biography is long enough
@@ -161,6 +161,9 @@
}
$expires = null; // passed by reference
$token = ConfirmAccount::getConfirmationToken( $u, $expires );
+
+ global $wgRequest;
+ $ip = $wgRequest->getIP();
# Insert into pending requests...
$req = UserAccountRequest::newFromArray( array(
'name' => $u->getName(),
@@ -179,12 +182,12 @@
'comment' => '',
'email_token' => md5( $token ),
'email_token_expires' => $expires,
- 'ip' => wfGetIP(),
+ 'ip' => $ip,
) );
$dbw->begin();
$req->insertOn();
# Send confirmation, required!
- $result = ConfirmAccount::sendConfirmationMail( $u, wfGetIP(),
$token, $expires );
+ $result = ConfirmAccount::sendConfirmationMail( $u, $ip,
$token, $expires );
if ( !$result->isOK() ) {
$dbw->rollback(); // Nevermind
return array( 'acct_request_mail_failed',
@@ -197,7 +200,7 @@
# No request spamming...
# BC: check if isPingLimitable() exists
if ( $wgAccountRequestThrottle && $reqUser->isPingLimitable() )
{
- $key = wfMemcKey( 'acctrequest', 'ip', wfGetIP() );
+ $key = wfMemcKey( 'acctrequest', 'ip', $ip );
$value = $wgMemc->incr( $key );
if ( !$value ) {
$wgMemc->set( $key, 1, 86400 );
Modified: trunk/extensions/ConfirmAccount/dataclasses/ConfirmAccount.class.php
===================================================================
--- trunk/extensions/ConfirmAccount/dataclasses/ConfirmAccount.class.php
2011-10-01 22:38:46 UTC (rev 98636)
+++ trunk/extensions/ConfirmAccount/dataclasses/ConfirmAccount.class.php
2011-10-01 22:43:43 UTC (rev 98637)
@@ -128,7 +128,8 @@
* @return string|false
*/
public function requestNameFromEmailToken( $code ) {
- return wfGetDB( DB_SLAVE )->selectField( 'account_requests',
+ $dbr = wfGetDB( DB_SLAVE );
+ return $dbr->selectField( 'account_requests',
'acr_name',
array(
'acr_email_token' => md5( $code ),
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
