Changeset 3217
- Timestamp:
- 09/06/10 18:21:07 (14 years ago)
- Location:
- branches/2.2/contactcenter/inc
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.2/contactcenter/inc/class.so_group.inc.php
r3216 r3217 117 117 . ' phpgw_cc_contact.names_ordered,' 118 118 . ' phpgw_cc_contact.alias,' 119 . ' phpgw_cc_connections.connection_name,' 119 120 . ' phpgw_cc_connections.connection_value,' 120 121 . ' phpgw_cc_contact_conns.id_typeof_contact_connection,' … … 125 126 . ' phpgw_cc_city.city_name,' 126 127 . ' phpgw_cc_state.state_name,' 127 . ' phpgw_cc_addresses.id_country'; 128 . ' phpgw_cc_addresses.id_country' 129 ; 128 130 129 131 $query .= ' from' … … 134 136 . ' left join phpgw_cc_addresses on ( phpgw_cc_contact_addrs.id_address = phpgw_cc_addresses.id_address )' 135 137 . ' left join phpgw_cc_city on ( phpgw_cc_addresses.id_city = phpgw_cc_city.id_city )' 136 . ' left join phpgw_cc_state on ( phpgw_cc_addresses.id_state = phpgw_cc_state.id_state)'; 138 . ' left join phpgw_cc_state on ( phpgw_cc_addresses.id_state = phpgw_cc_state.id_state)' 139 ; 137 140 138 141 $query .= ' where' 139 142 . " phpgw_cc_contact.id_owner = {$this->owner}" 140 . ' and phpgw_cc_connections.connection_is_default = true'; 143 //. ' and phpgw_cc_connections.connection_is_default = true' 144 ; 141 145 142 146 } … … 180 184 'connection_value' => '', 181 185 'phone' => '', 186 'mobile' => '', 182 187 'names_ordered' => '', 183 188 'id_contact' => '', 184 189 'id_connection' => '', 185 190 'alias' => '', 191 'main-mail' => '', 192 'aternative-mail' => '', 193 'business-phone' => '', 186 194 'business-address' => '', 187 'complement' => '', 188 'postal_code' => '', 189 'city_name' => '', 190 'state_name' => '', 191 'id_country' => '', 195 'business-complement' => '', 196 'business-postal_code' => '', 197 'business-city_name' => '', 198 'business-state_name' => '', 199 'business-id_country' => '', 200 'home-phone' => '', 192 201 'home-address' => '', 193 ' complement' => '',194 ' postal_code' => '',195 ' city_name' => '',196 ' state_name' => '',197 ' id_country' => ''202 'home-complement' => '', 203 'home-postal_code' => '', 204 'home-city_name' => '', 205 'home-state_name' => '', 206 'home-id_country' => '' 198 207 ); 199 208 … … 202 211 case 1 : 203 212 $all_contacts[ $object[ 'id_contact' ] ][ 'connection_value' ] = $object[ 'connection_value' ]; 213 switch ( strtolower( $object[ 'connection_name' ] ) ) 214 { 215 case 'alternativo' : 216 $all_contacts[ $object[ 'id_contact' ] ][ 'alternative-mail' ] = $object[ 'connection_value' ]; 217 break; 218 case 'principal' : 219 $all_contacts[ $object[ 'id_contact' ] ][ 'main-mail' ] = $object[ 'connection_value' ]; 220 break; 221 } 204 222 break; 205 223 case 2 : 206 224 $all_contacts[ $object[ 'id_contact' ] ][ 'phone' ] = $object[ 'connection_value' ]; 225 switch ( strtolower( $object[ 'connection_name' ] ) ) 226 { 227 case 'casa' : 228 $all_contacts[ $object[ 'id_contact' ] ][ 'home-phone' ] = $object[ 'connection_value' ]; 229 break; 230 case 'celular' : 231 $all_contacts[ $object[ 'id_contact' ] ][ 'mobile' ] = $object[ 'connection_value' ]; 232 break; 233 case 'trabalho' : 234 $all_contacts[ $object[ 'id_contact' ] ][ 'business-phone' ] = $object[ 'connection_value' ]; 235 break; 236 } 207 237 break; 208 238 } -
branches/2.2/contactcenter/inc/class.ui_data.inc.php
r3216 r3217 3479 3479 3480 3480 case 'expresso': 3481 $streamBuffer = 'Nome,Apelido,E mail,Telefone,'3482 . ' Endereço Comercial,Complemento End. Comercial,CEP Comercial,Cidade End. Comercial,Estado End. Comercial,País End. Comercial'3483 . ' Endereço Residencial,Complemento End. Residencial,CEP Residencial,Cidade End. Residencial,Estado End. Residencial,País End. Residencial'3481 $streamBuffer = 'Nome,Apelido,E-mail Principal,E-mail Alternativo,Celular,' 3482 . 'Telefone Comercial,Endereço Comercial,Complemento End. Comercial,CEP Comercial,Cidade End. Comercial,Estado End. Comercial,País End. Comercial,' 3483 . 'Telefone Residencial,Endereço Residencial,Complemento End. Residencial,CEP Residencial,Cidade End. Residencial,Estado End. Residencial,País End. Residencial' 3484 3484 . "\r\n"; 3485 3485 … … 3487 3487 $streamBuffer .= $object[ 'names_ordered'] . ',' 3488 3488 . $object[ 'alias' ] . ',' 3489 . $object[ 'connection_value' ] . ',' 3490 . $object[ 'phone' ] . ',' 3489 . $object[ 'main-mail' ] . ',' 3490 . $object[ 'alternative-mail' ] . ',' 3491 . $object[ 'mobile' ] . ',' 3492 . $object[ 'business-phone' ] . ',' 3491 3493 . $object[ 'business-address' ] . ',' 3492 3494 . $object[ 'business-complement' ] . ',' … … 3495 3497 . $object[ 'business-state_name' ] . ',' 3496 3498 . $object[ 'business-id_country' ] . ',' 3499 . $object[ 'home-phone' ] . ',' 3497 3500 . $object[ 'home-address' ] . ',' 3498 3501 . $object[ 'home-complement' ] . ','
Note: See TracChangeset
for help on using the changeset viewer.