Changeset 12871

Timestamp:

06/11/09 00:20:53 (1 year ago)

Author:

asha

Message:

#6020: Filesize,fielname was missing for a document created as a result of mail qualify of a mail having attachment and utf-8 characters were not handled in filename - DJ

Files:

• vtigercrm/branches/5.1/modules/Webmails/Save.php (modified) (3 diffs)

vtigercrm/branches/5.1/modules/Webmails/Save.php

@@ -102 +102 @@
-function add_attachment_to_contact($cid,$email,$emailid) {
-        // add vtiger_attachments to contact
-
+,$default_charset
-        for($j=0;$j<2;$j++) {
-            if($j==0)
@@ -116 +116 @@
-        
-                        $filename = ereg_replace("[ ()-]+", "_",$attachments[$i]["filename"]);
+                        preg_match_all('/=\?([^\?]+)\?([^\?]+)\?([^\?]+)\?=/', $filename, $matches);
+                        $totalmatches = count($matches[0]);
+                        
+                        for($index = 0; $index < $totalmatches; ++$index) {
+                                $charset = $matches[1][$index];
+                                $encoding= strtoupper($matches[2][$index]);
+                                $data    = $matches[3][$index];
+                                
+                                if($encoding == 'B') {
+                                        $filename = base64_decode($data);
+                                } else if($encoding == 'Q') {
+                                        $filename = quoted_printable_decode($data);
+                                }
+                                $filename = iconv(str_replace('_','-',$charset),$default_charset,$filename);
+                        }
+                        
-                        $saveasfile = $upload_filepath.'/'.$current_id.'_'.$filename;
-                $filetype = MailAttachmentMIME::detect($saveasfile);
@@ -134 +150 @@
-                                        $document->column_fields['notes_title']      = $filename;
-                                        $document->column_fields['filename']         = $filename;
+                                        $document->column_fields['filesize']             = $filesize;
+                                        $document->column_fields['filetype']             = $filetype;
-                                        $document->column_fields['filestatus']       = 1;
-                                        $document->column_fields['filelocationtype'] = 'I';