Thomas
2013-10-09 628706acdcb973154161b5862c30ce706a08455a
Prepare message list to display IMAP folder
6 files modified
40 ■■■■■ changed files
program/js/app.js 4 ●●● patch | view | raw | blame | history
program/js/list.js 14 ●●●●● patch | view | raw | blame | history
program/lib/Roundcube/rcube_imap.php 1 ●●●● patch | view | raw | blame | history
program/lib/Roundcube/rcube_message_header.php 9 ●●●●● patch | view | raw | blame | history
program/steps/mail/func.inc 4 ●●● patch | view | raw | blame | history
skins/larry/mail.css 8 ●●●●● patch | view | raw | blame | history
program/js/app.js
@@ -6399,8 +6399,10 @@
    if ((n = $.inArray('status', this.env.coltypes)) >= 0)
      this.env.status_col = n;
    if (list)
    if (list) {
      list.hide_column('folder', !(this.env.search_request || this.env.search_id));
      list.init_header();
    }
  };
  // replace content of row count display
program/js/list.js
@@ -382,6 +382,20 @@
/**
 * Set/unset the given column as hidden
 */
hide_column: function(col, hide)
{
  var method = hide ? 'addClass' : 'removeClass';
  if (this.fixed_header)
    $(this.row_tagname()+' '+this.col_tagname()+'.'+col, this.fixed_header)[method]('hidden');
  $(this.row_tagname()+' '+this.col_tagname()+'.'+col, this.list)[method]('hidden');
},
/**
 * onmousedown-handler of message list column
 */
drag_column: function(e, col)
program/lib/Roundcube/rcube_imap.php
@@ -1111,6 +1111,7 @@
        }
        foreach ($headers as $h) {
            $h->folder = $folder;
            $a_msg_headers[$h->uid] = $h;
        }
program/lib/Roundcube/rcube_message_header.php
@@ -167,6 +167,13 @@
    public $mdn_to;
    /**
     * IMAP folder this message is stored in
     *
     * @var string
     */
    public $folder;
    /**
     * Other message headers
     *
     * @var array
@@ -189,6 +196,8 @@
        'reply-to'  => 'replyto',
        'cc'        => 'cc',
        'bcc'       => 'bcc',
        'mbox'      => 'folder',
        'folder'    => 'folder',
        'content-transfer-encoding' => 'encoding',
        'in-reply-to'               => 'in_reply_to',
        'content-type'              => 'ctype',
program/steps/mail/func.inc
@@ -398,6 +398,8 @@
                $cont = show_bytes($header->$col);
            else if ($col == 'date')
                $cont = $RCMAIL->format_date($header->date);
            else if ($col == 'folder')
                $cont = rcube::Q(rcube_charset::convert($header->folder, 'UTF7-IMAP'));
            else
                $cont = rcube::Q($header->$col);
@@ -421,7 +423,7 @@
            $a_msg_flags['prio'] = (int) $header->priority;
        $a_msg_flags['ctype'] = rcube::Q($header->ctype);
        $a_msg_flags['mbox']  = $mbox;
        $a_msg_flags['mbox']  = $header->folder;
        // merge with plugin result (Deprecated, use $header->flags)
        if (!empty($header->list_flags) && is_array($header->list_flags))
skins/larry/mail.css
@@ -497,6 +497,14 @@
    width: 155px;
}
.messagelist tr td.folder {
    width: 135px;
}
.messagelist tr td.hidden {
    display: none;
}
.messagelist tr.message {
/*    background-color: #fff; */
}