[Vtigercrm-commits] [vtiger-commits] r5746 - in /vtigercrm/branches/4.2.4/adodb: ./ datadict/ drivers/ perf/ session/ session/old/ tests/ xsl/
vtigercrm-commits at vtiger.fosslabs.com
vtigercrm-commits at vtiger.fosslabs.com
Thu May 4 19:47:29 EDT 2006
Author: jeffk
Date: Thu May 4 17:47:05 2006
New Revision: 5746
Log:
refs #757. update adodb-4.72 to adodb-4.81
Added:
vtigercrm/branches/4.2.4/adodb/adodb-active-record.inc.php
- copied unchanged from r5742, vtigercrm/branches/4.2/adodb/adodb-active-record.inc.php
vtigercrm/branches/4.2.4/adodb/adodb-xmlschema03.inc.php
- copied unchanged from r5742, vtigercrm/branches/4.2/adodb/adodb-xmlschema03.inc.php
vtigercrm/branches/4.2.4/adodb/tests/test-active-record.php
- copied unchanged from r5742, vtigercrm/branches/4.2/adodb/tests/test-active-record.php
vtigercrm/branches/4.2.4/adodb/tests/test-active-recs2.php
- copied unchanged from r5742, vtigercrm/branches/4.2/adodb/tests/test-active-recs2.php
vtigercrm/branches/4.2.4/adodb/xsl/convert-0.1-0.3.xsl
- copied unchanged from r5742, vtigercrm/branches/4.2/adodb/xsl/convert-0.1-0.3.xsl
vtigercrm/branches/4.2.4/adodb/xsl/convert-0.2-0.3.xsl
- copied unchanged from r5742, vtigercrm/branches/4.2/adodb/xsl/convert-0.2-0.3.xsl
vtigercrm/branches/4.2.4/adodb/xsl/remove-0.3.xsl
- copied unchanged from r5742, vtigercrm/branches/4.2/adodb/xsl/remove-0.3.xsl
Modified:
vtigercrm/branches/4.2.4/adodb/adodb-csvlib.inc.php
vtigercrm/branches/4.2.4/adodb/adodb-datadict.inc.php
vtigercrm/branches/4.2.4/adodb/adodb-error.inc.php
vtigercrm/branches/4.2.4/adodb/adodb-errorhandler.inc.php
vtigercrm/branches/4.2.4/adodb/adodb-errorpear.inc.php
vtigercrm/branches/4.2.4/adodb/adodb-exceptions.inc.php
vtigercrm/branches/4.2.4/adodb/adodb-iterator.inc.php
vtigercrm/branches/4.2.4/adodb/adodb-lib.inc.php
vtigercrm/branches/4.2.4/adodb/adodb-pager.inc.php
vtigercrm/branches/4.2.4/adodb/adodb-pear.inc.php
vtigercrm/branches/4.2.4/adodb/adodb-perf.inc.php
vtigercrm/branches/4.2.4/adodb/adodb-php4.inc.php
vtigercrm/branches/4.2.4/adodb/adodb-time.inc.php
vtigercrm/branches/4.2.4/adodb/adodb-xmlschema.inc.php
vtigercrm/branches/4.2.4/adodb/adodb.inc.php
vtigercrm/branches/4.2.4/adodb/datadict/datadict-access.inc.php
vtigercrm/branches/4.2.4/adodb/datadict/datadict-db2.inc.php
vtigercrm/branches/4.2.4/adodb/datadict/datadict-firebird.inc.php
vtigercrm/branches/4.2.4/adodb/datadict/datadict-generic.inc.php
vtigercrm/branches/4.2.4/adodb/datadict/datadict-ibase.inc.php
vtigercrm/branches/4.2.4/adodb/datadict/datadict-informix.inc.php
vtigercrm/branches/4.2.4/adodb/datadict/datadict-mssql.inc.php
vtigercrm/branches/4.2.4/adodb/datadict/datadict-mysql.inc.php
vtigercrm/branches/4.2.4/adodb/datadict/datadict-oci8.inc.php
vtigercrm/branches/4.2.4/adodb/datadict/datadict-postgres.inc.php
vtigercrm/branches/4.2.4/adodb/datadict/datadict-sapdb.inc.php
vtigercrm/branches/4.2.4/adodb/datadict/datadict-sybase.inc.php
vtigercrm/branches/4.2.4/adodb/drivers/adodb-access.inc.php
vtigercrm/branches/4.2.4/adodb/drivers/adodb-ado.inc.php
vtigercrm/branches/4.2.4/adodb/drivers/adodb-ado5.inc.php
vtigercrm/branches/4.2.4/adodb/drivers/adodb-ado_access.inc.php
vtigercrm/branches/4.2.4/adodb/drivers/adodb-ado_mssql.inc.php
vtigercrm/branches/4.2.4/adodb/drivers/adodb-borland_ibase.inc.php
vtigercrm/branches/4.2.4/adodb/drivers/adodb-csv.inc.php
vtigercrm/branches/4.2.4/adodb/drivers/adodb-db2.inc.php
vtigercrm/branches/4.2.4/adodb/drivers/adodb-fbsql.inc.php
vtigercrm/branches/4.2.4/adodb/drivers/adodb-firebird.inc.php
vtigercrm/branches/4.2.4/adodb/drivers/adodb-ibase.inc.php
vtigercrm/branches/4.2.4/adodb/drivers/adodb-informix.inc.php
vtigercrm/branches/4.2.4/adodb/drivers/adodb-informix72.inc.php
vtigercrm/branches/4.2.4/adodb/drivers/adodb-ldap.inc.php
vtigercrm/branches/4.2.4/adodb/drivers/adodb-mssql.inc.php
vtigercrm/branches/4.2.4/adodb/drivers/adodb-mssqlpo.inc.php
vtigercrm/branches/4.2.4/adodb/drivers/adodb-mysql.inc.php
vtigercrm/branches/4.2.4/adodb/drivers/adodb-mysqli.inc.php
vtigercrm/branches/4.2.4/adodb/drivers/adodb-mysqlt.inc.php
vtigercrm/branches/4.2.4/adodb/drivers/adodb-netezza.inc.php
vtigercrm/branches/4.2.4/adodb/drivers/adodb-oci8.inc.php
vtigercrm/branches/4.2.4/adodb/drivers/adodb-oci805.inc.php
vtigercrm/branches/4.2.4/adodb/drivers/adodb-oci8po.inc.php
vtigercrm/branches/4.2.4/adodb/drivers/adodb-odbc.inc.php
vtigercrm/branches/4.2.4/adodb/drivers/adodb-odbc_db2.inc.php
vtigercrm/branches/4.2.4/adodb/drivers/adodb-odbc_mssql.inc.php
vtigercrm/branches/4.2.4/adodb/drivers/adodb-odbc_oracle.inc.php
vtigercrm/branches/4.2.4/adodb/drivers/adodb-odbtp.inc.php
vtigercrm/branches/4.2.4/adodb/drivers/adodb-odbtp_unicode.inc.php
vtigercrm/branches/4.2.4/adodb/drivers/adodb-oracle.inc.php
vtigercrm/branches/4.2.4/adodb/drivers/adodb-pdo.inc.php
vtigercrm/branches/4.2.4/adodb/drivers/adodb-pdo_mssql.inc.php
vtigercrm/branches/4.2.4/adodb/drivers/adodb-pdo_mysql.inc.php
vtigercrm/branches/4.2.4/adodb/drivers/adodb-pdo_oci.inc.php
vtigercrm/branches/4.2.4/adodb/drivers/adodb-pdo_pgsql.inc.php
vtigercrm/branches/4.2.4/adodb/drivers/adodb-postgres.inc.php
vtigercrm/branches/4.2.4/adodb/drivers/adodb-postgres64.inc.php
vtigercrm/branches/4.2.4/adodb/drivers/adodb-postgres7.inc.php
vtigercrm/branches/4.2.4/adodb/drivers/adodb-postgres8.inc.php
vtigercrm/branches/4.2.4/adodb/drivers/adodb-proxy.inc.php
vtigercrm/branches/4.2.4/adodb/drivers/adodb-sapdb.inc.php
vtigercrm/branches/4.2.4/adodb/drivers/adodb-sqlanywhere.inc.php
vtigercrm/branches/4.2.4/adodb/drivers/adodb-sqlite.inc.php
vtigercrm/branches/4.2.4/adodb/drivers/adodb-sqlitepo.inc.php
vtigercrm/branches/4.2.4/adodb/drivers/adodb-sybase.inc.php
vtigercrm/branches/4.2.4/adodb/drivers/adodb-sybase_ase.inc.php
vtigercrm/branches/4.2.4/adodb/drivers/adodb-vfp.inc.php
vtigercrm/branches/4.2.4/adodb/perf/perf-db2.inc.php
vtigercrm/branches/4.2.4/adodb/perf/perf-informix.inc.php
vtigercrm/branches/4.2.4/adodb/perf/perf-mssql.inc.php
vtigercrm/branches/4.2.4/adodb/perf/perf-mysql.inc.php
vtigercrm/branches/4.2.4/adodb/perf/perf-oci8.inc.php
vtigercrm/branches/4.2.4/adodb/perf/perf-postgres.inc.php
vtigercrm/branches/4.2.4/adodb/pivottable.inc.php
vtigercrm/branches/4.2.4/adodb/rsfilter.inc.php
vtigercrm/branches/4.2.4/adodb/server.php
vtigercrm/branches/4.2.4/adodb/session/adodb-compress-bzip2.php
vtigercrm/branches/4.2.4/adodb/session/adodb-compress-gzip.php
vtigercrm/branches/4.2.4/adodb/session/adodb-cryptsession.php
vtigercrm/branches/4.2.4/adodb/session/adodb-encrypt-mcrypt.php
vtigercrm/branches/4.2.4/adodb/session/adodb-encrypt-md5.php
vtigercrm/branches/4.2.4/adodb/session/adodb-encrypt-secret.php
vtigercrm/branches/4.2.4/adodb/session/adodb-session-clob.php
vtigercrm/branches/4.2.4/adodb/session/adodb-session.php
vtigercrm/branches/4.2.4/adodb/session/old/adodb-cryptsession.php
vtigercrm/branches/4.2.4/adodb/session/old/adodb-session-clob.php
vtigercrm/branches/4.2.4/adodb/session/old/adodb-session.php
vtigercrm/branches/4.2.4/adodb/tests/benchmark.php
vtigercrm/branches/4.2.4/adodb/tests/client.php
vtigercrm/branches/4.2.4/adodb/tests/test-datadict.php
vtigercrm/branches/4.2.4/adodb/tests/test-php5.php
vtigercrm/branches/4.2.4/adodb/tests/test-xmlschema.php
vtigercrm/branches/4.2.4/adodb/tests/test.php
vtigercrm/branches/4.2.4/adodb/tests/test3.php
vtigercrm/branches/4.2.4/adodb/tests/test4.php
vtigercrm/branches/4.2.4/adodb/tests/test5.php
vtigercrm/branches/4.2.4/adodb/tests/testcache.php
vtigercrm/branches/4.2.4/adodb/tests/testdatabases.inc.php
vtigercrm/branches/4.2.4/adodb/tests/testmssql.php
vtigercrm/branches/4.2.4/adodb/tests/testoci8.php
vtigercrm/branches/4.2.4/adodb/tests/testoci8cursor.php
vtigercrm/branches/4.2.4/adodb/tests/testpaging.php
vtigercrm/branches/4.2.4/adodb/tests/testpear.php
vtigercrm/branches/4.2.4/adodb/tests/testsessions.php
vtigercrm/branches/4.2.4/adodb/toexport.inc.php
vtigercrm/branches/4.2.4/adodb/tohtml.inc.php
vtigercrm/branches/4.2.4/adodb/xsl/convert-0.1-0.2.xsl
Modified: vtigercrm/branches/4.2.4/adodb/adodb-csvlib.inc.php
==============================================================================
--- vtigercrm/branches/4.2.4/adodb/adodb-csvlib.inc.php (original)
+++ vtigercrm/branches/4.2.4/adodb/adodb-csvlib.inc.php Thu May 4 17:47:05 2006
@@ -8,7 +8,7 @@
/*
- V4.72 21 Feb 2006 (c) 2000-2006 John Lim (jlim at natsoft.com.my). All rights reserved.
+ V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
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. See License.txt.
Modified: vtigercrm/branches/4.2.4/adodb/adodb-datadict.inc.php
==============================================================================
--- vtigercrm/branches/4.2.4/adodb/adodb-datadict.inc.php (original)
+++ vtigercrm/branches/4.2.4/adodb/adodb-datadict.inc.php Thu May 4 17:47:05 2006
@@ -1,6 +1,7 @@
<?php
+
/**
- V4.72 21 Feb 2006 (c) 2000-2006 John Lim (jlim at natsoft.com.my). All rights reserved.
+ V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
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.
@@ -256,27 +257,6 @@
return $this->NameQuote($name);
}
- // temporary for debuging vtiger - GS
-
- function println($msg)
- {
- require_once('include/logging.php');
- $log1 =& LoggerManager::getLogger('VT');
- if(is_array($msg))
- {
- $log1->fatal("Install ->".print_r($msg,true));
- }
- else
- {
- $log1->fatal("Install ->".$msg);
- }
- return $msg;
- }
-
-
-//----------------
-
-
// Executes the sql array returned by GetTableSQL and GetIndexSQL
function ExecuteSQLArray($sql, $continueOnError = true)
{
@@ -286,18 +266,10 @@
foreach($sql as $line) {
if ($this->debug) $conn->debug = true;
- $this->println($line);
$ok = $conn->Execute($line);
$conn->debug = $saved;
if (!$ok) {
- $this->println("Table Creation Error: Query Failed");
- $this->println(" ");
- if ($this->debug)
- {
-
- $this->println("InstallError: ".$conn->ErrorMsg());
- ADOConnection::outp($conn->ErrorMsg());
- }
+ if ($this->debug) ADOConnection::outp($conn->ErrorMsg());
if (!$continueOnError) return 0;
$rez = 1;
}
@@ -737,7 +709,7 @@
This function changes/adds new fields to your table. You don't
have to know if the col is new or not. It will check on its own.
*/
- function ChangeTableSQL($tablename, $flds, $tableoptions = false, $forceAlter = false) // GS Fix for constraint impl - forceAlter
+ function ChangeTableSQL($tablename, $flds, $tableoptions = false)
{
global $ADODB_FETCH_MODE;
@@ -754,7 +726,7 @@
if (isset($savem)) $this->connection->SetFetchMode($savem);
$ADODB_FETCH_MODE = $save;
- if ( $forceAlter == false && empty($cols)) { // GS Fix for constraint impl
+ if ( empty($cols)) {
return $this->CreateTableSQL($tablename, $flds, $tableoptions);
}
@@ -806,33 +778,7 @@
}
}
- // GS Fix for constraint impl -- start
- if($forceAlter == false) return $sql;
- $sqlarray = array();
-
- $alter .= implode(",\n", $sql);
- if (sizeof($pkey)>0) {
- $alter .= ",\n PRIMARY KEY (";
- $alter .= implode(", ",$pkey).")";
- }
-
- if (isset($tableoptions['CONSTRAINTS']))
- $alter .= "\n".$tableoptions['CONSTRAINTS'];
-
- if (isset($tableoptions[$this->upperName.'_CONSTRAINTS']))
- $alter .= "\n".$tableoptions[$this->upperName.'_CONSTRAINTS'];
-
- if (isset($tableoptions[$this->upperName])) $alter .= $tableoptions[$this->upperName];
- $sqlarray[] = $alter;
-
-
- $taboptions = $this->_Options($tableoptions);
- $tsql = $this->_Triggers($this->TableName($tablename),$taboptions);
- foreach($tsql as $s) $sqlarray[] = $s;
-
- // GS Fix for constraint impl -- end
-
- return $sqlarray;
+ return $sql;
}
} // class
?>
Modified: vtigercrm/branches/4.2.4/adodb/adodb-error.inc.php
==============================================================================
--- vtigercrm/branches/4.2.4/adodb/adodb-error.inc.php (original)
+++ vtigercrm/branches/4.2.4/adodb/adodb-error.inc.php Thu May 4 17:47:05 2006
@@ -1,6 +1,6 @@
<?php
/**
- * @version V4.72 21 Feb 2006 (c) 2000-2006 John Lim (jlim at natsoft.com.my). All rights reserved.
+ * @version V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
* 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.
Modified: vtigercrm/branches/4.2.4/adodb/adodb-errorhandler.inc.php
==============================================================================
--- vtigercrm/branches/4.2.4/adodb/adodb-errorhandler.inc.php (original)
+++ vtigercrm/branches/4.2.4/adodb/adodb-errorhandler.inc.php Thu May 4 17:47:05 2006
@@ -1,6 +1,6 @@
<?php
/**
- * @version V4.72 21 Feb 2006 (c) 2000-2006 John Lim (jlim at natsoft.com.my). All rights reserved.
+ * @version V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
* 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.
Modified: vtigercrm/branches/4.2.4/adodb/adodb-errorpear.inc.php
==============================================================================
--- vtigercrm/branches/4.2.4/adodb/adodb-errorpear.inc.php (original)
+++ vtigercrm/branches/4.2.4/adodb/adodb-errorpear.inc.php Thu May 4 17:47:05 2006
@@ -1,6 +1,6 @@
<?php
/**
- * @version V4.72 21 Feb 2006 (c) 2000-2006 John Lim (jlim at natsoft.com.my). All rights reserved.
+ * @version V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
* 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.
Modified: vtigercrm/branches/4.2.4/adodb/adodb-exceptions.inc.php
==============================================================================
--- vtigercrm/branches/4.2.4/adodb/adodb-exceptions.inc.php (original)
+++ vtigercrm/branches/4.2.4/adodb/adodb-exceptions.inc.php Thu May 4 17:47:05 2006
@@ -1,7 +1,7 @@
<?php
/**
- * @version V4.72 21 Feb 2006 (c) 2000-2006 John Lim (jlim at natsoft.com.my). All rights reserved.
+ * @version V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
* 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.
@@ -45,8 +45,10 @@
}
$this->dbms = $dbms;
- $this->host = $thisConnection->host;
- $this->database = $thisConnection->database;
+ if ($thisConnection) {
+ $this->host = $thisConnection->host;
+ $this->database = $thisConnection->database;
+ }
$this->fn = $fn;
$this->msg = $errmsg;
Modified: vtigercrm/branches/4.2.4/adodb/adodb-iterator.inc.php
==============================================================================
--- vtigercrm/branches/4.2.4/adodb/adodb-iterator.inc.php (original)
+++ vtigercrm/branches/4.2.4/adodb/adodb-iterator.inc.php Thu May 4 17:47:05 2006
@@ -1,7 +1,7 @@
<?php
/*
- V4.72 21 Feb 2006 (c) 2000-2006 John Lim (jlim at natsoft.com.my). All rights reserved.
+ V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
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.
@@ -81,4 +81,5 @@
}
}
+
?>
Modified: vtigercrm/branches/4.2.4/adodb/adodb-lib.inc.php
==============================================================================
--- vtigercrm/branches/4.2.4/adodb/adodb-lib.inc.php (original)
+++ vtigercrm/branches/4.2.4/adodb/adodb-lib.inc.php Thu May 4 17:47:05 2006
@@ -7,7 +7,7 @@
$ADODB_INCLUDED_LIB = 1;
/*
- @version V4.72 21 Feb 2006 (c) 2000-2006 John Lim (jlim\@natsoft.com.my). All rights reserved.
+ @version V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim\@natsoft.com.my). All rights reserved.
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. See License.txt.
Modified: vtigercrm/branches/4.2.4/adodb/adodb-pager.inc.php
==============================================================================
--- vtigercrm/branches/4.2.4/adodb/adodb-pager.inc.php (original)
+++ vtigercrm/branches/4.2.4/adodb/adodb-pager.inc.php Thu May 4 17:47:05 2006
@@ -1,7 +1,7 @@
<?php
/*
- V4.72 21 Feb 2006 (c) 2000-2006 John Lim (jlim at natsoft.com.my). All rights reserved.
+ V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
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.
Modified: vtigercrm/branches/4.2.4/adodb/adodb-pear.inc.php
==============================================================================
--- vtigercrm/branches/4.2.4/adodb/adodb-pear.inc.php (original)
+++ vtigercrm/branches/4.2.4/adodb/adodb-pear.inc.php Thu May 4 17:47:05 2006
@@ -1,6 +1,6 @@
<?php
/**
- * @version V4.72 21 Feb 2006 (c) 2000-2006 John Lim (jlim at natsoft.com.my). All rights reserved.
+ * @version V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
* 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.
Modified: vtigercrm/branches/4.2.4/adodb/adodb-perf.inc.php
==============================================================================
--- vtigercrm/branches/4.2.4/adodb/adodb-perf.inc.php (original)
+++ vtigercrm/branches/4.2.4/adodb/adodb-perf.inc.php Thu May 4 17:47:05 2006
@@ -1,6 +1,6 @@
<?php
/*
-V4.72 21 Feb 2006 (c) 2000-2006 John Lim (jlim at natsoft.com.my). All rights reserved.
+V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
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. See License.txt.
@@ -860,8 +860,11 @@
{
if (!$this->createTableSQL) return false;
+ $table = $this->table();
+ $sql = str_replace('adodb_logsql',$table,$this->createTableSQL);
+
$savelog = $this->conn->LogSQL(false);
- $ok = $this->conn->Execute($this->createTableSQL);
+ $ok = $this->conn->Execute($sql);
$this->conn->LogSQL($savelog);
return ($ok) ? true : false;
}
Modified: vtigercrm/branches/4.2.4/adodb/adodb-php4.inc.php
==============================================================================
--- vtigercrm/branches/4.2.4/adodb/adodb-php4.inc.php (original)
+++ vtigercrm/branches/4.2.4/adodb/adodb-php4.inc.php Thu May 4 17:47:05 2006
@@ -1,7 +1,7 @@
<?php
/*
- V4.72 21 Feb 2006 (c) 2000-2006 John Lim (jlim at natsoft.com.my). All rights reserved.
+ V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
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.
Modified: vtigercrm/branches/4.2.4/adodb/adodb-time.inc.php
==============================================================================
--- vtigercrm/branches/4.2.4/adodb/adodb-time.inc.php (original)
+++ vtigercrm/branches/4.2.4/adodb/adodb-time.inc.php Thu May 4 17:47:05 2006
@@ -241,6 +241,9 @@
CHANGELOG
+- 19 March 2006 0.24
+Changed strftime() locale detection, because some locales prepend the day of week to the date when %c is used.
+
- 10 Feb 2006 0.23
PHP5 compat: when we detect PHP5, the RFC2822 format for gmt 0000hrs is changed from -0000 to +0000.
In PHP4, we will still use -0000 for 100% compat with PHP4.
@@ -365,7 +368,7 @@
/*
Version Number
*/
-define('ADODB_DATE_VERSION',0.23);
+define('ADODB_DATE_VERSION',0.24);
/*
This code was originally for windows. But apparently this problem happens
@@ -1239,8 +1242,15 @@
}
if (empty($ADODB_DATE_LOCALE)) {
+ /*
$tstr = strtoupper(gmstrftime('%c',31366800)); // 30 Dec 1970, 1 am
$sep = substr($tstr,2,1);
+ $hasAM = strrpos($tstr,'M') !== false;
+ */
+ # see http://phplens.com/lens/lensforum/msgs.php?id=14865 for reasoning, and changelog for version 0.24
+ $dstr = gmstrftime('%x',31366800); // 30 Dec 1970, 1 am
+ $sep = substr($dstr,2,1);
+ $tstr = strtoupper(gmstrftime('%X',31366800)); // 30 Dec 1970, 1 am
$hasAM = strrpos($tstr,'M') !== false;
$ADODB_DATE_LOCALE = array();
Modified: vtigercrm/branches/4.2.4/adodb/adodb-xmlschema.inc.php
==============================================================================
--- vtigercrm/branches/4.2.4/adodb/adodb-xmlschema.inc.php (original)
+++ vtigercrm/branches/4.2.4/adodb/adodb-xmlschema.inc.php Thu May 4 17:47:05 2006
@@ -241,7 +241,6 @@
* @access private
*/
var $drop_field = array();
- var $alter; // GS Fix for constraint impl
/**
* Iniitializes a new table object.
@@ -252,11 +251,6 @@
function dbTable( &$parent, $attributes = NULL ) {
$this->parent =& $parent;
$this->name = $this->prefix($attributes['NAME']);
- // GS Fix for constraint impl
- if(isset($attributes['ALTER']))
- {
- $this->alter = $attributes['ALTER'];
- }
}
/**
@@ -329,12 +323,12 @@
if( isset( $this->current_field ) ) {
$this->addFieldOpt( $this->current_field, $this->currentElement, $cdata );
} else {
- $this->addTableOpt('CONSTRAINTS', $cdata ); // GS Fix for constraint impl
+ $this->addTableOpt( $cdata );
}
break;
// Table option
case 'OPT':
- $this->addTableOpt('mysql', $cdata ); // GS Fix for constraint impl
+ $this->addTableOpt( $cdata );
break;
default:
@@ -468,9 +462,8 @@
* @param string $opt Table option
* @return array Options
*/
- function addTableOpt($key, $opt ) { // GS Fix for constraint impl
- //$this->opts[] = $opt;
- $this->opts[$key] = $opt;
+ function addTableOpt( $opt ) {
+ $this->opts[] = $opt;
return $this->opts;
}
@@ -552,7 +545,7 @@
}
}
- if( empty( $legacy_fields ) && !isset($this->alter)) { // GS Fix for constraint impl
+ if( empty( $legacy_fields ) ) {
// Create the new table
$sql[] = $xmls->dict->CreateTableSQL( $this->name, $fldarray, $this->opts );
logMsg( end( $sql ), 'Generated CreateTableSQL' );
@@ -563,7 +556,7 @@
// Use ChangeTableSQL
case 'ALTER':
logMsg( 'Generated ChangeTableSQL (ALTERing table)' );
- $sql[] = $xmls->dict->ChangeTableSQL( $this->name, $fldarray, $this->opts, $this->alter ); // GS Fix for constraint impl
+ $sql[] = $xmls->dict->ChangeTableSQL( $this->name, $fldarray, $this->opts );
break;
case 'REPLACE':
logMsg( 'Doing upgrade REPLACE (testing)' );
@@ -2225,4 +2218,4 @@
echo '</pre>';
}
}
-?>
+?>
Modified: vtigercrm/branches/4.2.4/adodb/adodb.inc.php
==============================================================================
--- vtigercrm/branches/4.2.4/adodb/adodb.inc.php (original)
+++ vtigercrm/branches/4.2.4/adodb/adodb.inc.php Thu May 4 17:47:05 2006
@@ -14,7 +14,7 @@
/**
\mainpage
- @version V4.72 21 Feb 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+ @version V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
Released under both BSD license and Lesser GPL library license. You can choose which license
you prefer.
@@ -171,7 +171,7 @@
/**
* ADODB version as a string.
*/
- $ADODB_vers = 'V4.72 21 Feb 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved. Released BSD & LGPL.';
+ $ADODB_vers = 'V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved. Released BSD & LGPL.';
/**
* Determines whether recordset->RecordCount() is used.
@@ -314,7 +314,6 @@
var $_evalAll = false;
var $_affected = false;
var $_logsql = false;
-
/**
* Constructor
@@ -554,6 +553,7 @@
function q(&$s)
{
+ #if (!empty($this->qNull)) if ($s == 'null') return $s;
$s = $this->qstr($s,false);
}
@@ -865,7 +865,7 @@
{
if ($this->debug) {
global $ADODB_INCLUDED_LIB;
- if (empty($ADODB_INCLUDED_LIB)) include_once(ADODB_DIR.'/adodb-lib.inc.php');
+ if (empty($ADODB_INCLUDED_LIB)) include(ADODB_DIR.'/adodb-lib.inc.php');
$this->_queryID = _adodb_debug_execute($this, $sql,$inputarr);
} else {
$this->_queryID = @$this->_query($sql,$inputarr);
@@ -896,7 +896,6 @@
$rs->connection = &$this; // Pablo suggestion
$rs->Init();
if (is_array($sql)) $rs->sql = $sql[0];
- //New memory copy of input created here -mikefedyk
else $rs->sql = $sql;
if ($rs->_numOfRows <= 0) {
global $ADODB_COUNTRECS;
@@ -1463,7 +1462,7 @@
function Replace($table, $fieldArray, $keyCol, $autoQuote=false, $has_autoinc=false)
{
global $ADODB_INCLUDED_LIB;
- if (empty($ADODB_INCLUDED_LIB)) include_once(ADODB_DIR.'/adodb-lib.inc.php');
+ if (empty($ADODB_INCLUDED_LIB)) include(ADODB_DIR.'/adodb-lib.inc.php');
return _adodb_replace($this, $table, $fieldArray, $keyCol, $autoQuote, $has_autoinc);
}
@@ -1530,7 +1529,7 @@
}
global $ADODB_INCLUDED_CSV;
- if (empty($ADODB_INCLUDED_CSV)) include_once(ADODB_DIR.'/adodb-csvlib.inc.php');
+ if (empty($ADODB_INCLUDED_CSV)) include(ADODB_DIR.'/adodb-csvlib.inc.php');
$f = $this->_gencachename($sql.serialize($inputarr),false);
adodb_write_file($f,''); // is adodb_write_file needed?
@@ -1582,7 +1581,7 @@
}
global $ADODB_INCLUDED_CSV;
- if (empty($ADODB_INCLUDED_CSV)) include_once(ADODB_DIR.'/adodb-csvlib.inc.php');
+ if (empty($ADODB_INCLUDED_CSV)) include(ADODB_DIR.'/adodb-csvlib.inc.php');
$f = $this->_gencachename($sql.serialize($inputarr),false);
adodb_write_file($f,''); // is adodb_write_file needed?
@@ -1657,7 +1656,7 @@
$sqlparam = $sql;
global $ADODB_INCLUDED_CSV;
- if (empty($ADODB_INCLUDED_CSV)) include_once(ADODB_DIR.'/adodb-csvlib.inc.php');
+ if (empty($ADODB_INCLUDED_CSV)) include(ADODB_DIR.'/adodb-csvlib.inc.php');
$md5file = $this->_gencachename($sql.serialize($inputarr),true);
$err = '';
@@ -1788,7 +1787,7 @@
}
//********************************************************//
- if (empty($ADODB_INCLUDED_LIB)) include_once(ADODB_DIR.'/adodb-lib.inc.php');
+ if (empty($ADODB_INCLUDED_LIB)) include(ADODB_DIR.'/adodb-lib.inc.php');
return _adodb_getupdatesql($this,$rs,$arrFields,$forceUpdate,$magicq,$force);
}
@@ -1808,7 +1807,7 @@
$force = $ADODB_FORCE_TYPE;
}
- if (empty($ADODB_INCLUDED_LIB)) include_once(ADODB_DIR.'/adodb-lib.inc.php');
+ if (empty($ADODB_INCLUDED_LIB)) include(ADODB_DIR.'/adodb-lib.inc.php');
return _adodb_getinsertsql($this,$rs,$arrFields,$magicq,$force);
}
@@ -1958,6 +1957,48 @@
}
}
+ function &GetActiveRecordsClass($class, $table,$whereOrderBy=false,$bindarr=false, $primkeyArr=false)
+ {
+ global $_ADODB_ACTIVE_DBS;
+
+ $save = $this->SetFetchMode(ADODB_FETCH_NUM);
+ if (empty($whereOrderBy)) $whereOrderBy = '1=1';
+ $rows = $this->GetAll("select * from ".$table.' WHERE '.$whereOrderBy,$bindarr);
+ $this->SetFetchMode($save);
+
+ $false = false;
+
+ if ($rows === false) {
+ return $false;
+ }
+
+
+ if (!isset($_ADODB_ACTIVE_DBS)) {
+ include(ADODB_DIR.'/adodb-active-record.inc.php');
+ }
+ if (!class_exists($class)) {
+ ADOConnection::outp("Unknown class $class in GetActiveRcordsClass()");
+ return $false;
+ }
+ $arr = array();
+ foreach($rows as $row) {
+
+ $obj =& new $class($table,$primkeyArr,$this);
+ if ($obj->ErrorMsg()){
+ $this->_errorMsg = $obj->ErrorMsg();
+ return $false;
+ }
+ $obj->Set($row);
+ $arr[] =& $obj;
+ }
+ return $arr;
+ }
+
+ function &GetActiveRecords($table,$where=false,$bindarr=false,$primkeyArr=false)
+ {
+ $arr =& $this->GetActiveRecordsClass('ADODB_Active_Record', $table, $where, $bindarr, $primkeyArr);
+ return $arr;
+ }
/**
* Close Connection
@@ -2022,6 +2063,7 @@
return false;
}
+
/**
* @param ttype can either be 'VIEW' or 'TABLE' or false.
@@ -2422,7 +2464,7 @@
function &PageExecute($sql, $nrows, $page, $inputarr=false, $secs2cache=0)
{
global $ADODB_INCLUDED_LIB;
- if (empty($ADODB_INCLUDED_LIB)) include_once(ADODB_DIR.'/adodb-lib.inc.php');
+ if (empty($ADODB_INCLUDED_LIB)) include(ADODB_DIR.'/adodb-lib.inc.php');
if ($this->pageExecuteCountRows) $rs =& _adodb_pageexecute_all_rows($this, $sql, $nrows, $page, $inputarr, $secs2cache);
else $rs =& _adodb_pageexecute_no_last_page($this, $sql, $nrows, $page, $inputarr, $secs2cache);
return $rs;
@@ -2494,7 +2536,7 @@
//==============================================================================================
// DATE AND TIME FUNCTIONS
//==============================================================================================
- include_once(ADODB_DIR.'/adodb-time.inc.php');
+ if (!defined('ADODB_DATE_VERSION')) include(ADODB_DIR.'/adodb-time.inc.php');
//==============================================================================================
// CLASS ADORecordSet
@@ -2605,7 +2647,7 @@
$size=0, $selectAttr='',$compareFields0=true)
{
global $ADODB_INCLUDED_LIB;
- if (empty($ADODB_INCLUDED_LIB)) include_once(ADODB_DIR.'/adodb-lib.inc.php');
+ if (empty($ADODB_INCLUDED_LIB)) include(ADODB_DIR.'/adodb-lib.inc.php');
return _adodb_getmenu($this, $name,$defstr,$blank1stItem,$multiple,
$size, $selectAttr,$compareFields0);
}
@@ -2632,7 +2674,7 @@
$size=0, $selectAttr='')
{
global $ADODB_INCLUDED_LIB;
- if (empty($ADODB_INCLUDED_LIB)) include_once(ADODB_DIR.'/adodb-lib.inc.php');
+ if (empty($ADODB_INCLUDED_LIB)) include(ADODB_DIR.'/adodb-lib.inc.php');
return _adodb_getmenu_gp($this, $name,$defstr,$blank1stItem,$multiple,
$size, $selectAttr,false);
}
@@ -3147,6 +3189,7 @@
}
return $lnumrows;
}
+
/**
* @return the current row in the recordset. If at EOF, will return the last row. 0-based.
@@ -3878,7 +3921,6 @@
case 'oracle': $drivername = 'oci8'; break;
case 'access': if ($perf) $drivername = ''; break;
case 'db2' : break;
- case 'odbc_db2': $drivername = 'db2'; break;
case 'sapdb' : break;
default:
$drivername = 'generic';
@@ -3911,7 +3953,7 @@
$path = ADODB_DIR."/datadict/datadict-$drivername.inc.php";
if (!file_exists($path)) {
- ADOConnection::outp("Database driver '$path' not available");
+ ADOConnection::outp("Dictionary driver '$path' not available");
return $false;
}
include_once($path);
@@ -3957,7 +3999,7 @@
function adodb_backtrace($printOrArr=true,$levels=9999)
{
global $ADODB_INCLUDED_LIB;
- if (empty($ADODB_INCLUDED_LIB)) include_once(ADODB_DIR.'/adodb-lib.inc.php');
+ if (empty($ADODB_INCLUDED_LIB)) include(ADODB_DIR.'/adodb-lib.inc.php');
return _adodb_backtrace($printOrArr,$levels);
}
Modified: vtigercrm/branches/4.2.4/adodb/datadict/datadict-access.inc.php
==============================================================================
--- vtigercrm/branches/4.2.4/adodb/datadict/datadict-access.inc.php (original)
+++ vtigercrm/branches/4.2.4/adodb/datadict/datadict-access.inc.php Thu May 4 17:47:05 2006
@@ -1,7 +1,7 @@
<?php
/**
- V4.72 21 Feb 2006 (c) 2000-2006 John Lim (jlim at natsoft.com.my). All rights reserved.
+ V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
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.
Modified: vtigercrm/branches/4.2.4/adodb/datadict/datadict-db2.inc.php
==============================================================================
--- vtigercrm/branches/4.2.4/adodb/datadict/datadict-db2.inc.php (original)
+++ vtigercrm/branches/4.2.4/adodb/datadict/datadict-db2.inc.php Thu May 4 17:47:05 2006
@@ -1,7 +1,7 @@
<?php
/**
- V4.72 21 Feb 2006 (c) 2000-2006 John Lim (jlim at natsoft.com.my). All rights reserved.
+ V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
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.
Modified: vtigercrm/branches/4.2.4/adodb/datadict/datadict-firebird.inc.php
==============================================================================
--- vtigercrm/branches/4.2.4/adodb/datadict/datadict-firebird.inc.php (original)
+++ vtigercrm/branches/4.2.4/adodb/datadict/datadict-firebird.inc.php Thu May 4 17:47:05 2006
@@ -1,7 +1,7 @@
<?php
/**
- V4.72 21 Feb 2006 (c) 2000-2006 John Lim (jlim at natsoft.com.my). All rights reserved.
+ V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
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.
Modified: vtigercrm/branches/4.2.4/adodb/datadict/datadict-generic.inc.php
==============================================================================
--- vtigercrm/branches/4.2.4/adodb/datadict/datadict-generic.inc.php (original)
+++ vtigercrm/branches/4.2.4/adodb/datadict/datadict-generic.inc.php Thu May 4 17:47:05 2006
@@ -1,7 +1,7 @@
<?php
/**
- V4.72 21 Feb 2006 (c) 2000-2006 John Lim (jlim at natsoft.com.my). All rights reserved.
+ V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
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.
Modified: vtigercrm/branches/4.2.4/adodb/datadict/datadict-ibase.inc.php
==============================================================================
--- vtigercrm/branches/4.2.4/adodb/datadict/datadict-ibase.inc.php (original)
+++ vtigercrm/branches/4.2.4/adodb/datadict/datadict-ibase.inc.php Thu May 4 17:47:05 2006
@@ -1,7 +1,7 @@
<?php
/**
- V4.72 21 Feb 2006 (c) 2000-2006 John Lim (jlim at natsoft.com.my). All rights reserved.
+ V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
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.
Modified: vtigercrm/branches/4.2.4/adodb/datadict/datadict-informix.inc.php
==============================================================================
--- vtigercrm/branches/4.2.4/adodb/datadict/datadict-informix.inc.php (original)
+++ vtigercrm/branches/4.2.4/adodb/datadict/datadict-informix.inc.php Thu May 4 17:47:05 2006
@@ -1,7 +1,7 @@
<?php
/**
- V4.72 21 Feb 2006 (c) 2000-2006 John Lim (jlim at natsoft.com.my). All rights reserved.
+ V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
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.
Modified: vtigercrm/branches/4.2.4/adodb/datadict/datadict-mssql.inc.php
==============================================================================
--- vtigercrm/branches/4.2.4/adodb/datadict/datadict-mssql.inc.php (original)
+++ vtigercrm/branches/4.2.4/adodb/datadict/datadict-mssql.inc.php Thu May 4 17:47:05 2006
@@ -1,13 +1,41 @@
<?php
/**
- V4.72 21 Feb 2006 (c) 2000-2006 John Lim (jlim at natsoft.com.my). All rights reserved.
+ V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
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.
+*/
+
+/*
+In ADOdb, named quotes for MS SQL Server use ". From the MSSQL Docs:
+
+ Note Delimiters are for identifiers only. Delimiters cannot be used for keywords,
+ whether or not they are marked as reserved in SQL Server.
+
+ Quoted identifiers are delimited by double quotation marks ("):
+ SELECT * FROM "Blanks in Table Name"
+
+ Bracketed identifiers are delimited by brackets ([ ]):
+ SELECT * FROM [Blanks In Table Name]
+
+ Quoted identifiers are valid only when the QUOTED_IDENTIFIER option is set to ON. By default,
+ the Microsoft OLE DB Provider for SQL Server and SQL Server ODBC driver set QUOTED_IDENTIFIER ON
+ when they connect.
+
+ In Transact-SQL, the option can be set at various levels using SET QUOTED_IDENTIFIER,
+ the quoted identifier option of sp_dboption, or the user options option of sp_configure.
+
+ When SET ANSI_DEFAULTS is ON, SET QUOTED_IDENTIFIER is enabled.
+
+ Syntax
+
+ SET QUOTED_IDENTIFIER { ON | OFF }
+
+
*/
// security - hide paths
Modified: vtigercrm/branches/4.2.4/adodb/datadict/datadict-mysql.inc.php
==============================================================================
--- vtigercrm/branches/4.2.4/adodb/datadict/datadict-mysql.inc.php (original)
+++ vtigercrm/branches/4.2.4/adodb/datadict/datadict-mysql.inc.php Thu May 4 17:47:05 2006
@@ -1,7 +1,7 @@
<?php
/**
- V4.72 21 Feb 2006 (c) 2000-2006 John Lim (jlim at natsoft.com.my). All rights reserved.
+ V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
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.
Modified: vtigercrm/branches/4.2.4/adodb/datadict/datadict-oci8.inc.php
==============================================================================
--- vtigercrm/branches/4.2.4/adodb/datadict/datadict-oci8.inc.php (original)
+++ vtigercrm/branches/4.2.4/adodb/datadict/datadict-oci8.inc.php Thu May 4 17:47:05 2006
@@ -1,7 +1,7 @@
<?php
/**
- V4.72 21 Feb 2006 (c) 2000-2006 John Lim (jlim at natsoft.com.my). All rights reserved.
+ V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
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.
Modified: vtigercrm/branches/4.2.4/adodb/datadict/datadict-postgres.inc.php
==============================================================================
--- vtigercrm/branches/4.2.4/adodb/datadict/datadict-postgres.inc.php (original)
+++ vtigercrm/branches/4.2.4/adodb/datadict/datadict-postgres.inc.php Thu May 4 17:47:05 2006
@@ -1,7 +1,7 @@
<?php
/**
- V4.72 21 Feb 2006 (c) 2000-2006 John Lim (jlim at natsoft.com.my). All rights reserved.
+ V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
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.
Modified: vtigercrm/branches/4.2.4/adodb/datadict/datadict-sapdb.inc.php
==============================================================================
--- vtigercrm/branches/4.2.4/adodb/datadict/datadict-sapdb.inc.php (original)
+++ vtigercrm/branches/4.2.4/adodb/datadict/datadict-sapdb.inc.php Thu May 4 17:47:05 2006
@@ -1,7 +1,7 @@
<?php
/**
- V4.50 6 July 2004 (c) 2000-2006 John Lim (jlim at natsoft.com.my). All rights reserved.
+ V4.50 6 July 2004 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
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.
Modified: vtigercrm/branches/4.2.4/adodb/datadict/datadict-sybase.inc.php
==============================================================================
--- vtigercrm/branches/4.2.4/adodb/datadict/datadict-sybase.inc.php (original)
+++ vtigercrm/branches/4.2.4/adodb/datadict/datadict-sybase.inc.php Thu May 4 17:47:05 2006
@@ -1,7 +1,7 @@
<?php
/**
- V4.72 21 Feb 2006 (c) 2000-2006 John Lim (jlim at natsoft.com.my). All rights reserved.
+ V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
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.
Modified: vtigercrm/branches/4.2.4/adodb/drivers/adodb-access.inc.php
==============================================================================
--- vtigercrm/branches/4.2.4/adodb/drivers/adodb-access.inc.php (original)
+++ vtigercrm/branches/4.2.4/adodb/drivers/adodb-access.inc.php Thu May 4 17:47:05 2006
@@ -1,6 +1,6 @@
<?php
/*
-V4.72 21 Feb 2006 (c) 2000-2006 John Lim (jlim at natsoft.com.my). All rights reserved.
+V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
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. See License.txt.
Modified: vtigercrm/branches/4.2.4/adodb/drivers/adodb-ado.inc.php
==============================================================================
--- vtigercrm/branches/4.2.4/adodb/drivers/adodb-ado.inc.php (original)
+++ vtigercrm/branches/4.2.4/adodb/drivers/adodb-ado.inc.php Thu May 4 17:47:05 2006
@@ -1,6 +1,6 @@
<?php
/*
-V4.72 21 Feb 2006 (c) 2000-2006 John Lim (jlim at natsoft.com.my). All rights reserved.
+V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
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.
@@ -263,6 +263,7 @@
$this->transCnt += 1;
return true;
}
+
function CommitTrans($ok=true)
{
if (!$ok) return $this->RollbackTrans();
@@ -283,7 +284,9 @@
function ErrorMsg()
{
+ if (!$this->_connectionID) return "No connection established";
$errc = $this->_connectionID->Errors;
+ if (!$errc) return "No Errors object found";
if ($errc->Count == 0) return '';
$err = $errc->Item($errc->Count-1);
return $err->Description;
Modified: vtigercrm/branches/4.2.4/adodb/drivers/adodb-ado5.inc.php
==============================================================================
--- vtigercrm/branches/4.2.4/adodb/drivers/adodb-ado5.inc.php (original)
+++ vtigercrm/branches/4.2.4/adodb/drivers/adodb-ado5.inc.php Thu May 4 17:47:05 2006
@@ -1,6 +1,6 @@
<?php
/*
-V4.72 21 Feb 2006 (c) 2000-2006 John Lim (jlim at natsoft.com.my). All rights reserved.
+V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
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.
@@ -216,6 +216,9 @@
$dbc = $this->_connectionID;
// return rs
+
+ $false = false;
+
if ($inputarr) {
if (!empty($this->charPage))
@@ -236,22 +239,24 @@
$p = false;
$rs = $oCmd->Execute();
$e = $dbc->Errors;
- if ($dbc->Errors->Count > 0) return false;
+ if ($dbc->Errors->Count > 0) return $false;
return $rs;
}
$rs = @$dbc->Execute($sql,$this->_affectedRows, $this->_execute_option);
- if ($dbc->Errors->Count > 0) return false;
- if (! $rs) return false;
-
- if ($rs->State == 0) return true; // 0 = adStateClosed means no records returned
- return $rs;
+ if ($dbc->Errors->Count > 0) return $false;
+ if (! $rs) return $false;
+
+ if ($rs->State == 0) {
+ $true = true;
+ return $true; // 0 = adStateClosed means no records returned
+ } return $rs;
} catch (exception $e) {
}
- return false;
+ return $false;
}
@@ -290,7 +295,9 @@
function ErrorMsg()
{
+ if (!$this->_connectionID) return "No connection established";
$errc = $this->_connectionID->Errors;
+ if (!$errc) return "No Errors object found";
if ($errc->Count == 0) return '';
$err = $errc->Item($errc->Count-1);
return $err->Description;
Modified: vtigercrm/branches/4.2.4/adodb/drivers/adodb-ado_access.inc.php
==============================================================================
--- vtigercrm/branches/4.2.4/adodb/drivers/adodb-ado_access.inc.php (original)
+++ vtigercrm/branches/4.2.4/adodb/drivers/adodb-ado_access.inc.php Thu May 4 17:47:05 2006
@@ -1,6 +1,6 @@
<?php
/*
-V4.72 21 Feb 2006 (c) 2000-2006 John Lim (jlim at natsoft.com.my). All rights reserved.
+V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
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. See License.txt.
Modified: vtigercrm/branches/4.2.4/adodb/drivers/adodb-ado_mssql.inc.php
==============================================================================
--- vtigercrm/branches/4.2.4/adodb/drivers/adodb-ado_mssql.inc.php (original)
+++ vtigercrm/branches/4.2.4/adodb/drivers/adodb-ado_mssql.inc.php Thu May 4 17:47:05 2006
@@ -1,6 +1,6 @@
<?php
/*
-V4.72 21 Feb 2006 (c) 2000-2006 John Lim (jlim at natsoft.com.my). All rights reserved.
+V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
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.
Modified: vtigercrm/branches/4.2.4/adodb/drivers/adodb-borland_ibase.inc.php
==============================================================================
--- vtigercrm/branches/4.2.4/adodb/drivers/adodb-borland_ibase.inc.php (original)
+++ vtigercrm/branches/4.2.4/adodb/drivers/adodb-borland_ibase.inc.php Thu May 4 17:47:05 2006
@@ -1,6 +1,6 @@
<?php
/*
-V4.72 21 Feb 2006 (c) 2000-2006 John Lim (jlim at natsoft.com.my). All rights reserved.
+V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
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.
Modified: vtigercrm/branches/4.2.4/adodb/drivers/adodb-csv.inc.php
==============================================================================
--- vtigercrm/branches/4.2.4/adodb/drivers/adodb-csv.inc.php (original)
+++ vtigercrm/branches/4.2.4/adodb/drivers/adodb-csv.inc.php Thu May 4 17:47:05 2006
@@ -1,6 +1,6 @@
<?php
/*
-V4.72 21 Feb 2006 (c) 2000-2006 John Lim (jlim at natsoft.com.my). All rights reserved.
+V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
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.
Modified: vtigercrm/branches/4.2.4/adodb/drivers/adodb-db2.inc.php
==============================================================================
--- vtigercrm/branches/4.2.4/adodb/drivers/adodb-db2.inc.php (original)
+++ vtigercrm/branches/4.2.4/adodb/drivers/adodb-db2.inc.php Thu May 4 17:47:05 2006
@@ -1,6 +1,6 @@
<?php
/*
- V4.72 21 Feb 2006 (c) 2006 John Lim (jlim at natsoft.com.my). All rights reserved.
+ V4.81 3 May 2006 (c) 2006 John Lim (jlim#natsoft.com.my). All rights reserved.
This is a version of the ADODB driver for DB2. It uses the 'ibm_db2' PECL extension for PHP
(http://pecl.php.net/package/ibm_db2), which in turn requires DB2 V8.2.2.
Modified: vtigercrm/branches/4.2.4/adodb/drivers/adodb-fbsql.inc.php
==============================================================================
--- vtigercrm/branches/4.2.4/adodb/drivers/adodb-fbsql.inc.php (original)
+++ vtigercrm/branches/4.2.4/adodb/drivers/adodb-fbsql.inc.php Thu May 4 17:47:05 2006
@@ -1,6 +1,6 @@
<?php
/*
- @version V4.72 21 Feb 2006 (c) 2000-2006 John Lim (jlim at natsoft.com.my). All rights reserved.
+ @version V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
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.
Modified: vtigercrm/branches/4.2.4/adodb/drivers/adodb-firebird.inc.php
==============================================================================
--- vtigercrm/branches/4.2.4/adodb/drivers/adodb-firebird.inc.php (original)
+++ vtigercrm/branches/4.2.4/adodb/drivers/adodb-firebird.inc.php Thu May 4 17:47:05 2006
@@ -1,6 +1,6 @@
<?php
/*
-V4.72 21 Feb 2006 (c) 2000-2006 John Lim (jlim at natsoft.com.my). All rights reserved.
+V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
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.
Modified: vtigercrm/branches/4.2.4/adodb/drivers/adodb-ibase.inc.php
==============================================================================
--- vtigercrm/branches/4.2.4/adodb/drivers/adodb-ibase.inc.php (original)
+++ vtigercrm/branches/4.2.4/adodb/drivers/adodb-ibase.inc.php Thu May 4 17:47:05 2006
@@ -1,6 +1,6 @@
<?php
/*
-V4.72 21 Feb 2006 (c) 2000-2006 John Lim (jlim at natsoft.com.my). All rights reserved.
+V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
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.
@@ -558,7 +558,7 @@
// still used to auto-decode all blob's
function _BlobDecode( $blob )
{
- $blobid = ibase_blob_open( $blob );
+ $blobid = ibase_blob_open($this->_connectionID, $blob );
$realblob = ibase_blob_get( $blobid,$this->maxblobsize); // 2nd param is max size of blob -- Kevin Boillet <kevinboillet at yahoo.fr>
while($string = ibase_blob_get($blobid, 8192)){
$realblob .= $string;
Modified: vtigercrm/branches/4.2.4/adodb/drivers/adodb-informix.inc.php
==============================================================================
--- vtigercrm/branches/4.2.4/adodb/drivers/adodb-informix.inc.php (original)
+++ vtigercrm/branches/4.2.4/adodb/drivers/adodb-informix.inc.php Thu May 4 17:47:05 2006
@@ -1,6 +1,6 @@
<?php
/**
-* @version V4.72 21 Feb 2006 (c) 2000-2006 John Lim (jlim at natsoft.com.my). All rights reserved.
+* @version V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
* 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.
@@ -22,6 +22,11 @@
var $databaseType = "informix";
var $hasTop = 'FIRST';
var $ansiOuter = true;
+
+ function IfNull( $field, $ifNull )
+ {
+ return " NVL($field, $ifNull) "; // if Informix 9.X or 10.X
+ }
}
class ADORecordset_informix extends ADORecordset_informix72 {
Modified: vtigercrm/branches/4.2.4/adodb/drivers/adodb-informix72.inc.php
==============================================================================
--- vtigercrm/branches/4.2.4/adodb/drivers/adodb-informix72.inc.php (original)
+++ vtigercrm/branches/4.2.4/adodb/drivers/adodb-informix72.inc.php Thu May 4 17:47:05 2006
@@ -1,6 +1,6 @@
<?php
/*
-V4.72 21 Feb 2006 (c) 2000-2006 John Lim. All rights reserved.
+V4.81 3 May 2006 (c) 2000-2006 John Lim. All rights reserved.
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.
Modified: vtigercrm/branches/4.2.4/adodb/drivers/adodb-ldap.inc.php
==============================================================================
--- vtigercrm/branches/4.2.4/adodb/drivers/adodb-ldap.inc.php (original)
+++ vtigercrm/branches/4.2.4/adodb/drivers/adodb-ldap.inc.php Thu May 4 17:47:05 2006
@@ -1,6 +1,6 @@
<?php
/*
- V4.72 21 Feb 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+ V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
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.
Modified: vtigercrm/branches/4.2.4/adodb/drivers/adodb-mssql.inc.php
==============================================================================
--- vtigercrm/branches/4.2.4/adodb/drivers/adodb-mssql.inc.php (original)
+++ vtigercrm/branches/4.2.4/adodb/drivers/adodb-mssql.inc.php Thu May 4 17:47:05 2006
@@ -1,6 +1,6 @@
<?php
/*
-V4.72 21 Feb 2006 (c) 2000-2006 John Lim (jlim at natsoft.com.my). All rights reserved.
+V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
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.
Modified: vtigercrm/branches/4.2.4/adodb/drivers/adodb-mssqlpo.inc.php
==============================================================================
--- vtigercrm/branches/4.2.4/adodb/drivers/adodb-mssqlpo.inc.php (original)
+++ vtigercrm/branches/4.2.4/adodb/drivers/adodb-mssqlpo.inc.php Thu May 4 17:47:05 2006
@@ -1,6 +1,6 @@
<?php
/**
-* @version V4.72 21 Feb 2006 (c) 2000-2006 John Lim (jlim at natsoft.com.my). All rights reserved.
+* @version V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
* 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.
Modified: vtigercrm/branches/4.2.4/adodb/drivers/adodb-mysql.inc.php
==============================================================================
--- vtigercrm/branches/4.2.4/adodb/drivers/adodb-mysql.inc.php (original)
+++ vtigercrm/branches/4.2.4/adodb/drivers/adodb-mysql.inc.php Thu May 4 17:47:05 2006
@@ -1,6 +1,6 @@
<?php
/*
-V4.72 21 Feb 2006 (c) 2000-2006 John Lim (jlim at natsoft.com.my). All rights reserved.
+V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
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.
@@ -38,6 +38,7 @@
var $clientFlags = 0;
var $substr = "substring";
var $nameQuote = '`'; /// string to use to quote identifiers and names
+ var $compat323 = false; // true if compat with mysql 3.23
function ADODB_mysql()
{
@@ -156,7 +157,7 @@
function GetOne($sql,$inputarr=false)
{
- if (strncasecmp($sql,'sele',4) == 0) {
+ if ($this->compat323 == false && strncasecmp($sql,'sele',4) == 0) {
$rs =& $this->SelectLimit($sql,1,-1,$inputarr);
if ($rs) {
$rs->Close();
@@ -636,8 +637,8 @@
function &GetRowAssoc($upper=true)
{
- if ($this->fetchMode == MYSQL_ASSOC && !$upper) return $this->fields;
- $row =& ADORecordSet::GetRowAssoc($upper);
+ if ($this->fetchMode == MYSQL_ASSOC && !$upper) $row = $this->fields;
+ else $row =& ADORecordSet::GetRowAssoc($upper);
return $row;
}
Modified: vtigercrm/branches/4.2.4/adodb/drivers/adodb-mysqli.inc.php
==============================================================================
--- vtigercrm/branches/4.2.4/adodb/drivers/adodb-mysqli.inc.php (original)
+++ vtigercrm/branches/4.2.4/adodb/drivers/adodb-mysqli.inc.php Thu May 4 17:47:05 2006
@@ -1,6 +1,6 @@
<?php
/*
-V4.72 21 Feb 2006 (c) 2000-2006 John Lim (jlim at natsoft.com.my). All rights reserved.
+V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
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.
@@ -680,7 +680,7 @@
function GetCharSet()
{
//we will use ADO's builtin property charSet
- if (!is_callable($this->_connectionID,'character_set_name'))
+ if (!method_exists($this->_connectionID,'character_set_name'))
return false;
$this->charSet = @$this->_connectionID->character_set_name();
@@ -694,7 +694,7 @@
// SetCharSet - switch the client encoding
function SetCharSet($charset_name)
{
- if (!is_callable($this->_connectionID,'set_charset'))
+ if (!method_exists($this->_connectionID,'set_charset'))
return false;
if ($this->charSet !== $charset_name) {
Modified: vtigercrm/branches/4.2.4/adodb/drivers/adodb-mysqlt.inc.php
==============================================================================
--- vtigercrm/branches/4.2.4/adodb/drivers/adodb-mysqlt.inc.php (original)
+++ vtigercrm/branches/4.2.4/adodb/drivers/adodb-mysqlt.inc.php Thu May 4 17:47:05 2006
@@ -1,7 +1,7 @@
<?php
/*
-V4.72 21 Feb 2006 (c) 2000-2006 John Lim (jlim at natsoft.com.my). All rights reserved.
+V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
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.
Modified: vtigercrm/branches/4.2.4/adodb/drivers/adodb-netezza.inc.php
==============================================================================
--- vtigercrm/branches/4.2.4/adodb/drivers/adodb-netezza.inc.php (original)
+++ vtigercrm/branches/4.2.4/adodb/drivers/adodb-netezza.inc.php Thu May 4 17:47:05 2006
@@ -1,6 +1,6 @@
<?php
/*
- V4.72 21 Feb 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+ V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
First cut at the Netezza Driver by Josh Eldridge joshuae74#hotmail.com
Based on the previous postgres drivers.
Modified: vtigercrm/branches/4.2.4/adodb/drivers/adodb-oci8.inc.php
==============================================================================
--- vtigercrm/branches/4.2.4/adodb/drivers/adodb-oci8.inc.php (original)
+++ vtigercrm/branches/4.2.4/adodb/drivers/adodb-oci8.inc.php Thu May 4 17:47:05 2006
@@ -1,7 +1,7 @@
<?php
/*
- version V4.72 21 Feb 2006 (c) 2000-2006 John Lim. All rights reserved.
+ version V4.81 3 May 2006 (c) 2000-2006 John Lim. All rights reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
Modified: vtigercrm/branches/4.2.4/adodb/drivers/adodb-oci805.inc.php
==============================================================================
--- vtigercrm/branches/4.2.4/adodb/drivers/adodb-oci805.inc.php (original)
+++ vtigercrm/branches/4.2.4/adodb/drivers/adodb-oci805.inc.php Thu May 4 17:47:05 2006
@@ -1,6 +1,6 @@
<?php
/**
- * @version V4.72 21 Feb 2006 (c) 2000-2006 John Lim (jlim at natsoft.com.my). All rights reserved.
+ * @version V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
* 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.
Modified: vtigercrm/branches/4.2.4/adodb/drivers/adodb-oci8po.inc.php
==============================================================================
--- vtigercrm/branches/4.2.4/adodb/drivers/adodb-oci8po.inc.php (original)
+++ vtigercrm/branches/4.2.4/adodb/drivers/adodb-oci8po.inc.php Thu May 4 17:47:05 2006
@@ -1,6 +1,6 @@
<?php
/*
-V4.72 21 Feb 2006 (c) 2000-2006 John Lim. All rights reserved.
+V4.81 3 May 2006 (c) 2000-2006 John Lim. All rights reserved.
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.
Modified: vtigercrm/branches/4.2.4/adodb/drivers/adodb-odbc.inc.php
==============================================================================
--- vtigercrm/branches/4.2.4/adodb/drivers/adodb-odbc.inc.php (original)
+++ vtigercrm/branches/4.2.4/adodb/drivers/adodb-odbc.inc.php Thu May 4 17:47:05 2006
@@ -1,6 +1,6 @@
<?php
/*
-V4.72 21 Feb 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
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.
Modified: vtigercrm/branches/4.2.4/adodb/drivers/adodb-odbc_db2.inc.php
==============================================================================
--- vtigercrm/branches/4.2.4/adodb/drivers/adodb-odbc_db2.inc.php (original)
+++ vtigercrm/branches/4.2.4/adodb/drivers/adodb-odbc_db2.inc.php Thu May 4 17:47:05 2006
@@ -1,6 +1,6 @@
<?php
/*
-V4.72 21 Feb 2006 (c) 2000-2006 John Lim (jlim at natsoft.com.my). All rights reserved.
+V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
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.
Modified: vtigercrm/branches/4.2.4/adodb/drivers/adodb-odbc_mssql.inc.php
==============================================================================
--- vtigercrm/branches/4.2.4/adodb/drivers/adodb-odbc_mssql.inc.php (original)
+++ vtigercrm/branches/4.2.4/adodb/drivers/adodb-odbc_mssql.inc.php Thu May 4 17:47:05 2006
@@ -1,6 +1,6 @@
<?php
/*
-V4.72 21 Feb 2006 (c) 2000-2006 John Lim (jlim at natsoft.com.my). All rights reserved.
+V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
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.
Modified: vtigercrm/branches/4.2.4/adodb/drivers/adodb-odbc_oracle.inc.php
==============================================================================
--- vtigercrm/branches/4.2.4/adodb/drivers/adodb-odbc_oracle.inc.php (original)
+++ vtigercrm/branches/4.2.4/adodb/drivers/adodb-odbc_oracle.inc.php Thu May 4 17:47:05 2006
@@ -1,6 +1,6 @@
<?php
/*
-V4.72 21 Feb 2006 (c) 2000-2006 John Lim (jlim at natsoft.com.my). All rights reserved.
+V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
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.
Modified: vtigercrm/branches/4.2.4/adodb/drivers/adodb-odbtp.inc.php
==============================================================================
--- vtigercrm/branches/4.2.4/adodb/drivers/adodb-odbtp.inc.php (original)
+++ vtigercrm/branches/4.2.4/adodb/drivers/adodb-odbtp.inc.php Thu May 4 17:47:05 2006
@@ -1,6 +1,6 @@
<?php
/*
- V4.72 21 Feb 2006 (c) 2000-2006 John Lim (jlim at natsoft.com.my). All rights reserved.
+ V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
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. See License.txt.
Modified: vtigercrm/branches/4.2.4/adodb/drivers/adodb-odbtp_unicode.inc.php
==============================================================================
--- vtigercrm/branches/4.2.4/adodb/drivers/adodb-odbtp_unicode.inc.php (original)
+++ vtigercrm/branches/4.2.4/adodb/drivers/adodb-odbtp_unicode.inc.php Thu May 4 17:47:05 2006
@@ -1,6 +1,6 @@
<?php
/*
- V4.72 21 Feb 2006 (c) 2000-2006 John Lim (jlim at natsoft.com.my). All rights reserved.
+ V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
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. See License.txt.
Modified: vtigercrm/branches/4.2.4/adodb/drivers/adodb-oracle.inc.php
==============================================================================
--- vtigercrm/branches/4.2.4/adodb/drivers/adodb-oracle.inc.php (original)
+++ vtigercrm/branches/4.2.4/adodb/drivers/adodb-oracle.inc.php Thu May 4 17:47:05 2006
@@ -1,6 +1,6 @@
<?php
/*
-V4.72 21 Feb 2006 (c) 2000-2006 John Lim (jlim at natsoft.com.my). All rights reserved.
+V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
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.
Modified: vtigercrm/branches/4.2.4/adodb/drivers/adodb-pdo.inc.php
==============================================================================
--- vtigercrm/branches/4.2.4/adodb/drivers/adodb-pdo.inc.php (original)
+++ vtigercrm/branches/4.2.4/adodb/drivers/adodb-pdo.inc.php Thu May 4 17:47:05 2006
@@ -1,6 +1,6 @@
<?php
/*
-V4.72 21 Feb 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
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.
Modified: vtigercrm/branches/4.2.4/adodb/drivers/adodb-pdo_mssql.inc.php
==============================================================================
--- vtigercrm/branches/4.2.4/adodb/drivers/adodb-pdo_mssql.inc.php (original)
+++ vtigercrm/branches/4.2.4/adodb/drivers/adodb-pdo_mssql.inc.php Thu May 4 17:47:05 2006
@@ -2,7 +2,7 @@
/*
-V4.72 21 Feb 2006 (c) 2000-2006 John Lim (jlim at natsoft.com.my). All rights reserved.
+V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
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.
Modified: vtigercrm/branches/4.2.4/adodb/drivers/adodb-pdo_mysql.inc.php
==============================================================================
--- vtigercrm/branches/4.2.4/adodb/drivers/adodb-pdo_mysql.inc.php (original)
+++ vtigercrm/branches/4.2.4/adodb/drivers/adodb-pdo_mysql.inc.php Thu May 4 17:47:05 2006
@@ -2,7 +2,7 @@
/*
-V4.72 21 Feb 2006 (c) 2000-2006 John Lim (jlim at natsoft.com.my). All rights reserved.
+V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
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.
Modified: vtigercrm/branches/4.2.4/adodb/drivers/adodb-pdo_oci.inc.php
==============================================================================
--- vtigercrm/branches/4.2.4/adodb/drivers/adodb-pdo_oci.inc.php (original)
+++ vtigercrm/branches/4.2.4/adodb/drivers/adodb-pdo_oci.inc.php Thu May 4 17:47:05 2006
@@ -2,7 +2,7 @@
/*
-V4.72 21 Feb 2006 (c) 2000-2006 John Lim (jlim at natsoft.com.my). All rights reserved.
+V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
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.
Modified: vtigercrm/branches/4.2.4/adodb/drivers/adodb-pdo_pgsql.inc.php
==============================================================================
--- vtigercrm/branches/4.2.4/adodb/drivers/adodb-pdo_pgsql.inc.php (original)
+++ vtigercrm/branches/4.2.4/adodb/drivers/adodb-pdo_pgsql.inc.php Thu May 4 17:47:05 2006
@@ -1,7 +1,7 @@
<?php
/*
-V4.72 21 Feb 2006 (c) 2000-2006 John Lim (jlim at natsoft.com.my). All rights reserved.
+V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
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.
Modified: vtigercrm/branches/4.2.4/adodb/drivers/adodb-postgres.inc.php
==============================================================================
--- vtigercrm/branches/4.2.4/adodb/drivers/adodb-postgres.inc.php (original)
+++ vtigercrm/branches/4.2.4/adodb/drivers/adodb-postgres.inc.php Thu May 4 17:47:05 2006
@@ -1,6 +1,6 @@
<?php
/*
- V4.72 21 Feb 2006 (c) 2000-2006 John Lim (jlim at natsoft.com.my). All rights reserved.
+ V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
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.
Modified: vtigercrm/branches/4.2.4/adodb/drivers/adodb-postgres64.inc.php
==============================================================================
--- vtigercrm/branches/4.2.4/adodb/drivers/adodb-postgres64.inc.php (original)
+++ vtigercrm/branches/4.2.4/adodb/drivers/adodb-postgres64.inc.php Thu May 4 17:47:05 2006
@@ -1,6 +1,6 @@
<?php
/*
- V4.72 21 Feb 2006 (c) 2000-2006 John Lim (jlim at natsoft.com.my). All rights reserved.
+ V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
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.
@@ -161,7 +161,7 @@
}
// I get this error with PHP before 4.0.6 - jlim
-// Warning: This compilation does not support pg_cmdtuples() in d:/inetpub/wwwroot/php/adodb/adodb-postgres.inc.php on line 44
+// Warning: This compilation does not support pg_cmdtuples() in adodb-postgres.inc.php on line 44
function _affectedrows()
{
if (!is_resource($this->_resultid) || get_resource_type($this->_resultid) !== 'pgsql result') return false;
Modified: vtigercrm/branches/4.2.4/adodb/drivers/adodb-postgres7.inc.php
==============================================================================
--- vtigercrm/branches/4.2.4/adodb/drivers/adodb-postgres7.inc.php (original)
+++ vtigercrm/branches/4.2.4/adodb/drivers/adodb-postgres7.inc.php Thu May 4 17:47:05 2006
@@ -1,6 +1,6 @@
<?php
/*
- V4.72 21 Feb 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+ V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
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.
Modified: vtigercrm/branches/4.2.4/adodb/drivers/adodb-postgres8.inc.php
==============================================================================
--- vtigercrm/branches/4.2.4/adodb/drivers/adodb-postgres8.inc.php (original)
+++ vtigercrm/branches/4.2.4/adodb/drivers/adodb-postgres8.inc.php Thu May 4 17:47:05 2006
@@ -1,6 +1,6 @@
<?php
/*
- V4.72 21 Feb 2006 (c) 2000-2006 John Lim (jlim at natsoft.com.my). All rights reserved.
+ V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
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.
Modified: vtigercrm/branches/4.2.4/adodb/drivers/adodb-proxy.inc.php
==============================================================================
--- vtigercrm/branches/4.2.4/adodb/drivers/adodb-proxy.inc.php (original)
+++ vtigercrm/branches/4.2.4/adodb/drivers/adodb-proxy.inc.php Thu May 4 17:47:05 2006
@@ -1,6 +1,6 @@
<?php
/*
-V4.72 21 Feb 2006 (c) 2000-2006 John Lim (jlim at natsoft.com.my). All rights reserved.
+V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
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.
Modified: vtigercrm/branches/4.2.4/adodb/drivers/adodb-sapdb.inc.php
==============================================================================
--- vtigercrm/branches/4.2.4/adodb/drivers/adodb-sapdb.inc.php (original)
+++ vtigercrm/branches/4.2.4/adodb/drivers/adodb-sapdb.inc.php Thu May 4 17:47:05 2006
@@ -1,6 +1,6 @@
<?php
/*
-V4.72 21 Feb 2006 (c) 2000-2006 John Lim (jlim at natsoft.com.my). All rights reserved.
+V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
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.
Modified: vtigercrm/branches/4.2.4/adodb/drivers/adodb-sqlanywhere.inc.php
==============================================================================
--- vtigercrm/branches/4.2.4/adodb/drivers/adodb-sqlanywhere.inc.php (original)
+++ vtigercrm/branches/4.2.4/adodb/drivers/adodb-sqlanywhere.inc.php Thu May 4 17:47:05 2006
@@ -1,6 +1,6 @@
<?php
/*
-version V4.72 21 Feb 2006 (c) 2000-2006 John Lim (jlim at natsoft.com.my). All rights
+version V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights
reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
Modified: vtigercrm/branches/4.2.4/adodb/drivers/adodb-sqlite.inc.php
==============================================================================
--- vtigercrm/branches/4.2.4/adodb/drivers/adodb-sqlite.inc.php (original)
+++ vtigercrm/branches/4.2.4/adodb/drivers/adodb-sqlite.inc.php Thu May 4 17:47:05 2006
@@ -1,6 +1,6 @@
<?php
/*
-V4.72 21 Feb 2006 (c) 2000-2006 John Lim (jlim at natsoft.com.my). All rights reserved.
+V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
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.
Modified: vtigercrm/branches/4.2.4/adodb/drivers/adodb-sqlitepo.inc.php
==============================================================================
--- vtigercrm/branches/4.2.4/adodb/drivers/adodb-sqlitepo.inc.php (original)
+++ vtigercrm/branches/4.2.4/adodb/drivers/adodb-sqlitepo.inc.php Thu May 4 17:47:05 2006
@@ -1,6 +1,6 @@
<?php
/*
-V4.72 21 Feb 2006 (c) 2000-2006 John Lim (jlim at natsoft.com.my). All rights reserved.
+V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
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.
Modified: vtigercrm/branches/4.2.4/adodb/drivers/adodb-sybase.inc.php
==============================================================================
--- vtigercrm/branches/4.2.4/adodb/drivers/adodb-sybase.inc.php (original)
+++ vtigercrm/branches/4.2.4/adodb/drivers/adodb-sybase.inc.php Thu May 4 17:47:05 2006
@@ -1,6 +1,6 @@
<?php
/*
-V4.72 21 Feb 2006 (c) 2000-2006 John Lim. All rights reserved.
+V4.81 3 May 2006 (c) 2000-2006 John Lim. All rights reserved.
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.
Modified: vtigercrm/branches/4.2.4/adodb/drivers/adodb-sybase_ase.inc.php
==============================================================================
--- vtigercrm/branches/4.2.4/adodb/drivers/adodb-sybase_ase.inc.php (original)
+++ vtigercrm/branches/4.2.4/adodb/drivers/adodb-sybase_ase.inc.php Thu May 4 17:47:05 2006
@@ -1,6 +1,6 @@
<?php
/*
- V4.72 21 Feb 2006 (c) 2000-2006 John Lim (jlim at natsoft.com.my). All rights reserved.
+ V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
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.
Modified: vtigercrm/branches/4.2.4/adodb/drivers/adodb-vfp.inc.php
==============================================================================
--- vtigercrm/branches/4.2.4/adodb/drivers/adodb-vfp.inc.php (original)
+++ vtigercrm/branches/4.2.4/adodb/drivers/adodb-vfp.inc.php Thu May 4 17:47:05 2006
@@ -1,6 +1,6 @@
<?php
/*
-V4.72 21 Feb 2006 (c) 2000-2006 John Lim (jlim at natsoft.com.my). All rights reserved.
+V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
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.
Modified: vtigercrm/branches/4.2.4/adodb/perf/perf-db2.inc.php
==============================================================================
--- vtigercrm/branches/4.2.4/adodb/perf/perf-db2.inc.php (original)
+++ vtigercrm/branches/4.2.4/adodb/perf/perf-db2.inc.php Thu May 4 17:47:05 2006
@@ -1,6 +1,6 @@
<?php
/*
-V4.72 21 Feb 2006 (c) 2000-2006 John Lim (jlim at natsoft.com.my). All rights reserved.
+V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
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. See License.txt.
Modified: vtigercrm/branches/4.2.4/adodb/perf/perf-informix.inc.php
==============================================================================
--- vtigercrm/branches/4.2.4/adodb/perf/perf-informix.inc.php (original)
+++ vtigercrm/branches/4.2.4/adodb/perf/perf-informix.inc.php Thu May 4 17:47:05 2006
@@ -1,6 +1,6 @@
<?php
/*
-V4.72 21 Feb 2006 (c) 2000-2006 John Lim (jlim at natsoft.com.my). All rights reserved.
+V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
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. See License.txt.
Modified: vtigercrm/branches/4.2.4/adodb/perf/perf-mssql.inc.php
==============================================================================
--- vtigercrm/branches/4.2.4/adodb/perf/perf-mssql.inc.php (original)
+++ vtigercrm/branches/4.2.4/adodb/perf/perf-mssql.inc.php Thu May 4 17:47:05 2006
@@ -1,7 +1,7 @@
<?php
/*
-V4.72 21 Feb 2006 (c) 2000-2006 John Lim (jlim at natsoft.com.my). All rights reserved.
+V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
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. See License.txt.
Modified: vtigercrm/branches/4.2.4/adodb/perf/perf-mysql.inc.php
==============================================================================
--- vtigercrm/branches/4.2.4/adodb/perf/perf-mysql.inc.php (original)
+++ vtigercrm/branches/4.2.4/adodb/perf/perf-mysql.inc.php Thu May 4 17:47:05 2006
@@ -1,6 +1,6 @@
<?php
/*
-V4.72 21 Feb 2006 (c) 2000-2006 John Lim (jlim at natsoft.com.my). All rights reserved.
+V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
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. See License.txt.
Modified: vtigercrm/branches/4.2.4/adodb/perf/perf-oci8.inc.php
==============================================================================
--- vtigercrm/branches/4.2.4/adodb/perf/perf-oci8.inc.php (original)
+++ vtigercrm/branches/4.2.4/adodb/perf/perf-oci8.inc.php Thu May 4 17:47:05 2006
@@ -1,6 +1,6 @@
<?php
/*
-V4.72 21 Feb 2006 (c) 2000-2006 John Lim (jlim at natsoft.com.my). All rights reserved.
+V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
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. See License.txt.
Modified: vtigercrm/branches/4.2.4/adodb/perf/perf-postgres.inc.php
==============================================================================
--- vtigercrm/branches/4.2.4/adodb/perf/perf-postgres.inc.php (original)
+++ vtigercrm/branches/4.2.4/adodb/perf/perf-postgres.inc.php Thu May 4 17:47:05 2006
@@ -1,7 +1,7 @@
<?php
/*
-V4.72 21 Feb 2006 (c) 2000-2006 John Lim (jlim at natsoft.com.my). All rights reserved.
+V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
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. See License.txt.
Modified: vtigercrm/branches/4.2.4/adodb/pivottable.inc.php
==============================================================================
--- vtigercrm/branches/4.2.4/adodb/pivottable.inc.php (original)
+++ vtigercrm/branches/4.2.4/adodb/pivottable.inc.php Thu May 4 17:47:05 2006
@@ -1,6 +1,6 @@
<?php
/**
- * @version V4.72 21 Feb 2006 (c) 2000-2006 John Lim (jlim at natsoft.com.my). All rights reserved.
+ * @version V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
* 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.
Modified: vtigercrm/branches/4.2.4/adodb/rsfilter.inc.php
==============================================================================
--- vtigercrm/branches/4.2.4/adodb/rsfilter.inc.php (original)
+++ vtigercrm/branches/4.2.4/adodb/rsfilter.inc.php Thu May 4 17:47:05 2006
@@ -1,6 +1,6 @@
<?php
/**
- * @version V4.72 21 Feb 2006 (c) 2000-2006 John Lim (jlim at natsoft.com.my). All rights reserved.
+ * @version V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
* 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.
Modified: vtigercrm/branches/4.2.4/adodb/server.php
==============================================================================
--- vtigercrm/branches/4.2.4/adodb/server.php (original)
+++ vtigercrm/branches/4.2.4/adodb/server.php Thu May 4 17:47:05 2006
@@ -1,7 +1,7 @@
<?php
/**
- * @version V4.72 21 Feb 2006 (c) 2000-2006 John Lim (jlim at natsoft.com.my). All rights reserved.
+ * @version V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
* 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.
Modified: vtigercrm/branches/4.2.4/adodb/session/adodb-compress-bzip2.php
==============================================================================
--- vtigercrm/branches/4.2.4/adodb/session/adodb-compress-bzip2.php (original)
+++ vtigercrm/branches/4.2.4/adodb/session/adodb-compress-bzip2.php Thu May 4 17:47:05 2006
@@ -1,7 +1,7 @@
<?php
/*
-V4.72 21 Feb 2006 (c) 2000-2006 John Lim (jlim at natsoft.com.my). All rights reserved.
+V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
Contributed by Ross Smith (adodb at netebb.com).
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
Modified: vtigercrm/branches/4.2.4/adodb/session/adodb-compress-gzip.php
==============================================================================
--- vtigercrm/branches/4.2.4/adodb/session/adodb-compress-gzip.php (original)
+++ vtigercrm/branches/4.2.4/adodb/session/adodb-compress-gzip.php Thu May 4 17:47:05 2006
@@ -2,7 +2,7 @@
/*
-V4.72 21 Feb 2006 (c) 2000-2006 John Lim (jlim at natsoft.com.my). All rights reserved.
+V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
Contributed by Ross Smith (adodb at netebb.com).
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
Modified: vtigercrm/branches/4.2.4/adodb/session/adodb-cryptsession.php
==============================================================================
--- vtigercrm/branches/4.2.4/adodb/session/adodb-cryptsession.php (original)
+++ vtigercrm/branches/4.2.4/adodb/session/adodb-cryptsession.php Thu May 4 17:47:05 2006
@@ -2,7 +2,7 @@
/*
-V4.72 21 Feb 2006 (c) 2000-2006 John Lim (jlim at natsoft.com.my). All rights reserved.
+V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
Contributed by Ross Smith (adodb at netebb.com).
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
Modified: vtigercrm/branches/4.2.4/adodb/session/adodb-encrypt-mcrypt.php
==============================================================================
--- vtigercrm/branches/4.2.4/adodb/session/adodb-encrypt-mcrypt.php (original)
+++ vtigercrm/branches/4.2.4/adodb/session/adodb-encrypt-mcrypt.php Thu May 4 17:47:05 2006
@@ -2,7 +2,7 @@
/*
-V4.72 21 Feb 2006 (c) 2000-2006 John Lim (jlim at natsoft.com.my). All rights reserved.
+V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
Contributed by Ross Smith (adodb at netebb.com).
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
Modified: vtigercrm/branches/4.2.4/adodb/session/adodb-encrypt-md5.php
==============================================================================
--- vtigercrm/branches/4.2.4/adodb/session/adodb-encrypt-md5.php (original)
+++ vtigercrm/branches/4.2.4/adodb/session/adodb-encrypt-md5.php Thu May 4 17:47:05 2006
@@ -1,7 +1,7 @@
<?php
/*
-V4.72 21 Feb 2006 (c) 2000-2006 John Lim (jlim at natsoft.com.my). All rights reserved.
+V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
Contributed by Ross Smith (adodb at netebb.com).
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
Modified: vtigercrm/branches/4.2.4/adodb/session/adodb-encrypt-secret.php
==============================================================================
--- vtigercrm/branches/4.2.4/adodb/session/adodb-encrypt-secret.php (original)
+++ vtigercrm/branches/4.2.4/adodb/session/adodb-encrypt-secret.php Thu May 4 17:47:05 2006
@@ -1,7 +1,7 @@
<?php
/*
-V4.72 21 Feb 2006 (c) 2000-2006 John Lim (jlim at natsoft.com.my). All rights reserved.
+V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
Contributed by Ross Smith (adodb at netebb.com).
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
Modified: vtigercrm/branches/4.2.4/adodb/session/adodb-session-clob.php
==============================================================================
--- vtigercrm/branches/4.2.4/adodb/session/adodb-session-clob.php (original)
+++ vtigercrm/branches/4.2.4/adodb/session/adodb-session-clob.php Thu May 4 17:47:05 2006
@@ -2,7 +2,7 @@
/*
-V4.72 21 Feb 2006 (c) 2000-2006 John Lim (jlim at natsoft.com.my). All rights reserved.
+V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
Contributed by Ross Smith (adodb at netebb.com).
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
Modified: vtigercrm/branches/4.2.4/adodb/session/adodb-session.php
==============================================================================
--- vtigercrm/branches/4.2.4/adodb/session/adodb-session.php (original)
+++ vtigercrm/branches/4.2.4/adodb/session/adodb-session.php Thu May 4 17:47:05 2006
@@ -2,7 +2,7 @@
/*
-V4.72 21 Feb 2006 (c) 2000-2006 John Lim (jlim at natsoft.com.my). All rights reserved.
+V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
Contributed by Ross Smith (adodb at netebb.com).
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;
Modified: vtigercrm/branches/4.2.4/adodb/session/old/adodb-cryptsession.php
==============================================================================
--- vtigercrm/branches/4.2.4/adodb/session/old/adodb-cryptsession.php (original)
+++ vtigercrm/branches/4.2.4/adodb/session/old/adodb-cryptsession.php Thu May 4 17:47:05 2006
@@ -1,6 +1,6 @@
<?php
/*
-V4.72 21 Feb 2006 (c) 2000-2006 John Lim (jlim at natsoft.com.my). All rights reserved.
+V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
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.
Modified: vtigercrm/branches/4.2.4/adodb/session/old/adodb-session-clob.php
==============================================================================
--- vtigercrm/branches/4.2.4/adodb/session/old/adodb-session-clob.php (original)
+++ vtigercrm/branches/4.2.4/adodb/session/old/adodb-session-clob.php Thu May 4 17:47:05 2006
@@ -1,6 +1,6 @@
<?php
/*
- V4.72 21 Feb 2006 (c) 2000-2006 John Lim (jlim at natsoft.com.my). All rights reserved.
+ V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
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.
Modified: vtigercrm/branches/4.2.4/adodb/session/old/adodb-session.php
==============================================================================
--- vtigercrm/branches/4.2.4/adodb/session/old/adodb-session.php (original)
+++ vtigercrm/branches/4.2.4/adodb/session/old/adodb-session.php Thu May 4 17:47:05 2006
@@ -1,6 +1,6 @@
<?php
/*
-V4.72 21 Feb 2006 (c) 2000-2006 John Lim (jlim at natsoft.com.my). All rights reserved.
+V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
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.
Modified: vtigercrm/branches/4.2.4/adodb/tests/benchmark.php
==============================================================================
--- vtigercrm/branches/4.2.4/adodb/tests/benchmark.php (original)
+++ vtigercrm/branches/4.2.4/adodb/tests/benchmark.php Thu May 4 17:47:05 2006
@@ -8,7 +8,7 @@
<body>
<?php
/*
-V4.72 21 Feb 2006 (c) 2000-2006 John Lim (jlim at natsoft.com.my). All rights reserved.
+V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
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.
Modified: vtigercrm/branches/4.2.4/adodb/tests/client.php
==============================================================================
--- vtigercrm/branches/4.2.4/adodb/tests/client.php (original)
+++ vtigercrm/branches/4.2.4/adodb/tests/client.php Thu May 4 17:47:05 2006
@@ -2,7 +2,7 @@
<body bgcolor=white>
<?php
/**
- * V4.50 6 July 2004 (c) 2001-2002 John Lim (jlim at natsoft.com.my). All rights reserved.
+ * V4.50 6 July 2004 (c) 2001-2002 John Lim (jlim#natsoft.com.my). All rights reserved.
* 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.
Modified: vtigercrm/branches/4.2.4/adodb/tests/test-datadict.php
==============================================================================
--- vtigercrm/branches/4.2.4/adodb/tests/test-datadict.php (original)
+++ vtigercrm/branches/4.2.4/adodb/tests/test-datadict.php Thu May 4 17:47:05 2006
@@ -1,7 +1,7 @@
<?php
/*
- V4.72 21 Feb 2006 (c) 2000-2006 John Lim (jlim at natsoft.com.my). All rights reserved.
+ V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
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.
@@ -13,7 +13,7 @@
error_reporting(E_ALL);
include_once('../adodb.inc.php');
-foreach(array('sapdb','sybase','mysqlt','access','oci8po','postgres','odbc_mssql','odbc','db2','firebird','informix') as $dbType) {
+foreach(array('sapdb','sybase','mysql','access','oci8po','postgres','odbc_mssql','odbc','db2','firebird','informix') as $dbType) {
echo "<h3>$dbType</h3><p>";
$db = NewADOConnection($dbType);
$dict = NewDataDictionary($db);
@@ -21,7 +21,7 @@
if (!$dict) continue;
$dict->debug = 1;
- $opts = array('REPLACE','mysql' => 'TYPE=INNODB', 'oci8' => 'TABLESPACE USERS');
+ $opts = array('REPLACE','mysql' => 'ENGINE=INNODB', 'oci8' => 'TABLESPACE USERS');
/* $flds = array(
array('id', 'I',
Modified: vtigercrm/branches/4.2.4/adodb/tests/test-php5.php
==============================================================================
--- vtigercrm/branches/4.2.4/adodb/tests/test-php5.php (original)
+++ vtigercrm/branches/4.2.4/adodb/tests/test-php5.php Thu May 4 17:47:05 2006
@@ -1,6 +1,6 @@
<?php
/*
- V4.72 21 Feb 2006 (c) 2000-2006 John Lim (jlim at natsoft.com.my). All rights reserved.
+ V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
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.
@@ -30,7 +30,7 @@
default:
case 'mysql':
$db = NewADOConnection("mysql");
- $db->Connect('localhost','roots','','northwind');
+ $db->Connect('localhost','root','','northwind');
break;
case 'mysqli':
@@ -74,5 +74,35 @@
}
$rs = $db->Execute("select distinct id, firstname,lastname from adoxyz order by id");
-echo "Result=\n",$rs;
+echo "Result=\n",$rs,"</p>";
+
+echo "<h3>Active Record</h3>";
+try {
+ include_once("../adodb-active-record.inc.php");
+ class City extends ADOdb_Active_Record{};
+ $a = new City();
+
+} catch(exception $e){
+ echo $e->getMessage();
+}
+
+try {
+
+ ADOdb_Active_Record::SetDatabaseAdapter($db);
+ $a = new City();
+
+ echo "<p>Successfully created City()<br>";
+ var_dump($a->GetPrimaryKeys());
+ $a->city = 'Kuala Lumpur';
+ $a->Save();
+ $a->Update();
+ $a->SetPrimaryKeys(array('city'));
+ $a->country = "M'sia";
+ $a->save();
+ $a->Delete();
+} catch(exception $e){
+ echo $e->getMessage();
+}
+
+include_once("test-active-record.php");
?>
Modified: vtigercrm/branches/4.2.4/adodb/tests/test-xmlschema.php
==============================================================================
--- vtigercrm/branches/4.2.4/adodb/tests/test-xmlschema.php (original)
+++ vtigercrm/branches/4.2.4/adodb/tests/test-xmlschema.php Thu May 4 17:47:05 2006
@@ -1,54 +1,54 @@
-<?PHP
-
-// V4.50 6 July 2004
-
-error_reporting(E_ALL);
-include_once( "../adodb.inc.php" );
-include_once( "../adodb-xmlschema.inc.php" );
-
-// To build the schema, start by creating a normal ADOdb connection:
-$db = ADONewConnection( 'mysql' );
-$db->Connect( 'localhost', 'root', '', 'schematest' );
-
-// To create a schema object and build the query array.
-$schema = new adoSchema( $db );
-
-// To upgrade an existing schema object, use the following
-// To upgrade an existing database to the provided schema,
-// uncomment the following line:
-#$schema->upgradeSchema();
-
-print "<b>SQL to build xmlschema.xml</b>:\n<pre>";
-// Build the SQL array
-$sql = $schema->ParseSchema( "xmlschema.xml" );
-
-print_r( $sql );
-print "</pre>\n";
-
-// Execute the SQL on the database
-//$result = $schema->ExecuteSchema( $sql );
-
-// Finally, clean up after the XML parser
-// (PHP won't do this for you!)
-//$schema->Destroy();
-
-
-
-print "<b>SQL to build xmlschema-mssql.xml</b>:\n<pre>";
-
-$db2 = ADONewConnection('mssql');
-$db2->Connect('','adodb','natsoft','northwind') || die("Fail 2");
-
-$db2->Execute("drop table simple_table");
-
-$schema = new adoSchema( $db2 );
-$sql = $schema->ParseSchema( "xmlschema-mssql.xml" );
-
-print_r( $sql );
-print "</pre>\n";
-
-$db2->debug=1;
-
-foreach ($sql as $s)
-$db2->Execute($s);
+<?PHP
+
+// V4.50 6 July 2004
+
+error_reporting(E_ALL);
+include_once( "../adodb.inc.php" );
+include_once( "../adodb-xmlschema03.inc.php" );
+
+// To build the schema, start by creating a normal ADOdb connection:
+$db = ADONewConnection( 'mysql' );
+$db->Connect( 'localhost', 'root', '', 'schematest' );
+
+// To create a schema object and build the query array.
+$schema = new adoSchema( $db );
+
+// To upgrade an existing schema object, use the following
+// To upgrade an existing database to the provided schema,
+// uncomment the following line:
+#$schema->upgradeSchema();
+
+print "<b>SQL to build xmlschema.xml</b>:\n<pre>";
+// Build the SQL array
+$sql = $schema->ParseSchema( "xmlschema.xml" );
+
+print_r( $sql );
+print "</pre>\n";
+
+// Execute the SQL on the database
+//$result = $schema->ExecuteSchema( $sql );
+
+// Finally, clean up after the XML parser
+// (PHP won't do this for you!)
+//$schema->Destroy();
+
+
+
+print "<b>SQL to build xmlschema-mssql.xml</b>:\n<pre>";
+
+$db2 = ADONewConnection('mssql');
+$db2->Connect('','adodb','natsoft','northwind') || die("Fail 2");
+
+$db2->Execute("drop table simple_table");
+
+$schema = new adoSchema( $db2 );
+$sql = $schema->ParseSchema( "xmlschema-mssql.xml" );
+
+print_r( $sql );
+print "</pre>\n";
+
+$db2->debug=1;
+
+foreach ($sql as $s)
+$db2->Execute($s);
?>
Modified: vtigercrm/branches/4.2.4/adodb/tests/test.php
==============================================================================
--- vtigercrm/branches/4.2.4/adodb/tests/test.php (original)
+++ vtigercrm/branches/4.2.4/adodb/tests/test.php Thu May 4 17:47:05 2006
@@ -1,6 +1,6 @@
<?php
/*
-V4.72 21 Feb 2006 (c) 2000-2006 John Lim (jlim at natsoft.com.my). All rights reserved.
+V4.80 8 Mar 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
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.
@@ -1115,6 +1115,13 @@
else print " Fail<BR>";
$rs = &$db->CacheExecute(4,"select distinct firstname,lastname from ADOXYZ");
+
+ if ($rs) print ' 1st line set to **** , Steven selected: '. $rs->GetMenu('menu','Steven','1st:****').'<BR>';
+ else print " Fail<BR>";
+
+
+
+ $rs = &$db->CacheExecute(4,"select distinct firstname,lastname from ADOXYZ");
if ($rs) print ' Multiple, Alan selected: '. $rs->GetMenu('menu','Alan',false,true).'<BR>';
else print " Fail<BR>";
print '</p><hr />';
Modified: vtigercrm/branches/4.2.4/adodb/tests/test3.php
==============================================================================
--- vtigercrm/branches/4.2.4/adodb/tests/test3.php (original)
+++ vtigercrm/branches/4.2.4/adodb/tests/test3.php Thu May 4 17:47:05 2006
@@ -1,6 +1,6 @@
<?php
/*
- V4.72 21 Feb 2006 (c) 2000-2006 John Lim (jlim at natsoft.com.my). All rights reserved.
+ V4.80 8 Mar 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
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.
Modified: vtigercrm/branches/4.2.4/adodb/tests/test4.php
==============================================================================
--- vtigercrm/branches/4.2.4/adodb/tests/test4.php (original)
+++ vtigercrm/branches/4.2.4/adodb/tests/test4.php Thu May 4 17:47:05 2006
@@ -1,7 +1,7 @@
<?php
/**
- * @version V4.50 6 July 2004 (c) 2000-2006 John Lim (jlim at natsoft.com.my). All rights reserved.
+ * @version V4.50 6 July 2004 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
* 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.
Modified: vtigercrm/branches/4.2.4/adodb/tests/test5.php
==============================================================================
--- vtigercrm/branches/4.2.4/adodb/tests/test5.php (original)
+++ vtigercrm/branches/4.2.4/adodb/tests/test5.php Thu May 4 17:47:05 2006
@@ -1,6 +1,6 @@
<?php
/*
-V4.72 21 Feb 2006 (c) 2000-2006 John Lim (jlim at natsoft.com.my). All rights reserved.
+V4.80 8 Mar 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
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.
Modified: vtigercrm/branches/4.2.4/adodb/tests/testcache.php
==============================================================================
--- vtigercrm/branches/4.2.4/adodb/tests/testcache.php (original)
+++ vtigercrm/branches/4.2.4/adodb/tests/testcache.php Thu May 4 17:47:05 2006
@@ -2,7 +2,7 @@
<body>
<?php
/*
-V4.72 21 Feb 2006 (c) 2000-2006 John Lim (jlim at natsoft.com.my). All rights reserved.
+V4.80 8 Mar 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
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.
Modified: vtigercrm/branches/4.2.4/adodb/tests/testdatabases.inc.php
==============================================================================
--- vtigercrm/branches/4.2.4/adodb/tests/testdatabases.inc.php (original)
+++ vtigercrm/branches/4.2.4/adodb/tests/testdatabases.inc.php Thu May 4 17:47:05 2006
@@ -1,7 +1,7 @@
<?php
/*
-V4.72 21 Feb 2006 (c) 2000-2006 John Lim (jlim at natsoft.com.my). All rights reserved.
+V4.80 8 Mar 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
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.
Modified: vtigercrm/branches/4.2.4/adodb/tests/testmssql.php
==============================================================================
--- vtigercrm/branches/4.2.4/adodb/tests/testmssql.php (original)
+++ vtigercrm/branches/4.2.4/adodb/tests/testmssql.php Thu May 4 17:47:05 2006
@@ -1,7 +1,7 @@
<?php
/**
- * @version V4.50 6 July 2004 (c) 2000-2006 John Lim (jlim at natsoft.com.my). All rights reserved.
+ * @version V4.50 6 July 2004 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
* 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.
Modified: vtigercrm/branches/4.2.4/adodb/tests/testoci8.php
==============================================================================
--- vtigercrm/branches/4.2.4/adodb/tests/testoci8.php (original)
+++ vtigercrm/branches/4.2.4/adodb/tests/testoci8.php Thu May 4 17:47:05 2006
@@ -2,7 +2,7 @@
<body>
<?php
/*
-V4.72 21 Feb 2006 (c) 2000-2006 John Lim (jlim at natsoft.com.my). All rights reserved.
+V4.80 8 Mar 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
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.
Modified: vtigercrm/branches/4.2.4/adodb/tests/testoci8cursor.php
==============================================================================
--- vtigercrm/branches/4.2.4/adodb/tests/testoci8cursor.php (original)
+++ vtigercrm/branches/4.2.4/adodb/tests/testoci8cursor.php Thu May 4 17:47:05 2006
@@ -1,6 +1,6 @@
<?php
/*
-V4.72 21 Feb 2006 (c) 2000-2006 John Lim (jlim at natsoft.com.my). All rights reserved.
+V4.80 8 Mar 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
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.
Modified: vtigercrm/branches/4.2.4/adodb/tests/testpaging.php
==============================================================================
--- vtigercrm/branches/4.2.4/adodb/tests/testpaging.php (original)
+++ vtigercrm/branches/4.2.4/adodb/tests/testpaging.php Thu May 4 17:47:05 2006
@@ -1,6 +1,6 @@
<?php
/*
-V4.72 21 Feb 2006 (c) 2000-2006 John Lim (jlim at natsoft.com.my). All rights reserved.
+V4.80 8 Mar 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
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.
Modified: vtigercrm/branches/4.2.4/adodb/tests/testpear.php
==============================================================================
--- vtigercrm/branches/4.2.4/adodb/tests/testpear.php (original)
+++ vtigercrm/branches/4.2.4/adodb/tests/testpear.php Thu May 4 17:47:05 2006
@@ -1,6 +1,6 @@
<?php
/*
-V4.72 21 Feb 2006 (c) 2000-2006 John Lim (jlim at natsoft.com.my). All rights reserved.
+V4.80 8 Mar 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
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.
Modified: vtigercrm/branches/4.2.4/adodb/tests/testsessions.php
==============================================================================
--- vtigercrm/branches/4.2.4/adodb/tests/testsessions.php (original)
+++ vtigercrm/branches/4.2.4/adodb/tests/testsessions.php Thu May 4 17:47:05 2006
@@ -1,7 +1,7 @@
<?php
/*
-V4.72 21 Feb 2006 (c) 2000-2006 John Lim (jlim at natsoft.com.my). All rights reserved.
+V4.80 8 Mar 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
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.
Modified: vtigercrm/branches/4.2.4/adodb/toexport.inc.php
==============================================================================
--- vtigercrm/branches/4.2.4/adodb/toexport.inc.php (original)
+++ vtigercrm/branches/4.2.4/adodb/toexport.inc.php Thu May 4 17:47:05 2006
@@ -1,7 +1,7 @@
<?php
/**
- * @version V4.72 21 Feb 2006 (c) 2000-2006 John Lim (jlim at natsoft.com.my). All rights reserved.
+ * @version V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
* 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.
Modified: vtigercrm/branches/4.2.4/adodb/tohtml.inc.php
==============================================================================
--- vtigercrm/branches/4.2.4/adodb/tohtml.inc.php (original)
+++ vtigercrm/branches/4.2.4/adodb/tohtml.inc.php Thu May 4 17:47:05 2006
@@ -1,6 +1,6 @@
<?php
/*
- V4.72 21 Feb 2006 (c) 2000-2006 John Lim (jlim at natsoft.com.my). All rights reserved.
+ V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
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.
Modified: vtigercrm/branches/4.2.4/adodb/xsl/convert-0.1-0.2.xsl
==============================================================================
--- vtigercrm/branches/4.2.4/adodb/xsl/convert-0.1-0.2.xsl (original)
+++ vtigercrm/branches/4.2.4/adodb/xsl/convert-0.1-0.2.xsl Thu May 4 17:47:05 2006
@@ -97,7 +97,7 @@
</xsl:element>
</xsl:when>
<xsl:when test="count(DEFTIMESTAMP) > 0">
- <xsl:element name="DEFDTIMESTAMP">
+ <xsl:element name="DEFTIMESTAMP">
<xsl:attribute name="value">
<xsl:value-of select="DEFTIMESTAMP[1]/@value"/>
</xsl:attribute>
More information about the vtigercrm-commits
mailing list