Changeset 3499
- Timestamp:
- 11/11/10 16:01:01 (13 years ago)
- Location:
- branches/2.2
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.2/expressoMail1_2/inc/class.imap_functions.inc.php
r3493 r3499 210 210 $head_array['msg_number'] = $msg_number; 211 211 $head_array['udate'] = $header->udate; 212 $head_array['offsetToGMT'] = $this->functions->CalculateDateOffset(); 213 214 $msgTimestamp = $header->udate + $head_array['offsetToGMT']; 215 $date_msg = gmdate("d/m/Y",$msgTimestamp); 216 // if (date("d/m/Y") == $date_msg) 217 // $return['udate'] = $header->udate; 218 // else 219 220 if (date("d/m/Y") == $date_msg) //no dia 221 { 222 $head_array['smalldate'] = gmdate("H:i",$msgTimestamp); 223 } 224 else 225 { 226 $head_array['smalldate'] = gmdate("d/m/Y",$msgTimestamp); 227 } 212 228 213 229 $from = $header->from; … … 568 584 569 585 $date_msg = gmdate("d/m/Y",$msgTimestamp); 570 if (date("d/m/Y") == $date_msg)571 $return['udate'] = gmdate("H:i",$msgTimestamp);572 else573 $return['udate'] = $date_msg;586 // if (date("d/m/Y") == $date_msg) 587 // $return['udate'] = $header->udate; 588 // else 589 $return['udate'] = $header->udate; 574 590 575 591 $return['msg_day'] = $date_msg; … … 771 787 //All this is to help in local messages 772 788 //$return['timestamp'] = $header->udate; 773 $return['timestamp'] = $header->udate _original;789 $return['timestamp'] = $header->udate; 774 790 $return['login'] = $_SESSION['phpgw_info']['expressomail']['user']['account_id'];//$GLOBALS['phpgw_info']['user']['account_id']; 775 791 $return['reply_toaddress'] = $header->reply_toaddress; -
branches/2.2/expressoMail1_2/js/draw_api.js
r3493 r3499 840 840 if (typeof offsetToGMT == 'undefined') 841 841 { 842 offsetToGMT = 0;842 offsetToGMT = headers_msgs.offsetToGMT; 843 843 } 844 844 var tr_element = document.createElement('tr'); -
branches/2.2/mobile/inc/class.mobiletemplate.inc.php
r3484 r3499 54 54 $this-> template->set_var('lang_email', lang('E-mail')); 55 55 56 $save_in_folder = $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['save_in_folder'] ? $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['save_in_folder'] : "-1"; 56 $obj = createobject("expressoMail1_2.functions"); 57 // setting timezone preference 58 $zones = $obj->getTimezones(); 59 $_SESSION['phpgw_info']['user']['preferences']['expressoMail']['timezone'] = $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['timezone'] ? $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['timezone'] : sprintf("%s", array_search("America/Sao_Paulo", $zones)); 60 61 $save_in_folder = $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['save_in_folder'] ? $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['save_in_folder'] : "-1"; 57 62 $save_in_folder = @eregi_replace("INBOX/", "INBOX".$_SESSION['phpgw_info']['expressomail']['email_server']['imapDelimiter'], $save_in_folder); 58 63 $save_in_folder = @eregi_replace("INBOX.", "INBOX".$_SESSION['phpgw_info']['expressomail']['email_server']['imapDelimiter'], $save_in_folder); -
branches/2.2/mobile/inc/class.ui_mobilemail.inc.php
r3466 r3499 496 496 $p->set_var('subject', $subject); 497 497 $p->set_var('msg_number', $msg['msg_number']); 498 $p->set_var('date', $msg[' udate']);498 $p->set_var('date', $msg['smalldate']); 499 499 $p->set_var('msg_folder', $this->folders[$this->current_folder]['folder_id']); 500 500 $p->set_var('from_label', lang('From'));
Note: See TracChangeset
for help on using the changeset viewer.