summaryrefslogtreecommitdiff
path: root/program
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2010-10-08 09:45:17 +0000
committeralecpl <alec@alec.pl>2010-10-08 09:45:17 +0000
commit6b4929278b757f41e0572e2d42982772542e4882 (patch)
treefe78f2a4bf3a4d9a65299144d68fbed26f9aa434 /program
parentf1ad3650ed880fbd15d0b9930cc621a3b00f0bb2 (diff)
- Add message content-type to the message flags in add_message_row(), can be used e.g. to set message row style/icon according to message type
Diffstat (limited to 'program')
-rw-r--r--program/js/app.js6
-rw-r--r--program/steps/mail/func.inc4
2 files changed, 7 insertions, 3 deletions
diff --git a/program/js/app.js b/program/js/app.js
index 9c3252f53..618e07404 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -1565,6 +1565,7 @@ function rcube_webmail()
parent_uid: flags.parent_uid?flags.parent_uid:0,
selected: this.select_all_mode || this.message_list.in_selection(uid),
ml: flags.ml?1:0,
+ ctype: flags.ctype,
// flags from plugins
flags: flags.extra_flags
});
@@ -1658,7 +1659,10 @@ function rcube_webmail()
html = '<span id="flagicn'+uid+'" class="'+css_class+'">&nbsp;</span>';
}
else if (c == 'attachment') {
- html = flags.attachment ? '<span class="attachment">&nbsp;</span>' : '&nbsp;';
+ if (/application\/|multipart\/m/.test(flags.ctype))
+ html = '<span class="attachment">&nbsp;</span>';
+ else
+ html = '&nbsp;';
}
else if (c == 'threads')
html = expando;
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index ab2109fc5..1d65390c2 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -318,8 +318,8 @@ function rcmail_js_message_list($a_headers, $insert_top=FALSE, $a_show_cols=null
$a_msg_flags['flagged'] = 1;
if ($header->others['list-post'])
$a_msg_flags['ml'] = 1;
- if (preg_match("/(application\/|multipart\/m)/i", $header->ctype))
- $a_msg_flags['attachment'] = 1;
+
+ $a_msg_flags['ctype'] = Q($header->ctype);
$a_msg_flags['mbox'] = $mbox;
// merge with plugin result