Ticket #1487839: junk_col.patch

roundcubemail/config/main.inc.php.dist

@@ -342 +342 @@
 $rcmail_config['message_sort_order'] = 'DESC';
 
 // These cols are shown in the message list. Available cols are:
-// subject, from, to, cc, replyto, date, size, status, flag, attachment
+// subject, from, to, cc, replyto, date, size, status, flag, attachment, junk
 $rcmail_config['list_cols'] = array('subject', 'status', 'from', 'date', 'size', 'flag', 'attachment');
 
 // the default locale setting (leave empty for auto-detection)

roundcubemail/program/include/rcube_imap_generic.php

@@ -1753 +1753 @@
                                 $result[$id]->mdn_sent = true;
                             } else if ($flag == 'FLAGGED') {
                                  $result[$id]->flagged = true;
+                            } else if ($flag == 'JUNK') {
+                                 $result[$id]->junk = true;
                             }
                         }
                         $result[$id]->flags = $flags_a;

roundcubemail/program/js/app.js

@@ -1635 +1635 @@
       unread: flags.unread?1:0,
       forwarded: flags.forwarded?1:0,
       flagged: flags.flagged?1:0,
+      junk: flags.junk?1:0,
       has_children: flags.has_children?1:0,
       depth: flags.depth?flags.depth:0,
       unread_children: flags.unread_children?flags.unread_children:0,
@@ -1658 +1659 @@
         + (flags.unread ? ' unread' : '')
         + (flags.deleted ? ' deleted' : '')
         + (flags.flagged ? ' flagged' : '')
+        + (flags.junk ? ' junk' : '')
         + (flags.unread_children && !flags.unread && !this.env.autoexpand_threads ? ' unroot' : '')
         + (message.selected ? ' selected' : ''),
       // for performance use DOM instead of jQuery here
@@ -1735 +1737 @@
         css_class = (flags.flagged ? 'flagged' : 'unflagged');
         html = '<span id="flagicn'+uid+'" class="'+css_class+'">&nbsp;</span>';
       }
+      else if (c == 'junk') {
+        if (flags.junk)
+          html = '<span class="junk">&nbsp;</span>';
+        else
+          html = '&nbsp;';
+      }
       else if (c == 'attachment') {
         if (/application\/|multipart\/m/.test(flags.ctype))
           html = '<span class="attachment">&nbsp;</span>';

roundcubemail/program/localization/de_DE/labels.inc

@@ -142 +142 @@
 $labels['fromto'] = 'Sender/EmpfÀnger';
 $labels['flag'] = 'Markierung';
 $labels['attachment'] = 'Anhang';
+$labels['junk'] = 'Junk';
 $labels['nonesort'] = 'Keine';
 $labels['sentdate'] = 'Sendedatum';
 $labels['arrival'] = 'Empfangsdatum';

roundcubemail/program/steps/mail/func.inc

@@ -252 +252 @@
   if (empty($a_headers))
     return;
 
-  // remove 'threads', 'attachment', 'flag', 'status' columns, we don't need them here
-  foreach (array('threads', 'attachment', 'flag', 'status') as $col) {
+  // remove 'threads', 'attachment', 'flag', 'junk', 'status' columns, we don't need them here
+  foreach (array('threads', 'attachment', 'flag', 'junk', 'status') as $col) {
     if (($key = array_search($col, $a_show_cols)) !== FALSE)
       unset($a_show_cols[$key]);
   }
@@ -307 +307 @@
       $a_msg_flags['forwarded'] = 1;
     if ($header->flagged)
       $a_msg_flags['flagged'] = 1;
+    if ($header->junk)
+      $a_msg_flags['junk'] = 1;
     if ($header->others['list-post'])
       $a_msg_flags['ml'] = 1;
 
@@ -373 +375 @@
         break;
       case 'attachment':
       case 'status':
+      case 'junk':
         $col_name = '<span class="' . $col .'">&nbsp;</span>';
         break;
       case 'threads':

roundcubemail/skins/default/ie6hacks.css

@@ -128 +128 @@
 #messagelist tr td.attachment span.report,
 #messagelist tr td.flag span.flagged,
 #messagelist tr td.flag span.unflagged:hover,
+#messagelist tr td.junk span.junk,
 #messagelist tr td.status span.status,
 #messagelist tr td.status span.msgicon,
 #messagelist tr td.status span.deleted,

roundcubemail/skins/default/mail.css

@@ -714 +714 @@
 }
 
 #messagelist tr td.flag span,
+#messagelist tr td.junk span,
 #messagelist tr td.status span,
 #messagelist tr td.attachment span
 {
@@ -727 +728 @@
 #messagelist tr td.attachment span.report,
 #messagelist tr td.flag span.flagged,
 #messagelist tr td.flag span.unflagged:hover,
+#messagelist tr td.junk span.junk,
 #messagelist tr td.status span.status,
 #messagelist tr td.status span.msgicon,
 #messagelist tr td.status span.deleted,
@@ -760 +762 @@
   background-position: 0 -153px;
 }
 
+#messagelist tr td.junk span.junk
+{
+  background-position: 0 -289px;
+}
+
 #messagelist tr td.flag span.unflagged:hover
 {
   background-position: 0 -136px;
@@ -850 +857 @@
 #messagelist tr td.attachment,
 #messagelist tr td.threads,
 #messagelist tr td.status,
-#messagelist tr td.flag
+#messagelist tr td.flag,
+#messagelist tr td.junk
 {
   width: 17px;
   padding: 0 0 0 2px;

roundcubemail/skins/default/templates/mail.html

@@ -192 +192 @@
     <li><input type="checkbox" name="list_col[]" value="status" id="cols_status" /><label for="cols_status"><roundcube:label name="readstatus" /></label></li>
     <li><input type="checkbox" name="list_col[]" value="attachment" id="cols_attachment" /><label for="cols_attachment"><roundcube:label name="attachment" /></label></li>
     <li><input type="checkbox" name="list_col[]" value="flag" id="cols_flag" /><label for="cols_flag"><roundcube:label name="flag" /></label></li>
+    <li><input type="checkbox" name="list_col[]" value="junk" id="cols_junk" /><label for="cols_junk"><roundcube:label name="junk" /></label></li>
   </ul>
 </fieldset>
 <roundcube:endif />