typo

[lhc/web/wiklou.git] / includes / User.php

diff --git a/includes/User.php b/includes/User.php
index 509183d..572060b 100644 (file)
--- a/includes/User.php
+++ b/includes/User.php
@@ -1,7 +1,7 @@
 <?php
 # See user.doc
 
-include_once( "WatchedItem.php" );
+require_once( "WatchedItem.php" );
 
 class User {
        /* private */ var $mId, $mName, $mPassword, $mEmail, $mNewtalk;
@@ -12,6 +12,7 @@ class User {
        /* private */ var $mTouched;
        /* private */ var $mCookiePassword;
         /* private */ var $mRealName;
+       /* private */ var $mUserTable;
 
        function User()
        {
@@ -36,16 +37,29 @@ class User {
                return wfGetSQL( "user", "user_name", "user_id=$id" );
        }
 
+       /* static */ function whoIsReal( $id )
+       {
+               return wfGetSQL( "user", "user_real_name", "user_id=$id" );
+       }
+
        /* static */ function idFromName( $name )
        {
+               global $wgIsPg;
                $nt = Title::newFromText( $name );
-               $sql = "SELECT user_id FROM user WHERE user_name='" .
+               if( is_null( $nt ) ) {
+                       # Illegal name
+                       return null;
+               }
+               $usertable=$wgIsPg?'"user"':'user';
+               $sql = "SELECT user_id FROM $usertable WHERE user_name='" .
                  wfStrencode( $nt->getText() ) . "'";
                $res = wfQuery( $sql, DB_READ, "User::idFromName" );
 
-               if ( 0 == wfNumRows( $res ) ) { return 0; }
-               else {
+               if ( 0 == wfNumRows( $res ) ) {
+                       return 0;
+               } else {
                        $s = wfFetchObject( $res );
+                       wfFreeResult( $res );
                        return $s->user_id;
                }
        }
@@ -71,7 +85,7 @@ class User {
 
        function loadDefaults()
        {
-               global $wgLang, $wgIP;
+               global $wgLang, $wgIP, $wgIsPg;
                global $wgNamespacesToBeSearchedDefault;
 
                $this->mId = $this->mNewtalk = 0;
@@ -91,6 +105,9 @@ class User {
                $this->mBlockedby = -1; # Unset
                $this->mTouched = '0'; # Allow any pages to be cached
                $this->cookiePassword = "";
+
+               /* avoid reserved keyword usage for PostgreSQL */
+               $this->mUserTable=$wgIsPg?'"user"':'user';
        }
 
        /* private */ function getBlockedStatus()
@@ -140,7 +157,7 @@ class User {
        function SetupSession() {
                global $wgSessionsInMemcached, $wgCookiePath, $wgCookieDomain;
                if( $wgSessionsInMemcached ) {
-                       include_once( "MemcachedSessions.php" );
+                       require_once( "MemcachedSessions.php" );
                }
                session_set_cookie_params( 0, $wgCookiePath, $wgCookieDomain );
                session_cache_limiter( "private, must-revalidate" );
@@ -249,7 +266,7 @@ class User {
 
                $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;
+                  " FROM {$this->mUserTable} WHERE user_id=" . $this->mId;
                $res = wfQuery( $sql, DB_READ, "User::loadFromDatabase" );
 
                if ( wfNumRows( $res ) > 0 ) {
@@ -457,10 +474,14 @@ class User {
 
                        if ( !isset( $skinNames[$s] ) ) {
                                $fallback = array(
-                                       'standard' => "Standard",
-                                       'nostalgia' => "Nostalgia",
-                                       'cologneblue' => "Cologne Blue");
-                               if(is_int($s) && isset( $fallback[$s]) ){
+                                       0 => "SkinStandard",
+                                       1 => "SkinNostalgia",
+                                       2 => "SkinCologneBlue");
+                               if ( isset( $skinNames['monobook'] ) ) {
+                                       $fallback[0] = "SkinMonoBook";
+                               }
+                               
+                               if(is_numeric($s) && isset( $fallback[$s]) ){
                                        $sn = $fallback[$s];
                                } else {
                                        $sn = "SkinStandard";
@@ -546,7 +567,6 @@ class User {
        function saveSettings()
        {
                global $wgMemc, $wgDBname;
-
                if ( ! $this->mNewtalk ) {
                        if( $this->mId ) {
                                $sql="DELETE FROM user_newtalk WHERE user_id={$this->mId}";
@@ -559,7 +579,7 @@ class User {
                }
                if ( 0 == $this->mId ) { return; }
 
-               $sql = "UPDATE user SET " .
+               $sql = "UPDATE {$this->mUserTable} SET " .
                  "user_name= '" . wfStrencode( $this->mName ) . "', " .
                  "user_password= '" . wfStrencode( $this->mPassword ) . "', " .
                  "user_newpassword= '" . wfStrencode( $this->mNewpassword ) . "', " .
@@ -581,7 +601,7 @@ class User {
                $s = trim( $this->mName );
                if ( 0 == strcmp( "", $s ) ) return 0;
 
-               $sql = "SELECT user_id FROM user WHERE user_name='" .
+               $sql = "SELECT user_id FROM {$this->mUserTable} WHERE user_name='" .
                  wfStrencode( $s ) . "'";
                $res = wfQuery( $sql, DB_READ, "User::idForName" );
                if ( 0 == wfNumRows( $res ) ) { return 0; }
@@ -596,7 +616,7 @@ class User {
 
        function addToDatabase()
        {
-               $sql = "INSERT INTO user (user_name,user_password,user_newpassword," .
+               $sql = "INSERT INTO {$this->mUserTable} (user_name,user_password,user_newpassword," .
                  "user_email, user_real_name, user_rights, user_options) " .
                  " VALUES ('" . wfStrencode( $this->mName ) . "', '" .
                  wfStrencode( $this->mPassword ) . "', '" .
@@ -635,7 +655,7 @@ class User {
                }
                
                # Make a new block object with the desired properties
-               wfDebug( "Autoblocking {$this->mUserName}@{$wgIP}\n" );
+               wfDebug( "Autoblocking {$this->mName}@{$wgIP}\n" );
                $ipblock->mAddress = $wgIP;
                $ipblock->mUser = 0;
                $ipblock->mBy = $userblock->mBy;