Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-11 20:11:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Process emails by email date

Browse Source
This commit is contained in:
Laurent Destailleur
2024-08-28 02:41:58 +02:00
parent a40d280a01
commit a31c0b09cd
1 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
htdocs/emailcollector/class/emailcollector.class.php
View File

@@ -1402,7 +1402,7 @@ class EmailCollector extends CommonObject
} }
} }
if (empty($targetdir) || !getDolGlobalString('EMAILCOLLECTOR_NO_FILTER_ON_DATE_IF_THERE_IS_A_TARGETDIR')) { // Use last date as filter if there is no targetdir defined. if (empty($targetdir) || !getDolGlobalString('EMAILCOLLECTOR_NO_FILTER_ON_DATE_IF_THERE_IS_A_TARGETDIR')) { // Use the last date of successful check as a filter if there is no targetdir defined.
$fromdate = 0; $fromdate = 0;
if ($this->datelastok) { if ($this->datelastok) {
$fromdate = $this->datelastok; $fromdate = $this->datelastok;
@@ -1656,6 +1656,8 @@ class EmailCollector extends CommonObject
*/ */
dol_syslog("Start of loop on email", LOG_INFO, 1); dol_syslog("Start of loop on email", LOG_INFO, 1);
$richarrayofemail = array();
$iforemailloop = 0; $iforemailloop = 0;
foreach ($arrayofemail as $imapemail) { foreach ($arrayofemail as $imapemail) {
if ($nbemailprocessed > 1000) { if ($nbemailprocessed > 1000) {
@@ -1680,6 +1682,21 @@ class EmailCollector extends CommonObject
preg_match_all('/([^: ]+): (.+?(?:\r\n\s(?:.+?))*)\r\n/m', $header, $matches); preg_match_all('/([^: ]+): (.+?(?:\r\n\s(?:.+?))*)\r\n/m', $header, $matches);
$headers = array_combine($matches[1], $matches[2]); $headers = array_combine($matches[1], $matches[2]);
$richarrayofemail[] = array('imapemail' => $imapemail, 'header' => $header, 'headers' => $headers, 'overview' => $overview, 'date' => strtotime($headers['Date']));
}
// Sort email found by ascending date
$richarrayofemail = dol_sort_array($richarrayofemail, 'date', 'asc');
foreach ($richarrayofemail as $tmpval) {
$imapemail = $tmpval['imapemail'];
$header = $tmpval['header'];
$overview = $tmpval['overview'];
$headers = $tmpval['headers'];
if (!empty($headers['in-reply-to']) && empty($headers['In-Reply-To'])) { if (!empty($headers['in-reply-to']) && empty($headers['In-Reply-To'])) {
$headers['In-Reply-To'] = $headers['in-reply-to']; $headers['In-Reply-To'] = $headers['in-reply-to'];
} }
@@ -2219,7 +2236,7 @@ class EmailCollector extends CommonObject
$projectid = $objectemail->id; $projectid = $objectemail->id;
} }
if (get_class($objectemail) == 'Ticket') { if ($objectemail instanceof Ticket) {
$ticketid = $objectemail->id; $ticketid = $objectemail->id;
$changeonticket_references = false; $changeonticket_references = false;
@@ -2238,7 +2255,7 @@ class EmailCollector extends CommonObject
} }
} }
if ($changeonticket_references) { if ($changeonticket_references) {
$objectemail->update($user); $objectemail->update($user, 1); // We complete the references field, that is a field for technical tracking purpose, not a user field, so no need to execute triggers
} }
} }
} }
@@ -3529,8 +3546,8 @@ class EmailCollector extends CommonObject
// Disconnect // Disconnect
if (getDolGlobalString('MAIN_IMAP_USE_PHPIMAP')) { if (getDolGlobalString('MAIN_IMAP_USE_PHPIMAP')) {
// We revert the order to move/delete the more recent first (with higher number) so renumbering does not affect number of others to delete // We sort to move/delete array with the more recent first (with higher number) so renumbering does not affect number of others to delete
$arrayofemailtodelete = array_reverse($arrayofemailtodelete, true); krsort($arrayofemailtodelete, SORT_NUMERIC);
foreach ($arrayofemailtodelete as $imapemailnum => $imapemail) { foreach ($arrayofemailtodelete as $imapemailnum => $imapemail) {
dol_syslog("EmailCollect::doCollectOneCollector delete email ".$imapemailnum); dol_syslog("EmailCollect::doCollectOneCollector delete email ".$imapemailnum);