X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=session.php;h=4bbaea92ebfe134816e02d1a7ac073bb78b5c30b;hb=8355c5788f7179a3674ab1121c859530e838bb64;hp=07b759abecec8d9d8711ad10f81621e03f2913cf;hpb=ddd681b6dcd0ef511238e96a0c3b94d9e8600ef2;p=wfpl.git

diff --git a/session.php b/session.php
index 07b759a..4bbaea9 100644
--- a/session.php
+++ b/session.php
@@ -18,14 +18,23 @@
 #  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'])) {
-	require_once('db_connect.php');
+	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:
 # 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
 #
@@ -77,15 +86,26 @@ function session_touch($length = false) {
 	db_update('wfpl_sessions', 'expires', $expires, 'where id=%i', $GLOBALS['session_id']);
 }
 
+# delete the current session
+function kill_session() {
+	if(!session_exists()) {
+	    return;
+	}
+	_kill_session($GLOBALS['session_id']);
+}
+
+# for internal use. use kill_session() above
+function _kill_session($id) {
+	db_delete('wfpl_session_data', 'where session_id=%i', $id);
+	db_delete('wfpl_sessions', 'where id=%i', $id);
+}
+
 # delete expired sessions from database
 function session_purge_old() {
 	$now = time();
-	$exired_sessions = db_get_column('wfpl_sessions', 'id', 'where expires < %i', $now);
-	db_delete('wfpl_sessions', 'where expires < %i', $now);
-	if($expired_sessions) {
-		foreach($expired_sessions as $expired_session) {
-			db_delete('wfpl_session_data', 'where session_id=%i', $expired_session);
-		}
+	$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);
 	}
 }
 
@@ -95,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) {
@@ -130,21 +154,17 @@ function init_session() {
 	}
 }
 
-# delete the current session
-function kill_session() {
-	if(!session_exists()) {
-		return;
-	}
-	db_delete('wfpl_session_data', 'where session_id=%i', $GLOBALS['session_id']);
-	db_delete('wfpl_sessions', 'where id=%i', $GLOBALS['session_id']);
-}
-
 # save a variable into the session
 function session_set($name, $value) {
-	db_delete('wfpl_session_data', 'where session_id=%i && name=%"', $GLOBALS['session_id'], $name);
+	session_clear($name);
 	db_insert('wfpl_session_data', 'session_id,name,value', $GLOBALS['session_id'], $name, $value);
 }
 
+# remove variable from the session
+function session_clear($name) {
+	db_delete('wfpl_session_data', 'where session_id=%i && name=%"', $GLOBALS['session_id'], $name);
+}
+
 # get a variable into the session
 function session_get($name) {
 	return db_get_value('wfpl_session_data', 'value', 'where session_id=%i && name=%"', $GLOBALS['session_id'], $name);