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

Fix: infinite loop in function num_public_holiday

Browse Source
This commit is contained in:
Laurent Destailleur 2014-03-05 21:29:33 +01:00
parent 774017672f
commit fa098adc78
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
htdocs/core/lib/date.lib.php
View File

@ -585,7 +585,7 @@ function dol_get_first_day_week($day,$month,$year,$gm=false)
} }
/** /**
* Fonction retournant le nombre de jour feries samedis et dimanches entre 2 dates entrees en timestamp * Fonction retournant le nombre de jour feries, samedis et dimanches entre 2 dates entrees en timestamp. Dates must be UTC with hour, day, min to 0
* Called by function num_open_day * Called by function num_open_day
* *
* @param timestamp $timestampStart Timestamp de debut * @param timestamp $timestampStart Timestamp de debut
@ -597,7 +597,10 @@ function num_public_holiday($timestampStart, $timestampEnd, $countrycode='FR')
{ {
$nbFerie = 0; $nbFerie = 0;
while ($timestampStart != $timestampEnd) // Check to ensure we use correct parameters
if ((($timestampEnd - $timestampStart) % 86400) != 0) return 'ErrorDates must use same hour and be GMT dates';
while ($timestampStart < $timestampEnd) // Loop end when equals
{ {
$ferie=false; $ferie=false;
$countryfound=0; $countryfound=0;
@ -707,9 +710,9 @@ function num_public_holiday($timestampStart, $timestampEnd, $countrycode='FR')
// On incremente compteur // On incremente compteur
if ($ferie) $nbFerie++; if ($ferie) $nbFerie++;
// Incrementation du nombre de jour (on avance dans la boucle) // Increase number of days (on go up into loop)
$jour++; $jour++;
$timestampStart=mktime(0,0,0,$mois,$jour,$annee); $timestampStart=dol_mktime(0,0,0,$mois,$jour,$annee,1); // Generate GMT date for next day
} }
return $nbFerie; return $nbFerie;
@ -765,7 +768,6 @@ function num_open_day($timestampStart, $timestampEnd, $inhour=0, $lastday=0, $ha
//print 'num_open_day timestampStart='.$timestampStart.' timestampEnd='.$timestampEnd.' bit='.$lastday; //print 'num_open_day timestampStart='.$timestampStart.' timestampEnd='.$timestampEnd.' bit='.$lastday;
if ($timestampStart < $timestampEnd) if ($timestampStart < $timestampEnd)
{ {
//print num_between_day($timestampStart, $timestampEnd, $lastday).' - '.num_public_holiday($timestampStart, $timestampEnd);
$nbOpenDay = num_between_day($timestampStart, $timestampEnd, $lastday) - num_public_holiday($timestampStart, $timestampEnd, $lastday); $nbOpenDay = num_between_day($timestampStart, $timestampEnd, $lastday) - num_public_holiday($timestampStart, $timestampEnd, $lastday);
$nbOpenDay.= " " . $langs->trans("Days"); $nbOpenDay.= " " . $langs->trans("Days");
if ($inhour == 1 && $nbOpenDay <= 3) $nbOpenDay = $nbOpenDay*24 . $langs->trans("HourShort"); if ($inhour == 1 && $nbOpenDay <= 3) $nbOpenDay = $nbOpenDay*24 . $langs->trans("HourShort");

2
test/phpunit/DateLibTest.php
View File

@ -150,7 +150,7 @@ class DateLibTest extends PHPUnit_Framework_TestCase
print __METHOD__." result=".$result."\n"; print __METHOD__." result=".$result."\n";
$this->assertEquals(1,$result); $this->assertEquals(1,$result);
// With different date before and after sunlight hour (day to change is 2014-03-30) // With different date before and after sunlight hour (day to change sunlight hour is 2014-03-30)
$date1=dol_mktime(0, 0, 0, 3, 28, 2014, true); $date1=dol_mktime(0, 0, 0, 3, 28, 2014, true);
$date2=dol_mktime(0, 0, 0, 3, 31, 2014, true); $date2=dol_mktime(0, 0, 0, 3, 31, 2014, true);