X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=session.php;h=c61be6f40bab23af704cd86b04410554ad1ce246;hb=702a6250f176b2e59ad0fe66a89cf72e570f8784;hp=4bbaea92ebfe134816e02d1a7ac073bb78b5c30b;hpb=8355c5788f7179a3674ab1121c859530e838bb64;p=wfpl.git

diff --git a/session.php b/session.php
index 4bbaea9..c61be6f 100644
--- a/session.php
+++ b/session.php
@@ -18,18 +18,8 @@
 #  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 calls 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:
@@ -48,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.
@@ -71,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']);