|
|
|
@ -294,34 +294,147 @@ function onepoll_run(&$argv, &$argc){ |
|
|
|
$metas = email_msg_meta($mbox,implode(',',$msgs)); |
|
|
|
if(count($metas) != count($msgs)) { |
|
|
|
logger("onepoll: for " . $mailconf[0]['user'] . " there are ". count($msgs) . " messages but received " . count($metas) . " metas", LOGGER_DEBUG); |
|
|
|
break; |
|
|
|
} |
|
|
|
$msgs = array_combine($msgs, $metas); |
|
|
|
else { |
|
|
|
$msgs = array_combine($msgs, $metas); |
|
|
|
|
|
|
|
foreach($msgs as $msg_uid => $meta) { |
|
|
|
logger("Mail: Parsing mail ".$msg_uid, LOGGER_DATA); |
|
|
|
foreach($msgs as $msg_uid => $meta) { |
|
|
|
logger("Mail: Parsing mail ".$msg_uid, LOGGER_DATA); |
|
|
|
|
|
|
|
$datarray = array(); |
|
|
|
// $meta = email_msg_meta($mbox,$msg_uid);
|
|
|
|
// $headers = email_msg_headers($mbox,$msg_uid);
|
|
|
|
$datarray = array(); |
|
|
|
// $meta = email_msg_meta($mbox,$msg_uid);
|
|
|
|
// $headers = email_msg_headers($mbox,$msg_uid);
|
|
|
|
|
|
|
|
$datarray['uri'] = msgid2iri(trim($meta->message_id,'<>')); |
|
|
|
$datarray['uri'] = msgid2iri(trim($meta->message_id,'<>')); |
|
|
|
|
|
|
|
// Have we seen it before?
|
|
|
|
$r = q("SELECT * FROM `item` WHERE `uid` = %d AND `uri` = '%s' LIMIT 1", |
|
|
|
intval($importer_uid), |
|
|
|
dbesc($datarray['uri']) |
|
|
|
); |
|
|
|
|
|
|
|
if(count($r)) { |
|
|
|
logger("Mail: Seen before ".$msg_uid." for ".$mailconf[0]['user'],LOGGER_DEBUG); |
|
|
|
if($meta->deleted && ! $r[0]['deleted']) { |
|
|
|
q("UPDATE `item` SET `deleted` = 1, `changed` = '%s' WHERE `id` = %d LIMIT 1", |
|
|
|
dbesc(datetime_convert()), |
|
|
|
intval($r[0]['id']) |
|
|
|
); |
|
|
|
} |
|
|
|
/*switch ($mailconf[0]['action']) { |
|
|
|
case 0: |
|
|
|
logger("Mail: Seen before ".$msg_uid." for ".$mailconf[0]['user'].". Doing nothing.", LOGGER_DEBUG); |
|
|
|
break; |
|
|
|
case 1: |
|
|
|
logger("Mail: Deleting ".$msg_uid." for ".$mailconf[0]['user']); |
|
|
|
imap_delete($mbox, $msg_uid, FT_UID); |
|
|
|
break; |
|
|
|
case 2: |
|
|
|
logger("Mail: Mark as seen ".$msg_uid." for ".$mailconf[0]['user']); |
|
|
|
imap_setflag_full($mbox, $msg_uid, "\\Seen", ST_UID); |
|
|
|
break; |
|
|
|
case 3: |
|
|
|
logger("Mail: Moving ".$msg_uid." to ".$mailconf[0]['movetofolder']." for ".$mailconf[0]['user']); |
|
|
|
imap_setflag_full($mbox, $msg_uid, "\\Seen", ST_UID); |
|
|
|
if ($mailconf[0]['movetofolder'] != "") |
|
|
|
imap_mail_move($mbox, $msg_uid, $mailconf[0]['movetofolder'], FT_UID); |
|
|
|
break; |
|
|
|
}*/ |
|
|
|
continue; |
|
|
|
} |
|
|
|
|
|
|
|
// Have we seen it before?
|
|
|
|
$r = q("SELECT * FROM `item` WHERE `uid` = %d AND `uri` = '%s' LIMIT 1", |
|
|
|
intval($importer_uid), |
|
|
|
dbesc($datarray['uri']) |
|
|
|
); |
|
|
|
|
|
|
|
if(count($r)) { |
|
|
|
logger("Mail: Seen before ".$msg_uid." for ".$mailconf[0]['user'],LOGGER_DEBUG); |
|
|
|
if($meta->deleted && ! $r[0]['deleted']) { |
|
|
|
q("UPDATE `item` SET `deleted` = 1, `changed` = '%s' WHERE `id` = %d LIMIT 1", |
|
|
|
dbesc(datetime_convert()), |
|
|
|
intval($r[0]['id']) |
|
|
|
// look for a 'references' or an 'in-reply-to' header and try to match with a parent item we have locally.
|
|
|
|
|
|
|
|
// $raw_refs = ((x($headers,'references')) ? str_replace("\t",'',$headers['references']) : '');
|
|
|
|
$raw_refs = ((property_exists($meta,'references')) ? str_replace("\t",'',$meta->references) : ''); |
|
|
|
if(! trim($raw_refs)) |
|
|
|
$raw_refs = ((property_exists($meta,'in_reply_to')) ? str_replace("\t",'',$meta->in_reply_to) : ''); |
|
|
|
$raw_refs = trim($raw_refs); // Don't allow a blank reference in $refs_arr
|
|
|
|
|
|
|
|
if($raw_refs) { |
|
|
|
$refs_arr = explode(' ', $raw_refs); |
|
|
|
if(count($refs_arr)) { |
|
|
|
for($x = 0; $x < count($refs_arr); $x ++) |
|
|
|
$refs_arr[$x] = "'" . msgid2iri(str_replace(array('<','>',' '),array('','',''),dbesc($refs_arr[$x]))) . "'"; |
|
|
|
} |
|
|
|
$qstr = implode(',',$refs_arr); |
|
|
|
$r = q("SELECT `uri` , `parent-uri` FROM `item` WHERE `uri` IN ( $qstr ) AND `uid` = %d LIMIT 1", |
|
|
|
intval($importer_uid) |
|
|
|
); |
|
|
|
if(count($r)) |
|
|
|
$datarray['parent-uri'] = $r[0]['parent-uri']; // Set the parent as the top-level item
|
|
|
|
// $datarray['parent-uri'] = $r[0]['uri'];
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
if(! x($datarray,'parent-uri')) |
|
|
|
$datarray['parent-uri'] = $datarray['uri']; |
|
|
|
|
|
|
|
// Decoding the header
|
|
|
|
$subject = imap_mime_header_decode($meta->subject); |
|
|
|
$datarray['title'] = ""; |
|
|
|
foreach($subject as $subpart) |
|
|
|
if ($subpart->charset != "default") |
|
|
|
$datarray['title'] .= iconv($subpart->charset, 'UTF-8//IGNORE', $subpart->text); |
|
|
|
else |
|
|
|
$datarray['title'] .= $subpart->text; |
|
|
|
|
|
|
|
$datarray['title'] = notags(trim($datarray['title'])); |
|
|
|
|
|
|
|
//$datarray['title'] = notags(trim($meta->subject));
|
|
|
|
$datarray['created'] = datetime_convert('UTC','UTC',$meta->date); |
|
|
|
|
|
|
|
// Is it reply?
|
|
|
|
$reply = ((substr(strtolower($datarray['title']), 0, 3) == "re:") or |
|
|
|
(substr(strtolower($datarray['title']), 0, 3) == "re-") or |
|
|
|
(raw_refs != "")); |
|
|
|
|
|
|
|
$r = email_get_msg($mbox,$msg_uid, $reply); |
|
|
|
if(! $r) { |
|
|
|
logger("Mail: can't fetch msg ".$msg_uid." for ".$mailconf[0]['user']); |
|
|
|
continue; |
|
|
|
} |
|
|
|
$datarray['body'] = escape_tags($r['body']); |
|
|
|
|
|
|
|
logger("Mail: Importing ".$msg_uid." for ".$mailconf[0]['user']); |
|
|
|
|
|
|
|
// some mailing lists have the original author as 'from' - add this sender info to msg body.
|
|
|
|
// todo: adding a gravatar for the original author would be cool
|
|
|
|
|
|
|
|
if(! stristr($meta->from,$contact['addr'])) { |
|
|
|
$from = imap_mime_header_decode($meta->from); |
|
|
|
$fromdecoded = ""; |
|
|
|
foreach($from as $frompart) |
|
|
|
if ($frompart->charset != "default") |
|
|
|
$fromdecoded .= iconv($frompart->charset, 'UTF-8//IGNORE', $frompart->text); |
|
|
|
else |
|
|
|
$fromdecoded .= $frompart->text; |
|
|
|
|
|
|
|
$datarray['body'] = "[b]".t('From: ') . escape_tags($fromdecoded) . "[/b]\n\n" . $datarray['body']; |
|
|
|
} |
|
|
|
/*switch ($mailconf[0]['action']) { |
|
|
|
|
|
|
|
$datarray['uid'] = $importer_uid; |
|
|
|
$datarray['contact-id'] = $contact['id']; |
|
|
|
if($datarray['parent-uri'] === $datarray['uri']) |
|
|
|
$datarray['private'] = 1; |
|
|
|
if(($contact['network'] === NETWORK_MAIL) && (! get_pconfig($importer_uid,'system','allow_public_email_replies'))) { |
|
|
|
$datarray['private'] = 1; |
|
|
|
$datarray['allow_cid'] = '<' . $contact['id'] . '>'; |
|
|
|
} |
|
|
|
$datarray['author-name'] = $contact['name']; |
|
|
|
$datarray['author-link'] = 'mailbox'; |
|
|
|
$datarray['author-avatar'] = $contact['photo']; |
|
|
|
|
|
|
|
$stored_item = item_store($datarray); |
|
|
|
q("UPDATE `item` SET `last-child` = 0 WHERE `parent-uri` = '%s' AND `uid` = %d", |
|
|
|
dbesc($datarray['parent-uri']), |
|
|
|
intval($importer_uid) |
|
|
|
); |
|
|
|
q("UPDATE `item` SET `last-child` = 1 WHERE `id` = %d LIMIT 1", |
|
|
|
intval($stored_item) |
|
|
|
); |
|
|
|
switch ($mailconf[0]['action']) { |
|
|
|
case 0: |
|
|
|
logger("Mail: Seen before ".$msg_uid." for ".$mailconf[0]['user'].". Doing nothing.", LOGGER_DEBUG); |
|
|
|
break; |
|
|
|
@ -339,119 +452,7 @@ function onepoll_run(&$argv, &$argc){ |
|
|
|
if ($mailconf[0]['movetofolder'] != "") |
|
|
|
imap_mail_move($mbox, $msg_uid, $mailconf[0]['movetofolder'], FT_UID); |
|
|
|
break; |
|
|
|
}*/ |
|
|
|
continue; |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// look for a 'references' or an 'in-reply-to' header and try to match with a parent item we have locally.
|
|
|
|
|
|
|
|
// $raw_refs = ((x($headers,'references')) ? str_replace("\t",'',$headers['references']) : '');
|
|
|
|
$raw_refs = ((property_exists($meta,'references')) ? str_replace("\t",'',$meta->references) : ''); |
|
|
|
if(! trim($raw_refs)) |
|
|
|
$raw_refs = ((property_exists($meta,'in_reply_to')) ? str_replace("\t",'',$meta->in_reply_to) : ''); |
|
|
|
$raw_refs = trim($raw_refs); // Don't allow a blank reference in $refs_arr
|
|
|
|
|
|
|
|
if($raw_refs) { |
|
|
|
$refs_arr = explode(' ', $raw_refs); |
|
|
|
if(count($refs_arr)) { |
|
|
|
for($x = 0; $x < count($refs_arr); $x ++) |
|
|
|
$refs_arr[$x] = "'" . msgid2iri(str_replace(array('<','>',' '),array('','',''),dbesc($refs_arr[$x]))) . "'"; |
|
|
|
} |
|
|
|
$qstr = implode(',',$refs_arr); |
|
|
|
$r = q("SELECT `uri` , `parent-uri` FROM `item` WHERE `uri` IN ( $qstr ) AND `uid` = %d LIMIT 1", |
|
|
|
intval($importer_uid) |
|
|
|
); |
|
|
|
if(count($r)) |
|
|
|
$datarray['parent-uri'] = $r[0]['parent-uri']; // Set the parent as the top-level item
|
|
|
|
// $datarray['parent-uri'] = $r[0]['uri'];
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
if(! x($datarray,'parent-uri')) |
|
|
|
$datarray['parent-uri'] = $datarray['uri']; |
|
|
|
|
|
|
|
// Decoding the header
|
|
|
|
$subject = imap_mime_header_decode($meta->subject); |
|
|
|
$datarray['title'] = ""; |
|
|
|
foreach($subject as $subpart) |
|
|
|
if ($subpart->charset != "default") |
|
|
|
$datarray['title'] .= iconv($subpart->charset, 'UTF-8//IGNORE', $subpart->text); |
|
|
|
else |
|
|
|
$datarray['title'] .= $subpart->text; |
|
|
|
|
|
|
|
$datarray['title'] = notags(trim($datarray['title'])); |
|
|
|
|
|
|
|
//$datarray['title'] = notags(trim($meta->subject));
|
|
|
|
$datarray['created'] = datetime_convert('UTC','UTC',$meta->date); |
|
|
|
|
|
|
|
// Is it reply?
|
|
|
|
$reply = ((substr(strtolower($datarray['title']), 0, 3) == "re:") or |
|
|
|
(substr(strtolower($datarray['title']), 0, 3) == "re-") or |
|
|
|
(raw_refs != "")); |
|
|
|
|
|
|
|
$r = email_get_msg($mbox,$msg_uid, $reply); |
|
|
|
if(! $r) { |
|
|
|
logger("Mail: can't fetch msg ".$msg_uid." for ".$mailconf[0]['user']); |
|
|
|
continue; |
|
|
|
} |
|
|
|
$datarray['body'] = escape_tags($r['body']); |
|
|
|
|
|
|
|
logger("Mail: Importing ".$msg_uid." for ".$mailconf[0]['user']); |
|
|
|
|
|
|
|
// some mailing lists have the original author as 'from' - add this sender info to msg body.
|
|
|
|
// todo: adding a gravatar for the original author would be cool
|
|
|
|
|
|
|
|
if(! stristr($meta->from,$contact['addr'])) { |
|
|
|
$from = imap_mime_header_decode($meta->from); |
|
|
|
$fromdecoded = ""; |
|
|
|
foreach($from as $frompart) |
|
|
|
if ($frompart->charset != "default") |
|
|
|
$fromdecoded .= iconv($frompart->charset, 'UTF-8//IGNORE', $frompart->text); |
|
|
|
else |
|
|
|
$fromdecoded .= $frompart->text; |
|
|
|
|
|
|
|
$datarray['body'] = "[b]".t('From: ') . escape_tags($fromdecoded) . "[/b]\n\n" . $datarray['body']; |
|
|
|
} |
|
|
|
|
|
|
|
$datarray['uid'] = $importer_uid; |
|
|
|
$datarray['contact-id'] = $contact['id']; |
|
|
|
if($datarray['parent-uri'] === $datarray['uri']) |
|
|
|
$datarray['private'] = 1; |
|
|
|
if(($contact['network'] === NETWORK_MAIL) && (! get_pconfig($importer_uid,'system','allow_public_email_replies'))) { |
|
|
|
$datarray['private'] = 1; |
|
|
|
$datarray['allow_cid'] = '<' . $contact['id'] . '>'; |
|
|
|
} |
|
|
|
$datarray['author-name'] = $contact['name']; |
|
|
|
$datarray['author-link'] = 'mailbox'; |
|
|
|
$datarray['author-avatar'] = $contact['photo']; |
|
|
|
|
|
|
|
$stored_item = item_store($datarray); |
|
|
|
q("UPDATE `item` SET `last-child` = 0 WHERE `parent-uri` = '%s' AND `uid` = %d", |
|
|
|
dbesc($datarray['parent-uri']), |
|
|
|
intval($importer_uid) |
|
|
|
); |
|
|
|
q("UPDATE `item` SET `last-child` = 1 WHERE `id` = %d LIMIT 1", |
|
|
|
intval($stored_item) |
|
|
|
); |
|
|
|
switch ($mailconf[0]['action']) { |
|
|
|
case 0: |
|
|
|
logger("Mail: Seen before ".$msg_uid." for ".$mailconf[0]['user'].". Doing nothing.", LOGGER_DEBUG); |
|
|
|
break; |
|
|
|
case 1: |
|
|
|
logger("Mail: Deleting ".$msg_uid." for ".$mailconf[0]['user']); |
|
|
|
imap_delete($mbox, $msg_uid, FT_UID); |
|
|
|
break; |
|
|
|
case 2: |
|
|
|
logger("Mail: Mark as seen ".$msg_uid." for ".$mailconf[0]['user']); |
|
|
|
imap_setflag_full($mbox, $msg_uid, "\\Seen", ST_UID); |
|
|
|
break; |
|
|
|
case 3: |
|
|
|
logger("Mail: Moving ".$msg_uid." to ".$mailconf[0]['movetofolder']." for ".$mailconf[0]['user']); |
|
|
|
imap_setflag_full($mbox, $msg_uid, "\\Seen", ST_UID); |
|
|
|
if ($mailconf[0]['movetofolder'] != "") |
|
|
|
imap_mail_move($mbox, $msg_uid, $mailconf[0]['movetofolder'], FT_UID); |
|
|
|
break; |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
Zach Prezkuta
9 years ago