Changeset 3216 for branches/2.2/contactcenter
- Timestamp:
- 09/06/10 17:29:41 (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
r3215 r3216 112 112 if ( $shared_from == NULL ) 113 113 { 114 $query = "select" 115 . " phpgw_cc_connections.id_connection," 116 . " phpgw_cc_contact.id_contact," 117 . " phpgw_cc_contact.names_ordered," 118 . " phpgw_cc_contact.alias," 119 . " phpgw_cc_connections.connection_value ," 120 . " phpgw_cc_contact_conns.id_typeof_contact_connection," 121 . " phpgw_cc_addresses.address1," 122 . " phpgw_cc_addresses.complement," 123 . " phpgw_cc_addresses.postal_code," 124 . " phpgw_cc_city.city_name," 125 . " phpgw_cc_state.state_name," 126 . " phpgw_cc_addresses.id_country"; 127 128 $query .= " from" 129 . " phpgw_cc_contact" 130 . " inner join phpgw_cc_contact_conns on ( phpgw_cc_contact.id_contact = phpgw_cc_contact_conns.id_contact )" 131 . " inner join phpgw_cc_connections on ( phpgw_cc_contact_conns.id_connection = phpgw_cc_connections.id_connection )" 132 . " left join phpgw_cc_contact_addrs on ( phpgw_cc_contact.id_contact = phpgw_cc_contact_addrs.id_contact )" 133 . " left join phpgw_cc_addresses on ( phpgw_cc_contact_addrs.id_address = phpgw_cc_addresses.id_address )" 134 . " left join phpgw_cc_city on ( phpgw_cc_addresses.id_city = phpgw_cc_city.id_city )" 135 . " left join phpgw_cc_state on ( phpgw_cc_addresses.id_state = phpgw_cc_state.id_state)"; 136 137 $query .= " where" 114 $query = 'select' 115 . ' phpgw_cc_connections.id_connection,' 116 . ' phpgw_cc_contact.id_contact,' 117 . ' phpgw_cc_contact.names_ordered,' 118 . ' phpgw_cc_contact.alias,' 119 . ' phpgw_cc_connections.connection_value,' 120 . ' phpgw_cc_contact_conns.id_typeof_contact_connection,' 121 . ' phpgw_cc_contact_addrs.id_typeof_contact_address,' 122 . ' phpgw_cc_addresses.address1,' 123 . ' phpgw_cc_addresses.complement,' 124 . ' phpgw_cc_addresses.postal_code,' 125 . ' phpgw_cc_city.city_name,' 126 . ' phpgw_cc_state.state_name,' 127 . ' phpgw_cc_addresses.id_country'; 128 129 $query .= ' from' 130 . ' phpgw_cc_contact' 131 . ' inner join phpgw_cc_contact_conns on ( phpgw_cc_contact.id_contact = phpgw_cc_contact_conns.id_contact )' 132 . ' inner join phpgw_cc_connections on ( phpgw_cc_contact_conns.id_connection = phpgw_cc_connections.id_connection )' 133 . ' left join phpgw_cc_contact_addrs on ( phpgw_cc_contact.id_contact = phpgw_cc_contact_addrs.id_contact )' 134 . ' left join phpgw_cc_addresses on ( phpgw_cc_contact_addrs.id_address = phpgw_cc_addresses.id_address )' 135 . ' 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)'; 137 138 $query .= ' where' 138 139 . " phpgw_cc_contact.id_owner = {$this->owner}" 139 . " and phpgw_cc_connections.connection_is_default = true";140 . ' and phpgw_cc_connections.connection_is_default = true'; 140 141 141 142 } … … 175 176 foreach( $return as $i => $object ) 176 177 { 178 if ( ! array_key_exists( $object[ 'id_contact' ], $all_contacts ) ) 179 $all_contacts[ $object[ 'id_contact' ] ] = array( 180 'connection_value' => '', 181 'phone' => '', 182 'names_ordered' => '', 183 'id_contact' => '', 184 'id_connection' => '', 185 'alias' => '', 186 'business-address' => '', 187 'complement' => '', 188 'postal_code' => '', 189 'city_name' => '', 190 'state_name' => '', 191 'id_country' => '', 192 'home-address' => '', 193 'complement' => '', 194 'postal_code' => '', 195 'city_name' => '', 196 'state_name' => '', 197 'id_country' => '' 198 ); 199 177 200 switch( $object[ 'id_typeof_contact_connection' ] ) 178 201 { … … 189 212 $all_contacts[ $object[ 'id_contact' ] ][ 'id_connection' ] = $object[ 'id_connection' ]; 190 213 $all_contacts[ $object[ 'id_contact' ] ][ 'alias' ] = $object[ 'alias' ]; 191 $all_contacts[ $object[ 'id_contact' ] ][ 'address1' ] = $object[ 'address1' ]; 192 $all_contacts[ $object[ 'id_contact' ] ][ 'complement' ] = $object[ 'complement' ]; 193 $all_contacts[ $object[ 'id_contact' ] ][ 'postal_code' ] = $object[ 'postal_code' ]; 194 $all_contacts[ $object[ 'id_contact' ] ][ 'city_name' ] = $object[ 'city_name' ]; 195 $all_contacts[ $object[ 'id_contact' ] ][ 'state_name' ] = $object[ 'state_name' ]; 196 $all_contacts[ $object[ 'id_contact' ] ][ 'id_country' ] = $object[ 'id_country' ]; 214 215 switch( $object[ 'id_typeof_contact_address' ] ) 216 { 217 case 1 : 218 $all_contacts[ $object[ 'id_contact' ] ][ 'business-address' ] = $object[ 'address1' ]; 219 $all_contacts[ $object[ 'id_contact' ] ][ 'business-complement' ] = $object[ 'complement' ]; 220 $all_contacts[ $object[ 'id_contact' ] ][ 'business-postal_code' ] = $object[ 'postal_code' ]; 221 $all_contacts[ $object[ 'id_contact' ] ][ 'business-city_name' ] = $object[ 'city_name' ]; 222 $all_contacts[ $object[ 'id_contact' ] ][ 'business-state_name' ] = $object[ 'state_name' ]; 223 $all_contacts[ $object[ 'id_contact' ] ][ 'business-id_country' ] = $object[ 'id_country' ]; 224 break; 225 case 2 : 226 $all_contacts[ $object[ 'id_contact' ] ][ 'home-address' ] = $object[ 'address1' ]; 227 $all_contacts[ $object[ 'id_contact' ] ][ 'home-complement' ] = $object[ 'complement' ]; 228 $all_contacts[ $object[ 'id_contact' ] ][ 'home-postal_code' ] = $object[ 'postal_code' ]; 229 $all_contacts[ $object[ 'id_contact' ] ][ 'home-city_name' ] = $object[ 'city_name' ]; 230 $all_contacts[ $object[ 'id_contact' ] ][ 'home-state_name' ] = $object[ 'state_name' ]; 231 $all_contacts[ $object[ 'id_contact' ] ][ 'home-id_country' ] = $object[ 'id_country' ]; 232 break; 233 } 197 234 } 198 235 -
branches/2.2/contactcenter/inc/class.ui_data.inc.php
r3215 r3216 3479 3479 3480 3480 case 'expresso': 3481 $streamBuffer = "Nome,Apelido,Email,Telefone,Endereço,Complemento,CEP,Cidade,Estado,País\r\n"; 3481 $streamBuffer = 'Nome,Apelido,Email,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' 3484 . "\r\n"; 3482 3485 3483 3486 foreach($contacts as $index => $object){ 3484 $streamBuffer .= $object[ 'names_ordered'] . "," 3485 . $object[ 'alias' ] . "," 3486 . $object[ 'connection_value' ] . "," 3487 . $object[ 'phone' ] . "," 3488 . $object[ 'address1' ] . "," 3489 . $object[ 'complement' ] . "," 3490 . $object[ 'postal_code' ] . "," 3491 . $object[ 'city_name' ] . "," 3492 . $object[ 'state_name' ] . "," 3493 . $object[ 'id_country' ] . "\r\n"; 3487 $streamBuffer .= $object[ 'names_ordered'] . ',' 3488 . $object[ 'alias' ] . ',' 3489 . $object[ 'connection_value' ] . ',' 3490 . $object[ 'phone' ] . ',' 3491 . $object[ 'business-address' ] . ',' 3492 . $object[ 'business-complement' ] . ',' 3493 . $object[ 'business-postal_code' ] . ',' 3494 . $object[ 'business-city_name' ] . ',' 3495 . $object[ 'business-state_name' ] . ',' 3496 . $object[ 'business-id_country' ] . ',' 3497 . $object[ 'home-address' ] . ',' 3498 . $object[ 'home-complement' ] . ',' 3499 . $object[ 'home-postal_code' ] . ',' 3500 . $object[ 'home-city_name' ] . ',' 3501 . $object[ 'home-state_name' ] . ',' 3502 . $object[ 'home-id_country' ] . "\r\n"; 3494 3503 } 3495 3504 break;
Note: See TracChangeset
for help on using the changeset viewer.