(bug 24898) MediaWiki uses /tmp even if a vHost-specific tempdir is set, also make...
[lhc/web/wiklou.git] / includes / User.php
index eecaccf..675ccfd 100644 (file)
@@ -42,58 +42,6 @@ class PasswordError extends MWException {
  */
 class User {
 
-       /**
-        * \type{\arrayof{\string}} A list of default user toggles, i.e., boolean user
-         * preferences that are displayed by Special:Preferences as checkboxes.
-        * This list can be extended via the UserToggles hook or by
-        * $wgContLang::getExtraUserToggles().
-        * @showinitializer
-        */
-       public static $mToggles = array(
-               'highlightbroken',
-               'justify',
-               'hideminor',
-               'extendwatchlist',
-               'usenewrc',
-               'numberheadings',
-               'showtoolbar',
-               'editondblclick',
-               'editsection',
-               'editsectiononrightclick',
-               'showtoc',
-               'rememberpassword',
-               'editwidth',
-               'watchcreations',
-               'watchdefault',
-               'watchmoves',
-               'watchdeletion',
-               'minordefault',
-               'previewontop',
-               'previewonfirst',
-               'nocache',
-               'enotifwatchlistpages',
-               'enotifusertalkpages',
-               'enotifminoredits',
-               'enotifrevealaddr',
-               'shownumberswatching',
-               'fancysig',
-               'externaleditor',
-               'externaldiff',
-               'showjumplinks',
-               'uselivepreview',
-               'forceeditsummary',
-               'watchlisthideminor',
-               'watchlisthidebots',
-               'watchlisthideown',
-               'watchlisthideanons',
-               'watchlisthideliu',
-               'ccmeonemails',
-               'diffonly',
-               'showhiddencats',
-               'noconvertlink',
-               'norollbackdiff',
-       );
-
        /**
         * \type{\arrayof{\string}} List of member variables which are saved to the
         * shared cache (memcached). Any operation which changes the
@@ -142,6 +90,7 @@ class User {
                'createtalk',
                'delete',
                'deletedhistory',
+               'deletedtext',
                'deleterevision',
                'edit',
                'editinterface',
@@ -167,6 +116,8 @@ class User {
                'reupload',
                'reupload-shared',
                'rollback',
+               'selenium',
+               'sendemail',
                'siteadmin',
                'suppressionlog',
                'suppressredirect',
@@ -214,7 +165,7 @@ class User {
                $mBlockreason, $mBlock, $mEffectiveGroups, $mBlockedGlobally,
                $mLocked, $mHideName, $mOptions;
        //@}
-       
+
        static $idCacheByName = array();
 
        /**
@@ -343,7 +294,8 @@ class User {
         *    User::getCanonicalName(), except that true is accepted as an alias
         *    for 'valid', for BC.
         *
-        * @return \type{User} The User object, or null if the username is invalid. If the
+        * @return \type{User} The User object, or false if the username is invalid 
+        *    (e.g. if it contains illegal characters or is an IP address). If the
         *    username is not present in the database, the result will be a user object
         *    with a name, zero user ID and default settings.
         */
@@ -353,7 +305,7 @@ class User {
                }
                $name = self::getCanonicalName( $name, $validate );
                if ( $name === false ) {
-                       return null;
+                       return false;
                } else {
                        # Create unloaded user object
                        $u = new User;
@@ -433,7 +385,7 @@ class User {
         */
        static function whoIs( $id ) {
                $dbr = wfGetDB( DB_SLAVE );
-               return $dbr->selectField( 'user', 'user_name', array( 'user_id' => $id ), 'User::whoIs' );
+               return $dbr->selectField( 'user', 'user_name', array( 'user_id' => $id ), __METHOD__ );
        }
 
        /**
@@ -458,11 +410,11 @@ class User {
                        # Illegal name
                        return null;
                }
-               
-               if ( isset(self::$idCacheByName[$name]) ) {
+
+               if ( isset( self::$idCacheByName[$name] ) ) {
                        return self::$idCacheByName[$name];
                }
-               
+
                $dbr = wfGetDB( DB_SLAVE );
                $s = $dbr->selectRow( 'user', array( 'user_id' ), array( 'user_name' => $nt->getText() ), __METHOD__ );
 
@@ -471,13 +423,13 @@ class User {
                } else {
                        $result = $s->user_id;
                }
-               
+
                self::$idCacheByName[$name] = $result;
-               
-               if ( count(self::$idCacheByName) > 1000 ) {
+
+               if ( count( self::$idCacheByName ) > 1000 ) {
                        self::$idCacheByName = array();
                }
-               
+
                return $result;
        }
 
@@ -597,41 +549,74 @@ class User {
         * either by batch processes or by user accounts which have
         * already been created.
         *
-        * Additional character blacklisting may be added here
-        * rather than in isValidUserName() to avoid disrupting
-        * existing accounts.
+        * Additional blacklisting may be added here rather than in 
+        * isValidUserName() to avoid disrupting existing accounts.
         *
         * @param $name \string String to match
         * @return \bool True or false
         */
        static function isCreatableName( $name ) {
                global $wgInvalidUsernameCharacters;
-               return
-                       self::isUsableName( $name ) &&
 
-                       // Registration-time character blacklisting...
-                       !preg_match( '/[' . preg_quote( $wgInvalidUsernameCharacters, '/' ) . ']/', $name );
+               // Ensure that the username isn't longer than 235 bytes, so that
+               // (at least for the builtin skins) user javascript and css files
+               // will work. (bug 23080)
+               if( strlen( $name ) > 235 ) {
+                       wfDebugLog( 'username', __METHOD__ .
+                               ": '$name' invalid due to length" );
+                       return false;
+               }
+
+               if( preg_match( '/[' . preg_quote( $wgInvalidUsernameCharacters, '/' ) . ']/', $name ) ) {
+                       wfDebugLog( 'username', __METHOD__ .
+                               ": '$name' invalid due to wgInvalidUsernameCharacters" );
+                       return false;
+               }
+
+               return self::isUsableName( $name );
        }
 
        /**
         * Is the input a valid password for this user?
         *
         * @param $password String Desired password
-        * @return mixed: true on success, string of error message on failure
+        * @return bool True or false
         */
        function isValidPassword( $password ) {
+               //simple boolean wrapper for getPasswordValidity
+               return $this->getPasswordValidity( $password ) === true;
+       }
+
+       /**
+        * Given unvalidated password input, return error message on failure.
+        *
+        * @param $password String Desired password
+        * @return mixed: true on success, string of error message on failure
+        */
+       function getPasswordValidity( $password ) {
                global $wgMinimalPasswordLength, $wgContLang;
 
+               $result = false; //init $result to false for the internal checks
+
                if( !wfRunHooks( 'isValidPassword', array( $password, &$result, $this ) ) )
                        return $result;
 
-               // Password needs to be long enough
-               if( strlen( $password ) < $wgMinimalPasswordLength ) {
-                       return 'passwordtooshort';
-               } elseif( $wgContLang->lc( $password ) == $wgContLang->lc( $this->mName ) ) {
-                       return 'password-name-match';
-               } else {
+               if ( $result === false ) {
+                       if( strlen( $password ) < $wgMinimalPasswordLength ) {
+                               return 'passwordtooshort';
+                       } elseif ( $wgContLang->lc( $password ) == $wgContLang->lc( $this->mName ) ) {
+                               return 'password-name-match';
+                       } else {
+                               //it seems weird returning true here, but this is because of the
+                               //initialization of $result to false above. If the hook is never run or it
+                               //doesn't modify $result, then we will likely get down into this if with
+                               //a valid password.
+                               return true;
+                       }
+               } elseif( $result === true ) {
                        return true;
+               } else {
+                       return $result; //the isValidPassword hook set a string $result and returned true
                }
        }
 
@@ -678,7 +663,7 @@ class User {
                        return false;
 
                # Clean up name according to title rules
-               $t = ($validate === 'valid') ?
+               $t = ( $validate === 'valid' ) ?
                        Title::newFromText( $name ) : Title::makeTitle( NS_USER, $name );
                # Check for invalid titles
                if( is_null( $t ) ) {
@@ -709,7 +694,7 @@ class User {
                                }
                                break;
                        default:
-                               throw new MWException( 'Invalid parameter value for $validate in '.__METHOD__ );
+                               throw new MWException( 'Invalid parameter value for $validate in ' . __METHOD__ );
                }
                return $name;
        }
@@ -763,10 +748,10 @@ class User {
                $l = strlen( $pwchars ) - 1;
 
                $pwlength = max( 7, $wgMinimalPasswordLength );
-               $digit = mt_rand(0, $pwlength - 1);
+               $digit = mt_rand( 0, $pwlength - 1 );
                $np = '';
                for ( $i = 0; $i < $pwlength; $i++ ) {
-                       $np .= $i == $digit ? chr( mt_rand(48, 57) ) : $pwchars{ mt_rand(0, $l)};
+                       $np .= $i == $digit ? chr( mt_rand( 48, 57 ) ) : $pwchars{ mt_rand( 0, $l ) };
                }
                return $np;
        }
@@ -781,7 +766,7 @@ class User {
        function loadDefaults( $name = false ) {
                wfProfileIn( __METHOD__ );
 
-               global $wgCookiePrefix;
+               global $wgRequest;
 
                $this->mId = 0;
                $this->mName = $name;
@@ -792,8 +777,8 @@ class User {
                $this->mOptionOverrides = null;
                $this->mOptionsLoaded = false;
 
-               if ( isset( $_COOKIE[$wgCookiePrefix.'LoggedOut'] ) ) {
-                       $this->mTouched = wfTimestamp( TS_MW, $_COOKIE[$wgCookiePrefix.'LoggedOut'] );
+               if( $wgRequest->getCookie( 'LoggedOut' ) !== null ) {
+                       $this->mTouched = wfTimestamp( TS_MW, $wgRequest->getCookie( 'LoggedOut' ) );
                } else {
                        $this->mTouched = '0'; # Allow any pages to be cached
                }
@@ -824,7 +809,7 @@ class User {
         * @return \bool True if the user is logged in, false otherwise.
         */
        private function loadFromSession() {
-               global $wgMemc, $wgCookiePrefix;
+               global $wgRequest, $wgExternalAuthType, $wgAutocreatePolicy;
 
                $result = null;
                wfRunHooks( 'UserLoadFromSession', array( $this, &$result ) );
@@ -832,8 +817,16 @@ class User {
                        return $result;
                }
 
-               if ( isset( $_COOKIE["{$wgCookiePrefix}UserID"] ) ) {
-                       $sId = intval( $_COOKIE["{$wgCookiePrefix}UserID"] );
+               if ( $wgExternalAuthType && $wgAutocreatePolicy == 'view' ) {
+                       $extUser = ExternalUser::newFromCookie();
+                       if ( $extUser ) {
+                               # TODO: Automatically create the user here (or probably a bit
+                               # lower down, in fact)
+                       }
+               }
+
+               if ( $wgRequest->getCookie( 'UserID' ) !== null ) {
+                       $sId = intval( $wgRequest->getCookie( 'UserID' ) );
                        if( isset( $_SESSION['wsUserID'] ) && $sId != $_SESSION['wsUserID'] ) {
                                $this->loadDefaults(); // Possible collision!
                                wfDebugLog( 'loginSessions', "Session user ID ({$_SESSION['wsUserID']}) and
@@ -855,8 +848,8 @@ class User {
 
                if ( isset( $_SESSION['wsUserName'] ) ) {
                        $sName = $_SESSION['wsUserName'];
-               } else if ( isset( $_COOKIE["{$wgCookiePrefix}UserName"] ) ) {
-                       $sName = $_COOKIE["{$wgCookiePrefix}UserName"];
+               } else if ( $wgRequest->getCookie('UserName') !== null ) {
+                       $sName = $wgRequest->getCookie('UserName');
                        $_SESSION['wsUserName'] = $sName;
                } else {
                        $this->loadDefaults();
@@ -870,11 +863,18 @@ class User {
                        return false;
                }
 
+               global $wgBlockDisablesLogin;
+               if( $wgBlockDisablesLogin && $this->isBlocked() ) {
+                       # User blocked and we've disabled blocked user logins
+                       $this->loadDefaults();
+                       return false;
+               }
+
                if ( isset( $_SESSION['wsToken'] ) ) {
                        $passwordCorrect = $_SESSION['wsToken'] == $this->mToken;
                        $from = 'session';
-               } else if ( isset( $_COOKIE["{$wgCookiePrefix}Token"] ) ) {
-                       $passwordCorrect = $this->mToken == $_COOKIE["{$wgCookiePrefix}Token"];
+               } else if ( $wgRequest->getCookie( 'Token' ) !== null ) {
+                       $passwordCorrect = $this->mToken == $wgRequest->getCookie( 'Token' );
                        $from = 'cookie';
                } else {
                        # No session or persistent login cookie
@@ -1017,11 +1017,11 @@ class User {
                $variant = $wgContLang->getPreferredVariant( false );
                $defOpt['variant'] = $variant;
                $defOpt['language'] = $variant;
-               foreach(  SearchEngine::searchableNamespaces() as $nsnum => $nsname ) {
-                       $defOpt['searchNs'.$nsnum] = !empty($wgNamespacesToBeSearchedDefault[$nsnum]);
+               foreach( SearchEngine::searchableNamespaces() as $nsnum => $nsname ) {
+                       $defOpt['searchNs'.$nsnum] = !empty( $wgNamespacesToBeSearchedDefault[$nsnum] );
                }
                $defOpt['skin'] = $wgDefaultSkin;
-               
+
                return $defOpt;
        }
 
@@ -1040,22 +1040,6 @@ class User {
                }
        }
 
-       /**
-        * Get a list of user toggle names
-        * @return \type{\arrayof{\string}} Array of user toggle names
-        */
-       static function getToggles() {
-               global $wgContLang, $wgUseRCPatrol;
-               $extraToggles = array();
-               wfRunHooks( 'UserToggles', array( &$extraToggles ) );
-               if( $wgUseRCPatrol ) {
-                       $extraToggles[] = 'hidepatrolled';
-                       $extraToggles[] = 'newpageshidepatrolled';
-                       $extraToggles[] = 'watchlisthidepatrolled';
-               }
-               return array_merge( self::$mToggles, $extraToggles, $wgContLang->getExtraUserToggles() );
-       }
-
 
        /**
         * Get blocking information
@@ -1066,7 +1050,7 @@ class User {
         *                    done against master.
         */
        function getBlockedStatus( $bFromSlave = true ) {
-               global $wgEnableSorbs, $wgProxyWhitelist, $wgUser;
+               global $wgProxyWhitelist, $wgUser;
 
                if ( -1 != $this->mBlockedby ) {
                        wfDebug( "User::getBlockedStatus: already loaded.\n" );
@@ -1089,16 +1073,14 @@ class User {
 
                # Check if we are looking at an IP or a logged-in user
                if ( $this->isIP( $this->getName() ) ) {
-                       $ip = $this->getName(); 
-               }
-               else {
+                       $ip = $this->getName();
+               } else {
                        # Check if we are looking at the current user
                        # If we don't, and the user is logged in, we don't know about
                        # his IP / autoblock status, so ignore autoblock of current user's IP
                        if ( $this->getID() != $wgUser->getID() ) {
                                $ip = '';
-                       }
-                       else {
+                       } else {
                                # Get IP of current user
                                $ip = wfGetIP();
                        }
@@ -1113,8 +1095,10 @@ class User {
                $this->mBlock = new Block();
                $this->mBlock->fromMaster( !$bFromSlave );
                if ( $this->mBlock->load( $ip , $this->mId ) ) {
-                       wfDebug( __METHOD__.": Found block.\n" );
+                       wfDebug( __METHOD__ . ": Found block.\n" );
                        $this->mBlockedby = $this->mBlock->mBy;
+                       if( $this->mBlockedby == 0 )
+                               $this->mBlockedby = $this->mBlock->mByName;
                        $this->mBlockreason = $this->mBlock->mReason;
                        $this->mHideName = $this->mBlock->mHideName;
                        $this->mAllowUsertalk = $this->mBlock->mAllowUsertalk;
@@ -1128,7 +1112,7 @@ class User {
                }
 
                # Proxy blocking
-               if ( !$this->isAllowed('proxyunbannable') && !in_array( $ip, $wgProxyWhitelist ) ) {
+               if ( !$this->isAllowed( 'proxyunbannable' ) && !in_array( $ip, $wgProxyWhitelist ) ) {
                        # Local list
                        if ( wfIsLocallyBlockedProxy( $ip ) ) {
                                $this->mBlockedby = wfMsg( 'proxyblocker' );
@@ -1136,8 +1120,8 @@ class User {
                        }
 
                        # DNSBL
-                       if ( !$this->mBlockedby && $wgEnableSorbs && !$this->getID() ) {
-                               if ( $this->inSorbsBlacklist( $ip ) ) {
+                       if ( !$this->mBlockedby && !$this->getID() ) {
+                               if ( $this->isDnsBlacklisted( $ip ) ) {
                                        $this->mBlockedby = wfMsg( 'sorbs' );
                                        $this->mBlockreason = wfMsg( 'sorbsreason' );
                                }
@@ -1151,43 +1135,57 @@ class User {
        }
 
        /**
-        * Whether the given IP is in the SORBS blacklist.
+        * Whether the given IP is in a DNS blacklist.
         *
         * @param $ip \string IP to check
+        * @param $checkWhitelist Boolean: whether to check the whitelist first
         * @return \bool True if blacklisted.
         */
-       function inSorbsBlacklist( $ip ) {
-               global $wgEnableSorbs, $wgSorbsUrl;
+       function isDnsBlacklisted( $ip, $checkWhitelist = false ) {
+               global $wgEnableSorbs, $wgEnableDnsBlacklist,
+                       $wgSorbsUrl, $wgDnsBlacklistUrls, $wgProxyWhitelist;
+
+               if ( !$wgEnableDnsBlacklist && !$wgEnableSorbs )
+                       return false;
 
-               return $wgEnableSorbs &&
-                       $this->inDnsBlacklist( $ip, $wgSorbsUrl );
+               if ( $checkWhitelist && in_array( $ip, $wgProxyWhitelist ) )
+                       return false;
+
+               $urls = array_merge( $wgDnsBlacklistUrls, (array)$wgSorbsUrl );
+               return $this->inDnsBlacklist( $ip, $urls );
        }
 
        /**
         * Whether the given IP is in a given DNS blacklist.
         *
         * @param $ip \string IP to check
-        * @param $base \string URL of the DNS blacklist
+        * @param $bases \string or Array of Strings: URL of the DNS blacklist
         * @return \bool True if blacklisted.
         */
-       function inDnsBlacklist( $ip, $base ) {
+       function inDnsBlacklist( $ip, $bases ) {
                wfProfileIn( __METHOD__ );
 
                $found = false;
                $host = '';
                // FIXME: IPv6 ???  (http://bugs.php.net/bug.php?id=33170)
-               if( IP::isIPv4($ip) ) {
-                       # Make hostname
-                       $host = "$ip.$base";
+               if( IP::isIPv4( $ip ) ) {
+                       # Reverse IP, bug 21255
+                       $ipReversed = implode( '.', array_reverse( explode( '.', $ip ) ) );
 
-                       # Send query
-                       $ipList = gethostbynamel( $host );
+                       foreach( (array)$bases as $base ) {
+                               # Make hostname
+                               $host = "$ipReversed.$base";
 
-                       if( $ipList ) {
-                               wfDebug( "Hostname $host is {$ipList[0]}, it's a proxy says $base!\n" );
-                               $found = true;
-                       } else {
-                               wfDebug( "Requested $host, not found in $base.\n" );
+                               # Send query
+                               $ipList = gethostbynamel( $host );
+
+                               if( $ipList ) {
+                                       wfDebug( "Hostname $host is {$ipList[0]}, it's a proxy says $base!\n" );
+                                       $found = true;
+                                       break;
+                               } else {
+                                       wfDebug( "Requested $host, not found in $base.\n" );
+                               }
                        }
                }
 
@@ -1202,10 +1200,17 @@ class User {
         */
        public function isPingLimitable() {
                global $wgRateLimitsExcludedGroups;
+               global $wgRateLimitsExcludedIPs;
                if( array_intersect( $this->getEffectiveGroups(), $wgRateLimitsExcludedGroups ) ) {
                        // Deprecated, but kept for backwards-compatibility config
                        return false;
                }
+               if( in_array( wfGetIP(), $wgRateLimitsExcludedIPs ) ) {
+                       // No other good way currently to disable rate limits
+                       // for specific IPs. :P
+                       // But this is a crappy hack and should die.
+                       return false;
+               }
                return !$this->isAllowed('noratelimit');
        }
 
@@ -1219,8 +1224,7 @@ class User {
         * @param $action \string Action to enforce; 'edit' if unspecified
         * @return \bool True if a rate limiter was tripped
         */
-       function pingLimiter( $action='edit' ) {
-
+       function pingLimiter( $action = 'edit' ) {
                # Call the 'PingLimiter' hook
                $result = false;
                if( !wfRunHooks( 'PingLimiter', array( &$this, $action, $result ) ) ) {
@@ -1276,7 +1280,7 @@ class User {
                }
                // Set the user limit key
                if ( $userLimit !== false ) {
-                       wfDebug( __METHOD__.": effective user limit: $userLimit\n" );
+                       wfDebug( __METHOD__ . ": effective user limit: $userLimit\n" );
                        $keys[ wfMemcKey( 'limiter', $action, 'user', $id ) ] = $userLimit;
                }
 
@@ -1285,19 +1289,20 @@ class User {
                        list( $max, $period ) = $limit;
                        $summary = "(limit $max in {$period}s)";
                        $count = $wgMemc->get( $key );
+                       // Already pinged?
                        if( $count ) {
                                if( $count > $max ) {
-                                       wfDebug( __METHOD__.": tripped! $key at $count $summary\n" );
+                                       wfDebug( __METHOD__ . ": tripped! $key at $count $summary\n" );
                                        if( $wgRateLimitLog ) {
                                                @error_log( wfTimestamp( TS_MW ) . ' ' . wfWikiID() . ': ' . $this->getName() . " tripped $key at $count $summary\n", 3, $wgRateLimitLog );
                                        }
                                        $triggered = true;
                                } else {
-                                       wfDebug( __METHOD__.": ok. $key at $count $summary\n" );
+                                       wfDebug( __METHOD__ . ": ok. $key at $count $summary\n" );
                                }
                        } else {
-                               wfDebug( __METHOD__.": adding record for $key $summary\n" );
-                               $wgMemc->add( $key, 1, intval( $period ) );
+                               wfDebug( __METHOD__ . ": adding record for $key $summary\n" );
+                               $wgMemc->add( $key, 0, intval( $period ) ); // first ping
                        }
                        $wgMemc->incr( $key );
                }
@@ -1328,17 +1333,20 @@ class User {
        function isBlockedFrom( $title, $bFromSlave = false ) {
                global $wgBlockAllowsUTEdit;
                wfProfileIn( __METHOD__ );
-               wfDebug( __METHOD__.": enter\n" );
+               wfDebug( __METHOD__ . ": enter\n" );
 
-               wfDebug( __METHOD__.": asking isBlocked()\n" );
+               wfDebug( __METHOD__ . ": asking isBlocked()\n" );
                $blocked = $this->isBlocked( $bFromSlave );
-               $allowUsertalk = ($wgBlockAllowsUTEdit ? $this->mAllowUsertalk : false);
+               $allowUsertalk = ( $wgBlockAllowsUTEdit ? $this->mAllowUsertalk : false );
                # If a user's name is suppressed, they cannot make edits anywhere
                if ( !$this->mHideName && $allowUsertalk && $title->getText() === $this->getName() &&
                  $title->getNamespace() == NS_USER_TALK ) {
                        $blocked = false;
-                       wfDebug( __METHOD__.": self-talk page, ignoring any blocks\n" );
+                       wfDebug( __METHOD__ . ": self-talk page, ignoring any blocks\n" );
                }
+
+               wfRunHooks( 'UserIsBlockedFrom', array( $this, $title, &$blocked, &$allowUsertalk ) );
+
                wfProfileOut( __METHOD__ );
                return $blocked;
        }
@@ -1367,7 +1375,7 @@ class User {
         */
        function getBlockId() {
                $this->getBlockedStatus();
-               return ($this->mBlock ? $this->mBlock->mId : false);
+               return ( $this->mBlock ? $this->mBlock->mId : false );
        }
 
        /**
@@ -1535,17 +1543,16 @@ class User {
         */
        function getNewMessageLinks() {
                $talks = array();
-               if (!wfRunHooks('UserRetrieveNewTalks', array(&$this, &$talks)))
+               if( !wfRunHooks( 'UserRetrieveNewTalks', array( &$this, &$talks ) ) )
                        return $talks;
 
-               if (!$this->getNewtalk())
+               if( !$this->getNewtalk() )
                        return array();
                $up = $this->getUserPage();
                $utp = $up->getTalkPage();
-               return array(array("wiki" => wfWikiID(), "link" => $utp->getLocalURL()));
+               return array( array( 'wiki' => wfWikiID(), 'link' => $utp->getLocalURL() ) );
        }
 
-
        /**
         * Internal uncached check for new messages
         *
@@ -1581,10 +1588,10 @@ class User {
                        __METHOD__,
                        'IGNORE' );
                if ( $dbw->affectedRows() ) {
-                       wfDebug( __METHOD__.": set on ($field, $id)\n" );
+                       wfDebug( __METHOD__ . ": set on ($field, $id)\n" );
                        return true;
                } else {
-                       wfDebug( __METHOD__." already set ($field, $id)\n" );
+                       wfDebug( __METHOD__ . " already set ($field, $id)\n" );
                        return false;
                }
        }
@@ -1602,10 +1609,10 @@ class User {
                        array( $field => $id ),
                        __METHOD__ );
                if ( $dbw->affectedRows() ) {
-                       wfDebug( __METHOD__.": killed on ($field, $id)\n" );
+                       wfDebug( __METHOD__ . ": killed on ($field, $id)\n" );
                        return true;
                } else {
-                       wfDebug( __METHOD__.": already gone ($field, $id)\n" );
+                       wfDebug( __METHOD__ . ": already gone ($field, $id)\n" );
                        return false;
                }
        }
@@ -1702,7 +1709,7 @@ class User {
         */
        function validateCache( $timestamp ) {
                $this->load();
-               return ($timestamp >= $this->mTouched);
+               return ( $timestamp >= $this->mTouched );
        }
 
        /**
@@ -1735,12 +1742,12 @@ class User {
                                throw new PasswordError( wfMsg( 'password-change-forbidden' ) );
                        }
 
-                       $valid = $this->isValidPassword( $str );
-                       if( $valid !== true ) {
-                               global $wgMinimalPasswordLength;
+                       if( !$this->isValidPassword( $str ) ) {
+                               global $wgMinimalPasswordLength;
+                               $valid = $this->getPasswordValidity( $str );
                                throw new PasswordError( wfMsgExt( $valid, array( 'parsemag' ),
                                        $wgMinimalPasswordLength ) );
-                       }
+                       }
                }
 
                if( !$wgAuth->setPassword( $this, $str ) ) {
@@ -1918,6 +1925,16 @@ class User {
                }
        }
 
+       /**
+        * Get all user's options
+        *
+        * @return array
+        */
+       public function getOptions() {
+               $this->loadOptions();
+               return $this->mOptions;
+       }
+
        /**
         * Get the user's current setting for a given option, as a boolean value.
         *
@@ -1955,18 +1972,18 @@ class User {
        function setOption( $oname, $val ) {
                $this->load();
                $this->loadOptions();
-               
+
                if ( $oname == 'skin' ) {
                        # Clear cached skin, so the new one displays immediately in Special:Preferences
                        unset( $this->mSkin );
                }
-               
+
                // Explicitly NULL values should refer to defaults
                global $wgDefaultUserOptions;
-               if( is_null($val) && isset($wgDefaultUserOptions[$oname]) ) {
+               if( is_null( $val ) && isset( $wgDefaultUserOptions[$oname] ) ) {
                        $val = $wgDefaultUserOptions[$oname];
                }
-               
+
                $this->mOptions[$oname] = $val;
        }
 
@@ -1995,6 +2012,20 @@ class User {
                return $this->mDatePreference;
        }
 
+       /**
+        * Get the user preferred stub threshold
+        */
+       function getStubThreshold() {
+               global $wgMaxArticleSize; # Maximum article size, in Kb
+               $threshold = intval( $this->getOption( 'stubthreshold' ) );
+               if ( $threshold > $wgMaxArticleSize * 1024 ) {
+                       # If they have set an impossible value, disable the preference 
+                       # so we can use the parser cache again.
+                       $threshold = 0;
+               }
+               return $threshold;
+       }
+
        /**
         * Get the permissions this user has.
         * @return \type{\arrayof{\string}} Array of permission names
@@ -2028,6 +2059,7 @@ class User {
         */
        function getEffectiveGroups( $recache = false ) {
                if ( $recache || is_null( $this->mEffectiveGroups ) ) {
+                       wfProfileIn( __METHOD__ );
                        $this->mEffectiveGroups = $this->getGroups();
                        $this->mEffectiveGroups[] = '*';
                        if( $this->getId() ) {
@@ -2041,6 +2073,7 @@ class User {
                                # Hook for additional groups
                                wfRunHooks( 'UserEffectiveGroups', array( &$this, &$this->mEffectiveGroups ) );
                        }
+                       wfProfileOut( __METHOD__ );
                }
                return $this->mEffectiveGroups;
        }
@@ -2050,10 +2083,10 @@ class User {
         * @return \int User'e edit count
         */
        function getEditCount() {
-               if ($this->getId()) {
+               if( $this->getId() ) {
                        if ( !isset( $this->mEditCount ) ) {
                                /* Populate the count, if it has not been populated yet */
-                               $this->mEditCount = User::edits($this->mId);
+                               $this->mEditCount = User::edits( $this->mId );
                        }
                        return $this->mEditCount;
                } else {
@@ -2075,7 +2108,7 @@ class User {
                                        'ug_user'  => $this->getID(),
                                        'ug_group' => $group,
                                ),
-                               'User::addGroup',
+                               __METHOD__,
                                array( 'IGNORE' ) );
                }
 
@@ -2098,8 +2131,7 @@ class User {
                        array(
                                'ug_user'  => $this->getID(),
                                'ug_group' => $group,
-                       ),
-                       'User::removeGroup' );
+                       ), __METHOD__ );
 
                $this->loadGroups();
                $this->mGroups = array_diff( $this->mGroups, array( $group ) );
@@ -2108,7 +2140,6 @@ class User {
                $this->invalidateCache();
        }
 
-
        /**
         * Get whether the user is logged in
         * @return \bool True or false
@@ -2151,26 +2182,25 @@ class User {
                }
                # Use strict parameter to avoid matching numeric 0 accidentally inserted
                # by misconfiguration: 0 == 'foo'
-               return in_array( $action, $this->getRights(), true )
-                       || in_array( 'root', $this->getRights(), true );
+               return in_array( $action, $this->getRights(), true );
        }
 
        /**
-       * Check whether to enable recent changes patrol features for this user
-       * @return \bool True or false
-       */
+        * Check whether to enable recent changes patrol features for this user
+        * @return \bool True or false
+        */
        public function useRCPatrol() {
                global $wgUseRCPatrol;
-               return( $wgUseRCPatrol && ($this->isAllowed('patrol') || $this->isAllowed('patrolmarks')) );
+               return( $wgUseRCPatrol && ( $this->isAllowed( 'patrol' ) || $this->isAllowed( 'patrolmarks' ) ) );
        }
 
        /**
-       * Check whether to enable new pages patrol features for this user
-       * @return \bool True or false
-       */
+        * Check whether to enable new pages patrol features for this user
+        * @return \bool True or false
+        */
        public function useNPPatrol() {
                global $wgUseRCPatrol, $wgUseNPPatrol;
-               return( ($wgUseRCPatrol || $wgUseNPPatrol) && ($this->isAllowed('patrol') || $this->isAllowed('patrolmarks')) );
+               return( ( $wgUseRCPatrol || $wgUseNPPatrol ) && ( $this->isAllowed( 'patrol' ) || $this->isAllowed( 'patrolmarks' ) ) );
        }
 
        /**
@@ -2180,7 +2210,7 @@ class User {
         * @todo FIXME : need to check the old failback system [AV]
         */
        function &getSkin( $t = null ) {
-               if ( ! isset( $this->mSkin ) ) {
+               if ( !isset( $this->mSkin ) ) {
                        wfProfileIn( __METHOD__ );
 
                        global $wgHiddenPrefs;
@@ -2188,14 +2218,14 @@ class User {
                                # get the user skin
                                global $wgRequest;
                                $userSkin = $this->getOption( 'skin' );
-                               $userSkin = $wgRequest->getVal('useskin', $userSkin);
+                               $userSkin = $wgRequest->getVal( 'useskin', $userSkin );
                        } else {
                                # if we're not allowing users to override, then use the default
                                global $wgDefaultSkin;
                                $userSkin = $wgDefaultSkin;
                        }
 
-                       $this->mSkin =& Skin::newFromKey( $userSkin );
+                       $this->mSkin = Skin::newFromKey( $userSkin );
                        wfProfileOut( __METHOD__ );
                }
                if( $t || !$this->mSkin->getTitle() ) {
@@ -2252,9 +2282,9 @@ class User {
                        return;
                }
 
-               if ($title->getNamespace() == NS_USER_TALK &&
+               if$title->getNamespace() == NS_USER_TALK &&
                        $title->getText() == $this->getName() ) {
-                       if (!wfRunHooks('UserClearNewTalkNotification', array(&$this)))
+                       if( !wfRunHooks( 'UserClearNewTalkNotification', array( &$this ) ) )
                                return;
                        $this->setNewtalk( false );
                }
@@ -2272,8 +2302,8 @@ class User {
                // The query to find out if it is watched is cached both in memcached and per-invocation,
                // and when it does have to be executed, it can be on a slave
                // If this is the user's newtalk page, we always update the timestamp
-               if ($title->getNamespace() == NS_USER_TALK &&
-                       $title->getText() == $wgUser->getName())
+               if$title->getNamespace() == NS_USER_TALK &&
+                       $title->getText() == $wgUser->getName() )
                {
                        $watched = true;
                } elseif ( $this->getId() == $wgUser->getId() ) {
@@ -2288,7 +2318,7 @@ class User {
                        $dbw = wfGetDB( DB_MASTER );
                        $dbw->update( 'watchlist',
                                        array( /* SET */
-                                               'wl_notificationtimestamp' => NULL
+                                               'wl_notificationtimestamp' => null
                                        ), array( /* WHERE */
                                                'wl_title' => $title->getDBkey(),
                                                'wl_namespace' => $title->getNamespace(),
@@ -2315,7 +2345,7 @@ class User {
                        $dbw = wfGetDB( DB_MASTER );
                        $dbw->update( 'watchlist',
                                array( /* SET */
-                                       'wl_notificationtimestamp' => NULL
+                                       'wl_notificationtimestamp' => null
                                ), array( /* WHERE */
                                        'wl_user' => $currentUser
                                ), __METHOD__
@@ -2331,12 +2361,12 @@ class User {
         * @private
         */
        function decodeOptions( $str ) {
-               if (!$str)
+               if( !$str )
                        return;
-                       
+
                $this->mOptionsLoaded = true;
                $this->mOptionOverrides = array();
-               
+
                $this->mOptions = array();
                $a = explode( "\n", $str );
                foreach ( $a as $s ) {
@@ -2356,7 +2386,7 @@ class User {
         * @param $exp \int Expiration time, as a UNIX time value;
         *                   if 0 or not specified, use the default $wgCookieExpiration
         */
-       protected function setCookie( $name, $value, $exp=0 ) {
+       protected function setCookie( $name, $value, $exp = 0 ) {
                global $wgRequest;
                $wgRequest->response()->setcookie( $name, $value, $exp );
        }
@@ -2408,7 +2438,7 @@ class User {
         * Log this user out.
         */
        function logout() {
-               if( wfRunHooks( 'UserLogout', array(&$this) ) ) {
+               if( wfRunHooks( 'UserLogout', array( &$this ) ) ) {
                        $this->doLogout();
                }
        }
@@ -2452,7 +2482,7 @@ class User {
                                'user_email' => $this->mEmail,
                                'user_email_authenticated' => $dbw->timestampOrNull( $this->mEmailAuthenticated ),
                                'user_options' => '',
-                               'user_touched' => $dbw->timestamp($this->mTouched),
+                               'user_touched' => $dbw->timestamp( $this->mTouched ),
                                'user_token' => $this->mToken,
                                'user_email_token' => $this->mEmailToken,
                                'user_email_token_expires' => $dbw->timestampOrNull( $this->mEmailTokenExpires ),
@@ -2460,9 +2490,9 @@ class User {
                                'user_id' => $this->mId
                        ), __METHOD__
                );
-               
+
                $this->saveOptions();
-               
+
                wfRunHooks( 'UserSaveSettings', array( $this ) );
                $this->clearSharedCache();
                $this->getUserPage()->invalidateCache();
@@ -2561,7 +2591,7 @@ class User {
 
                // Clear instance cache other than user table data, which is already accurate
                $this->clearInstanceCache();
-               
+
                $this->saveOptions();
        }
 
@@ -2570,7 +2600,7 @@ class User {
         * they've successfully logged in from.
         */
        function spreadBlock() {
-               wfDebug( __METHOD__."()\n" );
+               wfDebug( __METHOD__ . "()\n" );
                $this->load();
                if ( $this->mId == 0 ) {
                        return;
@@ -2581,15 +2611,14 @@ class User {
                        return;
                }
 
-               $userblock->doAutoblock( wfGetIp() );
-
+               $userblock->doAutoblock( wfGetIP() );
        }
 
        /**
         * Generate a string which will be different for any combination of
         * user options which would produce different parser output.
         * This will be used as part of the hash key for the parser cache,
-        * so users will the same options can share the same cached data
+        * so users with the same options can share the same cached data
         * safely.
         *
         * Extensions which require it should install 'PageRenderingHash' hook,
@@ -2605,20 +2634,24 @@ class User {
                }
 
                // stubthreshold is only included below for completeness,
-               // it will always be 0 when this function is called by parsercache.
+               // since it disables the parser cache, its value will always 
+               // be 0 when this function is called by parsercache.
 
                $confstr =        $this->getOption( 'math' );
-               $confstr .= '!' . $this->getOption( 'stubthreshold' );
-               if ( $wgUseDynamicDates ) {
+               $confstr .= '!' . $this->getStubThreshold();
+               if ( $wgUseDynamicDates ) { # This is wrong (bug 24714)
                        $confstr .= '!' . $this->getDatePreference();
                }
-               $confstr .= '!' . ($this->getOption( 'numberheadings' ) ? '1' : '');
+               $confstr .= '!' . ( $this->getOption( 'numberheadings' ) ? '1' : '' );
                $confstr .= '!' . $wgLang->getCode();
                $confstr .= '!' . $this->getOption( 'thumbsize' );
                // add in language specific options, if any
                $extra = $wgContLang->getExtraHashOptions();
                $confstr .= $extra;
 
+               // Since the skin could be overloading link(), it should be
+               // included here but in practice, none of our skins do that.
+
                $confstr .= $wgRenderHashAppend;
 
                // Give a chance for extensions to modify the hash, if they have
@@ -2657,13 +2690,6 @@ class User {
                return $this->isAllowed( 'createaccount' ) && !$this->isBlockedFromCreateAccount();
        }
 
-       /**
-        * @deprecated
-        */
-       function setLoaded( $loaded ) {
-               wfDeprecated( __METHOD__ );
-       }
-
        /**
         * Get this user's personal page title.
         *
@@ -2695,7 +2721,7 @@ class User {
                        return $res;
                else {
                        $dbr = wfGetDB( DB_SLAVE );
-                       return $res = $dbr->selectField( 'user', 'max(user_id)', false, 'User::getMaxID' );
+                       return $res = $dbr->selectField( 'user', 'max(user_id)', false, __METHOD__ );
                }
        }
 
@@ -2722,7 +2748,7 @@ class User {
                // to. Certain authentication plugins do NOT want to save
                // domain passwords in a mysql database, so we should
                // check this (incase $wgAuth->strict() is false).
-               if( $this->isValidPassword( $password ) !== true ) {
+               if( !$this->isValidPassword( $password ) ) {
                        return false;
                }
 
@@ -2778,7 +2804,7 @@ class User {
                        return EDIT_TOKEN_SUFFIX;
                } else {
                        if( !isset( $_SESSION['wsEditToken'] ) ) {
-                               $token = $this->generateToken();
+                               $token = self::generateToken();
                                $_SESSION['wsEditToken'] = $token;
                        } else {
                                $token = $_SESSION['wsEditToken'];
@@ -2796,7 +2822,7 @@ class User {
         * @param $salt \string Optional salt value
         * @return \string The new random token
         */
-       function generateToken( $salt = '' ) {
+       public static function generateToken( $salt = '' ) {
                $token = dechex( mt_rand() ) . dechex( mt_rand() );
                return md5( $token . $salt );
        }
@@ -2836,9 +2862,10 @@ class User {
         * Generate a new e-mail confirmation token and send a confirmation/invalidation
         * mail to the user's given address.
         *
+        * @param $changed Boolean: whether the adress changed
         * @return \types{\bool,\type{WikiError}} True on success, a WikiError object on failure.
         */
-       function sendConfirmationMail() {
+       function sendConfirmationMail( $changed = false ) {
                global $wgLang;
                $expiration = null; // gets passed-by-ref and defined in next line.
                $token = $this->confirmationToken( $expiration );
@@ -2846,8 +2873,9 @@ class User {
                $invalidateURL = $this->invalidationTokenUrl( $token );
                $this->saveSettings();
 
+               $message = $changed ? 'confirmemail_body_changed' : 'confirmemail_body';
                return $this->sendMail( wfMsg( 'confirmemail_subject' ),
-                       wfMsg( 'confirmemail_body',
+                       wfMsg( $message,
                                wfGetIP(),
                                $this->getName(),
                                $url,
@@ -2893,7 +2921,7 @@ class User {
                $now = time();
                $expires = $now + 7 * 24 * 60 * 60;
                $expiration = wfTimestamp( TS_MW, $expires );
-               $token = $this->generateToken( $this->mId . $this->mEmail . $expires );
+               $token = self::generateToken( $this->mId . $this->mEmail . $expires );
                $hash = md5( $token );
                $this->load();
                $this->mEmailToken = $hash;
@@ -2910,6 +2938,7 @@ class User {
        function confirmationTokenUrl( $token ) {
                return $this->getTokenUrl( 'ConfirmEmail', $token );
        }
+
        /**
         * Return a URL the user can use to invalidate their email address.
         * @param $token \string Accepts the email confirmation token
@@ -2950,6 +2979,7 @@ class User {
         */
        function confirmEmail() {
                $this->setEmailAuthenticationTimestamp( wfTimestampNow() );
+               wfRunHooks( 'ConfirmEmailComplete', array( $this ) );
                return true;
        }
 
@@ -2964,6 +2994,7 @@ class User {
                $this->mEmailToken = null;
                $this->mEmailTokenExpires = null;
                $this->setEmailAuthenticationTimestamp( null );
+               wfRunHooks( 'InvalidateEmailComplete', array( $this ) );
                return true;
        }
 
@@ -2984,7 +3015,7 @@ class User {
         */
        function canSendEmail() {
                global $wgEnableEmail, $wgEnableUserEmail;
-               if( !$wgEnableEmail || !$wgEnableUserEmail ) {
+               if( !$wgEnableEmail || !$wgEnableUserEmail || !$this->isAllowed( 'sendemail' ) ) {
                        return false;
                }
                $canSend = $this->isEmailConfirmed();
@@ -3094,7 +3125,7 @@ class User {
                                        array_keys( array_filter( $wgRevokePermissions[$group] ) ) );
                        }
                }
-               return array_unique($rights);
+               return array_unique( $rights );
        }
 
        /**
@@ -3121,8 +3152,6 @@ class User {
         * @return \string Localized descriptive group name
         */
        static function getGroupName( $group ) {
-               global $wgMessageCache;
-               $wgMessageCache->loadAllMessages();
                $key = "group-$group";
                $name = wfMsg( $key );
                return $name == '' || wfEmptyMsg( $key, $name )
@@ -3137,8 +3166,6 @@ class User {
         * @return \string Localized name for group member
         */
        static function getGroupMember( $group ) {
-               global $wgMessageCache;
-               $wgMessageCache->loadAllMessages();
                $key = "group-$group-member";
                $name = wfMsg( $key );
                return $name == '' || wfEmptyMsg( $key, $name )
@@ -3195,8 +3222,6 @@ class User {
         * @return \types{\type{Title},\bool} Title of the page if it exists, false otherwise
         */
        static function getGroupPage( $group ) {
-               global $wgMessageCache;
-               $wgMessageCache->loadAllMessages();
                $page = wfMsgForContent( 'grouppage-' . $group );
                if( !wfEmptyMsg( 'grouppage-' . $group, $page ) ) {
                        $title = Title::newFromText( $page );
@@ -3262,53 +3287,53 @@ class User {
                global $wgAddGroups, $wgRemoveGroups, $wgGroupsAddToSelf, $wgGroupsRemoveFromSelf;
 
                $groups = array( 'add' => array(), 'remove' => array(), 'add-self' => array(), 'remove-self' => array() );
-               if( empty($wgAddGroups[$group]) ) {
+               if( empty( $wgAddGroups[$group] ) ) {
                        // Don't add anything to $groups
                } elseif( $wgAddGroups[$group] === true ) {
                        // You get everything
                        $groups['add'] = self::getAllGroups();
-               } elseif( is_array($wgAddGroups[$group]) ) {
+               } elseif( is_array( $wgAddGroups[$group] ) ) {
                        $groups['add'] = $wgAddGroups[$group];
                }
 
                // Same thing for remove
-               if( empty($wgRemoveGroups[$group]) ) {
-               } elseif($wgRemoveGroups[$group] === true ) {
+               if( empty( $wgRemoveGroups[$group] ) ) {
+               } elseif( $wgRemoveGroups[$group] === true ) {
                        $groups['remove'] = self::getAllGroups();
-               } elseif( is_array($wgRemoveGroups[$group]) ) {
+               } elseif( is_array( $wgRemoveGroups[$group] ) ) {
                        $groups['remove'] = $wgRemoveGroups[$group];
                }
 
                // Re-map numeric keys of AddToSelf/RemoveFromSelf to the 'user' key for backwards compatibility
-               if( empty($wgGroupsAddToSelf['user']) || $wgGroupsAddToSelf['user'] !== true ) {
-                       foreach($wgGroupsAddToSelf as $key => $value) {
-                               if( is_int($key) ) {
+               if( empty( $wgGroupsAddToSelf['user']) || $wgGroupsAddToSelf['user'] !== true ) {
+                       foreach( $wgGroupsAddToSelf as $key => $value ) {
+                               if( is_int( $key ) ) {
                                        $wgGroupsAddToSelf['user'][] = $value;
                                }
                        }
                }
 
-               if( empty($wgGroupsRemoveFromSelf['user']) || $wgGroupsRemoveFromSelf['user'] !== true ) {
-                       foreach($wgGroupsRemoveFromSelf as $key => $value) {
-                               if( is_int($key) ) {
+               if( empty( $wgGroupsRemoveFromSelf['user']) || $wgGroupsRemoveFromSelf['user'] !== true ) {
+                       foreach( $wgGroupsRemoveFromSelf as $key => $value ) {
+                               if( is_int( $key ) ) {
                                        $wgGroupsRemoveFromSelf['user'][] = $value;
                                }
                        }
                }
 
                // Now figure out what groups the user can add to him/herself
-               if( empty($wgGroupsAddToSelf[$group]) ) {
+               if( empty( $wgGroupsAddToSelf[$group] ) ) {
                } elseif( $wgGroupsAddToSelf[$group] === true ) {
                        // No idea WHY this would be used, but it's there
                        $groups['add-self'] = User::getAllGroups();
-               } elseif( is_array($wgGroupsAddToSelf[$group]) ) {
+               } elseif( is_array( $wgGroupsAddToSelf[$group] ) ) {
                        $groups['add-self'] = $wgGroupsAddToSelf[$group];
                }
 
-               if( empty($wgGroupsRemoveFromSelf[$group]) ) {
+               if( empty( $wgGroupsRemoveFromSelf[$group] ) ) {
                } elseif( $wgGroupsRemoveFromSelf[$group] === true ) {
                        $groups['remove-self'] = User::getAllGroups();
-               } elseif( is_array($wgGroupsRemoveFromSelf[$group]) ) {
+               } elseif( is_array( $wgGroupsRemoveFromSelf[$group] ) ) {
                        $groups['remove-self'] = $wgGroupsRemoveFromSelf[$group];
                }
 
@@ -3339,15 +3364,16 @@ class User {
 
                // Okay, it's not so simple, we will have to go through the arrays
                $groups = array(
-                               'add' => array(),
-                               'remove' => array(),
-                               'add-self' => array(),
-                               'remove-self' => array() );
+                       'add' => array(),
+                       'remove' => array(),
+                       'add-self' => array(),
+                       'remove-self' => array()
+               );
                $addergroups = $this->getEffectiveGroups();
 
-               foreach ($addergroups as $addergroup) {
+               foreach( $addergroups as $addergroup ) {
                        $groups = array_merge_recursive(
-                               $groups, $this->changeableByGroup($addergroup)
+                               $groups, $this->changeableByGroup( $addergroup )
                        );
                        $groups['add']    = array_unique( $groups['add'] );
                        $groups['remove'] = array_unique( $groups['remove'] );
@@ -3408,8 +3434,6 @@ class User {
         * @return \string Localized description of the right
         */
        static function getRightDescription( $right ) {
-               global $wgMessageCache;
-               $wgMessageCache->loadAllMessages();
                $key = "right-$right";
                $name = wfMsg( $key );
                return $name == '' || wfEmptyMsg( $key, $name )
@@ -3469,7 +3493,6 @@ class User {
         * @return \bool
         */
        static function comparePasswords( $hash, $password, $userId = false ) {
-               $m = false;
                $type = substr( $hash, 0, 3 );
 
                $result = false;
@@ -3492,23 +3515,36 @@ class User {
 
        /**
         * Add a newuser log entry for this user
+        *
         * @param $byEmail Boolean: account made by email?
+        * @param $reason String: user supplied reason
         */
-       public function addNewUserLogEntry( $byEmail = false ) {
+       public function addNewUserLogEntry( $byEmail = false, $reason = '' ) {
                global $wgUser, $wgContLang, $wgNewUserLog;
-               if( empty($wgNewUserLog) ) {
+               if( empty( $wgNewUserLog ) ) {
                        return true; // disabled
                }
-               $talk = $wgContLang->getFormattedNsText( NS_TALK );
+
                if( $this->getName() == $wgUser->getName() ) {
                        $action = 'create';
-                       $message = '';
                } else {
                        $action = 'create2';
-                       $message = $byEmail ? wfMsgForContent( 'newuserlog-byemail' ) : '';
+                       if ( $byEmail ) {
+                               if ( $reason === '' ) {
+                                       $reason = wfMsgForContent( 'newuserlog-byemail' );
+                               } else {
+                                       $reason = $wgContLang->commaList( array(
+                                               $reason, wfMsgForContent( 'newuserlog-byemail' ) ) );
+                               }
+                       }
                }
                $log = new LogPage( 'newusers' );
-               $log->addEntry( $action, $this->getUserPage(), $message, array( $this->getId() ) );
+               $log->addEntry(
+                       $action,
+                       $this->getUserPage(),
+                       $reason,
+                       array( $this->getId() )
+               );
                return true;
        }
 
@@ -3517,51 +3553,51 @@ class User {
         * Used by things like CentralAuth and perhaps other authplugins.
         */
        public function addNewUserLogEntryAutoCreate() {
-               global $wgNewUserLog;
-               if( empty($wgNewUserLog) ) {
+               global $wgNewUserLog, $wgLogAutocreatedAccounts;
+               if( !$wgNewUserLog || !$wgLogAutocreatedAccounts ) {
                        return true; // disabled
                }
                $log = new LogPage( 'newusers', false );
                $log->addEntry( 'autocreate', $this->getUserPage(), '', array( $this->getId() ) );
                return true;
        }
-       
+
        protected function loadOptions() {
                $this->load();
-               if ($this->mOptionsLoaded || !$this->getId() )
+               if ( $this->mOptionsLoaded || !$this->getId() )
                        return;
-       
+
                $this->mOptions = self::getDefaultOptions();
-               
+
                // Maybe load from the object
-               
-               if ( !is_null($this->mOptionOverrides) ) {
-                       wfDebug( "Loading options for user ".$this->getId()." from override cache.\n" ); 
+               if ( !is_null( $this->mOptionOverrides ) ) {
+                       wfDebug( "Loading options for user " . $this->getId() . " from override cache.\n" );
                        foreach( $this->mOptionOverrides as $key => $value ) {
                                $this->mOptions[$key] = $value;
                        }
                } else {
-                       wfDebug( "Loading options for user ".$this->getId()." from database.\n" );
+                       wfDebug( "Loading options for user " . $this->getId() . " from database.\n" );
                        // Load from database
                        $dbr = wfGetDB( DB_SLAVE );
-                       
-                       $res = $dbr->select( 'user_properties',
-                                                                       '*',
-                                                                       array('up_user' => $this->getId()),
-                                                                       __METHOD__
-                                                               );
-                       
+
+                       $res = $dbr->select(
+                               'user_properties',
+                               '*',
+                               array( 'up_user' => $this->getId() ),
+                               __METHOD__
+                       );
+
                        while( $row = $dbr->fetchObject( $res ) ) {
                                $this->mOptionOverrides[$row->up_property] = $row->up_value;
                                $this->mOptions[$row->up_property] = $row->up_value;
                        }
                }
-               
+
                $this->mOptionsLoaded = true;
-               
+
                wfRunHooks( 'UserLoadOptions', array( $this, &$this->mOptions ) );
        }
-       
+
        protected function saveOptions() {
                global $wgAllowPrefChange;
 
@@ -3569,16 +3605,16 @@ class User {
 
                $this->loadOptions();
                $dbw = wfGetDB( DB_MASTER );
-               
+
                $insert_rows = array();
-               
+
                $saveOptions = $this->mOptions;
-               
+
                // Allow hooks to abort, for instance to save to a global profile.
                // Reset options to default state before saving.
-               if (!wfRunHooks( 'UserSaveOptions', array($this, &$saveOptions) ) )
+               if( !wfRunHooks( 'UserSaveOptions', array( $this, &$saveOptions ) ) )
                        return;
-               
+
                foreach( $saveOptions as $key => $value ) {
                        # Don't bother storing default values
                        if ( ( is_null( self::getDefaultOption( $key ) ) &&
@@ -3592,14 +3628,16 @@ class User {
                        }
                        if ( $extuser && isset( $wgAllowPrefChange[$key] ) ) {
                                switch ( $wgAllowPrefChange[$key] ) {
-                                       case 'local': case 'message':
+                                       case 'local':
+                                       case 'message':
                                                break;
-                                       case 'semiglobal': case 'global':
+                                       case 'semiglobal':
+                                       case 'global':
                                                $extuser->setPref( $key, $value );
                                }
                        }
                }
-               
+
                $dbw->begin();
                $dbw->delete( 'user_properties', array( 'up_user' => $this->getId() ), __METHOD__ );
                $dbw->insert( 'user_properties', $insert_rows, __METHOD__ );
@@ -3607,7 +3645,7 @@ class User {
        }
 
        /**
-        * Provide an array of HTML 5 attributes to put on an input element
+        * Provide an array of HTML5 attributes to put on an input element
         * intended for the user to enter a new password.  This may include
         * required, title, and/or pattern, depending on $wgMinimalPasswordLength.
         *
@@ -3619,6 +3657,10 @@ class User {
         *
         * Obviously, you still need to do server-side checking.
         *
+        * NOTE: A combination of bugs in various browsers means that this function
+        * actually just returns array() unconditionally at the moment.  May as
+        * well keep it around for when the browser bugs get fixed, though.
+        *
         * @return array Array of HTML attributes suitable for feeding to
         *   Html::element(), directly or indirectly.  (Don't feed to Xml::*()!
         *   That will potentially output invalid XHTML 1.0 Transitional, and will
@@ -3633,7 +3675,14 @@ class User {
 
                # Note that the pattern requirement will always be satisfied if the
                # input is empty, so we need required in all cases.
-               $ret = array( 'required' );
+               #
+               # FIXME (bug 23769): This needs to not claim the password is required
+               # if e-mail confirmation is being used.  Since HTML5 input validation
+               # is b0rked anyway in some browsers, just return nothing.  When it's
+               # re-enabled, fix this code to not output required for e-mail
+               # registration.
+               #$ret = array( 'required' );
+               $ret = array();
 
                # We can't actually do this right now, because Opera 9.6 will print out
                # the entered password visibly in its error message!  When other
@@ -3651,4 +3700,92 @@ class User {
 
                return $ret;
        }
+
+       /**
+        * Format the user message using a hook, a template, or, failing these, a static format.
+        * @param $subject   String the subject of the message
+        * @param $text      String the content of the message
+        * @param $signature String the signature, if provided.
+        */
+       static protected function formatUserMessage( $subject, $text, $signature ) {
+               if ( wfRunHooks( 'FormatUserMessage',
+                               array( $subject, &$text, $signature ) ) ) {
+
+                       $signature = empty($signature) ? "~~~~~" : "{$signature} ~~~~~";
+
+                       $template = Title::newFromText( wfMsgForContent( 'usermessage-template' ) );
+                       if ( !$template
+                                       || $template->getNamespace() !== NS_TEMPLATE
+                                       || !$template->exists() ) {
+                               $text = "\n== $subject ==\n\n$text\n\n-- $signature";
+                       } else {
+                               $text = '{{'. $template->getText()
+                                       . " | subject=$subject | body=$text | signature=$signature }}";
+                       }
+               }
+
+               return $text;
+       }
+
+       /**
+        * Leave a user a message
+        * @param $subject String the subject of the message
+        * @param $text String the message to leave
+        * @param $signature String Text to leave in the signature
+        * @param $summary String the summary for this change, defaults to
+        *                        "Leave system message."
+        * @param $editor User The user leaving the message, defaults to
+        *                        "{{MediaWiki:usermessage-editor}}"
+        * @param $flags Int default edit flags
+        *
+        * @return boolean true if it was successful
+        */
+       public function leaveUserMessage( $subject, $text, $signature = "",
+                       $summary = null, $editor = null, $flags = 0 ) {
+               if ( !isset( $summary ) ) {
+                       $summary = wfMsgForContent( 'usermessage-summary' );
+               }
+
+               if ( !isset( $editor ) ) {
+                       $editor = User::newFromName( wfMsgForContent( 'usermessage-editor' ) );
+                       if ( !$editor->isLoggedIn() ) {
+                               $editor->addToDatabase();
+                       }
+               }
+
+               $article = new Article( $this->getTalkPage() );
+               wfRunHooks( 'SetupUserMessageArticle',
+                       array( $this, &$article, $subject, $text, $signature, $summary, $editor ) );
+
+
+               $text = self::formatUserMessage( $subject, $text, $signature );
+               $flags = $article->checkFlags( $flags );
+
+               if ( $flags & EDIT_UPDATE ) {
+                       $text = $article->getContent() . $text;
+               }
+
+               $dbw = wfGetDB( DB_MASTER );
+               $dbw->begin();
+
+               try {
+                       $status = $article->doEdit( $text, $summary, $flags, false, $editor );
+               } catch ( DBQueryError $e ) {
+                       $status = Status::newFatal("DB Error");
+               }
+
+               if ( $status->isGood() ) {
+                       // Set newtalk with the right user ID
+                       $this->setNewtalk( true );
+                       wfRunHooks( 'AfterUserMessage',
+                               array( $this, $article, $summary, $text, $signature, $summary, $editor ) );
+                       $dbw->commit();
+               } else {
+                       // The article was concurrently created
+                       wfDebug( __METHOD__ . ": Error ".$status->getWikiText() );
+                       $dbw->rollback();
+               }
+
+               return $status->isGood();
+       }
 }