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

[wfpl.git] / session.php

diff --git a/session.php b/session.php
index c3be9e9..4bbaea9 100644 (file)
--- a/session.php
+++ b/session.php
@@ -18,7 +18,7 @@
 #  along with wfpl; if not, write to the Free Software Foundation, Inc., 51
 #  Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
-# you'll need this file that calles db_connect()
+# you'll need this file that calls db_connect()
 if(!isset($GLOBALS['wfpl_db_handle'])) {
        if(file_exists('db_connect.php')) {
                require_once('db_connect.php');
@@ -32,6 +32,9 @@ if(!isset($GLOBALS['wfpl_db_handle'])) {
 # and these database tables:
 # create table wfpl_sessions (id int unique auto_increment, session_key varchar(16), length int, expires int);
 # create table wfpl_session_data (id int unique auto_increment, session_id int, name varchar(100), value text);
+# run this command to install/clear the tables:
+#   mysql DATABASE_NAME < code/wfpl/examples/session.sql
+# note: you may need these parameters for mysql:  -u USERNAME -p
 
 # GLOSSARY
 #
@@ -100,7 +103,7 @@ function _kill_session($id) {
 # delete expired sessions from database
 function session_purge_old() {
        $now = time();
-       $exired_sessions = db_get_column('wfpl_sessions', 'id', 'where expires < %i', $now);
+       $expired_sessions = db_get_column('wfpl_sessions', 'id', 'where expires < %i', $now);
        if($expired_sessions) foreach($expired_sessions as $expired_session) {
                _kill_session($expired_session);
        }
@@ -112,6 +115,10 @@ function session_exists() {
                return false;
        }
 
+       if(isset($GLOBALS['session_id'])) {
+               return true;
+       }
+
        $session_key = ereg_replace('[^a-zA-Z0-9]', '', $_REQUEST['session_key']);
 
        if(!strlen($session_key) == 16) {