- optimise _id2uid(), prevent from array_flip() warnings

alecpl

2010-02-05 f6b145d5612f7605b36deee8858565611126bee8

 program/include/rcube_imap.php

@@ -2139,7 +2139,7 @@
   */
  function create_default_folders()
    {
    $a_folders = iil_C_ListMailboxes($this->conn, $this->mod_mailbox(''), 'Drafts');
    $a_folders = iil_C_ListMailboxes($this->conn, $this->mod_mailbox(''), '*');
    $a_subscribed = iil_C_ListSubscribed($this->conn, $this->mod_mailbox(''), '*');
    
    // create default folders if they do not exist
@@ -3001,15 +3001,12 @@
    {
    if (!$mbox_name)
      $mbox_name = $this->mailbox;
      
    $index = array_flip((array)$this->uid_id_map[$mbox_name]);
    if (isset($index[$id]))
      $uid = $index[$id];
    else
      {
      $uid = iil_C_ID2UID($this->conn, $mbox_name, $id);
      $this->uid_id_map[$mbox_name][$uid] = $id;
      }

    if ($uid = array_search($id, (array)$this->uid_id_map[$mbox_name]))
      return $uid;

    $uid = iil_C_ID2UID($this->conn, $mbox_name, $id);
    $this->uid_id_map[$mbox_name][$uid] = $id;
    
    return $uid;
    }