Changeset 3282 for branches/2.2/contactcenter/inc
- Timestamp:
- 09/23/10 10:14:52 (14 years ago)
- Location:
- branches/2.2/contactcenter/inc
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.2/contactcenter/inc/class.bo_contactcenter.inc.php
r3211 r3282 300 300 // Necessary for the new way the catalog tree is built at initialization 301 301 $new_branch['name'] = $branch['name']; 302 $new_branch['external'] = $ branch['external'];302 $new_branch['external'] = $this->tree['branches'][$id]['external']; 303 303 $branch = $new_branch; 304 304 } -
branches/2.2/contactcenter/inc/class.bo_ldap_manager.inc.php
r3262 r3282 181 181 'telex' => array('telexNumber') 182 182 ), 183 'contact.connection.mail' => array('mail'), 184 'contact.connection.phone' => array('telephoneNumber') 183 185 ); 184 186 -
branches/2.2/contactcenter/inc/class.ui_data.inc.php
r3247 r3282 116 116 $GLOBALS['phpgw']->template->set_var('cc_qa_close',lang('Close')); 117 117 /* End Quick Add */ 118 119 /* Advanced Search */ 120 121 $GLOBALS['phpgw']->template->set_var('cc_corporate',lang('Corporate')); 122 $GLOBALS['phpgw']->template->set_var('cc_cs_title',lang('Advanced Search')); 123 $GLOBALS['phpgw']->template->set_var('cc_catalogues',lang('Catalogues')); 124 125 126 127 /* End of Advanced Search*/ 118 128 119 129 $cc_css_file = $GLOBALS['phpgw_info']['server']['webserver_url'].'/contactcenter/styles/cc.css'; … … 470 480 echo serialize(array( 471 481 'status' => 'ok', 482 'catalog' => $catalog_info['class'], 483 'external' => $catalog_info['external']?true:false, 472 484 'perms' => $perms 473 485 )); … … 2753 2765 } 2754 2766 2767 //Traduz o campo na busca completa por entradas no catálogo do usuário. 2768 function aux_full_search ($field,$isldap) { 2769 $retorno = ''; 2770 if($isldap) { 2771 switch($field) { 2772 case 'mail': 2773 $retorno = 'contact.connection.mail'; 2774 break; 2775 case 'phone': 2776 $retorno = 'contact.connection.phone'; 2777 break; 2778 } 2779 } 2780 else { 2781 switch($field) { 2782 case 'corporate': 2783 $retorno = 'contact.corporate_name'; 2784 break; 2785 case 'mail': 2786 case 'phone': 2787 $retorno = 'contact.contact_connection.connection.connection_value'; 2788 break; 2789 } 2790 } 2791 return $retorno; 2792 } 2755 2793 2756 2794 /*! … … 2775 2813 // It's an external catalog? 2776 2814 $external = $this->bo->is_external($this->page_info['actual_catalog']); 2777 2778 if (!is_array($data) || !$data['search_for'] || !is_array($data['fields'])) 2815 $full_search = isset($data['full_search'])?$data['full_search']:false; 2816 2817 if (!is_array($data) || (!$data['search_for'] && !$full_search) || !is_array($data['fields'])) 2779 2818 { 2780 2819 echo serialize(array( … … 2821 2860 if (!is_array($names)) 2822 2861 { 2823 echo serialize(array( 2824 'msg' => lang('Invalid Search Parameter'), 2825 'status' => 'abort' 2826 )); 2862 if(!$full_search) { 2863 echo serialize(array( 2864 'msg' => lang('Invalid Search Parameter'), 2865 'status' => 'abort' 2866 )); 2867 exit; 2868 } 2869 else 2870 $names = array(); 2827 2871 2828 2872 } … … 2840 2884 * must have attibute phpgwAccountStatus, phpgwAccountVisible != -1 2841 2885 */ 2886 2842 2887 $rules = array( 2843 2888 0 => array( … … 2868 2913 ), 2869 2914 ); 2915 2916 foreach($full_search as $field => $value) { 2917 if(trim($value)!='') 2918 array_push($rules,array( 2919 'field' => $this->aux_full_search($field,true), 2920 'type' => 'LIKE', 2921 'value' => '*'.$value.'*' 2922 )); 2923 } 2924 2925 } 2926 else if(!$external) { 2927 2928 foreach($full_search as $field => $value) { 2929 if(trim($value)!='') 2930 array_push($rules,array( 2931 'field' => $this->aux_full_search($field,false), 2932 'type' => 'iLIKE', 2933 'value' => '%'.$value.'%' 2934 )); 2935 } 2936 2870 2937 } 2871 2938 … … 2906 2973 'contact.object_class', 2907 2974 //'contact.account_status', 2908 'contact.account_visible' 2975 'contact.account_visible', 2976 'contact.connection.mail', 2977 'contact.connection.phone' 2909 2978 ), $rules, array('order' => $data['fields']['search'], 'sort' => 'ASC'), $data['search_for_area'], $data['search_for'] != null ); 2910 2979 }
Note: See TracChangeset
for help on using the changeset viewer.