Changeset 136 for trunk/lib/DBSessionHandler.inc.php

Timestamp:

Jun 3, 2006 7:47:48 PM (18 years ago)

Author:

scdev

Message:

Q - Merged branches/2.0singleton into trunk. Completed updating classes to use singleton methods. Implemented tests. Fixed some bugs. Changed some interfaces.

File:

• trunk/lib/DBSessionHandler.inc.php (modified) (9 diffs)

trunk/lib/DBSessionHandler.inc.php

@@ -3 +3 @@
  * DBSessionHandler.inc.php
  * Code by Strangecode :: www.strangecode.com :: This document contains copyrighted information.
+ * 
  * @author  Quinn Comendant <quinn@strangecode.com>
- * @version 1.3
+ * @version 2.1
  * @since   1999
  */
@@ -13 +14 @@
 
     var $_params = array(
-        'db_server' => 'localhost',
-        'db_name' => '',
-        'db_user' => '',
-        'db_pass' => '',
         'db_table' => 'session_tbl',
         'create_table' => true, // Automatically create table and verify columns. Better set to false after site launch.
@@ -30 +27 @@
      * @since   18 Jul 2005 11:02:50
      */
-    function DBSessionHandler($db=null, $params=array())
+    function DBSessionHandler($db, $params=array())
     {
+        $app =& App::getInstance();
+    
         $this->_params = array_merge($this->_params, $params);
 
-        if (isset($db)) {
-            if (is_a($db, 'DB')) {
-                if ($db->isConnected()) {
-                    // Use existing db connection.
-                    $this->db =& $db;
-                } else {
-                    App::logMsg(sprintf('Provided DB object is not connected. %s', mysql_error($db->dbh)), LOG_ERR, __FILE__, __LINE__);
+        if (!method_exists($db, 'isConnected')) {
+            $app->logMsg(sprintf('Provided object (%s) is not a valid DB object.', get_class($db)), LOG_ERR, __FILE__, __LINE__);
+        } else {
+            if (!$db->isConnected()) {
+                $app->logMsg('Provided DB object is not connected.', LOG_ERR, __FILE__, __LINE__);
+            } else {
+                // OK! We have a valid, connected DB object.
+                $this->db =& $db;
+
+                // Get create tables config from global context.
+                if (!is_null($app->getParam('db_create_tables'))) {
+                    $this->_params['create_table'] = $app->getParam('db_create_tables');
                 }
-            } else {
-                App::logMsg(sprintf('Provided DB object is not valid. %s', gettype($db)), LOG_ERR, __FILE__, __LINE__);
+
+                // Ensure db table is fit.
+                $this->initDB();
+
+                ini_set('session.save_handler', 'user');
+                session_set_save_handler(
+                    array(&$this, 'dbSessionOpen'),
+                    array(&$this, 'dbSessionClose'),
+                    array(&$this, 'dbSessionRead'),
+                    array(&$this, 'dbSessionWrite'),
+                    array(&$this, 'dbSessionDestroy'),
+                    array(&$this, 'dbSessionGarbage')
+                );
             }
-        } else {
-            // Create our own new db connection.
-            require_once dirname(__FILE__) . '/DB.inc.php';
-
-            $this->db =& new DB();
-            $this->db->setParam(array(
-                'db_server' => $this->_params['db_server'],
-                'db_name' => $this->_params['db_name'],
-                'db_user' => $this->_params['db_user'],
-                'db_pass' => $this->_params['db_pass'],
-                'db_always_debug' => $this->_params['db_always_debug'],
-                'db_debug' => $this->_params['db_debug'],
-                'db_die_on_failure' => $this->_params['db_die_on_failure'],
-            ));
-
-            // Connect to database.
-            $this->db->connect();
         }
-
-        if (!isset($this) || !is_a($this->db, 'DB') || !$this->db->isConnected()) {
-            trigger_error('Invalid DB object or unable to connect to database.', E_USER_ERROR);
-        }
-
-        // Get create tables config from global context.
-        if (!is_null(App::getParam('db_create_tables'))) {
-            $this->_params['create_table'] = App::getParam('db_create_tables');
-        }
-
-        // Ensure db table is fit.
-        $this->initDB();
-
-        ini_set('session.save_handler', 'user');
-        session_set_save_handler(
-            array(&$this, 'dbSessionOpen'),
-            array(&$this, 'dbSessionClose'),
-            array(&$this, 'dbSessionRead'),
-            array(&$this, 'dbSessionWrite'),
-            array(&$this, 'dbSessionDestroy'),
-            array(&$this, 'dbSessionGarbage')
-        );
     }
 
@@ -96 +72 @@
     function initDB($recreate_db=false)
     {
+        $app =& App::getInstance();
+    
         static $_db_tested = false;
 
         if ($recreate_db || !$_db_tested && $this->_params['create_table']) {
             if ($recreate_db) {
-                $this->db->query("DROP TABLE IF EXISTS " . $this->_params['db_table']);
-                App::logMsg(sprintf('Dropping and recreating table %s.', $this->_params['db_table']), LOG_DEBUG, __FILE__, __LINE__);
+                $this->db->query("DROP TABLE IF EXISTS " . $this->db->escapeString($this->_params['db_table']));
+                $app->logMsg(sprintf('Dropping and recreating table %s.', $this->_params['db_table']), LOG_DEBUG, __FILE__, __LINE__);
             }
-            $this->db->query("CREATE TABLE IF NOT EXISTS " . $this->_params['db_table'] . " (
+            $this->db->query("CREATE TABLE IF NOT EXISTS " . $this->db->escapeString($this->_params['db_table']) . " (
                 session_id char(32) NOT NULL default '',
                 session_data mediumtext NOT NULL,
@@ -112 +90 @@
 
             if (!$this->db->columnExists($this->_params['db_table'], array('session_id', 'session_data', 'last_access'))) {
-                App::logMsg(sprintf('Database table %s has invalid columns. Please update this table manually.', $this->_params['db_table']), LOG_ALERT, __FILE__, __LINE__);
+                $app->logMsg(sprintf('Database table %s has invalid columns. Please update this table manually.', $this->_params['db_table']), LOG_ALERT, __FILE__, __LINE__);
                 trigger_error(sprintf('Database table %s has invalid columns. Please update this table manually.', $this->_params['db_table']), E_USER_ERROR);
             }
@@ -132 +110 @@
     {
         // Select the data belonging to session $session_id from the session table
-        $qid = $this->db->query("SELECT session_data FROM " . $this->_params['db_table'] . " WHERE session_id = '" . $this->db->escapeString($session_id) . "'");
+        $qid = $this->db->query("SELECT session_data FROM " . $this->db->escapeString($this->_params['db_table']) . " WHERE session_id = '" . $this->db->escapeString($session_id) . "'");
 
         // Return the session data that was found
@@ -147 +125 @@
     {
         // Write the serialized session data ($session_data) to the session table
-        $this->db->query("REPLACE INTO " . $this->_params['db_table'] . "(session_id, session_data, last_access) VALUES ('" . $this->db->escapeString($session_id) . "', '" . $this->db->escapeString($session_data) . "', null)");
+        $this->db->query("REPLACE INTO " . $this->db->escapeString($this->_params['db_table']) . "(session_id, session_data, last_access) VALUES ('" . $this->db->escapeString($session_id) . "', '" . $this->db->escapeString($session_data) . "', null)");
 
         return true;
@@ -155 +133 @@
     {
         // Delete from the table all data for the session $session_id
-        $this->db->query("DELETE FROM " . $this->_params['db_table'] . " WHERE session_id = '" . $this->db->escapeString($session_id) . "'");
+        $this->db->query("DELETE FROM " . $this->db->escapeString($this->_params['db_table']) . " WHERE session_id = '" . $this->db->escapeString($session_id) . "'");
 
         return true;
@@ -163 +141 @@
     {
         // Delete old values from the session table
-        $qid = $this->db->query("DELETE FROM " . $this->_params['db_table'] . " WHERE UNIX_TIMESTAMP(last_access) < " . (time() - $max_lifetime));
+        $qid = $this->db->query("DELETE FROM " . $this->db->escapeString($this->_params['db_table']) . " WHERE UNIX_TIMESTAMP(last_access) < " . (time() - $max_lifetime));
 
         return true;