Update of /cvsroot/mantisbt/mantisbt/core/adodb/session
In directory sc8-pr-cvs16:/tmp/cvs-serv22448/session
Modified Files:
adodb-compress-bzip2.php adodb-compress-gzip.php
adodb-cryptsession.php adodb-encrypt-mcrypt.php
adodb-encrypt-md5.php adodb-encrypt-secret.php adodb-sess.txt
adodb-session-clob.php adodb-session.php
Added Files:
adodb-cryptsession2.php adodb-session-clob2.php
adodb-session2.php session_schema2.xml
Log Message:
Upgrade to ADODB 4.95a - without porting the changes that were applied to 4.80.
This will either be dropped or come back in follow up commits.
--- NEW FILE: adodb-cryptsession2.php ---
<?php
/*
V4.94 23 Jan 2007 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights
reserved.
Contributed by Ross Smith
(adodb-8k6CzKFoKBXQT0dZR+AlfA@xxxxxxxxxxxxxxxx).
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
Set tabs to 4 for best viewing.
*/
/*
This file is provided for backwards compatibility purposes
*/
if (!defined('ADODB_SESSION')) {
require_once dirname(__FILE__) . '/adodb-session2.php';
}
require_once ADODB_SESSION . '/adodb-encrypt-md5.php';
ADODB_Session::filter(new ADODB_Encrypt_MD5());
?>
Index: adodb-session.php
===================================================================
RCS file: /cvsroot/mantisbt/mantisbt/core/adodb/session/adodb-session.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- adodb-session.php 22 Apr 2006 11:12:16 -0000 1.4
+++ adodb-session.php 22 May 2007 05:59:46 -0000 1.5
@@ -2,7 +2,7 @@
/*
-V4.80 8 Mar 2006 (c) 2000-2006 John Lim
(jlim-l15XFKl8ZeYZ+IcD6AW/HA@xxxxxxxxxxxxxxxx). All rights reserved.
+V4.94 23 Jan 2007 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights
reserved.
Contributed by Ross Smith
(adodb-8k6CzKFoKBXQT0dZR+AlfA@xxxxxxxxxxxxxxxx).
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
@@ -26,7 +26,7 @@
*/
if (!defined('_ADODB_LAYER')) {
- require_once realpath(dirname(__FILE__) . '/../adodb.inc.php');
+ require realpath(dirname(__FILE__) . '/../adodb.inc.php');
}
if (defined('ADODB_SESSION')) return 1;
@@ -492,13 +492,29 @@
/////////////////////
// public methods
/////////////////////
+
+ function config($driver, $host, $user, $password,
$database=false,$options=false)
+ {
+ ADODB_Session::driver($driver);
+ ADODB_Session::host($host);
+ ADODB_Session::user($user);
+ ADODB_Session::password($password);
+ ADODB_Session::database($database);
+
+ if ($driver == 'oci8' || $driver == 'oci8po') $options['lob'] =
'CLOB';
+
+ if (isset($options['table']))
ADODB_Session::table($options['table']);
+ if (isset($options['lob']))
ADODB_Session::clob($options['lob']);
+ if (isset($options['debug']))
ADODB_Session::debug($options['debug']);
+ }
/*!
Create the connection to the database.
If $conn already exists, reuse that connection
*/
- function open($save_path, $session_name, $persist = null) {
+ function open($save_path, $session_name, $persist = null)
+ {
$conn =& ADODB_Session::_conn();
if ($conn) {
@@ -523,7 +539,6 @@
# assert('$driver');
# assert('$host');
- // cannot use =& below - do not know why...
$conn =& ADONewConnection($driver);
if ($debug) {
@@ -553,7 +568,8 @@
/*!
Close the connection
*/
- function close() {
+ function close()
+ {
/*
$conn =& ADODB_Session::_conn();
if ($conn) $conn->Close();
@@ -564,7 +580,8 @@
/*
Slurp in the session variables and return the serialized string
*/
- function read($key) {
+ function read($key)
+ {
$conn =& ADODB_Session::_conn();
$data = ADODB_Session::dataFieldName();
$filter = ADODB_Session::filter();
@@ -574,7 +591,7 @@
return '';
}
- assert('$table');
+ //assert('$table');
$qkey = $conn->quote($key);
$binary = $conn->dataProvider === 'mysql' ? '/*! BINARY */' :
'';
@@ -617,7 +634,12 @@
If the data has not been modified since the last read(), we do
not write.
*/
- function write($key, $val) {
+ function write($key, $val)
+ {
+ global $ADODB_SESSION_READONLY;
+
+ if (!empty($ADODB_SESSION_READONLY)) return;
+
$clob = ADODB_Session::clob();
$conn =& ADODB_Session::_conn();
$crc = ADODB_Session::_crc();
@@ -634,7 +656,7 @@
}
$qkey = $conn->qstr($key);
- assert('$table');
+ //assert('$table');
$expiry = time() + $lifetime;
@@ -646,12 +668,19 @@
if ($debug) {
echo '<p>Session: Only updating date - crc32
not changed</p>';
}
- $sql = "UPDATE $table SET expiry =
".$conn->Param('0')." WHERE $binary sesskey = ".$conn->Param('1')." AND expiry
>= ".$conn->Param('2');
- $rs =& $conn->Execute($sql,array($expiry,$key,time()));
- ADODB_Session::_dumprs($rs);
- if ($rs) {
- $rs->Close();
+
+ $expirevar = '';
+ if ($expire_notify) {
+ $var = reset($expire_notify);
+ global $$var;
+ if (isset($$var)) {
+ $expirevar = $$var;
+ }
}
+
+
+ $sql = "UPDATE $table SET expiry =
".$conn->Param('0').",expireref=".$conn->Param('1')." WHERE $binary sesskey =
".$conn->Param('2')." AND expiry >= ".$conn->Param('3');
+ $rs =&
$conn->Execute($sql,array($expiry,$expirevar,$key,time()));
return true;
}
$val = rawurlencode($val);
@@ -673,7 +702,7 @@
if (!$clob) { // no lobs, simply use replace()
$arr[$data] = $conn->qstr($val);
$rs = $conn->Replace($table, $arr, 'sesskey',
$autoQuote = true);
- ADODB_Session::_dumprs($rs);
+
} else {
// what value shall we insert/update for lob row?
switch ($driver) {
@@ -691,36 +720,27 @@
break;
}
+ $conn->StartTrans();
+ $expiryref = $conn->qstr($arr['expireref']);
// do we insert or update? => as for sesskey
$rs =& $conn->Execute("SELECT COUNT(*) AS cnt FROM
$table WHERE $binary sesskey = $qkey");
- ADODB_Session::_dumprs($rs);
if ($rs && reset($rs->fields) > 0) {
- $sql = "UPDATE $table SET expiry = $expiry,
$data = $lob_value WHERE sesskey = $qkey";
+ $sql = "UPDATE $table SET expiry = $expiry,
$data = $lob_value, expireref=$expiryref WHERE sesskey = $qkey";
} else {
- $sql = "INSERT INTO $table (expiry, $data,
sesskey) VALUES ($expiry, $lob_value, $qkey)";
- }
- if ($rs) {
- $rs->Close();
+ $sql = "INSERT INTO $table (expiry, $data,
sesskey,expireref) VALUES ($expiry, $lob_value, $qkey,$expiryref)";
}
+ if ($rs)$rs->Close();
+
$err = '';
$rs1 =& $conn->Execute($sql);
- ADODB_Session::_dumprs($rs1);
- if (!$rs1) {
- $err = $conn->ErrorMsg()."\n";
- }
+ if (!$rs1) $err = $conn->ErrorMsg()."\n";
+
$rs2 =& $conn->UpdateBlob($table, $data, $val, "
sesskey=$qkey", strtoupper($clob));
- ADODB_Session::_dumprs($rs2);
- if (!$rs2) {
- $err .= $conn->ErrorMsg()."\n";
- }
+ if (!$rs2) $err .= $conn->ErrorMsg()."\n";
+
$rs = ($rs && $rs2) ? true : false;
- if ($rs1) {
- $rs1->Close();
- }
- if (is_object($rs2)) {
- $rs2->Close();
- }
+ $conn->CompleteTrans();
}
if (!$rs) {
@@ -755,7 +775,7 @@
return false;
}
- assert('$table');
+ //assert('$table');
$qkey = $conn->quote($key);
$binary = $conn->dataProvider === 'mysql' ? '/*! BINARY */' :
'';
@@ -784,16 +804,14 @@
$sql = "DELETE FROM $table WHERE $binary sesskey = $qkey";
$rs =& $conn->Execute($sql);
ADODB_Session::_dumprs($rs);
- if ($rs) {
- $rs->Close();
- }
return $rs ? true : false;
}
/*!
*/
- function gc($maxlifetime) {
+ function gc($maxlifetime)
+ {
$conn =& ADODB_Session::_conn();
$debug = ADODB_Session::debug();
$expire_notify = ADODB_Session::expireNotify();
@@ -805,10 +823,8 @@
return false;
}
- assert('$table');
$time = time();
-
$binary = $conn->dataProvider === 'mysql' ? '/*! BINARY */' :
'';
if ($expire_notify) {
@@ -820,18 +836,18 @@
ADODB_Session::_dumprs($rs);
$conn->SetFetchMode($savem);
if ($rs) {
- $conn->BeginTrans();
+ $conn->StartTrans();
$keys = array();
while (!$rs->EOF) {
$ref = $rs->fields[0];
$key = $rs->fields[1];
$fn($ref, $key);
- $del = $conn->Execute("DELETE FROM
$table WHERE sesskey='$key'");
+ $del = $conn->Execute("DELETE FROM
$table WHERE sesskey=".$conn->Param('0'),array($key));
$rs->MoveNext();
}
$rs->Close();
- $conn->CommitTrans();
+ $conn->CompleteTrans();
}
} else {
@@ -839,8 +855,8 @@
$sql = "SELECT sesskey FROM $table WHERE expiry
< $time";
$arr =& $conn->GetAll($sql);
foreach ($arr as $row) {
- $sql2 = "DELETE FROM $table WHERE
sesskey='$row[0]'";
- $conn->Execute($sql2);
+ $sql2 = "DELETE FROM $table WHERE
sesskey=".$conn->Param('0');
+ $conn->Execute($sql2,array($row[0]));
}
} else {
$sql = "DELETE FROM $table WHERE expiry <
$time";
@@ -901,7 +917,8 @@
}
ADODB_Session::_init();
-register_shutdown_function('session_write_close');
+if (empty($ADODB_SESSION_READONLY))
+ register_shutdown_function('session_write_close');
// for backwards compatability only
function adodb_sess_open($save_path, $session_name, $persist = true) {
@@ -914,4 +931,4 @@
return ADODB_Session::gc($t);
}
-?>
+?>
\ No newline at end of file
--- NEW FILE: adodb-session2.php ---
<?php
/*
V4.94 23 Jan 2007 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights
reserved.
Contributed by Ross Smith
(adodb-8k6CzKFoKBXQT0dZR+AlfA@xxxxxxxxxxxxxxxx).
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
Set tabs to 4 for best viewing.
*/
/*
CREATE Table SCripts
Oracle
======
CREATE TABLE SESSIONS2
(
SESSKEY VARCHAR2(48 BYTE) NOT NULL,
EXPIRY DATE NOT NULL,
EXPIREREF VARCHAR2(200 BYTE),
CREATED DATE NOT NULL,
MODIFIED DATE NOT NULL,
SESSDATA CLOB,
PRIMARY KEY(SESSKEY)
);
CREATE INDEX SESS2_EXPIRY ON SESSIONS2(EXPIRY);
CREATE UNIQUE INDEX SESS2_PK ON SESSIONS2(SESSKEY);
CREATE INDEX SESS2_EXP_REF ON SESSIONS2(EXPIREREF);
MySQL
=====
CREATE TABLE sessions2(
sesskey VARCHAR( 64 ) NOT NULL DEFAULT '',
expiry TIMESTAMP NOT NULL ,
expireref VARCHAR( 250 ) DEFAULT '',
created TIMESTAMP NOT NULL ,
modified TIMESTAMP NOT NULL ,
sessdata LONGTEXT DEFAULT '',
PRIMARY KEY ( sesskey ) ,
INDEX sess2_expiry( expiry ),
INDEX sess2_expireref( expireref )
)
*/
if (!defined('_ADODB_LAYER')) {
require realpath(dirname(__FILE__) . '/../adodb.inc.php');
}
if (defined('ADODB_SESSION')) return 1;
define('ADODB_SESSION', dirname(__FILE__));
define('ADODB_SESSION2', ADODB_SESSION);
/*
Unserialize session data manually. See
http://phplens.com/lens/lensforum/msgs.php?id=9821
From Kerr Schere, to unserialize session data stored via ADOdb.
1. Pull the session data from the db and loop through it.
2. Inside the loop, you will need to urldecode the data column.
3. After urldecode, run the serialized string through this function:
*/
function adodb_unserialize( $serialized_string )
{
$variables = array( );
$a = preg_split( "/(\w+)\|/", $serialized_string, -1,
PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE );
for( $i = 0; $i < count( $a ); $i = $i+2 ) {
$variables[$a[$i]] = unserialize( $a[$i+1] );
}
return( $variables );
}
/*
Thanks Joe Li. See
http://phplens.com/lens/lensforum/msgs.php?id=11487&x=1
Since adodb 4.61.
*/
function adodb_session_regenerate_id()
{
$conn =& ADODB_Session::_conn();
if (!$conn) return false;
$old_id = session_id();
if (function_exists('session_regenerate_id')) {
session_regenerate_id();
} else {
session_id(md5(uniqid(rand(), true)));
$ck = session_get_cookie_params();
setcookie(session_name(), session_id(), false, $ck['path'],
$ck['domain'], $ck['secure']);
//@session_start();
}
$new_id = session_id();
$ok =& $conn->Execute('UPDATE '. ADODB_Session::table(). ' SET
sesskey='. $conn->qstr($new_id). ' WHERE sesskey='.$conn->qstr($old_id));
/* it is possible that the update statement fails due to a collision */
if (!$ok) {
session_id($old_id);
if (empty($ck)) $ck = session_get_cookie_params();
setcookie(session_name(), session_id(), false, $ck['path'],
$ck['domain'], $ck['secure']);
return false;
}
return true;
}
/*
Generate database table for session data
@see http://phplens.com/lens/lensforum/msgs.php?id=12280
@return 0 if failure, 1 if errors, 2 if successful.
@author Markus Staab http://www.public-4u.de
*/
function adodb_session_create_table($schemaFile=null,$conn = null)
{
// set default values
if ($schemaFile===null) $schemaFile = ADODB_SESSION .
'/session_schema2.xml';
if ($conn===null) $conn =& ADODB_Session::_conn();
if (!$conn) return 0;
$schema = new adoSchema($conn);
$schema->ParseSchema($schemaFile);
return $schema->ExecuteSchema();
}
/*!
\static
*/
class ADODB_Session {
/////////////////////
// getter/setter methods
/////////////////////
/*
function Lock($lock=null)
{
static $_lock = false;
if (!is_null($lock)) $_lock = $lock;
return $lock;
}
*/
/*!
*/
function driver($driver = null)
{
static $_driver = 'mysql';
static $set = false;
if (!is_null($driver)) {
$_driver = trim($driver);
$set = true;
} elseif (!$set) {
// backwards compatibility
if (isset($GLOBALS['ADODB_SESSION_DRIVER'])) {
return $GLOBALS['ADODB_SESSION_DRIVER'];
}
}
return $_driver;
}
/*!
*/
function host($host = null) {
static $_host = 'localhost';
static $set = false;
if (!is_null($host)) {
$_host = trim($host);
$set = true;
} elseif (!$set) {
// backwards compatibility
if (isset($GLOBALS['ADODB_SESSION_CONNECT'])) {
return $GLOBALS['ADODB_SESSION_CONNECT'];
}
}
return $_host;
}
/*!
*/
function user($user = null)
{
static $_user = 'root';
static $set = false;
if (!is_null($user)) {
$_user = trim($user);
$set = true;
} elseif (!$set) {
// backwards compatibility
if (isset($GLOBALS['ADODB_SESSION_USER'])) {
return $GLOBALS['ADODB_SESSION_USER'];
}
}
return $_user;
}
/*!
*/
function password($password = null)
{
static $_password = '';
static $set = false;
if (!is_null($password)) {
$_password = $password;
$set = true;
} elseif (!$set) {
// backwards compatibility
if (isset($GLOBALS['ADODB_SESSION_PWD'])) {
return $GLOBALS['ADODB_SESSION_PWD'];
}
}
return $_password;
}
/*!
*/
function database($database = null)
{
static $_database = '';
static $set = false;
if (!is_null($database)) {
$_database = trim($database);
$set = true;
} elseif (!$set) {
// backwards compatibility
if (isset($GLOBALS['ADODB_SESSION_DB'])) {
return $GLOBALS['ADODB_SESSION_DB'];
}
}
return $_database;
}
/*!
*/
function persist($persist = null)
{
static $_persist = true;
if (!is_null($persist)) {
$_persist = trim($persist);
}
return $_persist;
}
/*!
*/
function lifetime($lifetime = null)
{
static $_lifetime;
static $set = false;
if (!is_null($lifetime)) {
$_lifetime = (int) $lifetime;
$set = true;
} elseif (!$set) {
// backwards compatibility
if (isset($GLOBALS['ADODB_SESS_LIFE'])) {
return $GLOBALS['ADODB_SESS_LIFE'];
}
}
if (!$_lifetime) {
$_lifetime = ini_get('session.gc_maxlifetime');
if ($_lifetime <= 1) {
// bug in PHP 4.0.3 pl 1 -- how about other
versions?
//print "<h3>Session Error: PHP.INI setting
<i>session.gc_maxlifetime</i>not set: $lifetime</h3>";
$_lifetime = 1440;
}
}
return $_lifetime;
}
/*!
*/
function debug($debug = null)
{
static $_debug = false;
static $set = false;
if (!is_null($debug)) {
$_debug = (bool) $debug;
$conn = ADODB_Session::_conn();
if ($conn) {
$conn->debug = $_debug;
}
$set = true;
} elseif (!$set) {
// backwards compatibility
if (isset($GLOBALS['ADODB_SESS_DEBUG'])) {
return $GLOBALS['ADODB_SESS_DEBUG'];
}
}
return $_debug;
}
/*!
*/
function expireNotify($expire_notify = null)
{
static $_expire_notify;
static $set = false;
if (!is_null($expire_notify)) {
$_expire_notify = $expire_notify;
$set = true;
} elseif (!$set) {
// backwards compatibility
if (isset($GLOBALS['ADODB_SESSION_EXPIRE_NOTIFY'])) {
return $GLOBALS['ADODB_SESSION_EXPIRE_NOTIFY'];
}
}
return $_expire_notify;
}
/*!
*/
function table($table = null)
{
static $_table = 'sessions2';
static $set = false;
if (!is_null($table)) {
$_table = trim($table);
$set = true;
} elseif (!$set) {
// backwards compatibility
if (isset($GLOBALS['ADODB_SESSION_TBL'])) {
return $GLOBALS['ADODB_SESSION_TBL'];
}
}
return $_table;
}
/*!
*/
function optimize($optimize = null)
{
static $_optimize = false;
static $set = false;
if (!is_null($optimize)) {
$_optimize = (bool) $optimize;
$set = true;
} elseif (!$set) {
// backwards compatibility
if (defined('ADODB_SESSION_OPTIMIZE')) {
return true;
}
}
return $_optimize;
}
/*!
*/
function syncSeconds($sync_seconds = null) {
//echo ("<p>WARNING: ADODB_SESSION::syncSeconds is longer used,
please remove this function for your code</p>");
return 0;
}
/*!
*/
function clob($clob = null) {
static $_clob = false;
static $set = false;
if (!is_null($clob)) {
$_clob = strtolower(trim($clob));
$set = true;
} elseif (!$set) {
// backwards compatibility
if (isset($GLOBALS['ADODB_SESSION_USE_LOBS'])) {
return $GLOBALS['ADODB_SESSION_USE_LOBS'];
}
}
return $_clob;
}
/*!
*/
function dataFieldName($data_field_name = null) {
//echo ("<p>WARNING: ADODB_SESSION::dataFieldName() is longer
used, please remove this function for your code</p>");
return '';
}
/*!
*/
function filter($filter = null) {
static $_filter = array();
if (!is_null($filter)) {
if (!is_array($filter)) {
$filter = array($filter);
}
$_filter = $filter;
}
return $_filter;
}
/*!
*/
function encryptionKey($encryption_key = null) {
static $_encryption_key = 'CRYPTED ADODB SESSIONS ROCK!';
if (!is_null($encryption_key)) {
$_encryption_key = $encryption_key;
}
return $_encryption_key;
}
/////////////////////
// private methods
/////////////////////
/*!
*/
function &_conn($conn=null)
{
if (isset($GLOBALS['ADODB_SESS_CONN'])) {
$conn =& $GLOBALS['ADODB_SESS_CONN'];
return $conn;
}
$false = false;
return $false;
}
/*!
*/
function _crc($crc = null) {
static $_crc = false;
if (!is_null($crc)) {
$_crc = $crc;
}
return $_crc;
}
/*!
*/
function _init() {
session_module_name('user');
session_set_save_handler(
array('ADODB_Session', 'open'),
array('ADODB_Session', 'close'),
array('ADODB_Session', 'read'),
array('ADODB_Session', 'write'),
array('ADODB_Session', 'destroy'),
array('ADODB_Session', 'gc')
);
}
/*!
*/
function _sessionKey() {
// use this function to create the encryption key for crypted
sessions
// crypt the used key, ADODB_Session::encryptionKey() as key
and session_id() as salt
return crypt(ADODB_Session::encryptionKey(), session_id());
}
/*!
*/
function _dumprs($rs) {
$conn =& ADODB_Session::_conn();
$debug = ADODB_Session::debug();
if (!$conn) {
return;
}
if (!$debug) {
return;
}
if (!$rs) {
echo "<br />\$rs is null or false<br />\n";
return;
}
//echo "<br />\nAffected_Rows=",$conn->Affected_Rows(),"<br
/>\n";
if (!is_object($rs)) {
return;
}
require_once ADODB_SESSION.'/../tohtml.inc.php';
rs2html($rs);
}
/////////////////////
// public methods
/////////////////////
function config($driver, $host, $user, $password,
$database=false,$options=false)
{
ADODB_Session::driver($driver);
ADODB_Session::host($host);
ADODB_Session::user($user);
ADODB_Session::password($password);
ADODB_Session::database($database);
if ($driver == 'oci8' || $driver == 'oci8po') $options['lob'] =
'CLOB';
if (isset($options['table']))
ADODB_Session::table($options['table']);
if (isset($options['lob']))
ADODB_Session::clob($options['lob']);
if (isset($options['debug']))
ADODB_Session::debug($options['debug']);
}
/*!
Create the connection to the database.
If $conn already exists, reuse that connection
*/
function open($save_path, $session_name, $persist = null)
{
$conn =& ADODB_Session::_conn();
if ($conn) {
return true;
}
$database = ADODB_Session::database();
$debug = ADODB_Session::debug();
$driver = ADODB_Session::driver();
$host = ADODB_Session::host();
$password = ADODB_Session::password();
$user = ADODB_Session::user();
if (!is_null($persist)) {
ADODB_Session::persist($persist);
} else {
$persist = ADODB_Session::persist();
}
# these can all be defaulted to in php.ini
# assert('$database');
# assert('$driver');
# assert('$host');
$conn =& ADONewConnection($driver);
if ($debug) {
$conn->debug = true;
ADOConnection::outp( " driver=$driver user=$user
db=$database ");
}
if ($persist) {
switch($persist) {
default:
case 'P': $ok = $conn->PConnect($host, $user,
$password, $database); break;
case 'C': $ok = $conn->Connect($host, $user, $password,
$database); break;
case 'N': $ok = $conn->NConnect($host, $user,
$password, $database); break;
}
} else {
$ok = $conn->Connect($host, $user, $password,
$database);
}
if ($ok) $GLOBALS['ADODB_SESS_CONN'] =& $conn;
else
ADOConnection::outp('<p>Session: connection
failed</p>', false);
return $ok;
}
/*!
Close the connection
*/
function close()
{
/*
$conn =& ADODB_Session::_conn();
if ($conn) $conn->Close();
*/
return true;
}
/*
Slurp in the session variables and return the serialized string
*/
function read($key)
{
$conn =& ADODB_Session::_conn();
$filter = ADODB_Session::filter();
$table = ADODB_Session::table();
if (!$conn) {
return '';
}
//assert('$table');
$qkey = $conn->quote($key);
$binary = $conn->dataProvider === 'mysql' ? '/*! BINARY */' :
'';
$sql = "SELECT sessdata FROM $table WHERE sesskey = $binary
$qkey AND expiry >= " . $conn->sysTimeStamp;
/* Lock code does not work as it needs to hold transaction
within whole page, and we don't know if
developer has commited elsewhere... :(
*/
#if (ADODB_Session::Lock())
# $rs =& $conn->RowLock($table, "$binary sesskey = $qkey
AND expiry >= " . time(), sessdata);
#else
$rs =& $conn->Execute($sql);
//ADODB_Session::_dumprs($rs);
if ($rs) {
if ($rs->EOF) {
$v = '';
} else {
$v = reset($rs->fields);
$filter = array_reverse($filter);
foreach ($filter as $f) {
if (is_object($f)) {
$v = $f->read($v,
ADODB_Session::_sessionKey());
}
}
$v = rawurldecode($v);
}
$rs->Close();
ADODB_Session::_crc(strlen($v) . crc32($v));
return $v;
}
return '';
}
/*!
Write the serialized data to a database.
If the data has not been modified since the last read(), we do
not write.
*/
function write($key, $val)
{
global $ADODB_SESSION_READONLY;
if (!empty($ADODB_SESSION_READONLY)) return;
$clob = ADODB_Session::clob();
$conn =& ADODB_Session::_conn();
$crc = ADODB_Session::_crc();
$debug = ADODB_Session::debug();
$driver = ADODB_Session::driver();
$expire_notify = ADODB_Session::expireNotify();
$filter = ADODB_Session::filter();
$lifetime = ADODB_Session::lifetime();
$table = ADODB_Session::table();
if (!$conn) {
return false;
}
$sysTimeStamp = $conn->sysTimeStamp;
//assert('$table');
$expiry = $conn->OffsetDate($lifetime/(24*3600),$sysTimeStamp);
$binary = $conn->dataProvider === 'mysql' ? '/*! BINARY */' :
'';
// crc32 optimization since adodb 2.1
// now we only update expiry date, thx to sebastian thom in
adodb 2.32
if ($crc !== false && $crc == (strlen($val) . crc32($val))) {
if ($debug) {
echo '<p>Session: Only updating date - crc32
not changed</p>';
}
$expirevar = '';
if ($expire_notify) {
$var = reset($expire_notify);
global $$var;
if (isset($$var)) {
$expirevar = $$var;
}
}
$sql = "UPDATE $table SET expiry = $expiry
,expireref=".$conn->Param('0').", modified = $sysTimeStamp WHERE $binary
sesskey = ".$conn->Param('1')." AND expiry >= $sysTimeStamp";
$rs =& $conn->Execute($sql,array($expirevar,$key));
return true;
}
$val = rawurlencode($val);
foreach ($filter as $f) {
if (is_object($f)) {
$val = $f->write($val,
ADODB_Session::_sessionKey());
}
}
$expireref = '';
if ($expire_notify) {
$var = reset($expire_notify);
global $$var;
if (isset($$var)) {
$expireref = $$var;
}
}
if (!$clob) { // no lobs, simply use replace()
$rs =& $conn->Execute("SELECT COUNT(*) AS cnt FROM
$table WHERE $binary sesskey = ".$conn->Param(0),array($key));
if ($rs) $rs->Close();
if ($rs && reset($rs->fields) > 0) {
$sql = "UPDATE $table SET expiry=$expiry,
sessdata=".$conn->Param(0).", expireref=
".$conn->Param(1).",modified=$sysTimeStamp WHERE sesskey = ".$conn->Param('2');
} else {
$sql = "INSERT INTO $table (expiry, sessdata,
expireref, sesskey, created, modified)
VALUES ($expiry,".$conn->Param('0').",
". $conn->Param('1').", ".$conn->Param('2').", $sysTimeStamp, $sysTimeStamp)";
}
$rs =& $conn->Execute($sql,array($val,$expireref,$key));
} else {
// what value shall we insert/update for lob row?
switch ($driver) {
// empty_clob or empty_lob for oracle dbs
case 'oracle':
case 'oci8':
case 'oci8po':
case 'oci805':
$lob_value = sprintf('empty_%s()',
strtolower($clob));
break;
// null for all other
default:
$lob_value = 'null';
break;
}
$conn->StartTrans();
$rs =& $conn->Execute("SELECT COUNT(*) AS cnt FROM
$table WHERE $binary sesskey = ".$conn->Param(0),array($key));
if ($rs) $rs->Close();
if ($rs && reset($rs->fields) > 0) {
$sql = "UPDATE $table SET expiry=$expiry,
sessdata=$lob_value, expireref= ".$conn->Param(0).",modified=$sysTimeStamp
WHERE sesskey = ".$conn->Param('1');
} else {
$sql = "INSERT INTO $table (expiry, sessdata,
expireref, sesskey, created, modified)
VALUES ($expiry,$lob_value, ".
$conn->Param('0').", ".$conn->Param('1').", $sysTimeStamp, $sysTimeStamp)";
}
$rs =& $conn->Execute($sql,array($expireref,$key));
$qkey = $conn->qstr($key);
$rs2 = $conn->UpdateBlob($table, 'sessdata', $val, "
sesskey=$qkey", strtoupper($clob));
$rs = @$conn->CompleteTrans();
}
if (!$rs) {
ADOConnection::outp('<p>Session Replace: ' .
$conn->ErrorMsg() . '</p>', false);
return false;
} else {
// bug in access driver (could be odbc?) means that
info is not committed
// properly unless select statement executed in Win2000
if ($conn->databaseType == 'access') {
$sql = "SELECT sesskey FROM $table WHERE
$binary sesskey = $qkey";
$rs =& $conn->Execute($sql);
ADODB_Session::_dumprs($rs);
if ($rs) {
$rs->Close();
}
}
}/*
if (ADODB_Session::Lock()) {
$conn->CommitTrans();
}*/
return $rs ? true : false;
}
/*!
*/
function destroy($key) {
$conn =& ADODB_Session::_conn();
$table = ADODB_Session::table();
$expire_notify = ADODB_Session::expireNotify();
if (!$conn) {
return false;
}
//assert('$table');
$qkey = $conn->quote($key);
$binary = $conn->dataProvider === 'mysql' ? '/*! BINARY */' :
'';
if ($expire_notify) {
reset($expire_notify);
$fn = next($expire_notify);
$savem = $conn->SetFetchMode(ADODB_FETCH_NUM);
$sql = "SELECT expireref, sesskey FROM $table WHERE
$binary sesskey = $qkey";
$rs =& $conn->Execute($sql);
ADODB_Session::_dumprs($rs);
$conn->SetFetchMode($savem);
if (!$rs) {
return false;
}
if (!$rs->EOF) {
$ref = $rs->fields[0];
$key = $rs->fields[1];
//assert('$ref');
//assert('$key');
$fn($ref, $key);
}
$rs->Close();
}
$sql = "DELETE FROM $table WHERE $binary sesskey = $qkey";
$rs =& $conn->Execute($sql);
ADODB_Session::_dumprs($rs);
if ($rs) {
$rs->Close();
}
return $rs ? true : false;
}
/*!
*/
function gc($maxlifetime)
{
$conn =& ADODB_Session::_conn();
$debug = ADODB_Session::debug();
$expire_notify = ADODB_Session::expireNotify();
$optimize = ADODB_Session::optimize();
$table = ADODB_Session::table();
if (!$conn) {
return false;
}
//assert('$table');
$time = $conn->sysTimeStamp;
$binary = $conn->dataProvider === 'mysql' ? '/*! BINARY */' :
'';
if ($expire_notify) {
reset($expire_notify);
$fn = next($expire_notify);
$savem = $conn->SetFetchMode(ADODB_FETCH_NUM);
$sql = "SELECT expireref, sesskey FROM $table WHERE
expiry < $time";
$rs =& $conn->Execute($sql);
ADODB_Session::_dumprs($rs);
$conn->SetFetchMode($savem);
if ($rs) {
$conn->StartTrans();
$keys = array();
while (!$rs->EOF) {
$ref = $rs->fields[0];
$key = $rs->fields[1];
$fn($ref, $key);
$del = $conn->Execute("DELETE FROM
$table WHERE sesskey=".$conn->Param('0'),array($key));
$rs->MoveNext();
}
$rs->Close();
$conn->CompleteTrans();
}
} else {
if (0) {
$sql = "SELECT sesskey FROM $table WHERE expiry
< $time";
$arr =& $conn->GetAll($sql);
foreach ($arr as $row) {
$sql2 = "DELETE FROM $table WHERE
sesskey=".$conn->Param('0');
$conn->Execute($sql2,array($row[0]));
}
} else {
$sql = "DELETE FROM $table WHERE expiry <
$time";
$rs =& $conn->Execute($sql);
ADODB_Session::_dumprs($rs);
if ($rs) $rs->Close();
}
if ($debug) {
ADOConnection::outp("<p><b>Garbage
Collection</b>: $sql</p>");
}
}
// suggested by Cameron, "GaM3R"
<gamr-0R8jI162z55fq8cQ1yknNg@xxxxxxxxxxxxxxxx>
if ($optimize) {
$driver = ADODB_Session::driver();
if (preg_match('/mysql/i', $driver)) {
$sql = "OPTIMIZE TABLE $table";
}
if (preg_match('/postgres/i', $driver)) {
$sql = "VACUUM $table";
}
if (!empty($sql)) {
$conn->Execute($sql);
}
}
return true;
}
}
ADODB_Session::_init();
if (empty($ADODB_SESSION_READONLY))
register_shutdown_function('session_write_close');
// for backwards compatability only
function adodb_sess_open($save_path, $session_name, $persist = true) {
return ADODB_Session::open($save_path, $session_name, $persist);
}
// for backwards compatability only
function adodb_sess_gc($t)
{
return ADODB_Session::gc($t);
}
?>
Index: adodb-cryptsession.php
===================================================================
RCS file: /cvsroot/mantisbt/mantisbt/core/adodb/session/adodb-cryptsession.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- adodb-cryptsession.php 22 Apr 2006 11:12:16 -0000 1.4
+++ adodb-cryptsession.php 22 May 2007 05:59:45 -0000 1.5
@@ -2,7 +2,7 @@
/*
-V4.80 8 Mar 2006 (c) 2000-2006 John Lim
(jlim-l15XFKl8ZeYZ+IcD6AW/HA@xxxxxxxxxxxxxxxx). All rights reserved.
+V4.94 23 Jan 2007 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights
reserved.
Contributed by Ross Smith
(adodb-8k6CzKFoKBXQT0dZR+AlfA@xxxxxxxxxxxxxxxx).
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
@@ -16,7 +16,10 @@
*/
-require_once dirname(__FILE__) . '/adodb-session.php';
+if (!defined('ADODB_SESSION')) {
+ require_once dirname(__FILE__) . '/adodb-session.php';
+}
+
require_once ADODB_SESSION . '/adodb-encrypt-md5.php';
ADODB_Session::filter(new ADODB_Encrypt_MD5());
Index: adodb-encrypt-md5.php
===================================================================
RCS file: /cvsroot/mantisbt/mantisbt/core/adodb/session/adodb-encrypt-md5.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- adodb-encrypt-md5.php 22 Apr 2006 11:12:16 -0000 1.4
+++ adodb-encrypt-md5.php 22 May 2007 05:59:45 -0000 1.5
@@ -1,7 +1,7 @@
<?php
/*
-V4.80 8 Mar 2006 (c) 2000-2006 John Lim
(jlim-l15XFKl8ZeYZ+IcD6AW/HA@xxxxxxxxxxxxxxxx). All rights reserved.
+V4.94 23 Jan 2007 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights
reserved.
Contributed by Ross Smith
(adodb-8k6CzKFoKBXQT0dZR+AlfA@xxxxxxxxxxxxxxxx).
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
Index: adodb-compress-gzip.php
===================================================================
RCS file:
/cvsroot/mantisbt/mantisbt/core/adodb/session/adodb-compress-gzip.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- adodb-compress-gzip.php 22 Apr 2006 11:12:16 -0000 1.4
+++ adodb-compress-gzip.php 22 May 2007 05:59:45 -0000 1.5
@@ -2,7 +2,7 @@
/*
-V4.80 8 Mar 2006 (c) 2000-2006 John Lim
(jlim-l15XFKl8ZeYZ+IcD6AW/HA@xxxxxxxxxxxxxxxx). All rights reserved.
+V4.94 23 Jan 2007 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights
reserved.
Contributed by Ross Smith
(adodb-8k6CzKFoKBXQT0dZR+AlfA@xxxxxxxxxxxxxxxx).
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
Index: adodb-session-clob.php
===================================================================
RCS file: /cvsroot/mantisbt/mantisbt/core/adodb/session/adodb-session-clob.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- adodb-session-clob.php 22 Apr 2006 11:12:16 -0000 1.4
+++ adodb-session-clob.php 22 May 2007 05:59:46 -0000 1.5
@@ -2,7 +2,7 @@
/*
-V4.80 8 Mar 2006 (c) 2000-2006 John Lim
(jlim-l15XFKl8ZeYZ+IcD6AW/HA@xxxxxxxxxxxxxxxx). All rights reserved.
+V4.94 23 Jan 2007 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights
reserved.
Contributed by Ross Smith
(adodb-8k6CzKFoKBXQT0dZR+AlfA@xxxxxxxxxxxxxxxx).
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
@@ -16,8 +16,9 @@
*/
-require_once dirname(__FILE__) . '/adodb-session.php';
-
+if (!defined('ADODB_SESSION')) {
+ require_once dirname(__FILE__) . '/adodb-session.php';
+}
ADODB_Session::clob('CLOB');
?>
\ No newline at end of file
--- NEW FILE: adodb-session-clob2.php ---
<?php
/*
V4.94 23 Jan 2007 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights
reserved.
Contributed by Ross Smith
(adodb-8k6CzKFoKBXQT0dZR+AlfA@xxxxxxxxxxxxxxxx).
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
Set tabs to 4 for best viewing.
*/
/*
This file is provided for backwards compatibility purposes
*/
if (!defined('ADODB_SESSION')) {
require_once dirname(__FILE__) . '/adodb-session2.php';
}
ADODB_Session::clob('CLOB');
?>
--- NEW FILE: session_schema2.xml ---
<?xml version="1.0"?>
<schema version="0.3">
<table name="sessions2">
<desc>table for ADOdb session-management</desc>
<field name="SESSKEY" type="C" size="64">
<descr>session key</descr>
<KEY/>
<NOTNULL/>
</field>
<field name="EXPIRY" type="T">
<descr></descr>
<NOTNULL/>
</field>
<field name="CREATED" type="T">
<descr></descr>
<NOTNULL/>
</field>
<field name="MODIFIED" type="T">
<descr></descr>
<NOTNULL/>
</field>
<field name="EXPIREREF" type="C" size="250">
<descr></descr>
</field>
<field name="SESSDATA" type="XL">
<descr></descr>
<NOTNULL/>
</field>
</table>
</schema>
Index: adodb-sess.txt
===================================================================
RCS file: /cvsroot/mantisbt/mantisbt/core/adodb/session/adodb-sess.txt,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- adodb-sess.txt 22 Apr 2006 11:12:16 -0000 1.3
+++ adodb-sess.txt 22 May 2007 05:59:46 -0000 1.4
@@ -1,131 +1,131 @@
-John,
-
-I have been an extremely satisfied ADODB user for several years now.
-
-To give you something back for all your hard work, I've spent the last 3
-days rewriting the adodb-session.php code.
-
-----------
-What's New
-----------
-
-Here's a list of the new code's benefits:
-
-* Combines the functionality of the three files:
-
-adodb-session.php
-adodb-session-clob.php
-adodb-cryptsession.php
-
-each with very similar functionality, into a single file adodb-session.php.
-This will ease maintenance and support issues.
-
-* Supports multiple encryption and compression schemes.
- Currently, we support:
-
- MD5Crypt (crypt.inc.php)
- MCrypt
- Secure (Horde's emulation of MCrypt, if MCrypt module is not available.)
- GZip
- BZip2
-
-These can be stacked, so if you want to compress and then encrypt your
-session data, it's easy.
-Also, the built-in MCrypt functions will be *much* faster, and more secure,
-than the MD5Crypt code.
-
-* adodb-session.php contains a single class ADODB_Session that encapsulates
-all functionality.
- This eliminates the use of global vars and defines (though they are
-supported for backwards compatibility).
-
-* All user defined parameters are now static functions in the ADODB_Session
-class.
-
-New parameters include:
-
-* encryptionKey(): Define the encryption key used to encrypt the session.
-Originally, it was a hard coded string.
-
-* persist(): Define if the database will be opened in persistent mode.
-Originally, the user had to call adodb_sess_open().
-
-* dataFieldName(): Define the field name used to store the session data, as
-'DATA' appears to be a reserved word in the following cases:
- ANSI SQL
- IBM DB2
- MS SQL Server
- Postgres
- SAP
-
-* filter(): Used to support multiple, simulataneous encryption/compression
-schemes.
-
-* Debug support is improved thru _rsdump() function, which is called after
-every database call.
-
-------------
-What's Fixed
-------------
-
-The new code includes several bug fixes and enhancements:
-
-* sesskey is compared in BINARY mode for MySQL, to avoid problems with
-session keys that differ only by case.
- Of course, the user should define the sesskey field as BINARY, to
-correctly fix this problem, otherwise performance will suffer.
-
-* In ADODB_Session::gc(), if $expire_notify is true, the multiple DELETES in
-the original code have been optimized to a single DELETE.
-
-* In ADODB_Session::destroy(), since "SELECT expireref, sesskey FROM $table
-WHERE sesskey = $qkey" will only return a single value, we don't loop on the
-result, we simply process the row, if any.
-
-* We close $rs after every use.
-
----------------
-What's the Same
----------------
-
-I know backwards compatibility is *very* important to you. Therefore, the
-new code is 100% backwards compatible.
-
-If you like my code, but don't "trust" it's backwards compatible, maybe we
-offer it as beta code, in a new directory for a release or two?
-
-------------
-What's To Do
-------------
-
-I've vascillated over whether to use a single function to get/set
-parameters:
-
-$user = ADODB_Session::user(); // get
-ADODB_Session::user($user); // set
-
-or to use separate functions (which is the PEAR/Java way):
-
-$user = ADODB_Session::getUser();
-ADODB_Session::setUser($user);
-
-I've chosen the former as it's makes for a simpler API, and reduces the
-amount of code, but I'd be happy to change it to the latter.
-
-Also, do you think the class should be a singleton class, versus a static
-class?
-
-Let me know if you find this code useful, and will be including it in the
-next release of ADODB.
-
-If so, I will modify the current documentation to detail the new
-functionality. To that end, what file(s) contain the documentation? Please
-send them to me if they are not publically available.
-
-Also, if there is *anything* in the code that you like to see changed, let
-me know.
-
-Thanks,
-
-Ross
-
+John,
+
+I have been an extremely satisfied ADODB user for several years now.
+
+To give you something back for all your hard work, I've spent the last 3
+days rewriting the adodb-session.php code.
+
+----------
+What's New
+----------
+
+Here's a list of the new code's benefits:
+
+* Combines the functionality of the three files:
+
+adodb-session.php
+adodb-session-clob.php
+adodb-cryptsession.php
+
+each with very similar functionality, into a single file adodb-session.php.
+This will ease maintenance and support issues.
+
+* Supports multiple encryption and compression schemes.
+ Currently, we support:
+
+ MD5Crypt (crypt.inc.php)
+ MCrypt
+ Secure (Horde's emulation of MCrypt, if MCrypt module is not available.)
+ GZip
+ BZip2
+
+These can be stacked, so if you want to compress and then encrypt your
+session data, it's easy.
+Also, the built-in MCrypt functions will be *much* faster, and more secure,
+than the MD5Crypt code.
+
+* adodb-session.php contains a single class ADODB_Session that encapsulates
+all functionality.
+ This eliminates the use of global vars and defines (though they are
+supported for backwards compatibility).
+
+* All user defined parameters are now static functions in the ADODB_Session
+class.
+
+New parameters include:
+
+* encryptionKey(): Define the encryption key used to encrypt the session.
+Originally, it was a hard coded string.
+
+* persist(): Define if the database will be opened in persistent mode.
+Originally, the user had to call adodb_sess_open().
+
+* dataFieldName(): Define the field name used to store the session data, as
+'DATA' appears to be a reserved word in the following cases:
+ ANSI SQL
+ IBM DB2
+ MS SQL Server
+ Postgres
+ SAP
+
+* filter(): Used to support multiple, simulataneous encryption/compression
+schemes.
+
+* Debug support is improved thru _rsdump() function, which is called after
+every database call.
+
+------------
+What's Fixed
+------------
+
+The new code includes several bug fixes and enhancements:
+
+* sesskey is compared in BINARY mode for MySQL, to avoid problems with
+session keys that differ only by case.
+ Of course, the user should define the sesskey field as BINARY, to
+correctly fix this problem, otherwise performance will suffer.
+
+* In ADODB_Session::gc(), if $expire_notify is true, the multiple DELETES in
+the original code have been optimized to a single DELETE.
+
+* In ADODB_Session::destroy(), since "SELECT expireref, sesskey FROM $table
+WHERE sesskey = $qkey" will only return a single value, we don't loop on the
+result, we simply process the row, if any.
+
+* We close $rs after every use.
+
+---------------
+What's the Same
+---------------
+
+I know backwards compatibility is *very* important to you. Therefore, the
+new code is 100% backwards compatible.
+
+If you like my code, but don't "trust" it's backwards compatible, maybe we
+offer it as beta code, in a new directory for a release or two?
+
+------------
+What's To Do
+------------
+
+I've vascillated over whether to use a single function to get/set
+parameters:
+
+$user = ADODB_Session::user(); // get
+ADODB_Session::user($user); // set
+
+or to use separate functions (which is the PEAR/Java way):
+
+$user = ADODB_Session::getUser();
+ADODB_Session::setUser($user);
+
+I've chosen the former as it's makes for a simpler API, and reduces the
+amount of code, but I'd be happy to change it to the latter.
+
+Also, do you think the class should be a singleton class, versus a static
+class?
+
+Let me know if you find this code useful, and will be including it in the
+next release of ADODB.
+
+If so, I will modify the current documentation to detail the new
+functionality. To that end, what file(s) contain the documentation? Please
+send them to me if they are not publically available.
+
+Also, if there is *anything* in the code that you like to see changed, let
+me know.
+
+Thanks,
+
+Ross
+
Index: adodb-encrypt-mcrypt.php
===================================================================
RCS file:
/cvsroot/mantisbt/mantisbt/core/adodb/session/adodb-encrypt-mcrypt.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- adodb-encrypt-mcrypt.php 22 Apr 2006 11:12:16 -0000 1.4
+++ adodb-encrypt-mcrypt.php 22 May 2007 05:59:45 -0000 1.5
@@ -2,7 +2,7 @@
/*
-V4.80 8 Mar 2006 (c) 2000-2006 John Lim
(jlim-l15XFKl8ZeYZ+IcD6AW/HA@xxxxxxxxxxxxxxxx). All rights reserved.
+V4.94 23 Jan 2007 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights
reserved.
Contributed by Ross Smith
(adodb-8k6CzKFoKBXQT0dZR+AlfA@xxxxxxxxxxxxxxxx).
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
Index: adodb-encrypt-secret.php
===================================================================
RCS file:
/cvsroot/mantisbt/mantisbt/core/adodb/session/adodb-encrypt-secret.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- adodb-encrypt-secret.php 22 Apr 2006 11:12:16 -0000 1.4
+++ adodb-encrypt-secret.php 22 May 2007 05:59:45 -0000 1.5
@@ -1,7 +1,7 @@
<?php
/*
-V4.80 8 Mar 2006 (c) 2000-2006 John Lim
(jlim-l15XFKl8ZeYZ+IcD6AW/HA@xxxxxxxxxxxxxxxx). All rights reserved.
+V4.94 23 Jan 2007 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights
reserved.
Contributed by Ross Smith
(adodb-8k6CzKFoKBXQT0dZR+AlfA@xxxxxxxxxxxxxxxx).
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
Index: adodb-compress-bzip2.php
===================================================================
RCS file:
/cvsroot/mantisbt/mantisbt/core/adodb/session/adodb-compress-bzip2.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- adodb-compress-bzip2.php 22 Apr 2006 11:12:16 -0000 1.4
+++ adodb-compress-bzip2.php 22 May 2007 05:59:45 -0000 1.5
@@ -1,7 +1,7 @@
<?php
/*
-V4.80 8 Mar 2006 (c) 2000-2006 John Lim
(jlim-l15XFKl8ZeYZ+IcD6AW/HA@xxxxxxxxxxxxxxxx). All rights reserved.
+V4.94 23 Jan 2007 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights
reserved.
Contributed by Ross Smith
(adodb-8k6CzKFoKBXQT0dZR+AlfA@xxxxxxxxxxxxxxxx).
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
|
