Capitalization fix in memcached setting
[lhc/web/wiklou.git] / includes / User.php
index 578a7ee..b6f4238 100644 (file)
@@ -1,46 +1,93 @@
 <?php
-# See user.doc
-
+/**
+ * See user.doc
+ *
+ * @package MediaWiki
+ */
+
+/**
+ *
+ */
 require_once( 'WatchedItem.php' );
+require_once( 'Group.php' );
 
-class User {
-       /* private */ var $mId, $mName, $mPassword, $mEmail, $mNewtalk;
-       /* private */ var $mRights, $mOptions;
-       /* private */ var $mDataLoaded, $mNewpassword;
-       /* private */ var $mSkin;
-       /* private */ var $mBlockedby, $mBlockreason;
-       /* private */ var $mTouched;
-       /* private */ var $mCookiePassword;
-       /* private */ var $mRealName;
-       /* private */ var $mHash;
+# Number of characters in user_token field
+define( 'USER_TOKEN_LENGTH', 32 );
 
+/**
+ *
+ * @package MediaWiki
+ */
+class User {
+       /**#@+
+        * @access private
+        */
+       var $mId, $mName, $mPassword, $mEmail, $mNewtalk;
+       var $mRights, $mOptions;
+       var $mDataLoaded, $mNewpassword;
+       var $mSkin;
+       var $mBlockedby, $mBlockreason;
+       var $mTouched;
+       var $mToken;
+       var $mRealName;
+       var $mHash;
+       /** Array of group id the user belong to */
+       var $mGroups;
+       /**#@-*/
+
+       /** Construct using User:loadDefaults() */
        function User() {
                $this->loadDefaults();
        }
 
-       # Static factory method
-       #
+       /**
+        * Static factory method
+        * @static
+        * @param string $name Username, validated by Title:newFromText()
+        */
        function newFromName( $name ) {
                $u = new User();
 
                # Clean up name according to title rules
 
                $t = Title::newFromText( $name );
-               $u->setName( $t->getText() );
-               return $u;
+               if( is_null( $t ) ) {
+                       return NULL;
+               } else {
+                       $u->setName( $t->getText() );
+                       return $u;
+               }
        }
 
-       /* static */ function whoIs( $id )      {
+       /**
+        * Get username given an id.
+        * @param integer $id Database user id
+        * @return string Nickname of a user
+        * @static
+        */
+       function whoIs( $id )   {
                $dbr =& wfGetDB( DB_SLAVE );
-               return $dbr->getField( 'user', 'user_name', array( 'user_id' => $id ) );
+               return $dbr->selectField( 'user', 'user_name', array( 'user_id' => $id ) );
        }
 
-       /* static */ function whoIsReal( $id )  {
+       /**
+        * Get real username given an id.
+        * @param integer $id Database user id
+        * @return string Realname of a user
+        * @static
+        */
+       function whoIsReal( $id )       {
                $dbr =& wfGetDB( DB_SLAVE );
-               return $dbr->getField( 'user', 'user_real_name', array( 'user_id' => $id ) );
+               return $dbr->selectField( 'user', 'user_real_name', array( 'user_id' => $id ) );
        }
 
-       /* static */ function idFromName( $name ) {
+       /**
+        * Get database id given a user name
+        * @param string $name Nickname of a user
+        * @return integer|null Database user id (null: if non existent
+        * @static
+        */
+       function idFromName( $name ) {
                $fname = "User::idFromName";
 
                $nt = Title::newFromText( $name );
@@ -49,7 +96,7 @@ class User {
                        return null;
                }
                $dbr =& wfGetDB( DB_SLAVE );
-               $s = $dbr->getArray( 'user', array( 'user_id' ), array( 'user_name' => $nt->getText() ), $fname );
+               $s = $dbr->selectRow( 'user', array( 'user_id' ), array( 'user_name' => $nt->getText() ), $fname );
 
                if ( $s === false ) {
                        return 0;
@@ -58,13 +105,22 @@ class User {
                }
        }
 
-       # does the string match an anonymous user IP address?
-       /* static */ function isIP( $name ) {
+       /**
+        * does the string match an anonymous user IP address?
+        * @param string $name Nickname of a user
+        * @static
+        */
+       function isIP( $name ) {
                return preg_match("/^\d{1,3}\.\d{1,3}.\d{1,3}\.\d{1,3}$/",$name);
-
        }
 
-       /* static */ function randomPassword() {
+       /**
+        * probably return a random password
+        * @return string probably a random password
+        * @static
+        * @todo Check what is doing really [AV]
+        */
+       function randomPassword() {
                $pwchars = 'ABCDEFGHJKLMNPQRSTUVWXYZabcdefghjkmnpqrstuvwxyz';
                $l = strlen( $pwchars ) - 1;
 
@@ -75,19 +131,26 @@ class User {
                return $np;
        }
 
+       /**
+        * Set properties to default
+        * Used at construction. It will load per language default settings only
+        * if we have an available language object.
+        */
        function loadDefaults() {
-               global $wgLang, $wgIP;
+               global $wgContLang, $wgIP;
                global $wgNamespacesToBeSearchedDefault;
 
-               $this->mId = $this->mNewtalk = 0;
+               $this->mId = 0;
+               $this->mNewtalk = -1;
                $this->mName = $wgIP;
                $this->mRealName = $this->mEmail = '';
                $this->mPassword = $this->mNewpassword = '';
                $this->mRights = array();
-               $defOpt = $wgLang->getDefaultUserOptions() ;
-               foreach ( $defOpt as $oname => $val ) {
-                       $this->mOptions[$oname] = $val;
-               }
+               $this->mGroups = array();
+               
+               // Getting user defaults only if we have an available language
+               if(isset($wgContLang)) { $this->loadDefaultFromLanguage(); }
+               
                foreach ($wgNamespacesToBeSearchedDefault as $nsnum => $val) {
                        $this->mOptions['searchNs'.$nsnum] = $val;
                }
@@ -95,12 +158,33 @@ class User {
                $this->mDataLoaded = false;
                $this->mBlockedby = -1; # Unset
                $this->mTouched = '0'; # Allow any pages to be cached
-               $this->cookiePassword = '';
+               $this->setToken(); # Random
                $this->mHash = false;
        }
 
-       /* private */ function getBlockedStatus()
-       {
+       /**
+        * 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(){
+               global $wgContLang;
+               $defOpt = $wgContLang->getDefaultUserOptions() ;
+               foreach ( $defOpt as $oname => $val ) {
+                       $this->mOptions[$oname] = $val;
+               }               
+               /* 
+                 default language setting
+               */
+               $this->setOption('variant', $wgContLang->getPreferredVariant());
+               $this->setOption('language', $wgContLang->getPreferredVariant());
+       }
+
+       /**
+        * Get blocking information
+        * @access private
+        */
+       function getBlockedStatus() {
                global $wgIP, $wgBlockCache, $wgProxyList;
 
                if ( -1 != $this->mBlockedby ) { return; }
@@ -134,35 +218,56 @@ class User {
                }
        }
 
-       function isBlocked()
-       {
+       /**
+        * Check if user is blocked
+        * @return bool True if blocked, false otherwise
+        */
+       function isBlocked() {
                $this->getBlockedStatus();
                if ( 0 === $this->mBlockedby ) { return false; }
                return true;
        }
-
+       
+       /**
+        * Get name of blocker
+        * @return string name of blocker
+        */
        function blockedBy() {
                $this->getBlockedStatus();
                return $this->mBlockedby;
        }
-
+       
+       /**
+        * Get blocking reason
+        * @return string Blocking reason
+        */
        function blockedFor() {
                $this->getBlockedStatus();
                return $this->mBlockreason;
        }
 
+       /**
+        * Initialise php session
+        */
        function SetupSession() {
                global $wgSessionsInMemcached, $wgCookiePath, $wgCookieDomain;
                if( $wgSessionsInMemcached ) {
                        require_once( 'MemcachedSessions.php' );
+               } elseif( 'files' != ini_get( 'session.save_handler' ) ) {
+                       # If it's left on 'user' or another setting from another
+                       # application, it will end up failing. Try to recover.
+                       ini_set ( 'session.save_handler', 'files' );
                }
                session_set_cookie_params( 0, $wgCookiePath, $wgCookieDomain );
                session_cache_limiter( 'private, must-revalidate' );
                @session_start();
        }
 
-       /* static */ function loadFromSession()
-       {
+       /**
+        * Read datas from session
+        * @static
+        */
+       function loadFromSession() {
                global $wgMemc, $wgDBname;
 
                if ( isset( $_SESSION['wsUserID'] ) ) {
@@ -197,12 +302,10 @@ class User {
                        wfDebug( "User::loadFromSession() got from cache!\n" );
                }
 
-               if ( isset( $_SESSION['wsUserPassword'] ) ) {
-                       $passwordCorrect = $_SESSION['wsUserPassword'] == $user->mPassword;
-               } else if ( isset( $_COOKIE["{$wgDBname}Password"] ) ) {
-                       $user->mCookiePassword = $_COOKIE["{$wgDBname}Password"];
-                       $_SESSION['wsUserPassword'] = $user->addSalt( $user->mCookiePassword );
-                       $passwordCorrect = $_SESSION['wsUserPassword'] == $user->mPassword;
+               if ( isset( $_SESSION['wsToken'] ) ) {
+                       $passwordCorrect = $_SESSION['wsToken'] == $user->mToken;
+               } else if ( isset( $_COOKIE["{$wgDBname}Token"] ) ) {
+                       $passwordCorrect = $user->mToken == $_COOKIE["{$wgDBname}Token"];
                } else {
                        return new User(); # Can't log in from session
                }
@@ -220,9 +323,11 @@ class User {
                return new User(); # Can't log in from session
        }
 
-       function loadFromDatabase()
-       {
-               global $wgCommandLineMode;
+       /**
+        * Load a user from the database
+        */
+       function loadFromDatabase() {
+               global $wgCommandLineMode, $wgAnonGroupId, $wgLoggedInGroupId;
                $fname = "User::loadFromDatabase";
                if ( $this->mDataLoaded || $wgCommandLineMode ) {
                        return;
@@ -231,40 +336,25 @@ class User {
                # Paranoia
                $this->mId = IntVal( $this->mId );
 
-               # check in separate table if there are changes to the talk page
-               $this->mNewtalk=0; # reset talk page status
-               $dbr =& wfGetDB( DB_SLAVE );
-               if($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 {
-                       global $wgDBname, $wgMemc;
-                       $key = "$wgDBname:newtalk:ip:{$this->mName}";
-                       $newtalk = $wgMemc->get( $key );
-                       if( ! is_integer( $newtalk ) ){
-                               $res = $dbr->select( 'user_newtalk', 1, array( 'user_ip' => $this->mName ), $fname );
-
-                               $this->mNewtalk = $dbr->numRows( $res ) > 0 ? 1 : 0;
-                               $dbr->freeResult( $res );
-
-                               $wgMemc->set( $key, $this->mNewtalk, time() ); // + 1800 );
-                       } else {
-                               $this->mNewtalk = $newtalk ? 1 : 0;
-                       }
-               }
+               /** Anonymous user */
                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->mDataLoaded = true;
                        return;
                } # the following stuff is for non-anonymous users only
-
-               $s = $dbr->getArray( 'user', array( 'user_name','user_password','user_newpassword','user_email',
-                 'user_real_name','user_options','user_rights','user_touched' ),
+               
+               $dbr =& wfGetDB( DB_SLAVE );
+               $s = $dbr->selectRow( 'user', array( 'user_name','user_password','user_newpassword','user_email',
+                 'user_real_name','user_options','user_touched', 'user_token' ),
                  array( 'user_id' => $this->mId ), $fname );
-
+               
                if ( $s !== false ) {
                        $this->mName = $s->user_name;
                        $this->mEmail = $s->user_email;
@@ -272,8 +362,31 @@ class User {
                        $this->mPassword = $s->user_password;
                        $this->mNewpassword = $s->user_newpassword;
                        $this->decodeOptions( $s->user_options );
-                       $this->mRights = explode( ",", strtolower( $s->user_rights ) );
                        $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 ) );
+
+                       while($group = $dbr->fetchRow($res)) {
+                               $this->mGroups[] = $group[0];
+                       }
+
+                       // add the default group for logged in user
+                       $this->mGroups[] = $wgLoggedInGroupId;
+
+                       $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()));
+                       }
+                       
+                       // array merge duplicate rights which are part of several groups
+                       $this->mRights = array_unique($this->mRights);
+                       
+                       $dbr->freeResult($res);
                }
 
                $this->mDataLoaded = true;
@@ -296,12 +409,41 @@ class User {
        }
 
        function getNewtalk() {
+               $fname = 'User::getNewtalk';
                $this->loadFromDatabase();
+               
+               # Load the newtalk status if it is unloaded (mNewtalk=-1)
+               if ( $this->mNewtalk == -1 ) {
+                       $this->mNewtalk=0; # reset talk page status
+                       $dbr =& wfGetDB( DB_SLAVE );
+                       if($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 {
+                               global $wgDBname, $wgMemc;
+                               $key = "$wgDBname:newtalk:ip:{$this->mName}";
+                               $newtalk = $wgMemc->get( $key );
+                               if( ! is_integer( $newtalk ) ){
+                                       $res = $dbr->select( 'user_newtalk', 1, array( 'user_ip' => $this->mName ), $fname );
+
+                                       $this->mNewtalk = $dbr->numRows( $res ) > 0 ? 1 : 0;
+                                       $dbr->freeResult( $res );
+
+                                       $wgMemc->set( $key, $this->mNewtalk, time() ); // + 1800 );
+                               } else {
+                                       $this->mNewtalk = $newtalk ? 1 : 0;
+                               }
+                       }
+               }
+
                return ( 0 != $this->mNewtalk );
        }
 
-       function setNewtalk( $val )
-       {
+       function setNewtalk( $val ) {
                $this->loadFromDatabase();
                $this->mNewtalk = $val;
                $this->invalidateCache();
@@ -319,6 +461,12 @@ class User {
                return ($timestamp >= $this->mTouched);
        }
 
+       /**
+        * Salt a password.
+        * Will only be salted if $wgPasswordSalt is true
+        * @param string Password.
+        * @return string Salted password or clear password.
+        */
        function addSalt( $p ) {
                global $wgPasswordSalt;
                if($wgPasswordSalt)
@@ -327,17 +475,39 @@ class User {
                        return $p;
        }
 
+       /**
+        * Encrypt a password.
+        * It can eventuall salt a password @see User::addSalt()
+        * @param string $p clear Password.
+        * @param string Encrypted password.
+        */
        function encryptPassword( $p ) {
                return $this->addSalt( md5( $p ) );
        }
 
+       # Set the password and reset the random token
        function setPassword( $str ) {
                $this->loadFromDatabase();
-               $this->setCookiePassword( $str );
+               $this->setToken();
                $this->mPassword = $this->encryptPassword( $str );
                $this->mNewpassword = '';
        }
 
+       # Set the random token (used for persistent authentication)
+       function setToken( $token = false ) {
+               if ( !$token ) {
+                       $this->mToken = '';
+                       # Take random data from PRNG
+                       # This is reasonably secure if the PRNG has been seeded correctly
+                       for ($i = 0; $i<USER_TOKEN_LENGTH / 4; $i++) {
+                               $this->mToken .= sprintf( "%04X", mt_rand( 0, 65535 ) );
+                       }
+               } else {
+                       $this->mToken = $token;
+               }
+       }
+
+                       
        function setCookiePassword( $str ) {
                $this->loadFromDatabase();
                $this->mCookiePassword = md5( $str );
@@ -391,34 +561,65 @@ class User {
                $this->loadFromDatabase();
                return $this->mRights;
        }
-
+       
        function addRight( $rname )     {
                $this->loadFromDatabase();
                array_push( $this->mRights, $rname );
                $this->invalidateCache();
        }
 
+       function getGroups() {
+               $this->loadFromDatabase();
+               return $this->mGroups;
+       }
+
+       function setGroups($groups) {
+               $this->loadFromDatabase();
+               $this->mGroups = $groups;
+               $this->invalidateCache();
+       }
+
+       /**
+        * Check if a user is sysop
+        * Die with backtrace. Use User:isAllowed() instead.
+        * @deprecated
+        */
        function isSysop() {
+       /**
                $this->loadFromDatabase();
                if ( 0 == $this->mId ) { return false; }
 
                return in_array( 'sysop', $this->mRights );
+       */
+       wfDebugDieBacktrace("User::isSysop() is deprecated. Use User::isAllowed() instead");
        }
 
+       /** @deprecated */
        function isDeveloper() {
+       /**
                $this->loadFromDatabase();
                if ( 0 == $this->mId ) { return false; }
 
                return in_array( 'developer', $this->mRights );
+       */
+       wfDebugDieBacktrace("User::isDeveloper() is deprecated. Use User::isAllowed() instead");
        }
 
+       /** @deprecated */
        function isBureaucrat() {
+       /**
                $this->loadFromDatabase();
                if ( 0 == $this->mId ) { return false; }
 
                return in_array( 'bureaucrat', $this->mRights );
+       */
+       wfDebugDieBacktrace("User::isBureaucrat() is deprecated. Use User::isAllowed() instead");
        }
 
+       /**
+        * Whether the user is a bot
+        * @todo need to be migrated to the new user level management sytem
+        */
        function isBot() {
                $this->loadFromDatabase();
 
@@ -428,9 +629,24 @@ class User {
                return in_array( 'bot', $this->mRights );
        }
 
+       /**
+        * Check if user is allowed to access a feature / make an action
+        * @param string $action Action to be checked (see $wgAvailableRights in Defines.php for possible actions).
+        * @return boolean True: action is allowed, False: action should not be allowed
+        */
+       function isAllowed($action='') {
+               $this->loadFromDatabase();
+               return in_array( $action , $this->mRights );
+       }
+
+       /**
+        * Load a skin if it doesn't exist or return it
+        * @todo FIXME : need to check the old failback system [AV]
+        */
        function &getSkin() {
+               global $IP;
                if ( ! isset( $this->mSkin ) ) {
-                       # get all skin names available from SkinNames.php
+                       # get all skin names available
                        $skinNames = Skin::getSkinNames();
                        # get the user skin
                        $userSkin = $this->getOption( 'skin' );
@@ -439,65 +655,81 @@ class User {
                        if ( !isset( $skinNames[$userSkin] ) ) {
                                # in case the user skin could not be found find a replacement
                                $fallback = array(
-                                       0 => 'SkinStandard',
-                                       1 => 'SkinNostalgia',
-                                       2 => 'SkinCologneBlue');
-                               # if phptal is enabled we should have monobook skin that superseed
-                               # the good old SkinStandard.
+                                       0 => 'Standard',
+                                       1 => 'Nostalgia',
+                                       2 => 'CologneBlue');
+                               # if phptal is enabled we should have monobook skin that
+                               # superseed the good old SkinStandard.
                                if ( isset( $skinNames['monobook'] ) ) {
-                                       $fallback[0] = 'SkinMonoBook';
+                                       $fallback[0] = 'MonoBook';
                                }
 
                                if(is_numeric($userSkin) && isset( $fallback[$userSkin]) ){
                                        $sn = $fallback[$userSkin];
                                } else {
-                                       $sn = 'SkinStandard';
+                                       $sn = 'Standard';
                                }
                        } else {
                                # The user skin is available
-                               $sn = 'Skin' . $skinNames[$userSkin];
+                               $sn = $skinNames[$userSkin];
                        }
 
-                       # only require the needed stuff
-                       switch($sn) {
-                               case 'SkinMonoBook':
-                                       require_once( 'SkinPHPTal.php' );
-                                       break;
-                               case 'SkinStandard':
-                                       require_once( 'SkinStandard.php' );
-                                       break;
-                               case 'SkinNostalgia':
-                                       require_once( 'SkinNostalgia.php' );
-                                       break;
-                               case 'SkinCologneBlue':
-                                       require_once( 'SkinCologneBlue.php' );
-                                       break;
+                       # Grab the skin class and initialise it. Each skin checks for PHPTal
+                       # and will not load if it's not enabled.
+                       require_once( $IP.'/skins/'.$sn.'.php' );
+                       
+                       # Check if we got if not failback to default skin
+                       $className = 'Skin'.$sn;
+                       if( !class_exists( $className ) ) {
+                               # DO NOT die if the class isn't found. This breaks maintenance
+                               # scripts and can cause a user account to be unrecoverable
+                               # except by SQL manipulation if a previously valid skin name
+                               # is no longer valid.
+                               $className = 'SkinStandard';
+                               require_once( $IP.'/skins/Standard.php' );
                        }
-                       # now we can create the skin object
-                       $this->mSkin = new $sn;
+                       $this->mSkin = new $className;
                }
                return $this->mSkin;
        }
 
+       /**#@+
+        * @param string $title Article title to look at
+        */
+       
+       /**
+        * Check watched status of an article
+        * @return bool True if article is watched
+        */
        function isWatched( $title ) {
                $wl = WatchedItem::fromUserTitle( $this, $title );
                return $wl->isWatched();
        }
 
+       /**
+        * Watch an article
+        */
        function addWatch( $title ) {
                $wl = WatchedItem::fromUserTitle( $this, $title );
                $wl->addWatch();
                $this->invalidateCache();
        }
 
+       /**
+        * Stop watching an article
+        */
        function removeWatch( $title ) {
                $wl = WatchedItem::fromUserTitle( $this, $title );
                $wl->removeWatch();
                $this->invalidateCache();
        }
+       /**#@-*/
 
-
-       /* private */ function encodeOptions() {
+       /**
+        * @access private
+        * @return string Encoding options
+        */
+       function encodeOptions() {
                $a = array();
                foreach ( $this->mOptions as $oname => $oval ) {
                        array_push( $a, $oname.'='.$oval );
@@ -506,7 +738,10 @@ class User {
                return $s;
        }
 
-       /* private */ function decodeOptions( $str ) {
+       /**
+        * @access private
+        */
+       function decodeOptions( $str ) {
                $a = explode( "\n", $str );
                foreach ( $a as $s ) {
                        if ( preg_match( "/^(.[^=]*)=(.*)$/", $s, $m ) ) {
@@ -527,30 +762,38 @@ class User {
                $_SESSION['wsUserName'] = $this->mName;
                setcookie( $wgDBname.'UserName', $this->mName, $exp, $wgCookiePath, $wgCookieDomain );
 
-               $_SESSION['wsUserPassword'] = $this->mPassword;
+               $_SESSION['wsToken'] = $this->mToken;
                if ( 1 == $this->getOption( 'rememberpassword' ) ) {
-                       setcookie( $wgDBname.'Password', $this->mCookiePassword, $exp, $wgCookiePath, $wgCookieDomain );
+                       setcookie( $wgDBname.'Token', $this->mToken, $exp, $wgCookiePath, $wgCookieDomain );
                } else {
-                       setcookie( $wgDBname.'Password', '', time() - 3600 );
+                       setcookie( $wgDBname.'Token', '', time() - 3600 );
                }
        }
 
+       /**
+        * Logout user
+        * It will clean the session cookie
+        */
        function logout() {
-               global $wgCookiePath, $wgCookieDomain, $wgDBname;
-               $this->mId = 0;
+               global $wgCookiePath, $wgCookieDomain, $wgDBname, $wgIP;
+               $this->loadDefaults();
+               $this->setLoaded( true );
 
                $_SESSION['wsUserID'] = 0;
 
                setcookie( $wgDBname.'UserID', '', time() - 3600, $wgCookiePath, $wgCookieDomain );
-               setcookie( $wgDBname.'Password', '', time() - 3600, $wgCookiePath, $wgCookieDomain );
+               setcookie( $wgDBname.'Token', '', time() - 3600, $wgCookiePath, $wgCookieDomain );
        }
 
+       /**
+        * Save object settings into database
+        */
        function saveSettings() {
                global $wgMemc, $wgDBname;
                $fname = 'User::saveSettings';
 
                $dbw =& wfGetDB( DB_MASTER );
-               if ( ! $this->mNewtalk ) {
+               if ( ! $this->getNewtalk() ) {
                        # Delete user_newtalk row
                        if( $this->mId ) {
                                $dbw->delete( 'user_newtalk', array( 'user_id' => $this->mId ), $fname );
@@ -569,17 +812,34 @@ class User {
                                'user_real_name' => $this->mRealName,
                                'user_email' => $this->mEmail,
                                'user_options' => $this->encodeOptions(),
-                               'user_rights' => implode( ",", $this->mRights ),
-                               'user_touched' => $dbw->timestamp($this->mTouched)
+                               'user_touched' => $dbw->timestamp($this->mTouched),
+                               'user_token' => $this->mToken
                        ), array( /* WHERE */
                                '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" );
+               
+               // 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
+                       );
+               }
        }
 
-       # Checks if a user with the given name exists, returns the ID
-       #
+       /**
+        * Checks if a user with the given name exists, returns the ID
+        */
        function idForName() {
                $fname = 'User::idForName';
 
@@ -595,6 +855,9 @@ class User {
                return $id;
        }
 
+       /**
+        * Add user object to the database
+        */
        function addToDatabase() {
                $fname = 'User::addToDatabase';
                $dbw =& wfGetDB( DB_MASTER );
@@ -607,16 +870,30 @@ class User {
                                'user_newpassword' => $this->mNewpassword,
                                'user_email' => $this->mEmail,
                                'user_real_name' => $this->mRealName,
-                               'user_rights' => implode( ',', $this->mRights ),
-                               'user_options' => $this->encodeOptions()
+                               'user_options' => $this->encodeOptions(),
+                               'user_token' => $this->mToken
                        ), $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()
-       {
-               global $wgIP;
+       function spreadBlock() {
+               global $wgIP;
                # If the (non-anonymous) user is blocked, this function will block any IP address
                # that they successfully log on from.
                $fname = 'User::spreadBlock';
@@ -660,7 +937,8 @@ class User {
 
        }
 
-       function getPageRenderingHash(){
+       function getPageRenderingHash() {
+        global $wgContLang;
                if( $this->mHash ){
                        return $this->mHash;
                }
@@ -676,6 +954,12 @@ class User {
                $confstr .= '!' . $this->getOption( 'showtoc' );
                $confstr .= '!' . $this->getOption( 'date' );
                $confstr .= '!' . $this->getOption( 'numberheadings' );
+               $confstr .= '!' . $this->getOption( 'language' );
+               // add in language variant option if there are multiple variants
+               // supported by the language object
+               if(sizeof($wgContLang->getVariants())>1) {
+                       $confstr .= '!' . $this->getOption( 'variant' );
+               }
 
                $this->mHash = $confstr;
                return $confstr ;
@@ -693,10 +977,11 @@ class User {
                return $allowed;
        }
 
-       # Set mDataLoaded, return previous value
-       # Use this to prevent DB access in command-line scripts or similar situations
-       function setLoaded( $loaded )
-       {
+       /**
+        * Set mDataLoaded, return previous value
+        * Use this to prevent DB access in command-line scripts or similar situations
+        */
+       function setLoaded( $loaded ) {
                return wfSetVar( $this->mDataLoaded, $loaded );
        }
 
@@ -704,18 +989,40 @@ class User {
                return Title::makeTitle( NS_USER, $this->mName );
        }
 
-       /* static */ function getMaxID() {
+       /**
+        * @static
+        */
+       function getMaxID() {
                $dbr =& wfGetDB( DB_SLAVE );
                return $dbr->selectField( 'user', 'max(user_id)', false );
        }
 
+       /**
+        * Determine whether the user is a newbie. Newbies are either
+        * anonymous IPs, or the 1% most recently created accounts.
+        * Bots and sysops are excluded.
+        * @return bool True if it is a newbie.
+        */
        function isNewbie() {
                return $this->mId > User::getMaxID() * 0.99 && !$this->isSysop() && !$this->isBot() || $this->getID() == 0;
        }
 
-       # Check to see if the given clear-text password is one of the accepted passwords
+       /**
+        * Check to see if the given clear-text password is one of the accepted passwords
+        * @param string $password User password.
+        * @return bool True if the given password is correct otherwise False.
+        */
        function checkPassword( $password ) {
                $this->loadFromDatabase();
+               
+               global $wgAuth;
+               if( $wgAuth->authenticate( $this->getName(), $password ) ) {
+                       return true;
+               } elseif( $wgAuth->strict() ) {
+                       /* Auth plugin doesn't allow local authentication */
+                       return false;
+               }
+               
                $ep = $this->encryptPassword( $password );
                if ( 0 == strcmp( $ep, $this->mPassword ) ) {
                        return true;