mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-11-23 00:13:35 +01:00
rework of link to text functionality when converting HTML to Text
This commit is contained in:
parent
c51bf772c8
commit
e589930fd8
@ -1027,6 +1027,17 @@ class translation
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static function transform_url2text($matches)
|
||||||
|
{
|
||||||
|
//error_log(__METHOD__.__LINE__.array2string($matches));
|
||||||
|
$linkTextislink = false;
|
||||||
|
// this is the actual url
|
||||||
|
$matches[2] = trim(strip_tags($matches[2]));
|
||||||
|
if ($matches[2]==$matches[1]) $linkTextislink = true;
|
||||||
|
$matches[1] = str_replace(' ','%20',$matches[1]);
|
||||||
|
return ($linkTextislink?' ':'[ ').$matches[1].($linkTextislink?'':' -> '.$matches[2]).($linkTextislink?' ':' ]');
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* convertHTMLToText
|
* convertHTMLToText
|
||||||
* @param string $_html : Text to be stripped down
|
* @param string $_html : Text to be stripped down
|
||||||
@ -1146,7 +1157,8 @@ class translation
|
|||||||
// replace emailaddresses eclosed in <> (eg.: <me@you.de>) with the emailaddress only (e.g: me@you.de)
|
// replace emailaddresses eclosed in <> (eg.: <me@you.de>) with the emailaddress only (e.g: me@you.de)
|
||||||
self::replaceEmailAdresses($_html);
|
self::replaceEmailAdresses($_html);
|
||||||
//convert hrefs to description -> URL
|
//convert hrefs to description -> URL
|
||||||
$_html = preg_replace('~<a[^>]+href=\"([^"]+)\"[^>]*>(.*)</a>~si','[$2 -> $1]',$_html);
|
//$_html = preg_replace('~<a[^>]+href=\"([^"]+)\"[^>]*>(.*)</a>~si','[$2 -> $1]',$_html);
|
||||||
|
$_html = preg_replace_callback('~<a[^>]+href=\"([^"]+)\"[^>]*>(.*)</a>~si','self::transform_url2text',$_html);
|
||||||
|
|
||||||
// reducing double \r\n to single ones, dont mess with pre sections
|
// reducing double \r\n to single ones, dont mess with pre sections
|
||||||
if ($stripcrl === true && $isHTML)
|
if ($stripcrl === true && $isHTML)
|
||||||
|
Loading…
Reference in New Issue
Block a user