Ticket #1487839: junk_col.patch

File junk_col.patch, 7.5 KB (added by gerundt, 3 years ago)

patch file

  • roundcubemail/config/main.inc.php.dist

     
    342342$rcmail_config['message_sort_order'] = 'DESC'; 
    343343 
    344344// These cols are shown in the message list. Available cols are: 
    345 // subject, from, to, cc, replyto, date, size, status, flag, attachment 
     345// subject, from, to, cc, replyto, date, size, status, flag, attachment, junk 
    346346$rcmail_config['list_cols'] = array('subject', 'status', 'from', 'date', 'size', 'flag', 'attachment'); 
    347347 
    348348// the default locale setting (leave empty for auto-detection) 
  • roundcubemail/program/include/rcube_imap_generic.php

     
    17531753                                $result[$id]->mdn_sent = true; 
    17541754                            } else if ($flag == 'FLAGGED') { 
    17551755                                 $result[$id]->flagged = true; 
     1756                            } else if ($flag == 'JUNK') { 
     1757                                 $result[$id]->junk = true; 
    17561758                            } 
    17571759                        } 
    17581760                        $result[$id]->flags = $flags_a; 
  • roundcubemail/program/js/app.js

     
    16351635      unread: flags.unread?1:0, 
    16361636      forwarded: flags.forwarded?1:0, 
    16371637      flagged: flags.flagged?1:0, 
     1638      junk: flags.junk?1:0, 
    16381639      has_children: flags.has_children?1:0, 
    16391640      depth: flags.depth?flags.depth:0, 
    16401641      unread_children: flags.unread_children?flags.unread_children:0, 
     
    16581659        + (flags.unread ? ' unread' : '') 
    16591660        + (flags.deleted ? ' deleted' : '') 
    16601661        + (flags.flagged ? ' flagged' : '') 
     1662        + (flags.junk ? ' junk' : '') 
    16611663        + (flags.unread_children && !flags.unread && !this.env.autoexpand_threads ? ' unroot' : '') 
    16621664        + (message.selected ? ' selected' : ''), 
    16631665      // for performance use DOM instead of jQuery here 
     
    17351737        css_class = (flags.flagged ? 'flagged' : 'unflagged'); 
    17361738        html = '<span id="flagicn'+uid+'" class="'+css_class+'">&nbsp;</span>'; 
    17371739      } 
     1740      else if (c == 'junk') { 
     1741        if (flags.junk) 
     1742          html = '<span class="junk">&nbsp;</span>'; 
     1743        else 
     1744          html = '&nbsp;'; 
     1745      } 
    17381746      else if (c == 'attachment') { 
    17391747        if (/application\/|multipart\/m/.test(flags.ctype)) 
    17401748          html = '<span class="attachment">&nbsp;</span>'; 
  • roundcubemail/program/localization/de_DE/labels.inc

     
    142142$labels['fromto'] = 'Sender/EmpfÀnger'; 
    143143$labels['flag'] = 'Markierung'; 
    144144$labels['attachment'] = 'Anhang'; 
     145$labels['junk'] = 'Junk'; 
    145146$labels['nonesort'] = 'Keine'; 
    146147$labels['sentdate'] = 'Sendedatum'; 
    147148$labels['arrival'] = 'Empfangsdatum'; 
  • roundcubemail/program/steps/mail/func.inc

     
    252252  if (empty($a_headers)) 
    253253    return; 
    254254 
    255   // remove 'threads', 'attachment', 'flag', 'status' columns, we don't need them here 
    256   foreach (array('threads', 'attachment', 'flag', 'status') as $col) { 
     255  // remove 'threads', 'attachment', 'flag', 'junk', 'status' columns, we don't need them here 
     256  foreach (array('threads', 'attachment', 'flag', 'junk', 'status') as $col) { 
    257257    if (($key = array_search($col, $a_show_cols)) !== FALSE) 
    258258      unset($a_show_cols[$key]); 
    259259  } 
     
    307307      $a_msg_flags['forwarded'] = 1; 
    308308    if ($header->flagged) 
    309309      $a_msg_flags['flagged'] = 1; 
     310    if ($header->junk) 
     311      $a_msg_flags['junk'] = 1; 
    310312    if ($header->others['list-post']) 
    311313      $a_msg_flags['ml'] = 1; 
    312314 
     
    373375        break; 
    374376      case 'attachment': 
    375377      case 'status': 
     378      case 'junk': 
    376379        $col_name = '<span class="' . $col .'">&nbsp;</span>'; 
    377380        break; 
    378381      case 'threads': 
  • roundcubemail/skins/default/ie6hacks.css

     
    128128#messagelist tr td.attachment span.report, 
    129129#messagelist tr td.flag span.flagged, 
    130130#messagelist tr td.flag span.unflagged:hover, 
     131#messagelist tr td.junk span.junk, 
    131132#messagelist tr td.status span.status, 
    132133#messagelist tr td.status span.msgicon, 
    133134#messagelist tr td.status span.deleted, 
  • roundcubemail/skins/default/mail.css

    Kann nicht anzeigen: Dateityp ist als binär angegeben.
    svn:mime-type = application/octet-stream
    Kann nicht anzeigen: Dateityp ist als binär angegeben.
    svn:mime-type = application/octet-stream
     
    714714} 
    715715 
    716716#messagelist tr td.flag span, 
     717#messagelist tr td.junk span, 
    717718#messagelist tr td.status span, 
    718719#messagelist tr td.attachment span 
    719720{ 
     
    727728#messagelist tr td.attachment span.report, 
    728729#messagelist tr td.flag span.flagged, 
    729730#messagelist tr td.flag span.unflagged:hover, 
     731#messagelist tr td.junk span.junk, 
    730732#messagelist tr td.status span.status, 
    731733#messagelist tr td.status span.msgicon, 
    732734#messagelist tr td.status span.deleted, 
     
    760762  background-position: 0 -153px; 
    761763} 
    762764 
     765#messagelist tr td.junk span.junk 
     766{ 
     767  background-position: 0 -289px; 
     768} 
     769 
    763770#messagelist tr td.flag span.unflagged:hover 
    764771{ 
    765772  background-position: 0 -136px; 
     
    850857#messagelist tr td.attachment, 
    851858#messagelist tr td.threads, 
    852859#messagelist tr td.status, 
    853 #messagelist tr td.flag 
     860#messagelist tr td.flag, 
     861#messagelist tr td.junk 
    854862{ 
    855863  width: 17px; 
    856864  padding: 0 0 0 2px; 
  • roundcubemail/skins/default/templates/mail.html

     
    192192    <li><input type="checkbox" name="list_col[]" value="status" id="cols_status" /><label for="cols_status"><roundcube:label name="readstatus" /></label></li> 
    193193    <li><input type="checkbox" name="list_col[]" value="attachment" id="cols_attachment" /><label for="cols_attachment"><roundcube:label name="attachment" /></label></li> 
    194194    <li><input type="checkbox" name="list_col[]" value="flag" id="cols_flag" /><label for="cols_flag"><roundcube:label name="flag" /></label></li> 
     195    <li><input type="checkbox" name="list_col[]" value="junk" id="cols_junk" /><label for="cols_junk"><roundcube:label name="junk" /></label></li> 
    195196  </ul> 
    196197</fieldset> 
    197198<roundcube:endif />