Imported Upstream version 0.3

[roundcube.git] / program / include / rcube_contacts.php

diff --git a/program/include/rcube_contacts.php b/program/include/rcube_contacts.php
index 65d89ca2b2b597795233fda5c28f5f09ae757d7c..a931845ae581924c626ff8765511abe7d807c016 100644 (file)
--- a/program/include/rcube_contacts.php
+++ b/program/include/rcube_contacts.php
@@ -25,7 +25,7 @@
  *
  * @package Addressbook
  */
-class rcube_contacts
+class rcube_contacts extends rcube_addressbook
 {
   var $db = null;
   var $db_name = '';
@@ -59,30 +59,6 @@ class rcube_contacts
   }
 
 
-  /**
-   * Set internal list page
-   *
-   * @param  number  Page number to list
-   * @access public
-   */
-  function set_page($page)
-  {
-    $this->list_page = (int)$page;
-  }
-
-
-  /**
-   * Set internal page size
-   *
-   * @param  number  Number of messages to display on one page
-   * @access public
-   */
-  function set_pagesize($size)
-  {
-    $this->page_size = (int)$size;
-  }
-
-
   /**
    * Save a search string for future listings
    *
@@ -117,13 +93,6 @@ class rcube_contacts
   }
   
   
-  /**
-   * Close connection to source
-   * Called on script shutdown
-   */
-  function close(){}
-  
-  
   /**
    * List the current set of contact records
    *
@@ -185,7 +154,7 @@ class rcube_contacts
     {
       if ($col == 'ID' || $col == $this->primary_key)
       {
-        $ids = !is_array($value) ? split(',', $value) : $value;
+        $ids = !is_array($value) ? explode(',', $value) : $value;
         $add_where[] = $this->primary_key.' IN ('.join(',', $ids).')';
       }
       else if ($strict)
@@ -233,7 +202,7 @@ class rcube_contacts
    *
    * @return Result array or NULL if nothing selected yet
    */
-  function get_result($as_res=true)
+  function get_result()
   {
     return $this->result;
   }
@@ -293,18 +262,18 @@ class rcube_contacts
         $a_insert_cols[] = $this->db->quoteIdentifier($col);
         $a_insert_values[] = $this->db->quote($save_data[$col]);
       }
-    
+
     if (!$existing->count && !empty($a_insert_cols))
     {
       $this->db->query(
         "INSERT INTO ".$this->db_name."
          (user_id, changed, del, ".join(', ', $a_insert_cols).")
-         VALUES (?, ".$this->db->now().", 0, ".join(', ', $a_insert_values).")",
-        $this->user_id);
+         VALUES (".intval($this->user_id).", ".$this->db->now().", 0, ".join(', ', $a_insert_values).")"
+        );
         
-      $insert_id = $this->db->insert_id(get_sequence_name('contacts'));
+      $insert_id = $this->db->insert_id('contacts');
     }
-    
+
     return $insert_id;
   }