Added MSSQL support

6 files changed, 39 insertions, 17 deletions

diff --git a/program/include/main.inc b/program/include/main.inc
index 051d6e250..7458fe131 100644
--- a/program/include/main.inc
+++ b/program/include/main.inc
@@ -466,7 +466,7 @@ function rcmail_login($user, $pass, $host=NULL)
       
     // update user's record
     $DB->query("UPDATE ".get_table_name('users')."
-                SET    last_login=now()
+                SET    last_login=".$DB->now()."
                 WHERE  user_id=?",
                 $user_id);
     }
@@ -511,7 +511,7 @@ function rcmail_create_user($user, $host)
 
   $DB->query("INSERT INTO ".get_table_name('users')."
               (created, last_login, username, mail_host, alias, language)
-              VALUES (now(), now(), ?, ?, ?, ?)",
+              VALUES (".$DB->now().", ".$DB->now().", ?, ?, ?, ?)",
               $user,
               $host,
               $user_email,
diff --git a/program/include/rcube_db.inc b/program/include/rcube_db.inc
index 5b32798a7..a01b38dd6 100755
--- a/program/include/rcube_db.inc
+++ b/program/include/rcube_db.inc
@@ -292,13 +292,14 @@ class rcube_db
     switch($this->db_provider)
       {
       case 'pgsql':
-        // PostgreSQL uses sequences
         $result = &$this->db_handle->getOne("SELECT CURRVAL('$sequence')");
+        
+      case 'mssql':
+       	$result = &$this->db_handle->getOne("SELECT @@IDENTITY");
+
         if (DB::isError($result))
-          {
           raise_error(array('code' => 500, 'type' => 'db', 'line' => __LINE__, 'file' => __FILE__, 
                             'message' => $result->getMessage()), TRUE, FALSE);
-          }
 
         return $result;
                 
@@ -421,6 +422,25 @@ class rcube_db
     }
 
 
+  /*
+   * 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
    *
@@ -434,7 +454,9 @@ class rcube_db
       {
       case 'pgsql':
         return "EXTRACT (EPOCH FROM $field)";
-        break;
+
+      case 'mssql':
+        return "datediff(s, '1970-01-01 00:00:00', $field)";
 
       default:
         return "UNIX_TIMESTAMP($field)";
@@ -456,7 +478,7 @@ class rcube_db
       case 'mysqli':
       case 'mysql':
       case 'sqlite':
-        return "FROM_UNIXTIME($timestamp)";
+        return sprintf("FROM_UNIXTIME(%d)", $timestamp);
 
       default:
         return date("'Y-m-d H:i:s'", $timestamp);
diff --git a/program/include/rcube_imap.inc b/program/include/rcube_imap.inc
index 23636dc35..a11c74910 100644
--- a/program/include/rcube_imap.inc
+++ b/program/include/rcube_imap.inc
@@ -1764,7 +1764,7 @@ class rcube_imap
       {
       $this->db->query(
         "UPDATE ".get_table_name('cache')."
-         SET    created=now(),
+         SET    created=".$this->db->now().",
                 data=?
          WHERE  user_id=?
          AND    cache_key=?",
@@ -1778,7 +1778,7 @@ class rcube_imap
       $this->db->query(
         "INSERT INTO ".get_table_name('cache')."
          (created, user_id, cache_key, data)
-         VALUES (now(), ?, ?, ?)",
+         VALUES (".$this->db->now().", ?, ?, ?)",
         $_SESSION['user_id'],
         $key,
         $data);
@@ -1967,7 +1967,7 @@ class rcube_imap
       $this->db->query(
         "INSERT INTO ".get_table_name('messages')."
          (user_id, del, cache_key, created, idx, uid, subject, ".$this->db->quoteIdentifier('from').", ".$this->db->quoteIdentifier('to').", cc, date, size, headers, structure)
-         VALUES (?, 0, ?, now(), ?, ?, ?, ?, ?, ?, ".$this->db->fromunixtime($headers->timestamp).", ?, ?, ?)",
+         VALUES (?, 0, ?, ".$this->db->now().", ?, ?, ?, ?, ?, ?, ".$this->db->fromunixtime($headers->timestamp).", ?, ?, ?)",
         $_SESSION['user_id'],
         $key,
         $index,
diff --git a/program/include/session.inc b/program/include/session.inc
index dc362f8f9..00ca29915 100644
--- a/program/include/session.inc
+++ b/program/include/session.inc
@@ -70,7 +70,7 @@ function sess_write($key, $vars)
     session_decode($vars);
     $DB->query("UPDATE ".get_table_name('session')."
                 SET    vars=?,
-                       changed=now()
+                       changed=".$DB->now()."
                 WHERE  sess_id=?",
                 $vars,
                 $key);
@@ -79,7 +79,7 @@ function sess_write($key, $vars)
     {
     $DB->query("INSERT INTO ".get_table_name('session')."
                 (sess_id, vars, ip, created, changed)
-                VALUES (?, ?, ?, now(), now())",
+                VALUES (?, ?, ?, ".$DB->now().", ".$DB->now().")",
                 $key,
                 $vars,
                 $_SERVER['REMOTE_ADDR']);
@@ -118,7 +118,7 @@ function sess_gc($maxlifetime)
   // get all expired sessions  
   $sql_result = $DB->query("SELECT sess_id
                             FROM ".get_table_name('session')."
-                            WHERE ".$DB->unixtimestamp('now()')."-".$DB->unixtimestamp('changed')." > ?",
+                            WHERE ".$DB->unixtimestamp($DB->now())."-".$DB->unixtimestamp('changed')." > ?",
                             $maxlifetime);
                                    
   $a_exp_sessions = array();
diff --git a/program/steps/addressbook/save.inc b/program/steps/addressbook/save.inc
index f6b8b3cc2..abea316e5 100644
--- a/program/steps/addressbook/save.inc
+++ b/program/steps/addressbook/save.inc
@@ -50,7 +50,7 @@ if (!empty($_POST['_cid']))
   if (sizeof($a_write_sql))
     {
     $DB->query("UPDATE $contacts_table
-                SET    changed=now(), ".join(', ', $a_write_sql)."
+                SET    changed=".$DB->now().", ".join(', ', $a_write_sql)."
                 WHERE  contact_id=?
                 AND    user_id=?
                 AND    del<>1",
@@ -172,8 +172,8 @@ else
     if (sizeof($a_insert_cols))
       {
       $DB->query("INSERT INTO $contacts_table
-                (user_id, changed, del, ".join(', ', $a_insert_cols).")
-                VALUES (?, now(), 0, ".join(', ', $a_insert_values).")",
+                  (user_id, changed, del, ".join(', ', $a_insert_cols).")
+                  VALUES (?, ".$DB->now().", 0, ".join(', ', $a_insert_values).")",
                 $_SESSION['user_id']);
                        
       $insert_id = $DB->insert_id(get_sequence_name('contacts'));
diff --git a/program/steps/mail/addcontact.inc b/program/steps/mail/addcontact.inc
index a0e1e9394..b040581aa 100644
--- a/program/steps/mail/addcontact.inc
+++ b/program/steps/mail/addcontact.inc
@@ -43,7 +43,7 @@ if (!empty($_GET['_address']))
       {
       $DB->query("INSERT INTO ".get_table_name('contacts')."
                   (user_id, changed, del, name, email)
-                  VALUES (?, now(), 0, ?, ?)",
+                  VALUES (?, ".$DB->now().", 0, ?, ?)",
                   $_SESSION['user_id'],
                   $contact['name'],
                   $contact['mailto']);