Changeset 1026 in subversion

Timestamp:

Feb 7, 2008 2:50:37 AM (5 years ago)

Author:

thomasb

Message:

Truncate attachment filenames to 55 characters (#1484757) and fix misspelled function name

Location:

trunk/roundcubemail/program

Files:

• include/main.inc (modified) (2 diffs)
• include/rcube_shared.inc (modified) (1 diff)
• steps/mail/get.inc (modified) (1 diff)

trunk/roundcubemail/program/include/main.inc

@@ -1713 +1713 @@
       if ($maxlength && $maxlength>1)
         {
-        $fname = abbrevate_string($foldername, $maxlength);
+        $fname = abbreviate_string($foldername, $maxlength);
         if ($fname != $foldername)
           $title = ' title="'.Q($foldername).'"';
@@ -1792 +1792 @@
       // shorten the folder name to a given length
       if ($maxlength && $maxlength>1)
-        $foldername = abbrevate_string($foldername, $maxlength);
+        $foldername = abbreviate_string($foldername, $maxlength);
       }
 

trunk/roundcubemail/program/include/rcube_shared.inc

@@ -558 +558 @@
  * @param int    Max. length
  * @param string Replace removed chars with this
- * @return string Abbrevated string
- */
-function abbrevate_string($str, $maxlength, $place_holder='...')
+ * @return string Abbreviated string
+ */
+function abbreviate_string($str, $maxlength, $place_holder='...')
 {
   $length = rc_strlen($str);

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

@@ -109 +109 @@
       header(sprintf('Content-Disposition: %s; filename="%s";',
                      $_GET['_download'] ? 'attachment' : 'inline',
-                     $part->filename ? $part->filename : "roundcube.$ctype_secondary"));
+                     $part->filename ? abbreviate_string($part->filename, 55) : "roundcube.$ctype_secondary"));
 
       // turn off output buffering and print part content