[phpwiki-checkins] CVS: phpwiki/lib DbSession.php,1.32,1.33

[Reini U. <ru...@us...>]

Update of /cvsroot/phpwiki/phpwiki/lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32555

Modified Files:
	DbSession.php 
Log Message:
fix for php4 and case-sensitive filesystems

Index: DbSession.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/DbSession.php,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -2 -b -p -d -r1.32 -r1.33
--- DbSession.php	11 Feb 2005 14:41:57 -0000	1.32
+++ DbSession.php	27 Feb 2005 19:40:36 -0000	1.33
@@ -2,5 +2,5 @@
 
 /**
- * Store sessions data in Pear DB / ADODB / dba / ....
+ * Store sessions data in Pear DB / ADODB / dba / PDO, ....
  *
  * History
@@ -9,5 +9,5 @@
  * Minor rewrite by Reini Urban <ru...@x-...> for Phpwiki.
  * Quasi-major rewrite/decruft/fix by Jeff Dairiki <da...@da...>.
- * ADODB and dba classes by Reini Urban.
+ * ADODB, dba and PDO classes by Reini Urban.
  *
  * Warning: Enable USE_SAFE_DBSESSION if you get INSERT duplicate id warnings.
@@ -20,5 +20,5 @@ class DbSession
      *
      * @param mixed $dbh
-     * Pear DB handle, or WikiDB object (from which the Pear DB handle will
+     * DB handle, or WikiDB object (from which the DB handle will
      * be extracted.
      *
@@ -27,11 +27,8 @@ class DbSession
      */
     function DbSession(&$dbh, $table = 'session') {
-        // Coerce WikiDB to PearDB or ADODB.
-        // Todo: adodb/dba handlers
+        // Check for existing DbSession handler
         $db_type = $dbh->getParam('dbtype');
         if (isa($dbh, 'WikiDB')) {
-            $backend = &$dbh->_backend;
-            $db_type = substr(get_class($dbh),7);
-            $class = "DbSession_".$db_type;
+            //$db_type = substr(get_class($dbh),7); // will fail with php4 and case-sensitive filesystem
             
             // < 4.1.2 crash on dba sessions at session_write_close(). 
@@ -42,5 +39,8 @@ class DbSession
 
             @include_once("lib/DbSession/".$db_type.".php");
+            
+            $class = "DbSession_".$db_type;
             if (class_exists($class)) {
+                $backend = &$dbh->_backend;
                 $this->_backend = new $class($backend->_dbh, $table);
                 return $this->_backend;
@@ -64,4 +64,7 @@ class DbSession
 
 // $Log$
+// Revision 1.33  2005/02/27 19:40:36  rurban
+// fix for php4 and case-sensitive filesystems
+//
 // Revision 1.32  2005/02/11 14:41:57  rurban
 // seperate DbSession classes: less memory, a bit slower