BUG#93 Fix handling of <nowiki> in templates
[lhc/web/wiklou.git] / includes / User.php
index 322ae18..82323a8 100644 (file)
 <?php
-# See user.doc
-
+/**
+ * See user.doc
+ *
+ * @package MediaWiki
+ */
+
+/**
+ *
+ */
 require_once( 'WatchedItem.php' );
 
+/**
+ *
+ * @package MediaWiki
+ */
 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;
-
+       /**#@+
+        * @access private
+        */
+       var $mId, $mName, $mPassword, $mEmail, $mNewtalk;
+       var $mRights, $mOptions;
+       var $mDataLoaded, $mNewpassword;
+       var $mSkin;
+       var $mBlockedby, $mBlockreason;
+       var $mTouched;
+       var $mCookiePassword;
+       var $mRealName;
+       var $mHash;
+       /**#@-*/
+
+       /** 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;
-       }
-
-       /* static */ function whoIs( $id )      {
-               return wfGetSQL( 'user', 'user_name', 'user_id='.$id );
+               if( is_null( $t ) ) {
+                       return NULL;
+               } else {
+                       $u->setName( $t->getText() );
+                       return $u;
+               }
        }
 
-       /* static */ function whoIsReal( $id )  {
-               return wfGetSQL( 'user', 'user_real_name', 'user_id='.$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->selectField( 'user', 'user_name', array( 'user_id' => $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->selectField( 'user', 'user_real_name', array( 'user_id' => $id ) );
+       }
+
+       /**
+        * 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";
 
-       /* static */ function idFromName( $name ) {
                $nt = Title::newFromText( $name );
                if( is_null( $nt ) ) {
                        # Illegal name
                        return null;
                }
-               $sql = "SELECT user_id FROM user WHERE user_name='" .
-                 wfStrencode( $nt->getText() ) . "'";
-               $res = wfQuery( $sql, DB_READ, 'User::idFromName' );
+               $dbr =& wfGetDB( DB_SLAVE );
+               $s = $dbr->selectRow( 'user', array( 'user_id' ), array( 'user_name' => $nt->getText() ), $fname );
 
-               if ( 0 == wfNumRows( $res ) ) {
+               if ( $s === false ) {
                        return 0;
                } else {
-                       $s = wfFetchObject( $res );
-                       wfFreeResult( $res );
                        return $s->user_id;
                }
        }
 
-       # 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;
 
-               wfSeedRandom();
                $np = $pwchars{mt_rand( 0, $l )} . $pwchars{mt_rand( 0, $l )} .
                  $pwchars{mt_rand( 0, $l )} . chr( mt_rand(48, 57) ) .
                  $pwchars{mt_rand( 0, $l )} . $pwchars{mt_rand( 0, $l )} .
@@ -74,19 +125,23 @@ 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 $wgNamespacesToBeSearchedDefault;
 
                $this->mId = $this->mNewtalk = 0;
                $this->mName = $wgIP;
-               $this->mEmail = '';
+               $this->mRealName = $this->mEmail = '';
                $this->mPassword = $this->mNewpassword = '';
                $this->mRights = array();
-               $defOpt = $wgLang->getDefaultUserOptions() ;
-               foreach ( $defOpt as $oname => $val ) {
-                       $this->mOptions[$oname] = $val;
-               }
+               // Getting user defaults only if we have an available language
+               if(isset($wgLang)) { $this->loadDefaultFromLanguage(); }
+               
                foreach ($wgNamespacesToBeSearchedDefault as $nsnum => $val) {
                        $this->mOptions['searchNs'.$nsnum] = $val;
                }
@@ -95,18 +150,39 @@ class User {
                $this->mBlockedby = -1; # Unset
                $this->mTouched = '0'; # Allow any pages to be cached
                $this->cookiePassword = '';
+               $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 $wgLang;
+               $defOpt = $wgLang->getDefaultUserOptions() ;
+               foreach ( $defOpt as $oname => $val ) {
+                       $this->mOptions[$oname] = $val;
+               }               
+        /* so that new user will have a default 
+           language variant set using info from the http header 
+        */
+        $this->setOption('variant', $wgLang->getPreferredVariant());
+       }
+
+       /**
+        * Get blocking information
+        * @access private
+        */
+       function getBlockedStatus() {
                global $wgIP, $wgBlockCache, $wgProxyList;
 
                if ( -1 != $this->mBlockedby ) { return; }
-       
+
                $this->mBlockedby = 0;
-               
+
                # User blocking
-               if ( $this->mId ) {     
+               if ( $this->mId ) {
                        $block = new Block();
                        if ( $block->load( $wgIP , $this->mId ) ) {
                                $this->mBlockedby = $block->mBy;
@@ -132,35 +208,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'] ) ) {
@@ -218,9 +315,12 @@ class User {
                return new User(); # Can't log in from session
        }
 
-       function loadFromDatabase()
-       {
+       /**
+        * Load a user from the database
+        */
+       function loadFromDatabase() {
                global $wgCommandLineMode;
+               $fname = "User::loadFromDatabase";
                if ( $this->mDataLoaded || $wgCommandLineMode ) {
                        return;
                }
@@ -230,24 +330,23 @@ class User {
 
                # 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) {
-                       $sql = "SELECT 1 FROM user_newtalk WHERE user_id={$this->mId}";
-                       $res = wfQuery ($sql, DB_READ, "User::loadFromDatabase" );
+                       $res = $dbr->select( 'user_newtalk', 1, array( 'user_id' => $this->mId ), $fname );
 
-                       if (wfNumRows($res)>0) {
+                       if ( $dbr->numRows($res)>0 ) {
                                $this->mNewtalk= 1;
                        }
-                       wfFreeResult( $res );
+                       $dbr->freeResult( $res );
                } else {
                        global $wgDBname, $wgMemc;
                        $key = "$wgDBname:newtalk:ip:{$this->mName}";
                        $newtalk = $wgMemc->get( $key );
                        if( ! is_integer( $newtalk ) ){
-                               $sql = "SELECT 1 FROM user_newtalk WHERE user_ip='{$this->mName}'";
-                               $res = wfQuery ($sql, DB_READ, "User::loadFromDatabase" );
+                               $res = $dbr->select( 'user_newtalk', 1, array( 'user_ip' => $this->mName ), $fname );
 
-                               $this->mNewtalk = (wfNumRows($res)>0) ? 1 : 0;
-                               wfFreeResult( $res );
+                               $this->mNewtalk = $dbr->numRows( $res ) > 0 ? 1 : 0;
+                               $dbr->freeResult( $res );
 
                                $wgMemc->set( $key, $this->mNewtalk, time() ); // + 1800 );
                        } else {
@@ -259,24 +358,23 @@ class User {
                        return;
                } # the following stuff is for non-anonymous users only
 
-               $sql = "SELECT user_name,user_password,user_newpassword,user_email," .
-                 "user_real_name,user_options,user_rights,user_touched " . 
-                  " FROM user WHERE user_id=" . $this->mId;
-               $res = wfQuery( $sql, DB_READ, "User::loadFromDatabase" );
+               $s = $dbr->selectRow( 'user', array( 'user_name','user_password','user_newpassword','user_email',
+                 'user_real_name','user_options','user_touched' ),
+                 array( 'user_id' => $this->mId ), $fname );
 
-               if ( wfNumRows( $res ) > 0 ) {
-                       $s = wfFetchObject( $res );
+               if ( $s !== false ) {
                        $this->mName = $s->user_name;
                        $this->mEmail = $s->user_email;
                        $this->mRealName = $s->user_real_name;
                        $this->mPassword = $s->user_password;
                        $this->mNewpassword = $s->user_newpassword;
                        $this->decodeOptions( $s->user_options );
-                       $this->mRights = explode( ",", strtolower( $s->user_rights ) );
-                       $this->mTouched = $s->user_touched;
+                       $this->mTouched = wfTimestamp(TS_MW,$s->user_touched);
+                       $this->mRights = explode( ",", strtolower( 
+                               $dbr->selectField( 'user_rights', 'user_rights', array( 'user_id' => $this->mId ) )
+                       ) );
                }
 
-               wfFreeResult( $res );
                $this->mDataLoaded = true;
        }
 
@@ -301,8 +399,7 @@ class User {
                return ( 0 != $this->mNewtalk );
        }
 
-       function setNewtalk( $val )
-       {
+       function setNewtalk( $val ) {
                $this->loadFromDatabase();
                $this->mNewtalk = $val;
                $this->invalidateCache();
@@ -320,16 +417,12 @@ class User {
                return ($timestamp >= $this->mTouched);
        }
 
-       function getPassword() {
-               $this->loadFromDatabase();
-               return $this->mPassword;
-       }
-
-       function getNewpassword() {
-               $this->loadFromDatabase();
-               return $this->mNewpassword;
-       }
-
+       /**
+        * 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)
@@ -338,6 +431,12 @@ 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 ) );
        }
@@ -430,6 +529,9 @@ class User {
                return in_array( 'bureaucrat', $this->mRights );
        }
 
+       /**
+        * Whether the user is a bot
+        */
        function isBot() {
                $this->loadFromDatabase();
 
@@ -439,85 +541,107 @@ class User {
                return in_array( 'bot', $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, $wgUsePHPTal;
                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' );
                        if ( $userSkin == '' ) { $userSkin = 'standard'; }
-                       
+
                        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];
                        }
+
+                       # 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' );
                        
-                       # 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;
+                       # Check if we got if not failback to default skin
+                       $sn = 'Skin'.$sn;
+                       if(!class_exists($sn)) {
+                               #FIXME : should we print an error message instead of loading
+                               # standard skin ?
+                               $sn = 'SkinStandard';
+                               require_once( $IP.'/skins/Standard.php' );
                        }
-                       # now we can create the skin object
                        $this->mSkin = new $sn;
                }
                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 );
                }
                $s = implode( "\n", $a );
-               return wfStrencode( $s );
+               return $s;
        }
 
-       /* private */ function decodeOptions( $str ) {
+       /**
+        * @access private
+        */
+       function decodeOptions( $str ) {
                $a = explode( "\n", $str );
                foreach ( $a as $s ) {
                        if ( preg_match( "/^(.[^=]*)=(.*)$/", $s, $m ) ) {
@@ -546,6 +670,10 @@ class User {
                }
        }
 
+       /**
+        * Logout user
+        * It will clean the session cookie
+        */
        function logout() {
                global $wgCookiePath, $wgCookieDomain, $wgDBname;
                $this->mId = 0;
@@ -556,86 +684,105 @@ class User {
                setcookie( $wgDBname.'Password', '', time() - 3600, $wgCookiePath, $wgCookieDomain );
        }
 
+       /**
+        * Save object settings into database
+        */
        function saveSettings() {
                global $wgMemc, $wgDBname;
+               $fname = 'User::saveSettings';
 
+               $dbw =& wfGetDB( DB_MASTER );
                if ( ! $this->mNewtalk ) {
+                       # Delete user_newtalk row
                        if( $this->mId ) {
-                               $sql="DELETE FROM user_newtalk WHERE user_id={$this->mId}";
-                               wfQuery ($sql, DB_WRITE, "User::saveSettings");
+                               $dbw->delete( 'user_newtalk', array( 'user_id' => $this->mId ), $fname );
                        } else {
-                               $sql="DELETE FROM user_newtalk WHERE user_ip='{$this->mName}'";
-                               wfQuery ($sql, DB_WRITE, "User::saveSettings");
+                               $dbw->delete( 'user_newtalk', array( 'user_ip' => $this->mName ), $fname );
                                $wgMemc->delete( "$wgDBname:newtalk:ip:{$this->mName}" );
                        }
                }
                if ( 0 == $this->mId ) { return; }
 
-               $sql = "UPDATE user SET " .
-                 "user_name= '" . wfStrencode( $this->mName ) . "', " .
-                 "user_password= '" . wfStrencode( $this->mPassword ) . "', " .
-                 "user_newpassword= '" . wfStrencode( $this->mNewpassword ) . "', " .
-                 "user_real_name= '" . wfStrencode( $this->mRealName ) . "', " .
-                 "user_email= '" . wfStrencode( $this->mEmail ) . "', " .
-                 "user_options= '" . $this->encodeOptions() . "', " .
-                 "user_rights= '" . wfStrencode( implode( ",", $this->mRights ) ) . "', " .
-                 "user_touched= '" . wfStrencode( $this->mTouched ) .
-                 "' WHERE user_id={$this->mId}";
-               wfQuery( $sql, DB_WRITE, "User::saveSettings" );
+               $dbw->update( 'user',
+                       array( /* SET */
+                               'user_name' => $this->mName,
+                               'user_password' => $this->mPassword,
+                               'user_newpassword' => $this->mNewpassword,
+                               'user_real_name' => $this->mRealName,
+                               'user_email' => $this->mEmail,
+                               'user_options' => $this->encodeOptions(),
+                               'user_touched' => $dbw->timestamp($this->mTouched)
+                       ), array( /* WHERE */
+                               'user_id' => $this->mId
+                       ), $fname
+               );
+               $dbw->set( 'user_rights', 'user_rights', implode( ",", $this->mRights ),
+                       'user_id='. $this->mId, $fname ); 
                $wgMemc->delete( "$wgDBname:user:id:$this->mId" );
        }
 
-       # Checks if a user with the given name exists
-       #
+       /**
+        * Checks if a user with the given name exists, returns the ID
+        */
        function idForName() {
+               $fname = 'User::idForName';
+
                $gotid = 0;
                $s = trim( $this->mName );
                if ( 0 == strcmp( '', $s ) ) return 0;
 
-               $sql = "SELECT user_id FROM user WHERE user_name='" .
-                 wfStrencode( $s ) . "'";
-               $res = wfQuery( $sql, DB_READ, "User::idForName" );
-               if ( 0 == wfNumRows( $res ) ) { return 0; }
-
-               $s = wfFetchObject( $res );
-               if ( '' == $s ) return 0;
-
-               $gotid = $s->user_id;
-               wfFreeResult( $res );
-               return $gotid;
+               $dbr =& wfGetDB( DB_SLAVE );
+               $id = $dbr->selectField( 'user', 'user_id', array( 'user_name' => $s ), $fname );
+               if ( $id === false ) {
+                       $id = 0;
+               }
+               return $id;
        }
 
+       /**
+        * Add user object to the database
+        */
        function addToDatabase() {
-               $sql = "INSERT INTO user (user_name,user_password,user_newpassword," .
-                 "user_email, user_real_name, user_rights, user_options) " .
-                 " VALUES ('" . wfStrencode( $this->mName ) . "', '" .
-                 wfStrencode( $this->mPassword ) . "', '" .
-                 wfStrencode( $this->mNewpassword ) . "', '" .
-                 wfStrencode( $this->mEmail ) . "', '" .
-                 wfStrencode( $this->mRealName ) . "', '" .
-                 wfStrencode( implode( ',', $this->mRights ) ) . "', '" .
-                 $this->encodeOptions() . "')";
-               wfQuery( $sql, DB_WRITE, "User::addToDatabase" );
-               $this->mId = $this->idForName();
-       }
-
-       function spreadBlock()
-       {
-               global $wgIP;
+               $fname = 'User::addToDatabase';
+               $dbw =& wfGetDB( DB_MASTER );
+               $seqVal = $dbw->nextSequenceValue( 'user_user_id_seq' );
+               $dbw->insert( 'user',
+                       array(
+                               'user_id' => $seqVal,
+                               'user_name' => $this->mName,
+                               'user_password' => $this->mPassword,
+                               'user_newpassword' => $this->mNewpassword,
+                               'user_email' => $this->mEmail,
+                               'user_real_name' => $this->mRealName,
+                               'user_options' => $this->encodeOptions()
+                       ), $fname
+               );
+               $this->mId = $dbw->insertId();
+               $dbw->insert( 'user_rights',
+                       array(
+                               'user_id' => $this->mId,
+                               'user_rights' => implode( ',', $this->mRights )
+                       ), $fname
+               );
+                               
+       }
+
+       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';
-               
+
                wfDebug( "User:spreadBlock()\n" );
                if ( $this->mId == 0 ) {
                        return;
                }
-               
+
                $userblock = Block::newFromDB( '', $this->mId );
                if ( !$userblock->isValid() ) {
                        return;
                }
-               
+
                # Check if this IP address is already blocked
                $ipblock = Block::newFromDB( $wgIP );
                if ( $ipblock->isValid() ) {
@@ -643,7 +790,7 @@ class User {
                        $ipblock->updateTimestamp();
                        return;
                }
-               
+
                # Make a new block object with the desired properties
                wfDebug( "Autoblocking {$this->mName}@{$wgIP}\n" );
                $ipblock->mAddress = $wgIP;
@@ -652,7 +799,7 @@ class User {
                $ipblock->mReason = wfMsg( 'autoblocker', $this->getName(), $userblock->mReason );
                $ipblock->mTimestamp = wfTimestampNow();
                $ipblock->mAuto = 1;
-               # If the user is already blocked with an expiry date, we don't 
+               # If the user is already blocked with an expiry date, we don't
                # want to pile on top of that!
                if($userblock->mExpiry) {
                        $ipblock->mExpiry = min ( $userblock->mExpiry, Block::getAutoblockExpiry( $ipblock->mTimestamp ));
@@ -662,41 +809,34 @@ class User {
 
                # Insert it
                $ipblock->insert();
-       
+
        }
 
-       function getPageRenderingHash(){
-               static $hash = false;
-               if( $hash ){
-                       return $hash;
+       function getPageRenderingHash() {
+               if( $this->mHash ){
+                       return $this->mHash;
                }
 
-               // stubthreshold is only included below for completeness, 
+               // stubthreshold is only included below for completeness,
                // it will always be 0 when this function is called by parsercache.
 
-               $confstr =        $this->getOption( 'quickbar' );
-               $confstr .= '!' . $this->getOption( 'underline' );
-               $confstr .= '!' . $this->getOption( 'hover' );
-               $confstr .= '!' . $this->getOption( 'skin' );
-               $confstr .= '!' . $this->getOption( 'math' );
+               $confstr =        $this->getOption( 'math' );
                $confstr .= '!' . $this->getOption( 'highlightbroken' );
-               $confstr .= '!' . $this->getOption( 'stubthreshold' ); 
+               $confstr .= '!' . $this->getOption( 'stubthreshold' );
                $confstr .= '!' . $this->getOption( 'editsection' );
                $confstr .= '!' . $this->getOption( 'editsectiononrightclick' );
                $confstr .= '!' . $this->getOption( 'showtoc' );
                $confstr .= '!' . $this->getOption( 'date' );
+               $confstr .= '!' . $this->getOption( 'numberheadings' );
 
-               if(strlen($confstr) > 32)
-                       $hash = md5($confstr);
-               else
-                       $hash = $confstr;
-               return $hash;
+               $this->mHash = $confstr;
+               return $confstr ;
        }
 
        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()));
@@ -705,25 +845,58 @@ 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 ) 
-       {
-               wfSetVar( $this->mDataLoaded, $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 );
        }
-       
+
        function getUserPage() {
                return Title::makeTitle( NS_USER, $this->mName );
        }
 
-       /* static */ function getMaxID() {
-               $row = wfGetArray( 'user', array('max(user_id) as m'), false );
-               return $row->m;
+       /**
+        * @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
+        * @param string $password User password.
+        * @return bool True if the given password is correct otherwise False.
+        */
+       function checkPassword( $password ) {
+               $this->loadFromDatabase();
+               $ep = $this->encryptPassword( $password );
+               if ( 0 == strcmp( $ep, $this->mPassword ) ) {
+                       return true;
+               } elseif ( 0 == strcmp( $ep, $this->mNewpassword ) ) {
+                       return true;
+               } elseif ( function_exists( 'iconv' ) ) {
+                       # Some wikis were converted from ISO 8859-1 to UTF-8, the passwords can't be converted
+                       # Check for this with iconv
+/*                     $cp1252hash = $this->encryptPassword( iconv( 'UTF-8', 'WINDOWS-1252', $password ) );
+                       if ( 0 == strcmp( $cp1252hash, $this->mPassword ) ) {
+                               return true;
+                       }*/
+               }
+               return false;
+       }
 }
 
 ?>