Changeset 1831 in subversion

Timestamp:

Sep 18, 2008 3:50:58 PM (5 years ago)

Author:

thomasb

Message:

Trim and abbreviate subjects in message listing

File:

• trunk/roundcubemail/program/steps/mail/func.inc (modified) (3 diffs)

trunk/roundcubemail/program/steps/mail/func.inc

@@ -260 +260 @@
         $action = $mbox==$CONFIG['drafts_mbox'] ? 'compose' : 'show';
         $uid_param = $mbox==$CONFIG['drafts_mbox'] ? '_draft_uid' : '_uid';
-        $cont = Q($IMAP->decode_header($header->$col));
-        if (empty($cont)) $cont = Q(rcube_label('nosubject'));
-        $cont = sprintf('<a href="%s" onclick="return rcube_event.cancel(event)">%s</a>', Q(rcmail_url($action, array($uid_param=>$header->uid, '_mbox'=>$mbox))), $cont);
+        $cont = abbreviate_string(trim($IMAP->decode_header($header->$col)), 160);
+        if (empty($cont)) $cont = rcube_label('nosubject');
+        $cont = sprintf('<a href="%s" onclick="return rcube_event.cancel(event)">%s</a>', Q(rcmail_url($action, array($uid_param=>$header->uid, '_mbox'=>$mbox))), Q($cont));
         }
       else if ($col=='flag')
@@ -364 +364 @@
         $action = $mbox==$CONFIG['drafts_mbox'] ? 'compose' : 'show';
         $uid_param = $mbox==$CONFIG['drafts_mbox'] ? '_draft_uid' : '_uid';
-        $cont = Q($IMAP->decode_header($header->$col));
-        if (!$cont) $cont = Q(rcube_label('nosubject'));
-        $cont = sprintf('<a href="%s" onclick="return rcube_event.cancel(event)">%s</a>', Q(rcmail_url($action, array($uid_param=>$header->uid, '_mbox'=>$mbox))), $cont);
+        $cont = abbreviate_string(trim($IMAP->decode_header($header->$col)), 160);
+        if (!$cont) $cont = rcube_label('nosubject');
+        $cont = sprintf('<a href="%s" onclick="return rcube_event.cancel(event)">%s</a>', Q(rcmail_url($action, array($uid_param=>$header->uid, '_mbox'=>$mbox))), Q($cont));
         }
       else if ($col=='size')
@@ -810 +810 @@
       $header_value = Q(rcmail_address_string($headers[$hkey], null, true, $attrib['addicon']), 'show');
     else
-      $header_value = Q($IMAP->decode_header($headers[$hkey]));
+      $header_value = Q(trim($IMAP->decode_header($headers[$hkey])));
 
     $out .= "\n<tr>\n";