Changeset 42e328a in github

Timestamp:

Sep 19, 2008 3:42:11 PM (5 years ago)

Author:

thomascube <thomas@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

cc80c55

Parents:

29111be

Message:

Indent with spaces not tabs. Please respect our code-style when creating patches!

File:

• program/include/rcube_imap.php (modified) (5 diffs)

program/include/rcube_imap.php

@@ -1203 +1203 @@
         // TODO: fetch only Content-Type/Content-Disposition header
         $headers = iil_C_FetchPartHeader($this->conn, $this->mailbox, $this->_msg_id, $part->mime_id);
-        $filename_mime = '';
-        $i = 0;
-        while (preg_match('/filename\*'.$i.'\s*=\s*"*([^"\n;]+)[";]*/', $headers, $matches)) {
-          $filename_mime .= $matches[1];
-          $i++;
-          }
-        }       
-      }
+        $filename_mime = '';
+        $i = 0;
+        while (preg_match('/filename\*'.$i.'\s*=\s*"*([^"\n;]+)[";]*/', $headers, $matches)) {
+          $filename_mime .= $matches[1];
+          $i++;
+        }
+      }
+    }
     else if (!empty($part->d_parameters['filename*0*'])) {
       $i = 0;
       while (isset($part->d_parameters['filename*'.$i.'*'])) {
         $i++;
-        $filename_encoded .= $part->d_parameters['filename*'.$i.'*'];
-        }
+        $filename_encoded .= $part->d_parameters['filename*'.$i.'*'];
+      }
       if ($i<2) {
         $headers = iil_C_FetchPartHeader($this->conn, $this->mailbox, $this->_msg_id, $part->mime_id);
-        $filename_encoded = '';
-        $i = 0; $matches = array();
-        while (preg_match('/filename\*'.$i.'\*\s*=\s*"*([^"\n;]+)[";]*/', $headers, $matches)) {
-          $filename_encoded .= $matches[1];
-          $i++;
-          }
-        }       
-      }
+        $filename_encoded = '';
+        $i = 0; $matches = array();
+        while (preg_match('/filename\*'.$i.'\*\s*=\s*"*([^"\n;]+)[";]*/', $headers, $matches)) {
+          $filename_encoded .= $matches[1];
+          $i++;
+        }
+      }
+    }
     else if (!empty($part->ctype_parameters['name*0'])) {
       $i = 0;
@@ -1232 +1232 @@
         $i++;
         $filename_mime .= $part->ctype_parameters['name*'.$i];
-        }
+      }
       if ($i<2) {
         $headers = iil_C_FetchPartHeader($this->conn, $this->mailbox, $this->_msg_id, $part->mime_id);
-        $filename_mime = '';
-        $i = 0; $matches = array();
-        while (preg_match('/\s+name\*'.$i.'\s*=\s*"*([^"\n;]+)[";]*/', $headers, $matches)) {
-          $filename_mime .= $matches[1];
-          $i++;
-          }
-        }       
-      }
+        $filename_mime = '';
+        $i = 0; $matches = array();
+        while (preg_match('/\s+name\*'.$i.'\s*=\s*"*([^"\n;]+)[";]*/', $headers, $matches)) {
+          $filename_mime .= $matches[1];
+          $i++;
+        }
+      }
+    }
     else if (!empty($part->ctype_parameters['name*0*'])) {
       $i = 0;
@@ -1248 +1248 @@
         $i++;
         $filename_encoded .= $part->ctype_parameters['name*'.$i.'*'];
-        }
+      }
       if ($i<2) {
         $headers = iil_C_FetchPartHeader($this->conn, $this->mailbox, $this->_msg_id, $part->mime_id);
-        $filename_encoded = '';
-        $i = 0; $matches = array();
-        while (preg_match('/\s+name\*'.$i.'\*\s*=\s*"*([^"\n;]+)[";]*/', $headers, $matches)) {
-          $filename_encoded .= $matches[1];
-          $i++;
-          }
-        }       
-      }
+        $filename_encoded = '';
+        $i = 0; $matches = array();
+        while (preg_match('/\s+name\*'.$i.'\*\s*=\s*"*([^"\n;]+)[";]*/', $headers, $matches)) {
+          $filename_encoded .= $matches[1];
+          $i++;
+        }
+      }
+    }
     // Content-Disposition
     else if (!empty($part->headers['content-description']))
@@ -1268 +1268 @@
     if (!empty($filename_mime)) {
       $part->filename = rcube_imap::decode_mime_string($filename_mime, 
-            $part->charset ? $part->charset : rc_detect_encoding($filename_mime, $this->default_charset));
+        $part->charset ? $part->charset : rc_detect_encoding($filename_mime, $this->default_charset));
       } 
     else if (!empty($filename_encoded)) {
@@ -1343 +1343 @@
         {
         fwrite($fp, $body);
-        return true;
+        return true;
         }
       }