Merge branch 'master' of /home/jason/dev/git/wfpl

diff --combined session.php
index dc20360,c99ba3f..4f1cb67
--- 1/session.php
--- 2/session.php
+++ b/session.php
@@@ -48,7 -48,7 +48,7 @@@ if(!isset($GLOBALS['wfpl_db_handle'])) 
  
  # generate a new random 16-character string
  function session_generate_key() {
-       $character_set = "abcdefghijklmnopqrstuvwqyzABCDEFGHIJKLMNOPQRSTUVWQYZ0123456789";
+       $character_set = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
      $id = "                ";
  
        # PHP 4.2.0 and up seed the random number generator for you.
@@@ -75,7 -75,7 +75,7 @@@ function session_new($length = 86400) 
  }
  
  # call to renew the timeout for the session.
 -# assumes there's a session. call session_init() if you'd like one auto-create one if not found.
 +# assumes there's a session. call init_session() if you'd like one auto-create one if not found.
  function session_touch($length = false) {
        if(!$length) {
                $length = db_get_value('wfpl_sessions', 'length', 'where id=%i', $GLOBALS['session_id']);