*/
function addNewAccountInternal() {
global $wgUser, $wgOut;
- global $wgMaxNameChars;
+ global $wgMaxNameChars, $wgUseLatin1, $wgEnableSorbs, $wgProxyWhitelist;
global $wgMemc, $wgAccountCreationThrottle, $wgDBname, $wgIP;
global $wgMinimalPasswordLength;
global $wgAuth;
return false;
}
+ if ( $wgEnableSorbs && !in_array( $wgIP, $wgProxyWhitelist ) &&
+ $wgUser->inSorbsBlacklist( $wgIP ) )
+ {
+ $this->mainLoginForm( wfMsg( 'sorbs_create_account_reason' ) );
+ return;
+ }
+
+
if ( 0 != strcmp( $this->mPassword, $this->mRetype ) ) {
$this->mainLoginForm( wfMsg( 'badretype' ) );
return false;
}
# DNSBL
- if ( !$this->mBlockedby && $wgEnableSorbs ) {
+ if ( !$this->mBlockedby && $wgEnableSorbs && !$this->getID() ) {
if ( $this->inSorbsBlacklist( $wgIP ) ) {
$this->mBlockedby = wfMsg( 'sorbs' );
$this->mBlockreason = wfMsg( 'sorbsreason' );