ported changes to SORBS check from 1.4

diff --git a/includes/SpecialUserlogin.php b/includes/SpecialUserlogin.php
index b1d4886..e684c44 100644 (file)
--- a/includes/SpecialUserlogin.php
+++ b/includes/SpecialUserlogin.php
@@ -159,7 +159,7 @@ class LoginForm {
         */
        function addNewAccountInternal() {
                global $wgUser, $wgOut;
-               global $wgMaxNameChars;
+               global $wgMaxNameChars, $wgUseLatin1, $wgEnableSorbs, $wgProxyWhitelist;
                global $wgMemc, $wgAccountCreationThrottle, $wgDBname, $wgIP;
                global $wgMinimalPasswordLength;
                global $wgAuth;
@@ -190,6 +190,14 @@ class LoginForm {
                        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;

diff --git a/includes/User.php b/includes/User.php
index 3520a2e..93bd950 100644 (file)
--- a/includes/User.php
+++ b/includes/User.php
@@ -320,7 +320,7 @@ class User {
                        }
 
                        # DNSBL
-                       if ( !$this->mBlockedby && $wgEnableSorbs ) {
+                       if ( !$this->mBlockedby && $wgEnableSorbs && !$this->getID() ) {
                                if ( $this->inSorbsBlacklist( $wgIP ) ) {
                                        $this->mBlockedby = wfMsg( 'sorbs' );
                                        $this->mBlockreason = wfMsg( 'sorbsreason' );