Issue #321: Fixed saving of attachments (did not not work anymore)

src/PhpImap/IncomingMailAttachment.php

@@ -31,12 +31,6 @@ public function __get ($name) {
 			return $this->filePath;
 		}
 
-		if(false === file_put_contents($this->filePath, $this->dataInfo->fetch())) {
-			unset($this->filePath);
-			unset($this->file_path);
-			return false;
-		}
-
 		return $this->filePath;
 	}
 
@@ -47,4 +41,18 @@ public function setFilePath($filePath) {
 	public function addDataPartInfo(DataPartInfo $dataInfo) {
 		$this->dataInfo = $dataInfo;
 	}
+
+	/*
+	 * Saves the attachment object on the disk
+	 * @return boolean True, if it could save the attachment on the disk
+	*/
+	public function saveToDisk() {
+		if(false === file_put_contents($this->filePath, $this->dataInfo->fetch())) {
+			unset($this->filePath);
+			unset($this->file_path);
+
+			return false;
+		}
+		return true;
+	}
 }

src/PhpImap/Mailbox.php

@@ -903,9 +903,10 @@ protected function initMailPart(IncomingMail $mail, $partStructure, $partNum, $m
 					$ext = pathinfo($filePath, PATHINFO_EXTENSION);
 					$filePath = substr($filePath, 0, 255 - 1 - strlen($ext)) . "." . $ext;
 				}
-                $attachment->setFilePath($filePath);
+ 				$attachment->setFilePath($filePath);
+				$attachment->addDataPartInfo($dataInfo);
+				$attachment->saveToDisk();
 			}
-			$attachment->addDataPartInfo($dataInfo);
 			$mail->addAttachment($attachment);
 		}
 		else {