From 37d1e867337b9dee42148d285195975a31df557e Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Wed, 18 Nov 2009 14:19:03 +0000
Subject: [PATCH] Fix: include external image link is impossible
---
htdocs/lib/CMailFile.class.php | 45 +++++++++++++++++-----------------
1 file changed, 23 insertions(+), 22 deletions(-)
diff --git a/htdocs/lib/CMailFile.class.php b/htdocs/lib/CMailFile.class.php
index 30cac1f5849..2314fabaccf 100644
--- a/htdocs/lib/CMailFile.class.php
+++ b/htdocs/lib/CMailFile.class.php
@@ -975,30 +975,31 @@ class CMailFile
$i=0;
foreach ($matches[1] as $full)
{
- preg_match('/file=([A-Za-z0-9_\-\/]+[\.]?[A-Za-z0-9]+)?$/i',$full,$regs);
- $img = $regs[1];
-
- if (file_exists($images_dir.'/'.$img))
+ if (preg_match('/file=([A-Za-z0-9_\-\/]+[\.]?[A-Za-z0-9]+)?$/i',$full,$regs))
{
- // Image path in src
- $src = preg_quote($full,'/');
-
- // Image full path
- $this->html_images[$i]["fullpath"] = $images_dir.'/'.$img;
-
- // Image name
- $this->html_images[$i]["name"] = $img;
-
- // Content type
- $ext = preg_replace('/^.*\.(\w{3,4})$/e', 'strtolower("$1")', $img);
- $this->html_images[$i]["content_type"] = $this->image_types[$ext];
-
- // cid
- $this->html_images[$i]["cid"] = md5(uniqid(time()));
-
- $this->html = preg_replace("/src=\"$src\"|src='$src'/i", "src=\"cid:".$this->html_images[$i]["cid"]."\"", $this->html);
+ $img = $regs[1];
+
+ if (file_exists($images_dir.'/'.$img))
+ {
+ // Image path in src
+ $src = preg_quote($full,'/');
+
+ // Image full path
+ $this->html_images[$i]["fullpath"] = $images_dir.'/'.$img;
+
+ // Image name
+ $this->html_images[$i]["name"] = $img;
+
+ // Content type
+ $ext = preg_replace('/^.*\.(\w{3,4})$/e', 'strtolower("$1")', $img);
+ $this->html_images[$i]["content_type"] = $this->image_types[$ext];
+
+ // cid
+ $this->html_images[$i]["cid"] = md5(uniqid(time()));
+ $this->html = preg_replace("/src=\"$src\"|src='$src'/i", "src=\"cid:".$this->html_images[$i]["cid"]."\"", $this->html);
+ }
+ $i++;
}
- $i++;
}
if (!empty($this->html_images))
--
GitLab