Changeset 5707 for sandbox/webservice/api/json-rpc/Expresso.php

Timestamp:

03/12/12 18:48:44 (12 years ago)

Author:

niltonneto

Message:

Ticket #2507 - Adicionado algumas melhorias no método Catalog.getUserContacts().

File:

• sandbox/webservice/api/json-rpc/Expresso.php (modified) (2 diffs)

sandbox/webservice/api/json-rpc/Expresso.php

@@ -4 +4 @@
 
         protected $expressoVersion;
-        protected $ldap;
+        protected $ldapCatalog;
         var $result;
         var $error;
@@ -29 +29 @@
         }
         
-        protected function getLdap(){
-                if($this->ldap == null) {
-                        $this->ldap = $GLOBALS['phpgw']->common->ldapConnect();
+        protected function getLdapCatalog(){
+                if(!$this->ldapCatalog) {
+                        $catalog_config = CreateObject("contactcenter.bo_ldap_manager");
+                        $_SESSION['phpgw_info']['expressomail']['ldap_server'] = $catalog_config ? $catalog_config->srcs[1] : null;
+                        $this->ldapCatalog = CreateObject("expressoMail1_2.ldap_functions");
                 }
         
-                return $this->ldap;
+                return $this->ldapCatalog;
         }