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

New: Add a new trunc option

Browse Source
This commit is contained in:
Laurent Destailleur 2010-08-21 18:53:19 +00:00
parent 5df86f8a50
commit b2851ddfdf
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1014,7 +1014,7 @@ function dolibarr_trunc($string,$size=40,$trunc='right',$stringencoding='')
* If length = max length+1, we do no truncate to avoid having just 1 char replaced with '...'. * If length = max length+1, we do no truncate to avoid having just 1 char replaced with '...'.
* \param string String to truncate * \param string String to truncate
* \param size Max string size. 0 for no limit. * \param size Max string size. 0 for no limit.
* \param trunc Where to trunc: right, left, middle * \param trunc Where to trunc: right, left, middle, wrap
* \param stringencoding Tell what is source string encoding * \param stringencoding Tell what is source string encoding
* \return string Truncated string * \return string Truncated string
* \remarks MAIN_DISABLE_TRUNC=1 can disable all truncings * \remarks MAIN_DISABLE_TRUNC=1 can disable all truncings
@ -1055,6 +1055,14 @@ function dol_trunc($string,$size=40,$trunc='right',$stringencoding='')
else else
return $string; return $string;
} }
if ($trunc == 'wrap')
{
$newstring=dol_textishtml($string)?dol_string_nohtmltag($string,1):$string;
if (dol_strlen($newstring,$stringencoding) > ($size+1))
return dol_substr($newstring,0,$size,$stringencoding)."\n".dol_trunc(dol_substr($newstring,$size,dol_strlen($newstring,$stringencoding)-$size,$stringencoding),$size,$trunc);
else
return $string;
}
} }
else else
{ {
@ -2858,15 +2866,16 @@ function dol_string_nohtmltag($StringHtml,$removelinefeed=1)
* \brief Replace CRLF in string with a HTML BR tag. * \brief Replace CRLF in string with a HTML BR tag.
* \param string2encode String to encode * \param string2encode String to encode
* \param nl2brmode 0=Adding br before \n, 1=Replacing \n by br * \param nl2brmode 0=Adding br before \n, 1=Replacing \n by br
* \param forxml false=Use <br>, true=Use <br />
* \return string String encoded * \return string String encoded
*/ */
function dol_nl2br($stringtoencode,$nl2brmode=0) function dol_nl2br($stringtoencode,$nl2brmode=0,$forxml=false)
{ {
if (! $nl2brmode) return nl2br($stringtoencode); if (! $nl2brmode) return nl2br($stringtoencode,$forxml);
else else
{ {
$ret=str_replace("\r","",$stringtoencode); $ret=str_replace("\r","",$stringtoencode);
$ret=str_replace("\n","<br>",$ret); $ret=str_replace("\n",($forxml?'<br />':'<br>'),$ret);
return $ret; return $ret;
} }
} }