diff options
| author | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2009-01-28 10:52:02 +0000 |
|---|---|---|
| committer | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2009-01-28 10:52:02 +0000 |
| commit | 43c7d3a814c273aec88d99b83cd3d616fb5969f6 (patch) | |
| tree | 9b12d03f28e2081860e081d486ce28dddb6a62f6 | |
| parent | 990b56b22650010732731da5cf4b997b1826a345 (diff) | |
- Fix MDNSent flag checking, use arbitrary keywords (asterisk) flag (#1485706)
git-svn-id: https://svn.roundcube.net/trunk@2263 208e9e7b-5314-0410-a742-e7e81cd9613c
| -rw-r--r-- | roundcubemail/CHANGELOG | 4 | ||||
| -rw-r--r-- | roundcubemail/program/include/rcube_imap.php | 5 | ||||
| -rw-r--r-- | roundcubemail/program/lib/imap.inc | 5 | ||||
| -rw-r--r-- | roundcubemail/program/steps/mail/func.inc | 3 | ||||
| -rw-r--r-- | roundcubemail/program/steps/mail/show.inc | 2 |
5 files changed, 14 insertions, 5 deletions
diff --git a/roundcubemail/CHANGELOG b/roundcubemail/CHANGELOG index 5d5c53233..e0e9473b6 100644 --- a/roundcubemail/CHANGELOG +++ b/roundcubemail/CHANGELOG @@ -1,6 +1,10 @@ CHANGELOG RoundCube Webmail --------------------------- +2009/01/28 (alec) +---------- +- Fix MDNSent flag checking, use arbitrary keywords (asterisk) flag (#1485706) + 2009/01/23 (alec) ---------- - Fix creation of folders with '&' sign in name diff --git a/roundcubemail/program/include/rcube_imap.php b/roundcubemail/program/include/rcube_imap.php index 5b3267bef..032489c50 100644 --- a/roundcubemail/program/include/rcube_imap.php +++ b/roundcubemail/program/include/rcube_imap.php @@ -354,8 +354,9 @@ class rcube_imap */ function check_permflag($flag) { - $flagsmap = $GLOBALS['IMAP_FLAGS']; - return (($imap_flag = $flagsmap[strtoupper($flag)]) && in_array_nocase($imap_flag, $this->conn->permanentflags)); + $flag = strtoupper($flag); + $imap_flag = $GLOBALS['IMAP_FLAGS'][$flag]; + return (in_array_nocase($imap_flag, $this->conn->permanentflags)); } diff --git a/roundcubemail/program/lib/imap.inc b/roundcubemail/program/lib/imap.inc index cca499b09..7fd4aee26 100644 --- a/roundcubemail/program/lib/imap.inc +++ b/roundcubemail/program/lib/imap.inc @@ -78,6 +78,7 @@ - support multiquota result - include BODYSTRUCTURE in iil_C_FetchHeaders() - added iil_C_FetchMIMEHeaders() function + - added \* flag support ********************************************************/ @@ -114,7 +115,9 @@ $GLOBALS['IMAP_FLAGS'] = array( 'DRAFT' => '\\Draft', 'FLAGGED' => '\\Flagged', 'FORWARDED' => '$Forwarded', - 'MDNSENT' => '$MDNSent'); + 'MDNSENT' => '$MDNSent', + '*' => '\\*', +); $iil_error; $iil_errornum; diff --git a/roundcubemail/program/steps/mail/func.inc b/roundcubemail/program/steps/mail/func.inc index 06d949838..0ccc2cc13 100644 --- a/roundcubemail/program/steps/mail/func.inc +++ b/roundcubemail/program/steps/mail/func.inc @@ -1296,7 +1296,8 @@ function rcmail_send_mdn($uid) $message = new rcube_message($uid); - if ($message->headers->mdn_to && !$message->headers->mdn_sent && $IMAP->check_permflag('MDNSENT')) + if ($message->headers->mdn_to && !$message->headers->mdn_sent && + ($IMAP->check_permflag('MDNSENT') || $IMAP->check_permflag('*'))) { $identity = $RCMAIL->user->get_identity(); $sender = format_email_recipient($identity['email'], $identity['name']); diff --git a/roundcubemail/program/steps/mail/show.inc b/roundcubemail/program/steps/mail/show.inc index 091a7a10a..7ae0ae000 100644 --- a/roundcubemail/program/steps/mail/show.inc +++ b/roundcubemail/program/steps/mail/show.inc @@ -91,7 +91,7 @@ if ($_GET['_uid']) { // check for unset disposition notification if ($MESSAGE->headers->mdn_to && !$MESSAGE->headers->mdn_sent && !$MESSAGE->headers->seen && - $IMAP->check_permflag('MDNSENT') && + ($IMAP->check_permflag('MDNSENT') || $IMAP->check_permflag('*')) && $mbox_name != $CONFIG['drafts_mbox'] && $mbox_name != $CONFIG['sent_mbox']) { |