added progress-bar uploader.php

[wfpl.git] / session.php

diff --git a/session.php b/session.php
index c3be9e9..c61be6f 100644 (file)
--- a/session.php
+++ b/session.php
@@ -18,20 +18,13 @@
 #  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()
-if(!isset($GLOBALS['wfpl_db_handle'])) {
-       if(file_exists('db_connect.php')) {
-               require_once('db_connect.php');
-       } elseif(file_exists('code/db_connect.php')) {
-               require_once('code/db_connect.php');
-       } else {
-               die("session.php requires a file db_connect.php or that you call db_connect() first. See code/wfpl/db.php for more information.");
-       }
-}
 
-# and these database tables:
+# you'll need 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
 #
@@ -45,7 +38,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.
@@ -68,10 +61,11 @@ function session_new($length = 86400) {
        $GLOBALS['session_key'] = $session_key;
        $_REQUEST['session_key'] = $session_key; #just in case someone calls session_exists() after session_new()
        session_touch($length);
+       return $GLOBALS['session_key'];
 }
 
 # 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']);
@@ -100,7 +94,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 +106,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) {