Re-design of caching (new database table added\!); some bugfixes; Postgres ...

thomascube

2005-12-03 1cded85790206afe084e1baff371c543711b2b18

 program/steps/mail/addcontact.inc

@@ -6,7 +6,7 @@
 |                                                                       |
 | This file is part of the RoundCube Webmail client                     |
 | Copyright (C) 2005, RoundCube Dev. - Switzerland                      |
 | All rights reserved.                                                  |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 | PURPOSE:                                                              |
 |   Add the submitted contact to the users address book                 |
@@ -29,13 +29,11 @@
    $contact = $contact_arr[1];

    if ($contact['mailto'])
      $sql_result = $DB->query(sprintf("SELECT 1 FROM %s
                                        WHERE  user_id=%d
                                        AND    email='%s'
                                        AND    del!='1'",
                                       get_table_name('contacts'),
                                       $_SESSION['user_id'],
                                       $contact['mailto']));
      $sql_result = $DB->query("SELECT 1 FROM ".get_table_name('contacts')."
                                WHERE  user_id=?
                                AND    email=?
                                AND    del<>1",
                                $_SESSION['user_id'],$contact['mailto']);

    // contact entry with this mail address exists
    if ($sql_result && $DB->num_rows($sql_result))
@@ -43,15 +41,14 @@

    else if ($contact['mailto'])
      {
      $DB->query(sprintf("INSERT INTO %s
                          (user_id, name, email)
                          VALUES (%d, '%s', '%s')",
                         get_table_name('contacts'),
                         $_SESSION['user_id'],
                         $contact['name'],
                         $contact['mailto']));
      $DB->query("INSERT INTO ".get_table_name('contacts')."
                  (user_id, changed, del, name, email)
                  VALUES (?, now(), 0, ?, ?)",
                  $_SESSION['user_id'],
                  $contact['name'],
                  $contact['mailto']);

      $added = $DB->insert_id();
      $added = $DB->insert_id(get_sequence_name('contacts'));
      }
    }