Changeset 5219 in subversion

Timestamp:

Sep 15, 2011 9:34:32 AM (21 months ago)

Author:

alec

Message:

• Unify flags usage, fix parse error from last commit

Location:

branches/devel-mcache/roundcubemail/program

Files:

• js/app.js (modified) (5 diffs)
• steps/mail/func.inc (modified) (1 diff)
• steps/mail/show.inc (modified) (1 diff)

branches/devel-mcache/roundcubemail/program/js/app.js

@@ -1653 +1653 @@
     $.extend(this.env.messages[uid], {
       deleted: flags.deleted?1:0,
-      replied: flags.replied?1:0,
-      unread: flags.unread?1:0,
+      replied: flags.answered?1:0,
+      unread: !flags.seen?1:0,
       forwarded: flags.forwarded?1:0,
       flagged: flags.flagged?1:0,
@@ -1677 +1677 @@
       css_class = 'message'
         + (even ? ' even' : ' odd')
-        + (flags.unread ? ' unread' : '')
+        + (!flags.seen ? ' unread' : '')
         + (flags.deleted ? ' deleted' : '')
         + (flags.flagged ? ' flagged' : '')
-        + (flags.unread_children && !flags.unread && !this.env.autoexpand_threads ? ' unroot' : '')
+        + (flags.unread_children && flags.seen && !this.env.autoexpand_threads ? ' unroot' : '')
         + (message.selected ? ' selected' : ''),
       // for performance use DOM instead of jQuery here
@@ -1695 +1695 @@
       if (flags.deleted)
         css_class += ' deleted';
-      else if (flags.unread)
+      else if (!flags.seen)
         css_class += ' unread';
       else if (flags.unread_children > 0)
         css_class += ' unreadchildren';
     }
-    if (flags.replied)
+    if (flags.answered)
       css_class += ' replied';
     if (flags.forwarded)
@@ -1768 +1768 @@
         if (flags.deleted)
           css_class = 'deleted';
-        else if (flags.unread)
+        else if (!flags.seen)
           css_class = 'unread';
         else if (flags.unread_children > 0)
@@ -2053 +2053 @@
 
     while (new_row) {
-      if (new_row.nodeType == 1 && (r = this.message_list.rows[new_row.uid])
-            && r.unread_children) {
+      if (new_row.nodeType == 1 && (r = this.message_list.rows[new_row.uid]) && r.unread_children) {
             this.message_list.expand_all(r);
             this.set_unread_children(r.uid);

branches/devel-mcache/roundcubemail/program/steps/mail/func.inc

@@ -301 +301 @@
     if ($header->others['list-post'])
       $a_msg_flags['ml'] = 1;
-    // @TODO: change js/css scripts to use original flag names
-    if (empty($header->flags['SEEN']))
-      $a_msg_flags['unread'] = 1;
-    if (!empty($header->flags['ANSWERED']))
-      $a_msg_flags['replied'] = 1;
 
     $a_msg_flags['ctype'] = Q($header->ctype);

branches/devel-mcache/roundcubemail/program/steps/mail/show.inc

@@ -77 +77 @@
       && empty($MESSAGE->headers->flags['SEEN'])
       && ($IMAP->check_permflag('MDNSENT') || $IMAP->check_permflag('*'))
-      && $mbox_name != $CONFIG['drafts_mbox'] &&
-      && $mbox_name != $CONFIG['sent_mbox'])
-  {
+      && $mbox_name != $CONFIG['drafts_mbox']
+      && $mbox_name != $CONFIG['sent_mbox']
+  ) {
     $mdn_cfg = intval($CONFIG['mdn_requests']);