holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Avoid warning if no external domain preference set

Browse Source
This commit is contained in:
nathangray 2019-01-04 10:36:17 -07:00
parent 5ba68e2957
commit c4e50f3de4
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
api/src/Html/HtmLawed.php
View File

@ -400,8 +400,11 @@ function hl_email_tag_transform($element, $attribute_array=0)
if (!preg_match('/^cid:.*/',$attribute_array['src'])) if (!preg_match('/^cid:.*/',$attribute_array['src']))
{ {
$url = explode('/', preg_replace('/^(http|https):\/\//','',$attribute_array['src'])); $url = explode('/', preg_replace('/^(http|https):\/\//','',$attribute_array['src']));
$domains = is_array($GLOBALS['egw_info']['user']['preferences']['mail']['allowExternalDomains']) ?
$GLOBALS['egw_info']['user']['preferences']['mail']['allowExternalDomains'] :
array();
if ($GLOBALS['egw_info']['user']['preferences']['mail']['allowExternalIMGs'] != 1 if ($GLOBALS['egw_info']['user']['preferences']['mail']['allowExternalIMGs'] != 1
&& !in_array($url[0], $GLOBALS['egw_info']['user']['preferences']['mail']['allowExternalDomains'])) && !in_array($url[0], $domains))
{ {
//the own webserver url is not external, so it should be allowed //the own webserver url is not external, so it should be allowed
if (empty($GLOBALS['egw_info']['server']['webserver_url'])||!preg_match("$^".$GLOBALS['egw_info']['server']['webserver_url'].".*$",$attribute_array['src'])) if (empty($GLOBALS['egw_info']['server']['webserver_url'])||!preg_match("$^".$GLOBALS['egw_info']['server']['webserver_url'].".*$",$attribute_array['src']))