- Timestamp:
- 04/27/07 17:25:27 (17 years ago)
- Location:
- trunk
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/contactcenter/inc/class.ui_data.inc.php
r16 r19 2491 2491 2492 2492 case 'thunderbird': 2493 $streamBuffer = " ";2493 $streamBuffer = "\n"; 2494 2494 foreach($all_contacts as $index => $object){ 2495 $streamBuffer.= ",,".$object['name'].",,".$object['email'].",, ,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,\r\n";2495 $streamBuffer.= ",,".$object['name'].",,".$object['email'].",,".$object['phone'].",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,\r\n"; 2496 2496 } 2497 2497 break; … … 2554 2554 $name_pos=2; 2555 2555 $email_pos=4; 2556 $phone_pos= 5;2556 $phone_pos=7; 2557 2557 break; 2558 2558 default: -
trunk/expressoAdmin1_2/inc/class.functions.inc.php
r16 r19 303 303 } 304 304 305 //Criado nova função bem mais eficiente! 306 /* 305 307 function get_organizations($context, $selected='') 306 308 { … … 340 342 return $sector_select; 341 343 } 342 343 function get_organizations2($context, $selected='') 344 */ 345 346 function get_organizations($context, $selected='') 344 347 { 345 348 $dn = $GLOBALS['phpgw_info']['server']['ldap_root_dn']; -
trunk/expressoMail1_2/inc/class.phpmailer.php
r16 r19 496 496 if(count($bad_rcpt) > 0) // Create error message 497 497 { 498 $smtp_code_error = substr($this->smtp->error['smtp_msg'], 0, 5); 498 //Postfix version 2.3.8-2 499 $smtp_code_error = substr($this->smtp->error['smtp_msg'], 0, 5); 500 //Postfix version 2.1.5-9 501 $array_error = explode(":", $this->smtp->error['smtp_msg']); 502 499 503 for($i = 0; $i < count($bad_rcpt); $i++) 500 504 { … … 502 506 $error .= $bad_rcpt[$i]; 503 507 } 504 if ( $smtp_code_error == '5.7.1')508 if (($smtp_code_error == '5.7.1') || (trim($array_error[2]) == 'Access denied')) 505 509 $error = $this->Lang("not_allowed") . $error; 506 510 else
Note: See TracChangeset
for help on using the changeset viewer.