From 7a5c48e7f70b8bc938fcae3ffd2be0fdbeaab145 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Wed, 13 Dec 2006 02:17:24 -0500
Subject: [PATCH] Changed 'junk' label in French localization
---
program/include/rcube_mdb2.inc | 31 +++++++++++++++++++++++++++----
1 files changed, 27 insertions(+), 4 deletions(-)
diff --git a/program/include/rcube_mdb2.inc b/program/include/rcube_mdb2.inc
index eec975c..c71e723 100755
--- a/program/include/rcube_mdb2.inc
+++ b/program/include/rcube_mdb2.inc
@@ -59,14 +59,15 @@
* @param string DSN for read/write operations
* @param string Optional DSN for read only operations
*/
- function __construct($db_dsnw, $db_dsnr='')
+ function __construct($db_dsnw, $db_dsnr='', $pconn=false)
{
if ($db_dsnr=='')
$db_dsnr=$db_dsnw;
$this->db_dsnw = $db_dsnw;
$this->db_dsnr = $db_dsnr;
-
+ $this->db_pconn = $pconn;
+
$dsn_array = MDB2::parseDSN($db_dsnw);
$this->db_provider = $dsn_array['phptype'];
}
@@ -93,7 +94,7 @@
function dsn_connect($dsn)
{
// Use persistent connections if available
- $dbh = MDB2::connect($dsn, array('persistent' => TRUE, 'portability' => MDB2_PORTABILITY_ALL ^ MDB2_PORTABILITY_EMPTY_TO_NULL));
+ $dbh = MDB2::connect($dsn, array('persistent' => $this->db_pconn, 'portability' => MDB2_PORTABILITY_ALL ^ MDB2_PORTABILITY_EMPTY_TO_NULL));
if (PEAR::isError($dbh))
{
@@ -285,7 +286,7 @@
if (!$this->db_handle)
return FALSE;
- return $result;
+ return $this->_get_result($result);
}
@@ -411,6 +412,25 @@
/**
+ * Return SQL function for current time and date
+ *
+ * @return string SQL function to use in query
+ * @access public
+ */
+ function now()
+ {
+ switch($this->db_provider)
+ {
+ case 'mssql':
+ return "getdate()";
+
+ default:
+ return "now()";
+ }
+ }
+
+
+ /**
* Return SQL statement to convert a field value into a unix timestamp
*
* @param string Field name
@@ -425,6 +445,9 @@
return "EXTRACT (EPOCH FROM $field)";
break;
+ case 'mssql':
+ return "datediff(s, '1970-01-01 00:00:00', $field)";
+
default:
return "UNIX_TIMESTAMP($field)";
}
--
Gitblit v1.9.1