소스 검색

Ahhhh we don't use charset

stekkel 22 년 전
부모
커밋
03cf0daa25
1개의 변경된 파일5개의 추가작업 그리고 11개의 파일을 삭제
  1. 5 11
      src/download.php

+ 5 - 11
src/download.php

@@ -53,14 +53,8 @@ if ($ent_id) {
     
     
     if ($message->rfc822_header) {
     if ($message->rfc822_header) {
        $subject = $message->rfc822_header->subject;
        $subject = $message->rfc822_header->subject;
-       if (isset($header->content_type)) {
-           $charset = $header->content_type->properties['charset'];
-       } else {
-           $charset = '';
-       }
     } else {
     } else {
        $header = $message->header;
        $header = $message->header;
-       $charset = $header->getParameter('charset');
     }
     }
     $type0 = $header->type0;
     $type0 = $header->type0;
     $type1 = $header->type1;
     $type1 = $header->type1;
@@ -89,7 +83,7 @@ $filename = '';
 if (is_object($message->header->disposition)) {
 if (is_object($message->header->disposition)) {
     $filename = $header->disposition->getProperty('filename');
     $filename = $header->disposition->getProperty('filename');
     if (!$filename) {
     if (!$filename) {
-	$filename = $header->disposition->getProperty('name');
+        $filename = $header->disposition->getProperty('name');
     }
     }
     if (!$filename) {
     if (!$filename) {
         $filename = $header->getParameter('name');
         $filename = $header->getParameter('name');
@@ -102,16 +96,16 @@ $filename = decodeHeader($filename);
 if (strlen($filename) < 1) {
 if (strlen($filename) < 1) {
     if ($type1 == 'plain' && $type0 == 'text') {
     if ($type1 == 'plain' && $type0 == 'text') {
         $suffix = 'txt';
         $suffix = 'txt';
-	$filename = $subject . '.txt';
+        $filename = $subject . '.txt';
     } else if ($type1 == 'richtext' && $type0 == 'text') {
     } else if ($type1 == 'richtext' && $type0 == 'text') {
         $suffix = 'rtf';
         $suffix = 'rtf';
-	$filename = $subject . '.rtf';
+        $filename = $subject . '.rtf';
     } else if ($type1 == 'postscript' && $type0 == 'application') {
     } else if ($type1 == 'postscript' && $type0 == 'application') {
         $suffix = 'ps';
         $suffix = 'ps';
-	$filename = $subject . '.ps';
+        $filename = $subject . '.ps';
     } else if ($type1 == 'rfc822' && $type0 == 'message') {
     } else if ($type1 == 'rfc822' && $type0 == 'message') {
         $suffix = 'eml';
         $suffix = 'eml';
-	$filename = $subject . '.msg';
+        $filename = $subject . '.msg';
     } else {
     } else {
         $suffix = $type1;
         $suffix = $type1;
     }
     }