alecpl
2009-01-28 5c771cb25e62494cba263097175d9b718acb8aba
- Fix MDNSent flag checking, use arbitrary keywords (asterisk) flag (#1485706)


5 files modified
19 ■■■■ changed files
CHANGELOG 4 ●●●● patch | view | raw | blame | history
program/include/rcube_imap.php 5 ●●●●● patch | view | raw | blame | history
program/lib/imap.inc 5 ●●●● patch | view | raw | blame | history
program/steps/mail/func.inc 3 ●●●● patch | view | raw | blame | history
program/steps/mail/show.inc 2 ●●● patch | view | raw | blame | history
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
program/include/rcube_imap.php
@@ -354,8 +354,9 @@
   */
  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));
    }
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 @@
    'DRAFT'    => '\\Draft',
    'FLAGGED'  => '\\Flagged',
    'FORWARDED' => '$Forwarded',
    'MDNSENT'  => '$MDNSent');
    'MDNSENT'  => '$MDNSent',
    '*'        => '\\*',
);
$iil_error;
$iil_errornum;
program/steps/mail/func.inc
@@ -1296,7 +1296,8 @@
  $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']);
program/steps/mail/show.inc
@@ -91,7 +91,7 @@
  // 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'])
  {