From a8f4bd0a627b7d616ca81e1fbdd434a1bcdcc3a4 Mon Sep 17 00:00:00 2001
From: joebordes <joe@tsolucio.com>
Date: Sun, 1 Oct 2023 00:43:24 +0200
Subject: [PATCH] fix issue #970 migrating functions eliminated when deleting
 the Date/Time library

---
 adodb.inc.php                 | 29 ++++++++++++++---------------
 drivers/adodb-ado.inc.php     |  6 +++---
 drivers/adodb-ado5.inc.php    |  6 +++---
 drivers/adodb-db2.inc.php     |  2 +-
 drivers/adodb-oci8.inc.php    |  4 ++--
 drivers/adodb-odbtp.inc.php   |  4 ++--
 drivers/adodb-oracle.inc.php  |  4 ++--
 drivers/adodb-sqlite.inc.php  |  8 +++-----
 drivers/adodb-sqlite3.inc.php |  4 +---
 drivers/adodb-sybase.inc.php  |  4 ++--
 10 files changed, 33 insertions(+), 38 deletions(-)

diff --git a/adodb.inc.php b/adodb.inc.php
index bc9e675ab..ff2e08b36 100644
--- a/adodb.inc.php
+++ b/adodb.inc.php
@@ -3395,7 +3395,7 @@ function DBDate($d, $isfld=false) {
 			$d = ADOConnection::UnixDate($d);
 		}
 
-		return adodb_date($this->fmtDate,$d);
+		return date($this->fmtDate,$d);
 	}
 
 	function BindDate($d) {
@@ -3437,7 +3437,7 @@ function DBTimeStamp($ts,$isfld=false) {
 
 		# strlen(14) allows YYYYMMDDHHMMSS format
 		if (!is_string($ts) || (is_numeric($ts) && strlen($ts)<14)) {
-			return adodb_date($this->fmtTimeStamp,$ts);
+			return date($this->fmtTimeStamp,$ts);
 		}
 
 		if ($ts === 'null') {
@@ -3448,7 +3448,7 @@ function DBTimeStamp($ts,$isfld=false) {
 			return "'$ts'";
 		}
 		$ts = ADOConnection::UnixTimeStamp($ts);
-		return adodb_date($this->fmtTimeStamp,$ts);
+		return date($this->fmtTimeStamp,$ts);
 	}
 
 	/**
@@ -3461,7 +3461,7 @@ static function UnixDate($v) {
 		if (is_object($v)) {
 		// odbtp support
 		//( [year] => 2004 [month] => 9 [day] => 4 [hour] => 12 [minute] => 44 [second] => 8 [fraction] => 0 )
-			return adodb_mktime($v->hour,$v->minute,$v->second,$v->month,$v->day, $v->year);
+			return mktime($v->hour,$v->minute,$v->second,$v->month,$v->day, $v->year);
 		}
 
 		if (is_numeric($v) && strlen($v) !== 8) {
@@ -3476,7 +3476,7 @@ static function UnixDate($v) {
 		}
 
 		// h-m-s-MM-DD-YY
-		return @adodb_mktime(0,0,0,$rr[2],$rr[3],$rr[1]);
+		return mktime(0,0,0,$rr[2],$rr[3],$rr[1]);
 	}
 
 
@@ -3490,7 +3490,7 @@ static function UnixTimeStamp($v) {
 		if (is_object($v)) {
 		// odbtp support
 		//( [year] => 2004 [month] => 9 [day] => 4 [hour] => 12 [minute] => 44 [second] => 8 [fraction] => 0 )
-			return adodb_mktime($v->hour,$v->minute,$v->second,$v->month,$v->day, $v->year);
+			return mktime($v->hour,$v->minute,$v->second,$v->month,$v->day, $v->year);
 		}
 
 		if (!preg_match(
@@ -3503,9 +3503,9 @@ static function UnixTimeStamp($v) {
 
 		// h-m-s-MM-DD-YY
 		if (!isset($rr[5])) {
-			return  adodb_mktime(0,0,0,$rr[2],$rr[3],$rr[1]);
+			return mktime(0,0,0,$rr[2],$rr[3],$rr[1]);
 		}
-		return @adodb_mktime($rr[5],$rr[6],$rr[7],$rr[2],$rr[3],$rr[1]);
+		return mktime($rr[5],$rr[6],$rr[7],$rr[2],$rr[3],$rr[1]);
 	}
 
 	/**
@@ -3531,8 +3531,7 @@ function UserDate($v,$fmt='Y-m-d',$gmt=false) {
 			// pre-TIMESTAMP_FIRST_YEAR
 		}
 
-		return ($gmt) ? adodb_gmdate($fmt,$tt) : adodb_date($fmt,$tt);
-
+		return ($gmt) ? gmdate($fmt,$tt) : date($fmt,$tt);
 	}
 
 	/**
@@ -3550,7 +3549,7 @@ function UserTimeStamp($v,$fmt='Y-m-d H:i:s',$gmt=false) {
 		}
 		# strlen(14) allows YYYYMMDDHHMMSS format
 		if (is_numeric($v) && strlen($v)<14) {
-			return ($gmt) ? adodb_gmdate($fmt,$v) : adodb_date($fmt,$v);
+			return ($gmt) ? gmdate($fmt,$v) : date($fmt,$v);
 		}
 		$tt = $this->UnixTimeStamp($v);
 		// $tt == -1 if pre TIMESTAMP_FIRST_YEAR
@@ -3560,7 +3559,7 @@ function UserTimeStamp($v,$fmt='Y-m-d H:i:s',$gmt=false) {
 		if ($tt == 0) {
 			return $this->emptyTimeStamp;
 		}
-		return ($gmt) ? adodb_gmdate($fmt,$tt) : adodb_date($fmt,$tt);
+		return ($gmt) ? gmdate($fmt,$tt) : date($fmt,$tt);
 	}
 
 	/**
@@ -4527,7 +4526,7 @@ function getAssoc($force_array = false, $first2cols = false)
 	 */
 	function UserTimeStamp($v,$fmt='Y-m-d H:i:s') {
 		if (is_numeric($v) && strlen($v)<14) {
-			return adodb_date($fmt,$v);
+			return date($fmt,$v);
 		}
 		$tt = $this->UnixTimeStamp($v);
 		// $tt == -1 if pre TIMESTAMP_FIRST_YEAR
@@ -4537,7 +4536,7 @@ function UserTimeStamp($v,$fmt='Y-m-d H:i:s') {
 		if ($tt === 0) {
 			return $this->emptyTimeStamp;
 		}
-		return adodb_date($fmt,$tt);
+		return date($fmt,$tt);
 	}
 
 
@@ -4557,7 +4556,7 @@ function UserDate($v,$fmt='Y-m-d') {
 		} else if ($tt == -1) {
 			// pre-TIMESTAMP_FIRST_YEAR
 		}
-		return adodb_date($fmt,$tt);
+		return date($fmt,$tt);
 	}
 
 
diff --git a/drivers/adodb-ado.inc.php b/drivers/adodb-ado.inc.php
index 30edf28ba..5164c6513 100644
--- a/drivers/adodb-ado.inc.php
+++ b/drivers/adodb-ado.inc.php
@@ -574,7 +574,7 @@ function _fetch()
 						$val=(float) variant_cast($f->value,VT_R8)*3600*24-2209161600;
 					else
 						$val = $f->value;
-					$this->fields[] = adodb_date('Y-m-d H:i:s',$val);
+					$this->fields[] = date('Y-m-d H:i:s',$val);
 				}
 				break;
 			case 133:// A date value (yyyymmdd)
@@ -589,8 +589,8 @@ function _fetch()
 					if (!is_numeric($f->value)) $val = variant_date_to_timestamp($f->value);
 					else $val = $f->value;
 
-					if (($val % 86400) == 0) $this->fields[] = adodb_date('Y-m-d',$val);
-					else $this->fields[] = adodb_date('Y-m-d H:i:s',$val);
+					if (($val % 86400) == 0) $this->fields[] = date('Y-m-d',$val);
+					else $this->fields[] = date('Y-m-d H:i:s',$val);
 				}
 				break;
 			case 1: // null
diff --git a/drivers/adodb-ado5.inc.php b/drivers/adodb-ado5.inc.php
index 53bdc6a18..6e5759e3c 100644
--- a/drivers/adodb-ado5.inc.php
+++ b/drivers/adodb-ado5.inc.php
@@ -621,7 +621,7 @@ function _fetch()
 						$val= (float) variant_cast($f->value,VT_R8)*3600*24-2209161600;
 					else
 						$val = $f->value;
-					$this->fields[] = adodb_date('Y-m-d H:i:s',$val);
+					$this->fields[] = date('Y-m-d H:i:s',$val);
 				}
 				break;
 			case 133:// A date value (yyyymmdd)
@@ -636,8 +636,8 @@ function _fetch()
 					if (!is_numeric($f->value)) $val = variant_date_to_timestamp($f->value);
 					else $val = $f->value;
 
-					if (($val % 86400) == 0) $this->fields[] = adodb_date('Y-m-d',$val);
-					else $this->fields[] = adodb_date('Y-m-d H:i:s',$val);
+					if (($val % 86400) == 0) $this->fields[] = date('Y-m-d',$val);
+					else $this->fields[] = date('Y-m-d H:i:s',$val);
 				}
 				break;
 			case 1: // null
diff --git a/drivers/adodb-db2.inc.php b/drivers/adodb-db2.inc.php
index f04541c89..eb865c0b4 100644
--- a/drivers/adodb-db2.inc.php
+++ b/drivers/adodb-db2.inc.php
@@ -396,7 +396,7 @@ function dbTimeStamp($ts,$isField=false)
 	{
 		if (empty($ts) && $ts !== 0) return 'null';
 		if (is_string($ts)) $ts = ADORecordSet::unixTimeStamp($ts);
-		return 'TO_DATE('.adodb_date($this->fmtTimeStamp,$ts).",'YYYY-MM-DD HH24:MI:SS')";
+		return 'TO_DATE('.date($this->fmtTimeStamp,$ts).",'YYYY-MM-DD HH24:MI:SS')";
 	}
 
 	/**
diff --git a/drivers/adodb-oci8.inc.php b/drivers/adodb-oci8.inc.php
index d8b71c6e3..38b3df4b5 100644
--- a/drivers/adodb-oci8.inc.php
+++ b/drivers/adodb-oci8.inc.php
@@ -396,7 +396,7 @@ function DBDate($d,$isfld=false)
 			$ds = $d->format($this->fmtDate);
 		}
 		else {
-			$ds = adodb_date($this->fmtDate,$d);
+			$ds = date($this->fmtDate,$d);
 		}
 
 		return "TO_DATE(".$ds.",'".$this->dateformat."')";
@@ -425,7 +425,7 @@ function BindTimeStamp($ts)
 			$tss = $ts->format("'Y-m-d H:i:s'");
 		}
 		else {
-			$tss = adodb_date("'Y-m-d H:i:s'",$ts);
+			$tss = date("'Y-m-d H:i:s'",$ts);
 		}
 
 		return $tss;
diff --git a/drivers/adodb-odbtp.inc.php b/drivers/adodb-odbtp.inc.php
index b4e126010..46bf9c4a6 100644
--- a/drivers/adodb-odbtp.inc.php
+++ b/drivers/adodb-odbtp.inc.php
@@ -81,7 +81,7 @@ function DBDate($d,$isfld=false)
 		if ($isfld) return "convert(date, $d, 120)";
 
 		if (is_string($d)) $d = ADORecordSet::UnixDate($d);
-		$d = adodb_date($this->fmtDate,$d);
+		$d = date($this->fmtDate,$d);
 		return "convert(date, $d, 120)";
 	}
 
@@ -91,7 +91,7 @@ function DBTimeStamp($d,$isfld=false)
 		if ($isfld) return "convert(datetime, $d, 120)";
 
 		if (is_string($d)) $d = ADORecordSet::UnixDate($d);
-		$d = adodb_date($this->fmtDate,$d);
+		$d = date($this->fmtDate,$d);
 		return "convert(datetime, $d, 120)";
 	}
 */
diff --git a/drivers/adodb-oracle.inc.php b/drivers/adodb-oracle.inc.php
index 5cd4bedfa..7c061b078 100644
--- a/drivers/adodb-oracle.inc.php
+++ b/drivers/adodb-oracle.inc.php
@@ -41,7 +41,7 @@ function DBDate($d, $isfld = false)
 	{
 		if (is_string($d)) $d = ADORecordSet::UnixDate($d);
 		if (is_object($d)) $ds = $d->format($this->fmtDate);
-		else $ds = adodb_date($this->fmtDate,$d);
+		else $ds = date($this->fmtDate,$d);
 		return 'TO_DATE('.$ds.",'YYYY-MM-DD')";
 	}
 
@@ -51,7 +51,7 @@ function DBTimeStamp($ts, $isfld = false)
 
 		if (is_string($ts)) $ts = ADORecordSet::UnixTimeStamp($ts);
 		if (is_object($ts)) $ds = $ts->format($this->fmtDate);
-		else $ds = adodb_date($this->fmtTimeStamp,$ts);
+		else $ds = date($this->fmtTimeStamp,$ts);
 		return 'TO_DATE('.$ds.",'RRRR-MM-DD, HH:MI:SS AM')";
 	}
 
diff --git a/drivers/adodb-sqlite.inc.php b/drivers/adodb-sqlite.inc.php
index 697d43a63..00638e706 100644
--- a/drivers/adodb-sqlite.inc.php
+++ b/drivers/adodb-sqlite.inc.php
@@ -36,8 +36,8 @@ class ADODB_sqlite extends ADOConnection {
 	var $hasInsertID = true; 		/// supports autoincrement ID?
 	var $hasAffectedRows = true; 	/// supports affected rows for update/delete?
 	var $metaTablesSQL = "SELECT name FROM sqlite_master WHERE type='table' ORDER BY name";
-	var $sysDate = "adodb_date('Y-m-d')";
-	var $sysTimeStamp = "adodb_date('Y-m-d H:i:s')";
+	var $sysDate = "date('Y-m-d')";
+	var $sysTimeStamp = "date('Y-m-d H:i:s')";
 	var $fmtTimeStamp = "'Y-m-d H:i:s'";
 
 	function ServerInfo()
@@ -164,14 +164,12 @@ function ErrorNo()
 	function SQLDate($fmt, $col=false)
 	{
 		$fmt = $this->qstr($fmt);
-		return ($col) ? "adodb_date2($fmt,$col)" : "adodb_date($fmt)";
+		return ($col) ? "strftime($fmt,$col)" : "strftime($fmt)";
 	}
 
 
 	function _createFunctions()
 	{
-		@sqlite_create_function($this->_connectionID, 'adodb_date', 'adodb_date', 1);
-		@sqlite_create_function($this->_connectionID, 'adodb_date2', 'adodb_date2', 2);
 	}
 
 
diff --git a/drivers/adodb-sqlite3.inc.php b/drivers/adodb-sqlite3.inc.php
index 8141af6e1..0cceafb15 100644
--- a/drivers/adodb-sqlite3.inc.php
+++ b/drivers/adodb-sqlite3.inc.php
@@ -304,13 +304,11 @@ function SQLDate($fmt, $col=false)
 		$fmt       = str_replace($fromChars,$toChars,$fmt);
 
 		$fmt = $this->qstr($fmt);
-		return ($col) ? "adodb_date2($fmt,$col)" : "adodb_date($fmt)";
+		return ($col) ? "strftime($fmt,$col)" : "strftime($fmt)";
 	}
 
 	function _createFunctions()
 	{
-		$this->_connectionID->createFunction('adodb_date', 'adodb_date', 1);
-		$this->_connectionID->createFunction('adodb_date2', 'adodb_date2', 2);
 	}
 
 	/** @noinspection PhpUnusedParameterInspection */
diff --git a/drivers/adodb-sybase.inc.php b/drivers/adodb-sybase.inc.php
index 334426852..abadb51ce 100644
--- a/drivers/adodb-sybase.inc.php
+++ b/drivers/adodb-sybase.inc.php
@@ -408,7 +408,7 @@ static function UnixDate($v)
 		$themth = $ADODB_sybase_mths[$themth];
 		if ($themth <= 0) return false;
 		// h-m-s-MM-DD-YY
-		return  adodb_mktime(0,0,0,$themth,$rr[2],$rr[3]);
+		return mktime(0,0,0,$themth,$rr[2],$rr[3]);
 	}
 
 	static function UnixTimeStamp($v)
@@ -435,6 +435,6 @@ static function UnixTimeStamp($v)
 			break;
 		}
 		// h-m-s-MM-DD-YY
-		return  adodb_mktime($rr[4],$rr[5],0,$themth,$rr[2],$rr[3]);
+		return mktime($rr[4],$rr[5],0,$themth,$rr[2],$rr[3]);
 	}
 }