Changeset 5c771cb in github


Ignore:
Timestamp:
Jan 28, 2009 5:52:02 AM (4 years ago)
Author:
alecpl <alec@…>
Branches:
master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8
Children:
2a466a3
Parents:
3866fd4
Message:
  • Fix MDNSent flag checking, use arbitrary keywords (asterisk) flag (#1485706)
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • CHANGELOG

    r0d57de9 r5c771cb  
    11CHANGELOG RoundCube Webmail 
    22--------------------------- 
     3 
     42009/01/28 (alec) 
     5---------- 
     6- Fix MDNSent flag checking, use arbitrary keywords (asterisk) flag (#1485706) 
    37 
    482009/01/23 (alec) 

  • program/include/rcube_imap.php

    r3866fd4 r5c771cb  
    355355  function check_permflag($flag) 
    356356    { 
    357     $flagsmap = $GLOBALS['IMAP_FLAGS']; 
    358     return (($imap_flag = $flagsmap[strtoupper($flag)]) && in_array_nocase($imap_flag, $this->conn->permanentflags)); 
     357    $flag = strtoupper($flag); 
     358    $imap_flag = $GLOBALS['IMAP_FLAGS'][$flag]; 
     359    return (in_array_nocase($imap_flag, $this->conn->permanentflags)); 
    359360    } 
    360361 

  • program/lib/imap.inc

    rb7c1685 r5c771cb  
    7979                - include BODYSTRUCTURE in iil_C_FetchHeaders() 
    8080                - added iil_C_FetchMIMEHeaders() function 
     81                - added \* flag support  
    8182 
    8283********************************************************/ 
    … …  
    115116    'FLAGGED'  => '\\Flagged', 
    116117    'FORWARDED' => '$Forwarded', 
    117     'MDNSENT'  => '$MDNSent'); 
     118    'MDNSENT'  => '$MDNSent', 
     119    '*'        => '\\*', 
     120); 
    118121 
    119122$iil_error; 

  • program/steps/mail/func.inc

    r5282aa6 r5c771cb  
    12971297  $message = new rcube_message($uid); 
    12981298   
    1299   if ($message->headers->mdn_to && !$message->headers->mdn_sent && $IMAP->check_permflag('MDNSENT')) 
     1299  if ($message->headers->mdn_to && !$message->headers->mdn_sent && 
     1300    ($IMAP->check_permflag('MDNSENT') || $IMAP->check_permflag('*'))) 
    13001301  { 
    13011302    $identity = $RCMAIL->user->get_identity(); 

  • program/steps/mail/show.inc

    rcbbef37 r5c771cb  
    9292  if ($MESSAGE->headers->mdn_to && 
    9393      !$MESSAGE->headers->mdn_sent && !$MESSAGE->headers->seen && 
    94       $IMAP->check_permflag('MDNSENT') && 
     94      ($IMAP->check_permflag('MDNSENT') || $IMAP->check_permflag('*')) && 
    9595      $mbox_name != $CONFIG['drafts_mbox'] && 
    9696      $mbox_name != $CONFIG['sent_mbox']) 
Note: See TracChangeset for help on using the changeset viewer.