2
0
mirror of https://github.com/ACSPRI/queXS synced 2024-04-02 12:12:16 +00:00

Merged from McMasterReports branch

This commit is contained in:
azammitdcarf
2010-01-14 07:45:37 +00:00
parent 18dbb16138
commit d1b139d315
1884 changed files with 555891 additions and 364768 deletions

View File

@@ -2,7 +2,7 @@
/*
V4.94 23 Jan 2007 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
V5.08 6 Apr 2009 (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
Contributed by Ross Smith (adodb@netebb.com).
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
@@ -59,7 +59,7 @@ function adodb_unserialize( $serialized_string )
*/
function adodb_session_regenerate_id()
{
$conn =& ADODB_Session::_conn();
$conn = ADODB_Session::_conn();
if (!$conn) return false;
$old_id = session_id();
@@ -72,7 +72,7 @@ function adodb_session_regenerate_id()
//@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));
$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) {
@@ -95,7 +95,7 @@ function adodb_session_create_table($schemaFile=null,$conn = null)
{
// set default values
if ($schemaFile===null) $schemaFile = ADODB_SESSION . '/session_schema.xml';
if ($conn===null) $conn =& ADODB_Session::_conn();
if ($conn===null) $conn = ADODB_Session::_conn();
if (!$conn) return 0;
@@ -421,7 +421,7 @@ class ADODB_Session {
/*!
*/
function &_conn($conn=null) {
function _conn($conn=null) {
return $GLOBALS['ADODB_SESS_CONN'];
}
@@ -463,7 +463,7 @@ class ADODB_Session {
/*!
*/
function _dumprs($rs) {
$conn =& ADODB_Session::_conn();
$conn = ADODB_Session::_conn();
$debug = ADODB_Session::debug();
if (!$conn) {
@@ -515,7 +515,7 @@ class ADODB_Session {
*/
function open($save_path, $session_name, $persist = null)
{
$conn =& ADODB_Session::_conn();
$conn = ADODB_Session::_conn();
if ($conn) {
return true;
@@ -539,7 +539,7 @@ class ADODB_Session {
# assert('$driver');
# assert('$host');
$conn =& ADONewConnection($driver);
$conn = ADONewConnection($driver);
if ($debug) {
$conn->debug = true;
@@ -557,7 +557,7 @@ class ADODB_Session {
$ok = $conn->Connect($host, $user, $password, $database);
}
if ($ok) $GLOBALS['ADODB_SESS_CONN'] =& $conn;
if ($ok) $GLOBALS['ADODB_SESS_CONN'] = $conn;
else
ADOConnection::outp('<p>Session: connection failed</p>', false);
@@ -571,7 +571,7 @@ class ADODB_Session {
function close()
{
/*
$conn =& ADODB_Session::_conn();
$conn = ADODB_Session::_conn();
if ($conn) $conn->Close();
*/
return true;
@@ -582,7 +582,7 @@ class ADODB_Session {
*/
function read($key)
{
$conn =& ADODB_Session::_conn();
$conn = ADODB_Session::_conn();
$data = ADODB_Session::dataFieldName();
$filter = ADODB_Session::filter();
$table = ADODB_Session::table();
@@ -601,10 +601,10 @@ class ADODB_Session {
developer has commited elsewhere... :(
*/
#if (ADODB_Session::Lock())
# $rs =& $conn->RowLock($table, "$binary sesskey = $qkey AND expiry >= " . time(), $data);
# $rs = $conn->RowLock($table, "$binary sesskey = $qkey AND expiry >= " . time(), $data);
#else
$rs =& $conn->Execute($sql);
$rs = $conn->Execute($sql);
//ADODB_Session::_dumprs($rs);
if ($rs) {
if ($rs->EOF) {
@@ -641,7 +641,7 @@ class ADODB_Session {
if (!empty($ADODB_SESSION_READONLY)) return;
$clob = ADODB_Session::clob();
$conn =& ADODB_Session::_conn();
$conn = ADODB_Session::_conn();
$crc = ADODB_Session::_crc();
$data = ADODB_Session::dataFieldName();
$debug = ADODB_Session::debug();
@@ -666,7 +666,7 @@ class ADODB_Session {
// 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>';
ADOConnection::outp( '<p>Session: Only updating date - crc32 not changed</p>');
}
$expirevar = '';
@@ -680,7 +680,7 @@ class ADODB_Session {
$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()));
$rs = $conn->Execute($sql,array($expiry,$expirevar,$key,time()));
return true;
}
$val = rawurlencode($val);
@@ -700,7 +700,7 @@ class ADODB_Session {
}
if (!$clob) { // no lobs, simply use replace()
$arr[$data] = $conn->qstr($val);
$arr[$data] = $val;
$rs = $conn->Replace($table, $arr, 'sesskey', $autoQuote = true);
} else {
@@ -723,7 +723,7 @@ class ADODB_Session {
$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");
$rs = $conn->Execute("SELECT COUNT(*) AS cnt FROM $table WHERE $binary sesskey = $qkey");
if ($rs && reset($rs->fields) > 0) {
$sql = "UPDATE $table SET expiry = $expiry, $data = $lob_value, expireref=$expiryref WHERE sesskey = $qkey";
} else {
@@ -733,10 +733,10 @@ class ADODB_Session {
$err = '';
$rs1 =& $conn->Execute($sql);
$rs1 = $conn->Execute($sql);
if (!$rs1) $err = $conn->ErrorMsg()."\n";
$rs2 =& $conn->UpdateBlob($table, $data, $val, " sesskey=$qkey", strtoupper($clob));
$rs2 = $conn->UpdateBlob($table, $data, $val, " sesskey=$qkey", strtoupper($clob));
if (!$rs2) $err .= $conn->ErrorMsg()."\n";
$rs = ($rs && $rs2) ? true : false;
@@ -751,7 +751,7 @@ class ADODB_Session {
// properly unless select statement executed in Win2000
if ($conn->databaseType == 'access') {
$sql = "SELECT sesskey FROM $table WHERE $binary sesskey = $qkey";
$rs =& $conn->Execute($sql);
$rs = $conn->Execute($sql);
ADODB_Session::_dumprs($rs);
if ($rs) {
$rs->Close();
@@ -767,7 +767,7 @@ class ADODB_Session {
/*!
*/
function destroy($key) {
$conn =& ADODB_Session::_conn();
$conn = ADODB_Session::_conn();
$table = ADODB_Session::table();
$expire_notify = ADODB_Session::expireNotify();
@@ -785,7 +785,7 @@ class ADODB_Session {
$fn = next($expire_notify);
$savem = $conn->SetFetchMode(ADODB_FETCH_NUM);
$sql = "SELECT expireref, sesskey FROM $table WHERE $binary sesskey = $qkey";
$rs =& $conn->Execute($sql);
$rs = $conn->Execute($sql);
ADODB_Session::_dumprs($rs);
$conn->SetFetchMode($savem);
if (!$rs) {
@@ -802,7 +802,7 @@ class ADODB_Session {
}
$sql = "DELETE FROM $table WHERE $binary sesskey = $qkey";
$rs =& $conn->Execute($sql);
$rs = $conn->Execute($sql);
ADODB_Session::_dumprs($rs);
return $rs ? true : false;
@@ -812,7 +812,7 @@ class ADODB_Session {
*/
function gc($maxlifetime)
{
$conn =& ADODB_Session::_conn();
$conn = ADODB_Session::_conn();
$debug = ADODB_Session::debug();
$expire_notify = ADODB_Session::expireNotify();
$optimize = ADODB_Session::optimize();
@@ -832,7 +832,7 @@ class ADODB_Session {
$fn = next($expire_notify);
$savem = $conn->SetFetchMode(ADODB_FETCH_NUM);
$sql = "SELECT expireref, sesskey FROM $table WHERE expiry < $time";
$rs =& $conn->Execute($sql);
$rs = $conn->Execute($sql);
ADODB_Session::_dumprs($rs);
$conn->SetFetchMode($savem);
if ($rs) {
@@ -853,14 +853,14 @@ class ADODB_Session {
if (1) {
$sql = "SELECT sesskey FROM $table WHERE expiry < $time";
$arr =& $conn->GetAll($sql);
$arr = $conn->GetAll($sql);
foreach ($arr as $row) {
$sql2 = "DELETE FROM $table WHERE sesskey=".$conn->Param('0');
$conn->Execute($sql2,array($row[0]));
$conn->Execute($sql2,array(reset($row)));
}
} else {
$sql = "DELETE FROM $table WHERE expiry < $time";
$rs =& $conn->Execute($sql);
$rs = $conn->Execute($sql);
ADODB_Session::_dumprs($rs);
if ($rs) $rs->Close();
}
@@ -893,7 +893,7 @@ class ADODB_Session {
}
$sql .= " FROM $table";
$rs =& $conn->SelectLimit($sql, 1);
$rs = $conn->SelectLimit($sql, 1);
if ($rs && !$rs->EOF) {
$dbts = reset($rs->fields);
$rs->Close();