Changeset 3211 for branches/2.2/contactcenter

Timestamp:

09/02/10 14:54:07 (14 years ago)

Author:

niltonneto

Message:

Ticket #1185 - Corrigido erro ao listar OU com muitos objetos dentro do Catálogo Geral.

Location:

branches/2.2/contactcenter/inc

Files:

• class.bo_catalog_group_catalog.inc.php (modified) (2 diffs)
• class.bo_contactcenter.inc.php (modified) (1 diff)
• class.bo_global_ldap_catalog.inc.php (modified) (2 diffs)
• class.ui_data.inc.php (modified) (3 diffs)

branches/2.2/contactcenter/inc/class.bo_catalog_group_catalog.inc.php

@@ -71 +71 @@
                 
                 */
-                function find($what, $rules, $other)
+                function find($what, $rules, $other, $recursive=false)
                 {
                         if ($ldap_info = $this->catalog['ldap'])
                         {
                                 $meta_catalog =& CreateObject('contactcenter.bo_global_ldap_catalog',$ldap_info['id_source'], $ldap_info['context'], $this->external);
-                                return $meta_catalog->find($what, $rules, $other);
+                                return $meta_catalog->find($what, $rules, $other, false, $recursive);
                         }
                         
@@ -95 +95 @@
                                 }
                                 
-                                $temp_res = $this->bo_contactcenter->catalog->find($what, $rules, $other);
+                                $temp_res = $this->bo_contactcenter->catalog->find($what, $rules, $other, false, $recursive);
                                 if (is_array($temp_res) and count($temp_res))
                                 {

branches/2.2/contactcenter/inc/class.bo_contactcenter.inc.php

@@ -206 +206 @@
                                 
                 */
-                function find($what, $rules=false, $other=false, $area=false)
-                {
-                        return $this->catalog->find($what, $rules, $other, $area);
+                function find($what, $rules=false, $other=false, $area=false, $recursive=false)
+                {
+                        return $this->catalog->find($what, $rules, $other, $area, $recursive);
                 }
                 

branches/2.2/contactcenter/inc/class.bo_global_ldap_catalog.inc.php

@@ -113 +113 @@
                 
                 */
-                function find($what, $rules=false, $other=false, $area=false)
+                function find($what, $rules=false, $other=false, $area=false, $recursive=false)
                 {
                         $restric_fields = $this->get_restrictions_without_branch($rules);
@@ -170 +170 @@
                         }
                         
-                        $ldap = $GLOBALS['phpgw']->common->ldapConnect($this->src_info['host'], $this->src_info['acc'], $this->src_info['pw'], $followReferral);
-                        $result_r = ldap_search($ldap ,($refer_context  ? $refer_context  : $this->src_info['context']), $filter, $fields, 0, $this->src_info['max_results']);
+                        $ldap = $GLOBALS['phpgw']->common->ldapConnect($this->src_info['host'], $this->src_info['acc'], $this->src_info['pw'], $followReferral);
+                        $result_r = $recursive ? ldap_search($ldap ,($refer_context  ? $refer_context  : $this->src_info['context']), $filter, $fields, 0, $this->src_info['max_results']) :
+                                                ldap_list($ldap , ($refer_context  ? $refer_context  : $this->src_info['context']), $filter, $fields, 0, $this->src_info['max_results']);
 
                         if (!$result_r)

branches/2.2/contactcenter/inc/class.ui_data.inc.php

@@ -1393 +1393 @@
 
                                                 if($this->page_info['actual_catalog']['class']!='bo_global_ldap_catalog'){
-                                                        $final[3][$i][1] = $contact['names_ordered'] ? urldecode($contact['names_ordered'])  : 'none';
+                                                        $final[3][$i][1] = $contact['names_ordered'] ? urldecode(is_array($contact['names_ordered']) ? $contact['names_ordered'][0] : $contact['names_ordered'])  : 'none';
                                                 }
                                                 else {
@@ -2897 +2897 @@
                                 // Get only this attributes: dn, cn for external catalogs,
                                 // used to restrict the attributes used in filters
-                                $ids = $this->bo->find(array($data['fields']['id'], $data['fields']['search']), $rules, array('order' => $data['fields']['search'], 'sort' => 'ASC'));
+                                $ids = $this->bo->find(array($data['fields']['id'], $data['fields']['search']), $rules, array('order' => $data['fields']['search'], 'sort' => 'ASC'), $data['search_for'] != null);
                         }
                         else
@@ -2909 +2909 @@
                                         //'contact.account_status',
                                         'contact.account_visible'
-                                        ), $rules, array('order' => $data['fields']['search'], 'sort' => 'ASC'), $data['search_for_area'] );
+                                        ), $rules, array('order' => $data['fields']['search'], 'sort' => 'ASC'), $data['search_for_area'], $data['search_for'] != null );
                         }