diff options
| author | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2010-10-08 09:45:17 +0000 |
|---|---|---|
| committer | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2010-10-08 09:45:17 +0000 |
| commit | 7cf9475067129efee5bcb4c3f7913f055020804a (patch) | |
| tree | 573137aca6016261cefce7a8d23b6c74347c283f /roundcubemail/program | |
| parent | dfa4210f4ce73d82f3023cff1b624b0ab59a41cf (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
git-svn-id: https://svn.roundcube.net/trunk@4063 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/program')
| -rw-r--r-- | roundcubemail/program/js/app.js | 6 | ||||
| -rw-r--r-- | roundcubemail/program/steps/mail/func.inc | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/roundcubemail/program/js/app.js b/roundcubemail/program/js/app.js index 9c3252f53..618e07404 100644 --- a/roundcubemail/program/js/app.js +++ b/roundcubemail/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+'"> </span>'; } else if (c == 'attachment') { - html = flags.attachment ? '<span class="attachment"> </span>' : ' '; + if (/application\/|multipart\/m/.test(flags.ctype)) + html = '<span class="attachment"> </span>'; + else + html = ' '; } else if (c == 'threads') html = expando; diff --git a/roundcubemail/program/steps/mail/func.inc b/roundcubemail/program/steps/mail/func.inc index ab2109fc5..1d65390c2 100644 --- a/roundcubemail/program/steps/mail/func.inc +++ b/roundcubemail/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 |