Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-09 11:08:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

doxygen

Browse Source
This commit is contained in:
Laurent Destailleur
2008-10-24 01:01:56 +00:00
parent 53218d9032
commit f35e3108d0
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -416,7 +416,8 @@ function dolibarr_time_plus_duree($time,$duration_value,$duration_unit)
* "%d/%m/%Y %H:%M:%S", * "%d/%m/%Y %H:%M:%S",
* "day", "daytext", "dayhour", "dayhourldap", "dayhourtext" * "day", "daytext", "dayhour", "dayhourldap", "dayhourtext"
* \param to_gmt false=output string if for local server TZ users, true=output string is for GMT users * \param to_gmt false=output string if for local server TZ users, true=output string is for GMT users
* \param convtooutput true=Output string is encoded into encoding defined into $langs->charset_output. * \param convtooutput true=Output string is encoded into encoding defined into $langs->charset_output
* This means output is endoded in UTF-8 in default case.
* \return string Formated date or '' if time is null * \return string Formated date or '' if time is null
*/ */
function dolibarr_print_date($time,$format='',$to_gmt=false,$convtooutput=true) function dolibarr_print_date($time,$format='',$to_gmt=false,$convtooutput=true)
@@ -2663,13 +2664,13 @@ function dol_htmlentitiesbr($stringtoencode,$nl2brmode=0)
} }
} }
/* /**
* \brief This function is called to decode a HTML string * \brief This function is called to decode a HTML string (it decodes entities and br tags)
* \param stringtodecode String to decode * \param stringtodecode String to decode
*/ */
function dol_htmlentitiesbr_decode($stringtodecode) function dol_htmlentitiesbr_decode($stringtodecode,$pagecodeto='UTF-8')
{ {
$ret=html_entity_decode($stringtodecode); $ret=html_entity_decode($stringtodecode,ENT_COMPAT,$pagecodeto);
$ret=eregi_replace("\r\n".'<br( [ a-zA-Z_="]*)?/?>',"<br>",$ret); $ret=eregi_replace("\r\n".'<br( [ a-zA-Z_="]*)?/?>',"<br>",$ret);
$ret=eregi_replace('<br( [ a-zA-Z_="]*)?/?>'."\r\n","\r\n",$ret); $ret=eregi_replace('<br( [ a-zA-Z_="]*)?/?>'."\r\n","\r\n",$ret);
$ret=eregi_replace('<br( [ a-zA-Z_="]*)?/?>'."\n","\n",$ret); $ret=eregi_replace('<br( [ a-zA-Z_="]*)?/?>'."\n","\n",$ret);
@@ -2678,14 +2679,14 @@ function dol_htmlentitiesbr_decode($stringtodecode)
} }
/** /**
* \brief Decode le code html * \brief This function is called to decode a HTML string (it decodes entities tags)
* \param string stringhtml * \param string stringhtml
* \return string decodestring * \return string decodestring
*/ */
function dol_entity_decode($stringhtml) function dol_entity_decode($stringhtml,$pagecodeto='UTF-8')
{ {
$decodedstring = html_entity_decode($stringhtml); $ret=html_entity_decode($stringhtml,ENT_COMPAT,$pagecodeto);
return $decodedstring; return $ret;
} }
/** /**