Changeset 1590 in subversion

Timestamp:

Jul 15, 2008 12:48:20 PM (5 years ago)

Author:

thomasb

Message:

Check PERMANENTFLAGS before saving MDNSent flag (#1484963, #1485163)

Location:

trunk/roundcubemail

Files:

• CHANGELOG (modified) (1 diff)
• program/include/html.php (modified) (4 diffs)
• program/include/rcube_imap.php (modified) (1 diff)
• program/lib/imap.inc (modified) (7 diffs)
• program/steps/mail/func.inc (modified) (1 diff)
• program/steps/mail/show.inc (modified) (1 diff)

trunk/roundcubemail/CHANGELOG

@@ -5 +5 @@
 ----------
 - Re-enable autocomplete attribute for login form (#1485211)
+- Check PERMANENTFLAGS before saving $MDNSent flag (#1484963, #1485163)
 
 2008/06/30 (alec)

trunk/roundcubemail/program/include/html.php

@@ -249 +249 @@
     protected $tagname = 'input';
     protected $type = 'text';
-    protected $allowed = array('type','name','value','size','tabindex','autocomplete','checked');
+    protected $allowed = array('type','name','value','size','tabindex','autocomplete','checked','onchange');
 
     public function __construct($attrib = array())
@@ -417 +417 @@
 {
     protected $tagname = 'textarea';
-    protected $allowed = array('name','rows','cols','wrap','tabindex');
+    protected $allowed = array('name','rows','cols','wrap','tabindex','onchange');
 
     /**
@@ -474 +474 @@
     protected $tagname = 'select';
     protected $options = array();
+    protected $allowed = array('name','size','tabindex','autocomplete','multiple','onchange');
     
     /**
@@ -514 +515 @@
                 'value' => $option['value'],
                 'selected' => (in_array($option['value'], $select, true) ||
-            in_array($option['text'], $select, true)) ? 1 : null);
+                  in_array($option['text'], $select, true)) ? 1 : null);
 
             $this->content .= self::tag('option', $attr, Q($option['text']));

trunk/roundcubemail/program/include/rcube_imap.php

@@ -343 +343 @@
     $cap = strtoupper($cap);
     return $this->capabilities[$cap];
+    }
+
+
+  /**
+   * Checks the PERMANENTFLAGS capability of the current mailbox
+   * and returns true if the given flag is supported by the IMAP server
+   *
+   * @param   string  Permanentflag name
+   * @return  mixed   True if this flag is supported
+   * @access  public
+   */
+  function check_permflag($flag)
+    {
+    $flagsmap = $GLOBALS['IMAP_FLAGS'];
+    return (($imap_flag = $flagsmap[strtoupper($flag)]) && in_array_nocase($imap_flag, $this->conn->permanentflags));
     }
 

trunk/roundcubemail/program/lib/imap.inc

@@ -91 +91 @@
 $GLOBALS['IMAP_SERVER_TZ'] = date('Z');
 
+$GLOBALS['IMAP_FLAGS'] = array(
+    'SEEN'     => '\\Seen',
+    'DELETED'  => '\\Deleted',
+    'RECENT'   => '\\Recent',
+    'ANSWERED' => '\\Answered',
+    'DRAFT'    => '\\Draft',
+    'FLAGGED'  => '\\Flagged',
+    'FORWARDED' => '$Forwarded',
+    'MDNSENT'  => '$MDNSent');
+
 $iil_error;
 $iil_errornum;
@@ -114 +124 @@
         var $delimiter;
         var $capability = array();
+        var $permanentflags = array();
 }
 
@@ -143 +154 @@
         var $mdn_to;
         var $mdn_sent = false;
-        var $is_reply = false;
+        var $is_draft = false;
         var $seen = false;
         var $deleted = false;
@@ -717 +728 @@
         }
         if (strcmp($conn->selected, $mailbox) == 0) {
-                return true;
+                return true;
         }
     
@@ -730 +741 @@
                                         $conn->exists = (int) $a[1];
                                 }
-                                if (strcasecmp($a[2], 'RECENT') == 0) {
-                                        $conn->recent = (int) $a[1];
-                                }
+                                if (strcasecmp($a[2], 'RECENT') == 0) {
+                                        $conn->recent = (int) $a[1];
+                                }
+                        }
+                        else if (preg_match('/\[?PERMANENTFLAGS\s+\(([^\)]+)\)\]/U', $line, $match)) {
+                                $conn->permanentflags = explode(' ', $match[1]);
                         }
                 } while (!iil_StartsWith($line, 'sel1'));
@@ -1758 +1772 @@
                                                         } else if (strcasecmp($val, '$Forwarded') == 0) {
                                                             $result[$id]->forwarded = true;
+                                                        } else if (strcasecmp($val, 'Draft') == 0) {
+                                                            $result[$id]->is_draft = true;
                                                         } else if (strcasecmp($val, '$MDNSent') == 0) {
                                                             $result[$id]->mdn_sent = true;
@@ -1910 +1926 @@
     
         $fp    = $conn->fp;
-        $flags = array(
-        'SEEN'     => '\\Seen',
-        'DELETED'  => '\\Deleted',
-        'RECENT'   => '\\Recent',
-        'ANSWERED' => '\\Answered',
-        'DRAFT'    => '\\Draft',
-        'FLAGGED'  => '\\Flagged',
-        'FORWARDED' => '$Forwarded',
-        'MDNSENT'  => '$MDNSent');
+        $flags = $GLOBALS['IMAP_FLAGS'];
         
         $flag = strtoupper($flag);

trunk/roundcubemail/program/steps/mail/func.inc

@@ -1070 +1070 @@
   $message = new rcube_message($uid);
   
-  if ($message->headers->mdn_to && !$message->headers->mdn_sent)
+  if ($message->headers->mdn_to && !$message->headers->mdn_sent && $IMAP->check_permflag('MDNSENT'))
   {
     $identity = $RCMAIL->user->get_identity();

trunk/roundcubemail/program/steps/mail/show.inc

@@ -83 +83 @@
   
   // check for unset disposition notification
-  if ($MESSAGE->headers->mdn_to && !$MESSAGE->headers->mdn_sent &&
-      $mbox_name != $CONFIG['drafts_mbox'] && $mbox_name != $CONFIG['sent_mbox'])
+  if ($MESSAGE->headers->mdn_to &&
+      !$MESSAGE->headers->mdn_sent &&
+      $IMAP->check_permflag('MDNSENT') &&
+      $mbox_name != $CONFIG['drafts_mbox'] &&
+      $mbox_name != $CONFIG['sent_mbox'])
   {
     if (intval($CONFIG['mdn_requests']) === 1)