lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Try to remove html tags only if required by truncation. Avoid if not required.

Browse Source
This commit is contained in:
Laurent Destailleur 2009-06-05 12:44:33 +00:00
parent e4c402c1cf
commit b9a09a251a
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
htdocs/lib/functions.lib.php
View File

@ -863,32 +863,34 @@ function dol_trunc($string,$size=40,$trunc='right',$stringencoding='')
global $conf; global $conf;
if ($size==0) return $string; if ($size==0) return $string;
if (dol_textishtml($string)) $string = dol_string_nohtmltag($string,1); if (! defined('USE_SHORT_TITLE') || USE_SHORT_TITLE)
if (! defined('USE_SHORT_TITLE') || (defined('USE_SHORT_TITLE') && USE_SHORT_TITLE))
{ {
// We go always here // We go always here
if ($trunc == 'right') if ($trunc == 'right')
{ {
if (dol_strlen($string,$stringencoding) > $size) $newstring=dol_textishtml($string)?dol_string_nohtmltag($string,1):$string;
return dol_substr($string,0,$size,$stringencoding).'...'; if (dol_strlen($newstring,$stringencoding) > $size)
return dol_substr($newstring,0,$size,$stringencoding).'...';
else else
return $string; return $string;
} }
if ($trunc == 'middle') if ($trunc == 'middle')
{ {
if (dol_strlen($string,$stringencoding) > 2 && dol_strlen($string,$stringencoding) > $size) $newstring=dol_textishtml($string)?dol_string_nohtmltag($string,1):$string;
if (dol_strlen($newstring,$stringencoding) > 2 && dol_strlen($newstring,$stringencoding) > $size)
{ {
$size1=round($size/2); $size1=round($size/2);
$size2=round($size/2); $size2=round($size/2);
return dol_substr($string,0,$size1,$stringencoding).'...'.dol_substr($string,dol_strlen($string,$stringencoding) - $size2,$size2,$stringencoding); return dol_substr($newstring,0,$size1,$stringencoding).'...'.dol_substr($newstring,dol_strlen($newstring,$stringencoding) - $size2,$size2,$stringencoding);
} }
else else
return $string; return $string;
} }
if ($trunc == 'left') if ($trunc == 'left')
{ {
if (dol_strlen($string,$stringencoding) > $size) $newstring=dol_textishtml($string)?dol_string_nohtmltag($string,1):$string;
return '...'.dol_substr($string,dol_strlen($string,$stringencoding) - $size,$size,$stringencoding); if (dol_strlen($newstring,$stringencoding) > $size)
return '...'.dol_substr($newstring,dol_strlen($newstring,$stringencoding) - $size,$size,$stringencoding);
else else
return $string; return $string;
} }