Changeset 3489 in subversion for trunk/roundcubemail/program/include/rcube_contacts.php

Timestamp:

Apr 15, 2010 2:33:30 AM (3 years ago)

Author:

thomasb

Message:

Always set changed date when marking a DB record as deleted + provide a cleanup script

File:

• trunk/roundcubemail/program/include/rcube_contacts.php (modified) (3 diffs)

trunk/roundcubemail/program/include/rcube_contacts.php

@@ -404 +404 @@
       $ids = join(',', $ids);
 
-    // delete all group members linked with these contacts
-    if ($this->groups) {
-      $this->db->query(
-        "DELETE FROM ".get_table_name('contactgroupmembers')."
-         WHERE  contact_id IN (".$ids.")");
-    }
-
+    // flag record as deleted
     $this->db->query(
       "UPDATE ".$this->db_name."
-       SET    del=1
+       SET    del=1, changed=".$this->db->now()."
        WHERE  user_id=?
        AND    contact_id IN (".$ids.")",
@@ -457 +451 @@
 
   /**
-   * Delete the given group and all linked group members
+   * Delete the given group (and all linked group members)
    *
    * @param string Group identifier
@@ -464 +458 @@
   function delete_group($gid)
   {
-    $sql_result = $this->db->query(
-      "DELETE FROM ".get_table_name('contactgroupmembers')."
-       WHERE  contactgroup_id=?",
-      $gid);
-    
+    // flag group record as deleted
     $sql_result = $this->db->query(
       "UPDATE ".get_table_name('contactgroups')."