fetch commons descriptions for display on local wikis
[lhc/web/wiklou.git] / includes / User.php
index 28ed805..edf98ef 100644 (file)
@@ -9,11 +9,13 @@
  *
  */
 require_once( 'WatchedItem.php' );
-require_once( 'Group.php' );
 
 # Number of characters in user_token field
 define( 'USER_TOKEN_LENGTH', 32 );
 
+# Serialized record version
+define( 'MW_USER_VERSION', 2 );
+
 /**
  *
  * @package MediaWiki
@@ -32,13 +34,13 @@ class User {
        var $mToken;
        var $mRealName;
        var $mHash;
-       /** Array of group id the user belong to */
        var $mGroups;
-       /**#@-*/
+       var $mVersion; // serialized version
 
        /** Construct using User:loadDefaults() */
        function User() {
                $this->loadDefaults();
+               $this->mVersion = MW_USER_VERSION;
        }
 
        /**
@@ -50,16 +52,25 @@ class User {
        function newFromName( $name ) {
                $u = new User();
 
+               # Force usernames to capital
+               global $wgContLang;
+               $name = $wgContLang->ucfirst( $name );
+               
                # Clean up name according to title rules
-
                $t = Title::newFromText( $name );
                if( is_null( $t ) ) {
-                       return NULL;
-               } else {
-                       $u->setName( $t->getText() );
-                       $u->setId( $u->idFromName( $t->getText() ) );
-                       return $u;
+                       return null;
                }
+               
+               # Reject various classes of invalid names
+               $canonicalName = $t->getText();
+               if( !User::isValidUserName( $canonicalName ) ) {
+                       return null;
+               }
+               
+               $u->setName( $canonicalName );
+               $u->setId( $u->idFromName( $t->getText() ) );
+               return $u;
        }
        
        /**
@@ -85,6 +96,17 @@ class User {
                        return null;
                }
        }
+       
+       /**
+        * Serialze sleep function, for better cache efficiency and avoidance of 
+        * silly "incomplete type" errors when skins are cached
+        */
+       function __sleep() {
+               return array( 'mId', 'mName', 'mPassword', 'mEmail', 'mNewtalk',
+                       'mEmailAuthenticated', 'mRights', 'mOptions', 'mDataLoaded', 
+                       'mNewpassword', 'mBlockedby', 'mBlockreason', 'mTouched', 
+                       'mToken', 'mRealName', 'mHash', 'mGroups' );
+       }
 
        /**
         * Get username given an id.
@@ -140,7 +162,7 @@ class User {
         * @return bool
         */
        function isIP( $name ) {
-               return preg_match("/^\d{1,3}\.\d{1,3}.\d{1,3}\.\d{1,3}$/",$name);
+               return preg_match("/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/",$name);
                /*return preg_match("/^
                        (?:[01]?\d{1,2}|2(:?[0-4]\d|5[0-5]))\.
                        (?:[01]?\d{1,2}|2(:?[0-4]\d|5[0-5]))\.
@@ -150,8 +172,46 @@ class User {
        }
 
        /**
+        * Is the input a valid username?
+        *
+        * Checks if the input is a valid username, we don't want an empty string,
+        * an IP address, anything that containins slashes (would mess up subpages),
+        * is longer than the maximum allowed username size or doesn't begin with
+        * a capital letter.
+        *
+        * @param string $name
+        * @return bool
+        * @static
+        */
+       function isValidUserName( $name ) {
+               global $wgContLang, $wgMaxNameChars;
+               
+               if ( $name == ''
+               || User::isIP( $name )
+               || strpos( $name, '/' ) !== false
+               || strlen( $name ) > $wgMaxNameChars
+               || $name != $wgContLang->ucfirst( $name ) )
+                       return false;
+               else
+                       return true;
+       }
+
+       /**
+        * Is the input a valid password?
+        *
+        * @param string $password
+        * @return bool
+        * @static
+        */
+       function isValidPassword( $password ) {
+               global $wgMinimalPasswordLength;
+               return strlen( $password ) >= $wgMinimalPasswordLength;
+       }
+
+       /**     
         * does the string match roughly an email address ?
         *
+        * @todo Check for RFC 2822 compilance
         * @bug 959
         *
         * @param string $addr email address
@@ -204,10 +264,7 @@ class User {
                $this->mPassword = $this->mNewpassword = '';
                $this->mRights = array();
                $this->mGroups = array();
-               // Getting user defaults only if we have an available language
-               if( isset( $wgContLang ) ) {
-                       $this->loadDefaultFromLanguage();
-               }
+               $this->mOptions = User::getDefaultOptions();
                
                foreach( $wgNamespacesToBeSearchedDefault as $nsnum => $val ) {
                        $this->mOptions['searchNs'.$nsnum] = $val;
@@ -227,15 +284,6 @@ class User {
 
                wfProfileOut( $fname );
        }
-
-       /**
-        * Used to load user options from a language.
-        * This is not in loadDefault() cause we sometime create user before having
-        * a language object.
-        */     
-       function loadDefaultFromLanguage(){
-               $this->mOptions = User::getDefaultOptions();
-       }
        
        /**
         * Combine the language default options with any site-specific options
@@ -291,8 +339,8 @@ class User {
         * just slightly outta sync and soon corrected - safer to block slightly more that less.
         * And it's cheaper to check slave first, then master if needed, than master always.
         */
-       function getBlockedStatus() {
-               global $wgIP, $wgBlockCache, $wgProxyList, $wgEnableSorbs, $bFromSlave;
+       function getBlockedStatus( $bFromSlave = true ) {
+               global $wgIP, $wgBlockCache, $wgProxyList, $wgEnableSorbs, $wgProxyWhitelist;
 
                if ( -1 != $this->mBlockedby ) { return; }
 
@@ -326,25 +374,38 @@ class User {
                }
 
                # Proxy blocking
-               if ( !$this->mBlockedby ) {
+               if ( !$this->isSysop() && !in_array( $wgIP, $wgProxyWhitelist ) ) {
+               
+                       # Local list
                        if ( array_key_exists( $wgIP, $wgProxyList ) ) {
                                $this->mBlockedby = wfMsg( 'proxyblocker' );
                                $this->mBlockreason = wfMsg( 'proxyblockreason' );
                        }
-               }
 
-               # DNSBL
-               if ( !$this->mBlockedby && $wgEnableSorbs ) {
-                       if ( $this->inSorbsBlacklist( $wgIP ) ) {
-                               $this->mBlockedby = wfMsg( 'sorbs' );
-                               $this->mBlockreason = wfMsg( 'sorbsreason' );
+                       # DNSBL
+                       if ( !$this->mBlockedby && $wgEnableSorbs && !$this->getID() ) {
+                               if ( $this->inSorbsBlacklist( $wgIP ) ) {
+                                       $this->mBlockedby = wfMsg( 'sorbs' );
+                                       $this->mBlockreason = wfMsg( 'sorbsreason' );
+                               }
                        }
                }
-                       
        }
 
        function inSorbsBlacklist( $ip ) {
-               $fname = 'User::inSorbsBlacklist';
+               global $wgEnableSorbs;
+               return $wgEnableSorbs &&
+                       $this->inDnsBlacklist( $ip, 'http.dnsbl.sorbs.net.' );
+       }
+       
+       function inOpmBlacklist( $ip ) {
+               global $wgEnableOpm;
+               return $wgEnableOpm &&
+                       $this->inDnsBlacklist( $ip, 'opm.blitzed.org.' );
+       }
+       
+       function inDnsBlacklist( $ip, $base ) {
+               $fname = 'User::inDnsBlacklist';
                wfProfileIn( $fname );
                
                $found = false;
@@ -355,16 +416,16 @@ class User {
                        for ( $i=4; $i>=1; $i-- ) {
                                $host .= $m[$i] . '.';
                        }
-                       $host .= 'http.dnsbl.sorbs.net.';
+                       $host .= $base;
 
                        # Send query
                        $ipList = gethostbynamel( $host );
                        
                        if ( $ipList ) {
-                               wfDebug( "Hostname $host is {$ipList[0]}, it's a proxy!\n" );
+                               wfDebug( "Hostname $host is {$ipList[0]}, it's a proxy says $base!\n" );
                                $found = true;
                        } else {
-                               wfDebug( "Requested $host, not found.\n" );
+                               wfDebug( "Requested $host, not found in $base.\n" );
                        }
                }
 
@@ -372,6 +433,77 @@ class User {
                return $found;
        }
        
+       /**
+        * Primitive rate limits: enforce maximum actions per time period
+        * to put a brake on flooding.
+        *
+        * Note: when using a shared cache like memcached, IP-address
+        * last-hit counters will be shared across wikis.
+        *
+        * @return bool true if a rate limiter was tripped
+        * @access public
+        */
+       function pingLimiter( $action='edit' ) {
+               global $wgRateLimits;
+               if( !isset( $wgRateLimits[$action] ) ) {
+                       return false;
+               }
+               if( $this->isAllowed( 'delete' ) ) {
+                       // goddam cabal
+                       return false;
+               }
+               
+               global $wgMemc, $wgIP, $wgDBname, $wgRateLimitLog;
+               $fname = 'User::pingLimiter';
+               $limits = $wgRateLimits[$action];
+               $keys = array();
+               $id = $this->getId();
+               
+               if( isset( $limits['anon'] ) && $id == 0 ) {
+                       $keys["$wgDBname:limiter:$action:anon"] = $limits['anon'];
+               }
+               
+               if( isset( $limits['user'] ) && $id != 0 ) {
+                       $keys["$wgDBname:limiter:$action:user:$id"] = $limits['user'];
+               }
+               if( $this->isNewbie() ) {
+                       if( isset( $limits['newbie'] ) && $id != 0 ) {
+                               $keys["$wgDBname:limiter:$action:user:$id"] = $limits['newbie'];
+                       }
+                       if( isset( $limits['ip'] ) ) {
+                               $keys["mediawiki:limiter:$action:ip:$wgIP"] = $limits['ip'];
+                       }
+                       if( isset( $limits['subnet'] ) && preg_match( '/^(\d+\.\d+\.\d+)\.\d+$/', $wgIP, $matches ) ) {
+                               $subnet = $matches[1];
+                               $keys["mediawiki:limiter:$action:subnet:$subnet"] = $limits['subnet'];
+                       }
+               }
+               
+               $triggered = false;
+               foreach( $keys as $key => $limit ) {
+                       list( $max, $period ) = $limit;
+                       $summary = "(limit $max in {$period}s)";
+                       $count = $wgMemc->get( $key );
+                       if( $count ) {
+                               if( $count > $max ) {
+                                       wfDebug( "$fname: tripped! $key at $count $summary\n" );
+                                       if( $wgRateLimitLog ) {
+                                               @error_log( wfTimestamp( TS_MW ) . ' ' . $wgDBname . ': ' . $this->getName() . " tripped $key at $count $summary\n", 3, $wgRateLimitLog );
+                                       }
+                                       $triggered = true;
+                               } else {
+                                       wfDebug( "$fname: ok. $key at $count $summary\n" );
+                               }
+                       } else {
+                               wfDebug( "$fname: adding record for $key $summary\n" );
+                               $wgMemc->add( $key, 1, IntVal( $period ) );
+                       }
+                       $wgMemc->incr( $key );
+               }
+               
+               return $triggered;
+       }
+       
        /**
         * Check if user is blocked
         * @return bool True if blocked, false otherwise
@@ -446,6 +578,10 @@ class User {
 
                $passwordCorrect = FALSE;
                $user = $wgMemc->get( $key = "$wgDBname:user:id:$sId" );
+               if( !is_object( $user ) || $user->mVersion < MW_USER_VERSION ) {
+                       # Expire old serialized objects; they may be corrupt.
+                       $user = false;
+               }
                if($makenew = !$user) {
                        wfDebug( "User::loadFromSession() unable to load from memcached\n" );
                        $user = new User();
@@ -479,7 +615,7 @@ class User {
         * Load a user from the database
         */
        function loadFromDatabase() {
-               global $wgCommandLineMode, $wgAnonGroupId, $wgLoggedInGroupId;
+               global $wgCommandLineMode;
                $fname = "User::loadFromDatabase";
                
                # Counter-intuitive, breaks various things, use User::setLoaded() if you want to suppress 
@@ -493,15 +629,9 @@ class User {
                $this->mId = IntVal( $this->mId );
 
                /** Anonymous user */
-               if(!$this->mId) {
+               if( !$this->mId ) {
                        /** Get rights */
-                       $anong = Group::newFromId($wgAnonGroupId);
-                       if (!$anong) 
-                               wfDebugDieBacktrace("Please update your database schema "
-                                       ."and populate initial group data from "
-                                       ."maintenance/archives patches");
-                       $anong->loadFromDatabase();
-                       $this->mRights = explode(',', $anong->getRights());
+                       $this->mRights = $this->getGroupPermissions( array( '*' ) );
                        $this->mDataLoaded = true;
                        return;
                } # the following stuff is for non-anonymous users only
@@ -523,31 +653,16 @@ class User {
                        $this->mTouched = wfTimestamp(TS_MW,$s->user_touched);
                        $this->mToken = $s->user_token;
 
-                       // Get groups id
-                       $res = $dbr->select( 'user_groups', array( 'ug_group' ), array( 'ug_user' => $this->mId ) );
-                       
-                       // add the default group for logged in user
-                       $this->mGroups = array( $wgLoggedInGroupId );
-
-                       while($group = $dbr->fetchRow($res)) {
-                               if ( $group[0] != $wgLoggedInGroupId ) {
-                                       $this->mGroups[] = $group[0];
-                               }
-                       }
-
-
-                       $this->mRights = array();
-                       // now we merge groups rights to get this user rights
-                       foreach($this->mGroups as $aGroupId) {
-                               $g = Group::newFromId($aGroupId);
-                               $g->loadFromDatabase();
-                               $this->mRights = array_merge($this->mRights, explode(',', $g->getRights()));
+                       $res = $dbr->select( 'user_groups',
+                               array( 'ug_group' ),
+                               array( 'ug_user' => $this->mId ),
+                               $fname );
+                       $this->mGroups = array();
+                       while( $row = $dbr->fetchObject( $res ) ) {
+                               $this->mGroups[] = $row->ug_group;
                        }
-                       
-                       // array merge duplicate rights which are part of several groups
-                       $this->mRights = array_unique($this->mRights);
-                       
-                       $dbr->freeResult($res);
+                       $effectiveGroups = array_merge( array( '*', 'user' ), $this->mGroups );
+                       $this->mRights = $this->getGroupPermissions( $effectiveGroups );
                }
 
                $this->mDataLoaded = true;
@@ -580,6 +695,7 @@ class User {
        }
        
        function getNewtalk() {
+               global $wgUseEnotif;
                $fname = 'User::getNewtalk';
                $this->loadFromDatabase();
                
@@ -597,20 +713,33 @@ class User {
                                        $this->mNewtalk = $newtalk ? 1 : 0;
                                        return (bool)$this->mNewtalk;
                                }
-                       }
+                       } 
                        
                        $dbr =& wfGetDB( DB_SLAVE );
-                       $res = $dbr->select( 'watchlist',
-                               array( 'wl_user' ),
-                               array( 'wl_title'     => $this->getTitleKey(),
-                                          'wl_namespace' => NS_USER_TALK,
-                                          'wl_user'      => $this->mId,
-                                          'wl_notificationtimestamp != 0' ),
-                               'User::getNewtalk' );
-                       if( $dbr->numRows($res) > 0 ) {
-                               $this->mNewtalk = 1;
+                       if ( $wgUseEnotif ) {
+                               $res = $dbr->select( 'watchlist',
+                                       array( 'wl_user' ),
+                                       array( 'wl_title'     => $this->getTitleKey(),
+                                                  'wl_namespace' => NS_USER_TALK,
+                                                  'wl_user'      => $this->mId,
+                                                  'wl_notificationtimestamp != 0' ),
+                                       'User::getNewtalk' );
+                               if( $dbr->numRows($res) > 0 ) {
+                                       $this->mNewtalk = 1;
+                               }
+                               $dbr->freeResult( $res );
+                       } elseif ( $this->mId ) {
+                               $res = $dbr->select( 'user_newtalk', 1, array( 'user_id' => $this->mId ), $fname );
+
+                               if ( $dbr->numRows($res)>0 ) {
+                                       $this->mNewtalk= 1;
+                               }
+                               $dbr->freeResult( $res );
+                       } else {
+                               $res = $dbr->select( 'user_newtalk', 1, array( 'user_ip' => $this->mName ), $fname );
+                               $this->mNewtalk = $dbr->numRows( $res ) > 0 ? 1 : 0;
+                               $dbr->freeResult( $res );
                        }
-                       $dbr->freeResult( $res );
                        
                        if( !$this->mId ) {
                                $wgMemc->set( $key, $this->mNewtalk, time() ); // + 1800 );
@@ -627,8 +756,9 @@ class User {
        }
 
        function invalidateCache() {
+               global $wgClockSkewFudge;
                $this->loadFromDatabase();
-               $this->mTouched = wfTimestampNow();
+               $this->mTouched = wfTimestamp(TS_MW, time() + $wgClockSkewFudge );
                # Don't forget to save the options after this or
                # it won't take effect!
        }
@@ -681,7 +811,7 @@ class User {
                        } else {
                                $key = microtime();
                        }
-                       $this->mToken = md5( $wgSecretKey . mt_rand( 0, 0x7fffffff ) . $wgDBname . $this->mId );
+                       $this->mToken = md5( $key . mt_rand( 0, 0x7fffffff ) . $wgDBname . $this->mId );
                } else {
                        $this->mToken = $token;
                }
@@ -726,7 +856,7 @@ class User {
        function getOption( $oname ) {
                $this->loadFromDatabase();
                if ( array_key_exists( $oname, $this->mOptions ) ) {
-                       return $this->mOptions[$oname];
+                       return trim( $this->mOptions[$oname] );
                } else {
                        return '';
                }
@@ -746,23 +876,74 @@ class User {
                $this->loadFromDatabase();
                return $this->mRights;
        }
-       
-       function addRight( $rname )     {
-               $this->loadFromDatabase();
-               array_push( $this->mRights, $rname );
-               $this->invalidateCache();
-       }
 
+       /**
+        * Get the list of explicit group memberships this user has.
+        * The implicit * and user groups are not included.
+        * @return array of strings
+        */
        function getGroups() {
                $this->loadFromDatabase();
                return $this->mGroups;
        }
 
-       function setGroups($groups) {
-               $this->loadFromDatabase();
-               $this->mGroups = $groups;
+       /**
+        * Get the list of implicit group memberships this user has.
+        * This includes all explicit groups, plus 'user' if logged in
+        * and '*' for all accounts.
+        * @return array of strings
+        */
+       function getEffectiveGroups() {
+               $base = array( '*' );
+               if( $this->isLoggedIn() ) {
+                       $base[] = 'user';
+               }
+               return array_merge( $base, $this->getGroups() );
+       }
+       
+       /**
+        * Remove the user from the given group.
+        * This takes immediate effect.
+        * @string $group
+        */
+       function addGroup( $group ) {
+               $dbw =& wfGetDB( DB_MASTER );
+               $dbw->insert( 'user_groups',
+                       array(
+                               'ug_user'  => $this->getID(),
+                               'ug_group' => $group,
+                       ),
+                       'User::addGroup',
+                       array( 'IGNORE' ) );
+               
+               $this->mGroups = array_merge( $this->mGroups, array( $group ) );
+               $this->mRights = User::getGroupPermissions( $this->getEffectiveGroups() );
+               
                $this->invalidateCache();
+               $this->saveSettings();
        }
+       
+       /**
+        * Remove the user from the given group.
+        * This takes immediate effect.
+        * @string $group
+        */
+       function removeGroup( $group ) {
+               $dbw =& wfGetDB( DB_MASTER );
+               $dbw->delete( 'user_groups',
+                       array(
+                               'ug_user'  => $this->getID(),
+                               'ug_group' => $group,
+                       ),
+                       'User::removeGroup' );
+               
+               $this->mGroups = array_diff( $this->mGroups, array( $group ) );
+               $this->mRights = User::getGroupPermissions( $this->getEffectiveGroups() );
+               
+               $this->invalidateCache();
+               $this->saveSettings();
+       }
+
 
        /**
         * A more legible check for non-anonymousness.
@@ -790,17 +971,17 @@ class User {
         * @deprecated
         */
        function isSysop() {
-               wfDebugDieBacktrace("User::isSysop() is deprecated. Use User::isAllowed() instead");
+               return $this->isAllowed( 'protect' );
        }
 
        /** @deprecated */
        function isDeveloper() {
-               wfDebugDieBacktrace("User::isDeveloper() is deprecated. Use User::isAllowed() instead");
+               return $this->isAllowed( 'siteadmin' );
        }
 
        /** @deprecated */
        function isBureaucrat() {
-               wfDebugDieBacktrace("User::isBureaucrat() is deprecated. Use User::isAllowed() instead");
+               return $this->isAllowed( 'makesysop' );
        }
 
        /**
@@ -918,11 +1099,16 @@ class User {
         * the next change of the page if it's watched etc.
         */
        function clearNotification( &$title ) {
-               global $wgUser;
+               global $wgUser, $wgUseEnotif;
+
+               if ( !$wgUseEnotif ) {
+                       return;
+               }
 
                $userid = $this->getID();
-               if ($userid==0)
+               if ($userid==0) {
                        return;
+               }
                
                // Only update the timestamp if the page is being watched. 
                // The query to find out if it is watched is cached both in memcached and per-invocation,
@@ -965,6 +1151,10 @@ class User {
         * @access public
         */
        function clearAllNotifications( $currentUser ) {
+               global $wgUseEnotif;
+               if ( !$wgUseEnotif ) {
+                       return;
+               }
                if( $currentUser != 0 )  {
        
                        $dbw =& wfGetDB( DB_MASTER );
@@ -1048,26 +1238,14 @@ class User {
         * Save object settings into database
         */
        function saveSettings() {
-               global $wgMemc, $wgDBname;
+               global $wgMemc, $wgDBname, $wgUseEnotif;
                $fname = 'User::saveSettings';
 
-               $dbw =& wfGetDB( DB_MASTER );
-               if ( ! $this->getNewtalk() ) {
-                       # Delete the watchlist entry for user_talk page X watched by user X
-                       $dbw->delete( 'watchlist',
-                               array( 'wl_user'      => $this->mId,
-                                          'wl_title'     => $this->getTitleKey(),
-                                          'wl_namespace' => NS_USER_TALK ),
-                               $fname );
-                       if( !$this->mId ) {
-                               # Anon users have a separate memcache space for newtalk
-                               # since they don't store their own info. Trim...
-                               $wgMemc->delete( "$wgDBname:newtalk:ip:{$this->mName}" );
-                       }
-               }
-
+               if ( wfReadOnly() ) { return; }
+               $this->saveNewtalk();
                if ( 0 == $this->mId ) { return; }
                
+               $dbw =& wfGetDB( DB_MASTER );
                $dbw->update( 'user',
                        array( /* SET */
                                'user_name' => $this->mName,
@@ -1083,26 +1261,83 @@ class User {
                                'user_id' => $this->mId
                        ), $fname
                );
-               $dbw->set( 'user_rights', 'ur_rights', implode( ',', $this->mRights ),
-                       'ur_user='. $this->mId, $fname ); 
                $wgMemc->delete( "$wgDBname:user:id:$this->mId" );
+       }
+       
+       /**
+        * Save value of new talk flag.
+        */
+       function saveNewtalk() {
+               global $wgDBname, $wgMemc, $wgUseEnotif;
                
-               // delete old groups
-               $dbw->delete( 'user_groups', array( 'ug_user' => $this->mId), $fname);
-               
-               // save new ones
-               foreach ($this->mGroups as $group) {
-                       $dbw->replace( 'user_groups',
-                               array(array('ug_user','ug_group')),
-                               array(
-                                       'ug_user' => $this->mId,
-                                       'ug_group' => $group
-                               ), $fname
-                       );
+               $fname = 'User::saveNewtalk';
+
+               $changed = false;
+
+               if ( wfReadOnly() ) { return ; }
+               $dbr =& wfGetDB( DB_SLAVE );
+               $dbw =& wfGetDB( DB_MASTER );
+               $changed = false;
+               if ( $wgUseEnotif ) {
+                       if ( ! $this->getNewtalk() ) {
+                               # Delete the watchlist entry for user_talk page X watched by user X
+                               $dbw->delete( 'watchlist',
+                                       array( 'wl_user'      => $this->mId,
+                                                  'wl_title'     => $this->getTitleKey(),
+                                                  'wl_namespace' => NS_USER_TALK ),
+                                       $fname );
+                               if ( $dbw->affectedRows() ) {
+                                       $changed = true;
+                               }
+                               if( !$this->mId ) {
+                                       # Anon users have a separate memcache space for newtalk
+                                       # since they don't store their own info. Trim...
+                                       $wgMemc->delete( "$wgDBname:newtalk:ip:{$this->mName}" );
+                               }
+                       }
+               } else {
+                       if ($this->getID() != 0) {
+                               $field = 'user_id';
+                               $value = $this->getID();
+                               $key = false;
+                       } else {
+                               $field = 'user_ip';
+                               $value = $this->mName;
+                               $key = "$wgDBname:newtalk:ip:$this->mName";
+                       }
+                       
+                       $dbr =& wfGetDB( DB_SLAVE );
+                       $dbw =& wfGetDB( DB_MASTER );
+
+                       $res = $dbr->selectField('user_newtalk', $field,
+                                                                        array($field => $value), $fname);
+
+                       $changed = true;
+                       if ($res !== false && $this->mNewtalk == 0) {
+                               $dbw->delete('user_newtalk', array($field => $value), $fname);
+                               if ( $key ) {
+                                       $wgMemc->set( $key, 0 );
+                               }
+                       } else if ($res === false && $this->mNewtalk == 1) {
+                               $dbw->insert('user_newtalk', array($field => $value), $fname);
+                               if ( $key ) {
+                                       $wgMemc->set( $key, 1 );
+                               }
+                       } else {
+                               $changed = false;
+                       }
+               }
+
+               # Update user_touched, so that newtalk notifications in the client cache are invalidated
+               if ( $changed && $this->getID() ) {
+                       $dbw->update('user', 
+                               /*SET*/ array( 'user_touched' => $this->mTouched ),
+                               /*WHERE*/ array( 'user_id' => $this->getID() ),
+                               $fname);
+                       $wgMemc->set( "$wgDBname:user:id:{$this->mId}", $this, 86400 );
                }
        }
 
-       
        /**
         * Checks if a user with the given name exists, returns the ID
         */
@@ -1142,21 +1377,6 @@ class User {
                        ), $fname
                );
                $this->mId = $dbw->insertId();
-               $dbw->insert( 'user_rights',
-                       array(
-                               'ur_user' => $this->mId,
-                               'ur_rights' => implode( ',', $this->mRights )
-                       ), $fname
-               );
-               
-               foreach ($this->mGroups as $group) {
-                       $dbw->insert( 'user_groups',
-                               array(
-                                       'ug_user' => $this->mId,
-                                       'ug_group' => $group
-                               ), $fname
-                       );
-               }
        }
 
        function spreadBlock() {
@@ -1229,15 +1449,7 @@ class User {
        }
 
        function isAllowedToCreateAccount() {
-               global $wgWhitelistAccount;
-               $allowed = false;
-
-               if (!$wgWhitelistAccount) { return 1; }; // default behaviour
-               foreach ($wgWhitelistAccount as $right => $ok) {
-                       $userHasRight = (!strcmp($right, 'user') || in_array($right, $this->getRights()));
-                       $allowed |= ($ok && $userHasRight);
-               }
-               return $allowed;
+               return $this->isAllowed( 'createaccount' );
        }
 
        /**
@@ -1284,7 +1496,7 @@ class User {
         * @return bool True if it is a newbie.
         */
        function isNewbie() {
-               return $this->mId > User::getMaxID() * 0.99 && !$this->isAllowed( 'delete' ) && !$this->isBot() || $this->getID() == 0;
+               return $this->isAnon() || $this->mId > User::getMaxID() * 0.99 && !$this->isAllowed( 'delete' ) && !$this->isBot();
        }
 
        /**
@@ -1293,8 +1505,17 @@ class User {
         * @return bool True if the given password is correct otherwise False.
         */
        function checkPassword( $password ) {
-               global $wgAuth;
+               global $wgAuth, $wgMinimalPasswordLength;
                $this->loadFromDatabase();
+
+               // Even though we stop people from creating passwords that
+               // are shorter than this, doesn't mean people wont be able
+               // 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( strlen( $password ) < $wgMinimalPasswordLength ) {
+                       return false;
+               }
                
                if( $wgAuth->authenticate( $this->getName(), $password ) ) {
                        return true;
@@ -1306,17 +1527,6 @@ class User {
                if ( 0 == strcmp( $ep, $this->mPassword ) ) {
                        return true;
                } elseif ( ($this->mNewpassword != '') && (0 == strcmp( $ep, $this->mNewpassword )) ) {
-                       # If e-mail confirmation hasn't been done already,
-                       # we may as well confirm it here -- the user can only
-                       # get this password via e-mail.
-                       $this->mEmailAuthenticated = wfTimestampNow();
-                       
-                       # use the temporary one-time password only once: clear it now !
-
-                       # Emergency measure. Uncomment blanking of one-time password
-                       # reported in bug 2126
-                       # $this->mNewpassword = '';
-                       $this->saveSettings();
                        return true;
                } elseif ( function_exists( 'iconv' ) ) {
                        # Some wikis were converted from ISO 8859-1 to UTF-8, the passwords can't be converted
@@ -1509,6 +1719,52 @@ class User {
                        return false;
                return true;
        }
+       
+       /**
+        * @param array $groups list of groups
+        * @return array list of permission key names for given groups combined
+        * @static
+        */
+       function getGroupPermissions( $groups ) {
+               global $wgGroupPermissions;
+               $rights = array();
+               foreach( $groups as $group ) {
+                       if( isset( $wgGroupPermissions[$group] ) ) {
+                               $rights = array_merge( $rights,
+                                       array_keys( array_filter( $wgGroupPermissions[$group] ) ) );
+                       }
+               }
+               return $rights;
+       }
+
+       /**
+        * @param string $group key name
+        * @return string localized descriptive name, if provided
+        * @static
+        */
+       function getGroupName( $group ) {
+               $key = "group-$group-name";
+               $name = wfMsg( $key );
+               if( $name == '' || $name == "&lt;$key&gt;" ) {
+                       return $group;
+               } else {
+                       return $name;
+               }
+       }
+       
+       /**
+        * Return the set of defined explicit groups.
+        * The * and 'user' groups are not included.
+        * @return array
+        * @static
+        */
+       function getAllGroups() {
+               global $wgGroupPermissions;
+               return array_diff(
+                       array_keys( $wgGroupPermissions ),
+                       array( '*', 'user' ) );
+       }
+
 }
 
 ?>