The horror... the horror...

diff --git a/docs/skin.doc b/docs/skin.doc
index cdc9cfd..8fdc58e 100644 (file)
--- a/docs/skin.doc
+++ b/docs/skin.doc
@@ -6,3 +6,6 @@ HTML rendering code. It is placed here rather than in comments
 in the code itself to help reduce the code size.
 
 
+Unfortunately there isn't any documentation, and the code's in
+a bit of a mess right now during the transition from the old skin
+code to the new template-based skin code in 1.3.

diff --git a/docs/user.doc b/docs/user.doc
index 2eb0dee..ec3949f 100644 (file)
--- a/docs/user.doc
+++ b/docs/user.doc
@@ -11,22 +11,27 @@ Database fields:
 
   user_id
     Unique integer identifier; primary key. Sent to user in
-    cookie "$WikiUserOpts".
+    cookie "{$wgDBname}UserID".
 
   user_name
     Text of full user name; title of "user:" page.  Displayed
-    on change lists, etc.  Sent to user as cookie "$WikiUserName".
+    on change lists, etc.  Sent to user as cookie "{$wgDBname}UserName".
     Note that user names can contain spaces, while these are
     converted to underscores in page titles.
 
   user_rights
     Comma-separated list of rights. Right now, only "sysop",
-    "developer", and "bot".
+    "developer", "bureaucrat", and "bot" have meaning.
 
   user_password
-    md5 has of user login password.  If user option to
-    remember password is set, this is stored in cookie
-    "$WikiUserPassword".
+    Salted md5 hash of md5-hashed user login password.  If user option to
+    remember password is set, an md5 password hash is stored in cookie
+    "{$wgDBname}UserPassword". The original password and the hashed password
+    can be compared to the salted-hashed-hashed password.
+
+  user_newpassword
+    Hash for randomly generated password sent on 'send me a new password'.
+    If a match is made on login, the new password will replace the old one.
 
   user_email
     User's e-mail address. (Optional, used for user-to-user
@@ -34,8 +39,16 @@ Database fields:
 
   user_options
     A urlencoded string of name=value pairs to set various
-    user options. Some of these (but not all) are encoded into
-    the cookie "$WikiUserOpts".
+    user options.
+
+  user_touched
+    Timestamp updated when the user logs in, changes preferences, alters
+    watchlist, or when someone edits their user talk page or they clear
+    the new-talk field by viewing it. Used to invalidate old cached pages
+    from the user's browser cache.
+
+  user_real_name
+    "Real name" optionally used in some metadata lists.
 
 The user object encapsulates all of the settings, and clients
 classes use the getXXX() functions to access them. These functions
@@ -48,30 +61,3 @@ of the database.
 Options
   The user_options field is a list of name-value pairs.  The
   following option names are used at various points in the system:
-
-
-Cookies
-
-  $WikiUserName
-    Plain text user name directly from database
-
-  $WikiUserPassword
-    From the database; only set if the user's options are set
-    to remember passwords.
-
-  $WikiUserOpts
-    User ID and various options encoded into a compact string;
-    for example, "12e0q0s2h0u1j0n1f0y0".  The first string of digits
-    is the ID; the rest of the string a flag-letter plus number
-    pairs representing a few important options:
-
-      e = "encoding" (index into array)
-      q = "quickBar" (0=none, 1=left, 2=right)
-      s = "skin" (0=standard, 1=startrek, 2=nostalgia, 3=cologneblue)
-      h = "showHover" (1=true)
-      u = "underlineLinks" (1=true)
-      j = "justify" (1=true)
-      n = "numberHeadings" (1=true)
-      f = "viewFrames" (1=true)
-      y = 1 if user_rights include "is_sysop"
-