Skip to content
This repository has been archived by the owner on Nov 4, 2024. It is now read-only.

Commit

Permalink
Disable OBJECTID capability by default due to #1640
Browse files Browse the repository at this point in the history
  • Loading branch information
the-djmaze committed Jun 25, 2024
1 parent 5a63b02 commit c872e5a
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion dev/View/Popup/Domain.js
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,7 @@ export class DomainPopupView extends AbstractViewPopup {
'STATUS=SIZE',
'THREAD'
]);
this.imapDisabled_capabilities(['METADATA','PREVIEW','STATUS=SIZE']);
this.imapDisabled_capabilities(['METADATA','OBJECTID','PREVIEW','STATUS=SIZE']);
forEachObjectEntry(domainDefaults, (key, value) => this[key](value));
this.enableSmartPorts(true);
if (oDomain) {
Expand Down
1 change: 1 addition & 0 deletions snappymail/v/0.0.0/app/domains/default.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
},
"disabled_capabilities": [
"METADATA",
"OBJECTID",
"PREVIEW",
"STATUS=SIZE"
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -119,12 +119,12 @@ private function setStatusItem(string $name, $value) : bool
}
if (\property_exists(__TRAIT__, $name)) {
if ('MAILBOXID' === $name) {
// https://github.com/the-djmaze/snappymail/issues/1640
$value = \is_array($value) ? \reset($value) : $value;
if (\is_string($value)) {
$this->MAILBOXID = \base64_encode($value);
} else {
\error_log("{$this->FullName} invalid MAILBOXID value");
// Cyrus bug https://github.com/the-djmaze/snappymail/issues/1640
\error_log("{$this->FullName} invalid MAILBOXID value. Disable the OBJECTID capability.");
}
} else {
$this->$name = (int) $value;
Expand Down

0 comments on commit c872e5a

Please sign in to comment.