Changeset 4544 for sandbox/2.2.0.2/contactcenter/inc

Timestamp:

05/27/11 17:57:48 (13 years ago)

Author:

airton

Message:

Ticket #1954 - Implementação de busca avançada no contactcenter

Location:

sandbox/2.2.0.2/contactcenter/inc

Files:

• class.abo_catalog.inc.php (modified) (1 diff)
• class.bo_global_ldap_catalog.inc.php (modified) (1 diff)
• class.ui_data.inc.php (modified) (5 diffs)

sandbox/2.2.0.2/contactcenter/inc/class.abo_catalog.inc.php

@@ -523 +523 @@
                                                         }
                                                         break;
-                                                                                        
+                                                case 'customFilter':
+                                                case 'exact':
+                                                case 'CN':
+                                                        break;
+                                                
                                                 default:
                                                         exit('Invalid \'other\' field passed to find in file '.__FILE__.' on line '.__LINE__);

sandbox/2.2.0.2/contactcenter/inc/class.bo_global_ldap_catalog.inc.php

@@ -219 +219 @@
                     require_once $_SESSION['rootPath'].'/API/class.servicelocator.php';
                     $ldapService = ServiceLocator::getService('ldap');
-                    $filter =  $ldapService->getSearchFilter($find);
+
+                    if($other['customFilter'])
+                        $filter =  $ldapService->getSearchFilter( $other['CN'], false, $find, $other['exact'] );
+                    else
+                        $filter =  $ldapService->getSearchFilter( $find );
+
                     $fields = array('cn','dn');
                     $ldap = $GLOBALS['phpgw']->common->ldapConnect($this->src_info['host'], $this->src_info['acc'], $this->src_info['pw'], true);

sandbox/2.2.0.2/contactcenter/inc/class.ui_data.inc.php

@@ -19 +19 @@
                 var $public_functions = array(
                         'data_manager' => true,
+                        'advanced_searh_fields' => true
                 );
 
@@ -262 +263 @@
                         $GLOBALS['phpgw']->template->set_var('cc_msg_add_contact_to_group', lang('You did not add any contact for this group.'));
                         $GLOBALS['phpgw']->template->set_var('cc_msg_fill_field_name', lang('Fill the field Full Name'));
+                        
+                        
+
+
+                            /*
+                             * Monta Contactcenter Busca Avancada
+                             */
+                            $c = CreateObject('phpgwapi.config','contactcenter');
+                            $c->read_repository();
+                            $current_config = $c->config_data;
+
+                            $arraySearch = array();
+                            foreach ($current_config as $index => $value)
+                            {
+
+                                if(substr($index, 0, 24) == 'cc_attribute_searchable_')
+                                {
+                                    if($value == 'true')
+                                    {
+                                        $v = substr($index, 24, strlen($index));
+                                        $arraySearch[] = $v;
+                                    }
+                                }
+                            }
+                            $advanceSearchArray = array();
+                            foreach ($arraySearch as $value)
+                            {
+                                foreach ($current_config as $index => $value2)
+                                {
+                                    if($value == substr($index, 22, strlen($index)) && substr($index, 0, 22) == 'cc_attribute_ldapname_')
+                                    {
+                                        foreach ($current_config as $index2 => $value3)
+                                        {
+                                            if($value == substr($index2, 18, strlen($index2)) && substr($index2, 0, 18) == 'cc_attribute_name_')
+                                                 $advanceSearchArray[$value2] =  $value3;
+                                        }
+                                    }
+
+                                }
+                            }
+
+                            $advanceSearch = array();
+                            foreach ($advanceSearchArray as $index => $value)
+                                $advanceSearch[] ='"'.$index.'":"'.$value.'"';
+
+                            $advancedFields =  "{".implode(',',$advanceSearch)."}";
+
+
+                        $GLOBALS['phpgw']->template->set_var('cc_config_advanced_search', $advancedFields);
 
                         $select_groups = '';
@@ -3194 +3244 @@
                         {
 
-                                $data['search_for'] = utf8_encode($data['search_for']);
+                                $data['search_for'] = ($data['search_for']);
                         }
 
@@ -3319 +3369 @@
                                 // 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'), $data['search_for'] != null);
+                                $ids = $this->bo->find(array($data['fields']['id'], $data['fields']['search']), $rules, array('order' => $data['fields']['search'], 'sort' => 'ASC', 'customFilter' => $data['custom_filter'], 'CN' => $data['CN'], 'exact' => $data['exact']), $data['search_for'] != null);
                         }
                         else
@@ -3333 +3383 @@
                                         'contact.connection.mail',
                                         'contact.connection.phone'
-                                        ), $rules, array('order' => $data['fields']['search'], 'sort' => 'ASC'), $data['search_for_area'], $data['search_for'] != null );
+                                        ), $rules, array('order' => $data['fields']['search'], 'sort' => 'ASC', 'customFilter' => $data['custom_filter'], 'CN' => $data['CN'], 'exact' => $data['exact']), $data['search_for_area'], $data['search_for'] != null );
                         }