mirror of
https://github.com/the-djmaze/snappymail.git
synced 2026-07-13 03:27:39 +03:00
Remove date_from_headers from application.ini and internalTimestamp
This commit is contained in:
parent
2656d362d6
commit
aaae0a314c
4 changed files with 0 additions and 6 deletions
|
|
@ -81,7 +81,6 @@ export class MessageModel extends AbstractModel {
|
||||||
// autocrypt: ko.observableArray(),
|
// autocrypt: ko.observableArray(),
|
||||||
hasVirus: null, // or boolean when scanned
|
hasVirus: null, // or boolean when scanned
|
||||||
priority: 3, // Normal
|
priority: 3, // Normal
|
||||||
internalTimestamp: 0,
|
|
||||||
senderEmailsString: '',
|
senderEmailsString: '',
|
||||||
senderClearEmailsString: '',
|
senderClearEmailsString: '',
|
||||||
isSpam: false,
|
isSpam: false,
|
||||||
|
|
|
||||||
|
|
@ -507,7 +507,6 @@ class Message implements \JsonSerializable
|
||||||
'spamResult' => $this->sSpamResult,
|
'spamResult' => $this->sSpamResult,
|
||||||
'isSpam' => $this->bIsSpam,
|
'isSpam' => $this->bIsSpam,
|
||||||
'dateTimestamp' => $this->iHeaderTimeStampInUTC ?: $this->iInternalTimeStampInUTC,
|
'dateTimestamp' => $this->iHeaderTimeStampInUTC ?: $this->iInternalTimeStampInUTC,
|
||||||
'internalTimestamp' => $this->iInternalTimeStampInUTC,
|
|
||||||
|
|
||||||
// \MailSo\Mime\EmailCollection
|
// \MailSo\Mime\EmailCollection
|
||||||
'from' => $this->oFrom,
|
'from' => $this->oFrom,
|
||||||
|
|
|
||||||
|
|
@ -93,9 +93,6 @@ trait Response
|
||||||
|
|
||||||
if ($mResponse instanceof \MailSo\Mail\Message) {
|
if ($mResponse instanceof \MailSo\Mail\Message) {
|
||||||
$aResult = $mResponse->jsonSerialize();
|
$aResult = $mResponse->jsonSerialize();
|
||||||
if (!$this->Config()->Get('labs', 'date_from_headers', true) && $aResult['internalTimestamp']) {
|
|
||||||
$aResult['dateTimestamp'] = $aResult['internalTimestamp'];
|
|
||||||
}
|
|
||||||
if (!$sParent && \strlen($aResult['readReceipt']) && !\in_array('$mdnsent', $aResult['flags']) && !\in_array('\\answered', $aResult['flags'])) {
|
if (!$sParent && \strlen($aResult['readReceipt']) && !\in_array('$mdnsent', $aResult['flags']) && !\in_array('\\answered', $aResult['flags'])) {
|
||||||
$oAccount = $this->getAccountFromToken();
|
$oAccount = $this->getAccountFromToken();
|
||||||
if ('1' === $this->Cacher($oAccount)->Get(\RainLoop\KeyPathHelper::ReadReceiptCache($oAccount->Email(), $aResult['folder'], $aResult['uid']), '0')) {
|
if ('1' === $this->Cacher($oAccount)->Get(\RainLoop\KeyPathHelper::ReadReceiptCache($oAccount->Email(), $aResult['folder'], $aResult['uid']), '0')) {
|
||||||
|
|
|
||||||
|
|
@ -415,7 +415,6 @@ Enables caching in the system'),
|
||||||
),
|
),
|
||||||
|
|
||||||
'labs' => array(
|
'labs' => array(
|
||||||
'date_from_headers' => array(true, 'Display message RFC 2822 date and time header, instead of the arrival internal date.'),
|
|
||||||
'allow_message_append' => array(false, 'Allow drag & drop .eml files from system into messages list'),
|
'allow_message_append' => array(false, 'Allow drag & drop .eml files from system into messages list'),
|
||||||
'login_fault_delay' => array(5, 'When login fails, wait N seconds before responding'),
|
'login_fault_delay' => array(5, 'When login fails, wait N seconds before responding'),
|
||||||
'log_ajax_response_write_limit' => array(300),
|
'log_ajax_response_write_limit' => array(300),
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue