Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Fix: Show sending method

Browse Source 
Fix: Avoid long loop with bad date in dol_print_date
This commit is contained in:
Laurent Destailleur
2009-02-03 02:59:16 +00:00
parent cef4ed576f
commit f9dde86da9
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -405,12 +405,15 @@ function dol_print_date($time,$format='',$to_gmt=false,$outputlangs='')
// If date undefined or "", we return "" // If date undefined or "", we return ""
if (strlen($time) == 0) return ''; // $time=0 allowed (it means 01/01/1970 00:00:00) if (strlen($time) == 0) return ''; // $time=0 allowed (it means 01/01/1970 00:00:00)
// Analyse de la date (deprecated) //print 'x'.$time;
if (eregi('^([0-9]+)\-([0-9]+)\-([0-9]+) ?([0-9]+)?:?([0-9]+)?:?([0-9]+)?',$time,$reg))
// Analyse de la date (deprecated) Ex: 19700101, 19700101010000
if (eregi('^([0-9]+)\-([0-9]+)\-([0-9]+) ?([0-9]+)?:?([0-9]+)?:?([0-9]+)?',$time,$reg)
|| eregi('^([0-9][0-9][0-9][0-9])([0-9][0-9])([0-9][0-9])([0-9][0-9])([0-9][0-9])([0-9][0-9])$',$time,$reg))
{ {
// This part of code should not be used. // This part of code should not be used.
dolibarr_syslog("Functions.lib::dolibarr_print_date function call with deprecated parameter in page ".$_SERVER["PHP_SELF"], LOG_WARNING); dolibarr_syslog("Functions.lib::dolibarr_print_date function call with deprecated parameter in page ".$_SERVER["PHP_SELF"], LOG_WARNING);
// Date est au format 'YYYY-MM-DD' ou 'YYYY-MM-DD HH:MM:SS' // Date has format 'YYYY-MM-DD' or 'YYYY-MM-DD HH:MM:SS' or 'YYYYMMDDHHMMSS'
$syear = $reg[1]; $syear = $reg[1];
$smonth = $reg[2]; $smonth = $reg[2];
$sday = $reg[3]; $sday = $reg[3];
@@ -423,8 +426,12 @@ function dol_print_date($time,$format='',$to_gmt=false,$outputlangs='')
else else
{ {
// Date is a timestamps // Date is a timestamps
if ($time < 100000000000) // Protection against bad date values
{
$ret=adodb_strftime($format,$time,$to_gmt); $ret=adodb_strftime($format,$time,$to_gmt);
} }
else $ret='Bad value '.$time.' for date';
}
// What is page code of texts from strftime functions ? // What is page code of texts from strftime functions ?
$pagecodefrom='ISO-8859-1'; $pagecodefrom='ISO-8859-1';