- Timestamp:
- 05/15/12 10:47:27 (12 years ago)
- Location:
- trunk/expressoMail1_2
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/expressoMail1_2/inc/class.imap_functions.inc.php
r6178 r6185 426 426 $return['reply_toaddress'] = isset($header->reply_toaddress) ? self::decodeMimeString($header->reply_toaddress) : ''; 427 427 $return['flag'] = $header->Unseen.$header->Recent.$header->Flagged.$header->Draft.$header->Answered.$header->Deleted.( $return['attachment'] === '1' ? 'T': '' ); 428 429 if( isset( $header->to[0] )) 430 $return['to'] = self::formatMailObject( $header->to[0] ); 431 else if( isset( $header->cc[0] )) 432 $return['to'] = self::formatMailObject( $header->cc[0] ); 433 else if( isset( $header->bcc[0] )) 434 $return['to'] = self::formatMailObject( $header->bcc[0] ); 435 else 428 429 if (!empty($header->to)){ 430 foreach ($header->to as $i => $v){ 431 $return['to'][$i] = self::formatMailObject( $v ); 432 } 433 } 434 else if (!empty($header->cc)){ 435 foreach ($header->cc as $i => $v){ 436 $return['to'][$i] = self::formatMailObject( $v ); 437 } 438 } 439 else if (!empty($header->bcc)){ 440 foreach ($header->bcc as $i => $v){ 441 $return['to'][$i] = self::formatMailObject( $v ); 442 } 443 } 444 else 436 445 $return['to'] = array( 'name' => '' , 'email' => ''); 437 438 if($return['to']['name'] == 'undisclosed-recipients@' || $return['to']['name'] == '@') 439 $return['to'] = $return['from']; 440 446 447 if (!empty($return['to'])){ 448 foreach ($return['to'] as $i => $v){ 449 if($v['name'] == 'undisclosed-recipients@' || $v['name'] == '@') 450 $return['to'][$i] = $return['from']; 451 } 452 } 453 441 454 if($appendSample !== false) 442 455 $return['msg_sample'] = $this->get_msg_sample($msg_number); -
trunk/expressoMail1_2/js/draw_api.js
r6174 r6185 1543 1543 if( (msg_folder.indexOf(special_folders['Sent']) !=-1) && (headers_msgs.from != undefined) && headers_msgs.from.email.toLowerCase() == Element("user_email").value.toLowerCase() && (preferences.from_to_sent == "1") && !(msg_folder.substr(0,5) == "user/")) 1544 1544 { 1545 td_element3.onmouseover = function () {this.title=headers_msgs.to.email;}; 1545 td_element3.onmouseover = function () { 1546 var title_to = ''; 1547 $.each(headers_msgs.to, function(index, value) { 1548 if(index == (headers_msgs.to.length - 1)){ 1549 title_to = title_to + value.email; 1550 } 1551 else { 1552 title_to = title_to + value.email + ', '; 1553 } 1554 }); 1555 this.title = title_to; 1556 }; 1546 1557 1547 1558 if (headers_msgs.Draft == 'X') 1548 1559 td_element3.innerHTML += "<span style=\"color:red\">("+get_lang("Draft")+") </span>"; 1549 1560 else{ 1550 if(headers_msgs.to .email != null && headers_msgs.to.email.toLowerCase() != Element("user_email").value)1561 if(headers_msgs.to[0].email != null && headers_msgs.to[0].email.toLowerCase() != Element("user_email").value) 1551 1562 td_element24.innerHTML = "<img align='center' src ='templates/"+template+"/images/sent.gif' title='"+get_lang('Sent')+"'>"; 1552 1563 1553 1564 if (headers_msgs.to) { 1554 if (headers_msgs.to .name != null)1555 td_element3.innerHTML += headers_msgs.to .name;1556 else if(headers_msgs.to .email != null) {1557 td_element3.innerHTML += headers_msgs.to .email;1565 if (headers_msgs.to[0].name != null) 1566 td_element3.innerHTML += headers_msgs.to[0].name; 1567 else if(headers_msgs.to[0].email != null) { 1568 td_element3.innerHTML += headers_msgs.to[0].email; 1558 1569 } 1559 1570 else { -
trunk/expressoMail1_2/setup/tables_update.inc.php
r5988 r6185 252 252 } 253 253 254 254 $test[] = '2.4.5'; 255 255 function expressoMail1_2_upgrade2_4_5() { 256 256 $oProc = $GLOBALS['phpgw_setup']->oProc; 257 /* Seta o valor padrão para a configuração de número m áximo de marcadores */257 /* Seta o valor padrão para a configuração de número mínimo de marcadores */ 258 258 $oProc->query("INSERT INTO phpgw_config(config_app, config_name, config_value) VALUES ('expressoMail1_2', 'expressoMail_limit_labels', 20);"); 259 259 /* Registra o hook de validação do administrador*/
Note: See TracChangeset
for help on using the changeset viewer.