mirror of
https://github.com/the-djmaze/snappymail.git
synced 2024-09-20 07:35:55 +08:00
Activate OLDER and YOUNGER of RFC 5032
This commit is contained in:
parent
ad3d8c87ec
commit
60964c9869
|
@ -292,14 +292,26 @@ abstract class SearchCriterias
|
|||
$bUseCache = false;
|
||||
break;
|
||||
case 'OLDER_THAN':
|
||||
$aCriteriasResult[] = 'BEFORE';
|
||||
$aCriteriasResult[] = (new \DateTime())->sub(new \DateInterval("P{$sRawValue}"))->format('j-M-Y');
|
||||
$oDate = (new \DateTime())->sub(new \DateInterval("P{$sRawValue}"));
|
||||
if ($oImapClient->hasCapability('WITHIN')) {
|
||||
$aCriteriasResult[] = 'OLDER';
|
||||
$aCriteriasResult[] = \time() - $oDate->getTimestamp();
|
||||
} else {
|
||||
$aCriteriasResult[] = 'BEFORE';
|
||||
$aCriteriasResult[] = $oDate->format('j-M-Y');
|
||||
}
|
||||
break;
|
||||
case 'NEWER_THAN':
|
||||
$iTimeFilter = \max(
|
||||
$iTimeFilter,
|
||||
(new \DateTime())->sub(new \DateInterval("P{$sRawValue}"))->getTimestamp()
|
||||
);
|
||||
$oDate = (new \DateTime())->sub(new \DateInterval("P{$sRawValue}"));
|
||||
if ($oImapClient->hasCapability('WITHIN')) {
|
||||
$aCriteriasResult[] = 'YOUNGER';
|
||||
$aCriteriasResult[] = \time() - $oDate->getTimestamp();
|
||||
} else {
|
||||
$iTimeFilter = \max(
|
||||
$iTimeFilter,
|
||||
(new \DateTime())->sub(new \DateInterval("P{$sRawValue}"))->getTimestamp()
|
||||
);
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
@ -397,6 +409,8 @@ abstract class SearchCriterias
|
|||
case 'SENTSINCE':
|
||||
case 'SENTBEFORE':
|
||||
case 'BEFORE':
|
||||
case 'OLDER':
|
||||
case 'YOUNGER':
|
||||
if (\strlen($mValue)) {
|
||||
$aResult[$sName] = $mValue;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue