Changeset 6b603da in github

Timestamp:

Aug 15, 2007 4:28:01 PM (6 years ago)

Author:

thomascube <thomas@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

ef9641e

Parents:

88f66ec

Message:

LDAP improvements

Files:

• CHANGELOG (modified) (1 diff)
• config/main.inc.php.dist (modified) (1 diff)
• program/include/main.inc (modified) (2 diffs)
• program/include/rcube_contacts.inc (modified) (1 diff)
• program/include/rcube_ldap.inc (modified) (3 diffs)
• program/js/app.js (modified) (1 diff)
• program/steps/addressbook/copy.inc (modified) (1 diff)

CHANGELOG

@@ -1 +1 @@
 CHANGELOG RoundCube Webmail
 ---------------------------
+
+2007/08/15 (thomasb)
+----------
+- Applied patch for LDAP contacts listing by Glen Ogilvie
+- Applied patch for more address fields in LDAP contacts (#1484402)
+- Close LDAP connections on script shutdown
+
 
 2007/08/13 (thomasb)

config/main.inc.php.dist

@@ -203 +203 @@
  *  'name_field'    => 'cn',    // this field represents the contact's name
  *  'email_field'   => 'mail',  // this field represents the contact's e-mail
+ *  'surname_field' => 'sn',    // this field represents the contact's last name
+ *  'firstname_field' => 'gn',  // this field represents the contact's first name
  *  'scope'         => 'sub',   // search mode: sub|base|list
- *  'filter'        => '',      // will be &'d with search field ex: (status=act)
+ *  'filter'        => '',      // used for basic listing (if not empty) and will be &'d with search queries. ex: (status=act)
  *  'fuzzy_search'  => true);   // server allows wildcard search
  */

program/include/main.inc

@@ -300 +300 @@
 function rcmail_shutdown()
   {
-  global $IMAP;
+  global $IMAP, $CONTACTS;
   
   if (is_object($IMAP))
@@ -307 +307 @@
     $IMAP->write_cache();
     }
+    
+  if (is_object($CONTACTS))
+    $CONTACTS->close();
     
   // before closing the database connection, write session data

program/include/rcube_contacts.inc

@@ -129 +129 @@
   
   /**
+   * Close connection to source
+   * Called on script shutdown
+   */
+  function close(){}
+  
+  
+  /**
    * List the current set of contact records
    *

program/include/rcube_ldap.inc

@@ -59 +59 @@
         $this->fieldmap[$matches[1]] = $value;
     
-    // $this->filter = "(dn=*)";
     $this->connect();
   }
@@ -143 +142 @@
   {
     if ($this->conn)
+    {
       @ldap_unbind($this->conn);
+      $this->conn = null;
+    }
   }
 
@@ -213 +215 @@
   function list_records($cols=null, $subset=0)
   {
+    // add general filter to query
+    if (!empty($this->prop['filter']))
+    {
+      $filter = $this->prop['filter'];
+      $this->set_search_set($filter);
+    }
+    
     // exec LDAP search if no result resource is stored
     if ($this->conn && !$this->ldap_result)

program/js/app.js

@@ -2254 +2254 @@
       page = 1;
       this.env.current_page = page;
+      this.reset_qsearch();
       }
 

program/steps/addressbook/copy.inc

@@ -37 +37 @@
   else
     $OUTPUT->show_message('copysuccess', 'notice', array('nr' => count($success)));
+    
+  // close connection to second address directory
+  $TARGET->close();
 }
-  
+
 // send response
 $OUTPUT->send();