Changeset 535 for trunk/expressoMail1_2/inc/class.imap_functions.inc.php
- Timestamp:
- 10/17/08 10:04:01 (16 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/expressoMail1_2/inc/class.imap_functions.inc.php
r504 r535 82 82 $msg_number = $sort_array_msg[$msg_range_begin-1]; 83 83 84 $header = @imap_headerinfo($this->mbox, imap_msgno($this->mbox, $msg_number), 80, 255);84 $header = $this->get_header($msg_number); 85 85 if (!is_object($header)) 86 86 return false; … … 101 101 //$return[$i]['msg_folder'] = $folder; 102 102 103 $date_msg = date("d/m/Y",$header->udate);104 if ( date("d/m/Y") == $date_msg)105 $return[$i]['udate'] = date("H:i",$header->udate);103 $date_msg = gmdate("d/m/Y",$header->udate); 104 if (gmdate("d/m/Y") == $date_msg) 105 $return[$i]['udate'] = gmdate("H:i",$header->udate); 106 106 else 107 107 $return[$i]['udate'] = $date_msg; … … 171 171 $this->mbox = $this->open_mbox($msg_folder); 172 172 173 $header = @imap_headerinfo($this->mbox, imap_msgno($this->mbox, $msg_number), 80, 255);173 $header = $this->get_header($msg_number); 174 174 if (!$header) { 175 $return['status_get_msg_info'] = "false"; 175 $return['status_get_msg_info'] = "false"; 176 176 return $return; 177 177 } 178 178 179 $all_header = explode("\n", imap_fetchheader($this->mbox, $msg_number, FT_UID)); 179 180 $return_get_body = $this->get_body_msg($msg_number, $msg_folder); … … 198 199 $return['Forwarded'] = 'F'; 199 200 } 201 200 202 else { 201 203 $return['Answered'] = $header->Answered; … … 206 208 $return['msg_folder'] = $msg_folder; 207 209 208 $date_msg = date("d/m/Y",$header->udate);210 $date_msg = gmdate("d/m/Y",$header->udate); 209 211 if (date("d/m/Y") == $date_msg) 210 $return['udate'] = date("H:i",$header->udate);212 $return['udate'] = gmdate("H:i",$header->udate); 211 213 else 212 214 $return['udate'] = $date_msg; 213 215 214 216 $return['msg_day'] = $date_msg; 215 $return['msg_hour'] = date("H:i",$header->udate);217 $return['msg_hour'] = gmdate("H:i",$header->udate); 216 218 217 219 if (date("d/m/Y") == $date_msg) //no dia 218 220 { 219 $return['fulldate'] = date("d/m/Y H:i",$header->udate); 220 $return['smalldate'] = date("H:i",$header->udate); 221 222 $timestamp_now = strtotime("now"); 223 $timestamp_msg_time = $header->udate; 224 $timestamp_diff = $timestamp_now - $timestamp_msg_time; 221 $return['fulldate'] = gmdate("d/m/Y H:i",$header->udate); 222 $return['smalldate'] = gmdate("H:i",$header->udate); 223 224 $timestamp_now = strtotime("now"); 225 $timestamp_msg_time = $header->udate; 226 // $timestamp_now is GMT and $timestamp_msg_time is MailDate TZ. 227 // The variable $timestamp_diff is calculated without MailDate TZ. 228 $pdate = date_parse($header->MailDate); 229 $timestamp_diff = $timestamp_now - $timestamp_msg_time + ($pdate['zone']*(-60)); 225 230 226 231 if (gmdate("H",$timestamp_diff) > 0) … … 242 247 } 243 248 else{ 244 $return['fulldate'] = date("d/m/Y H:i",$header->udate);245 $return['smalldate'] = date("d/m/Y",$header->udate);249 $return['fulldate'] = gmdate("d/m/Y H:i",$header->udate); 250 $return['smalldate'] = gmdate("d/m/Y",$header->udate); 246 251 } 247 252 … … 936 941 foreach($msgs_to_exec as $msg_number => $command) 937 942 { 938 $header = @imap_headerinfo($this->mbox, imap_msgno($this->mbox , $msg_number), 80, 255);943 $header = $this->get_header($msg_number); 939 944 if (!is_object($header)) 940 945 return false; … … 951 956 $return[$i]['Flagged'] = $header->Flagged; 952 957 953 $date_msg = date("d/m/Y",$header->udate);954 if ( date("d/m/Y") == $date_msg)955 $return[$i]['udate'] = date("H:i",$header->udate);958 $date_msg = gmdate("d/m/Y",$header->udate); 959 if (gmdate("d/m/Y") == $date_msg) 960 $return[$i]['udate'] = gmdate("H:i",$header->udate); 956 961 else 957 962 $return[$i]['udate'] = $date_msg; … … 1415 1420 for ($i=1; $i<=$num_msgs; $i++) 1416 1421 { 1417 $header = imap_headerinfo($this->mbox, $i, 80, 255);1422 $header = $this->get_header($i); 1418 1423 // List UNSEEN messages. 1419 1424 if($search_box_type == "UNSEEN" && (!trim($header->Recent) && !trim($header->Unseen))){ … … 2113 2118 foreach($messages as $msg_number) 2114 2119 { 2115 $header = @imap_headerinfo($mbox_stream, imap_msgno($mbox_stream, $msg_number), 80, 255);2120 $header = $this->get_header($msg_number); 2116 2121 if (!is_object($header)) 2117 2122 return false; … … 2126 2131 $return[$j][$i]['Flagged'] = $header->Flagged; 2127 2132 2128 $date_msg = date("d/m/Y",$header->udate);2129 if ( date("d/m/Y") == $date_msg)2130 $return[$j][$i]['udate'] = date("H:i",$header->udate);2133 $date_msg = gmdate("d/m/Y",$header->udate); 2134 if (gmdate("d/m/Y") == $date_msg) 2135 $return[$j][$i]['udate'] = gmdate("H:i",$header->udate); 2131 2136 else 2132 2137 $return[$j][$i]['udate'] = $date_msg; … … 2285 2290 function get_msg($uid_msg,$name_box, $mbox_stream ) 2286 2291 { 2287 $header = @imap_headerinfo($mbox_stream, imap_msgno($mbox_stream, $uid_msg), 80, 255);2292 $header = $this->get_header($uid_msg); 2288 2293 $subject = $this->decode_string($header->fetchsubject); 2289 2294 $from = $header->from[0]->mailbox; 2290 2295 if($header->from[0]->personal != "") 2291 2296 $from = $header->from[0]->personal; 2292 $ret_msg = $this->decode_string($from) . "--" . $subject . "--". date("d/m/Y",$header ->udate)."--". $this->size_msg($header->Size);2297 $ret_msg = $this->decode_string($from) . "--" . $subject . "--". gmdate("d/m/Y",$header ->udate)."--". $this->size_msg($header->Size); 2293 2298 return $ret_msg; 2294 2299 } … … 2531 2536 return false; 2532 2537 } 2538 function get_header($msg_number){ 2539 $header = @imap_headerinfo($this->mbox, imap_msgno($this->mbox, $msg_number), 80, 255); 2540 if (!is_object($header)) 2541 return false; 2542 // Prepare udate from mailDate (DateTime arrived with TZ) for fixing summertime problem. 2543 $pdate = date_parse($header->MailDate); 2544 $header->udate += $pdate['zone']*(-60); 2545 return $header; 2546 } 2533 2547 } 2534 2548 ?>
Note: See TracChangeset
for help on using the changeset viewer.
