Fixed parsing internal links (thanks to @Kethryweryn)

Closes #24
barbushin · May 6, 2015 · e7e65de · e7e65de
1 parent be8571f
commit e7e65de
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/PhpImap/IncomingMail.php b/src/PhpImap/IncomingMail.php
@@ -39,14 +39,17 @@ public function getAttachments() {
 	 * @return array attachmentId => link placeholder
 	 */
 	public function getInternalLinksPlaceholders() {
-		return preg_match_all('/=["\'](ci?d:(\w+))["\']/i', $this->textHtml, $matches) ? array_combine($matches[2], $matches[1]) : array();
+		return preg_match_all('/=["\'](ci?d:([\w\.%*@-]+))["\']/i', $this->textHtml, $matches) ? array_combine($matches[2], $matches[1]) : array();
+
 	}
 
 	public function replaceInternalLinks($baseUri) {
 		$baseUri = rtrim($baseUri, '\\/') . '/';
 		$fetchedHtml = $this->textHtml;
 		foreach($this->getInternalLinksPlaceholders() as $attachmentId => $placeholder) {
-			$fetchedHtml = str_replace($placeholder, $baseUri . basename($this->attachments[$attachmentId]->filePath), $fetchedHtml);
+			if(isset($this->attachments[$attachmentId])) {
+				$fetchedHtml = str_replace($placeholder, $baseUri . basename($this->attachments[$attachmentId]->filePath), $fetchedHtml);
+			}
 		}
 		return $fetchedHtml;
 	}