/******************************************************************************
** Returns some general header information -- FROM, DATE, and SUBJECT
******************************************************************************/
- function sqimap_get_small_header ($imap_stream, $id, &$from, &$subject, &$date) {
- //fputs ($imap_stream, "a001 FETCH $id BODY[HEADER.FIELDS (DATE FROM SUBJECT)]\r\n");
- //fputs ($imap_stream, "a001 FETCH $id RFC822.HEADER\r\n");
- fputs ($imap_stream, "a001 FETCH $id BODY.PEEK[HEADER.FIELDS (Date From Subject)]\r\n");
+ class small_header {
+ var $from, $subject, $date;
+ }
+
+ function sqimap_get_small_header ($imap_stream, $id, $sent) {
+ fputs ($imap_stream, "a001 FETCH $id BODY.PEEK[HEADER.FIELDS (Date To From Subject)]\r\n");
$read = sqimap_read_data ($imap_stream, "a001", true, $response, $message);
$subject = _("(no subject)");
$from = _("Unknown Sender");
+ $g = 0;
for ($i = 0; $i < count($read); $i++) {
- if (eregi ("^from:", $read[$i])) {
- $from = sqimap_find_displayable_name(substr($read[$i], 5));
- } else if (eregi ("^date:", $read[$i])) {
+ if ($sent == true) {
+ if (eregi ("^to:", $read[$i])) {
+ $from = sqimap_find_displayable_name(substr($read[$i], 3));
+ }
+ } else {
+ if (eregi ("^from:", $read[$i])) {
+ $from = sqimap_find_displayable_name(substr($read[$i], 5));
+ }
+ }
+
+ if (eregi ("^date:", $read[$i])) {
$date = substr($read[$i], 5);
} else if (eregi ("^subject:", $read[$i])) {
$subject = htmlspecialchars(eregi_replace ("^subject: ", "", $read[$i]));
- if (strlen($subject) == 0)
+ if (strlen(Chop($subject)) == 0)
$subject = _("(no subject)");
}
- }
+ }
+
+ $header = new small_header;
+ $header->from = $from;
+ $header->date = $date;
+ $header->subject = $subject;
+
+ return $header;
}
/******************************************************************************
$pos = 0;
$header["CC"][$pos] = trim(substr($read[$i], 4));
$i++;
- while ((substr($read[$i], 0, 1) == " ") && (trim($read[$i]) != "")) {
+ while (((substr($read[$i], 0, 1) == " ") || (substr($read[$i], 0, 1) == "\t")) && (trim($read[$i]) != "")){
$pos++;
$header["CC"][$pos] = trim($read[$i]);
$i++;
$pos = 0;
$header["TO"][$pos] = trim(substr($read[$i], 4));
$i++;
- while ((substr($read[$i], 0, 1) == " ") && (trim($read[$i]) != "")){
+ while (((substr($read[$i], 0, 1) == " ") || (substr($read[$i], 0, 1) == "\t")) && (trim($read[$i]) != "")){
$pos++;
$header["TO"][$pos] = trim($read[$i]);
$i++;
/** ERROR CORRECTION **/
else if (substr($read[$i], 0, 1) == ")") {
- if ($header["SUBJECT"] == "")
+ if (strlen(trim($header["SUBJECT"])) == 0)
$header["SUBJECT"] = _("(no subject)");
- if ($header["FROM"] == "")
+ if (strlen(trim($header["FROM"])) == 0)
$header["FROM"] = _("(unknown sender)");
- if ($header["DATE"] == "")
+ if (strlen(trim($header["DATE"])) == 0)
$header["DATE"] = time();
$i++;
}