fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BUG 0000 Adjustment for the standardization of code. CODE_STYLE

Browse Source
This commit is contained in:
Hector Cortez
2013-03-14 12:36:34 -04:00
parent 5cc9925075
commit b7e254b425
9 changed files with 864 additions and 897 deletions
Download Patch File Download Diff File Expand all files Collapse all files

302
workflow/engine/classes/class.dates.php
View File

@@ -1,4 +1,5 @@
<?php
/**
* class.dates.php
*
@@ -30,7 +31,6 @@
*
* @author David Callizaya <davidsantos@colosa.com>
*/
require_once ("classes/model/TaskPeer.php");
require_once ("classes/model/HolidayPeer.php");
@@ -40,14 +40,14 @@ require_once ("classes/model/HolidayPeer.php");
*/
class dates
{
private $holidays = array ();
private $weekends = array ();
private $range = array ();
private $holidays = array();
private $weekends = array();
private $range = array();
private $skipEveryYear = true;
private $calendarDays = false; //by default we are using working days
private $hoursPerDay = 8; //you should change this
/**
* Function that calculate a final date based on $sInitDate and $iDuration
* This function also uses a Calendar component (class.calendar.php) where all the definition of
@@ -70,14 +70,14 @@ class dates
*
*
*/
function calculateDate ($sInitDate, $iDuration, $sTimeUnit, $iTypeDay, $UsrUid = NULL, $ProUid = NULL, $TasUid = NULL)
public function calculateDate($sInitDate, $iDuration, $sTimeUnit, $iTypeDay, $UsrUid = null, $ProUid = null, $TasUid = null)
{
//$oldDate=$this->calculateDate_noCalendar( $sInitDate, $iDuration, $sTimeUnit, $iTypeDay, $UsrUid, $ProUid, $TasUid);
//Set Calendar when the object is instanced in this order/priority (Task, User, Process, Default)
G::LoadClass( 'calendar' );
$calendarObj = new calendar( $UsrUid, $ProUid, $TasUid );
G::LoadClass('calendar');
$calendarObj = new calendar($UsrUid, $ProUid, $TasUid);
//Get next Business Hours/Range based on :
switch (strtoupper( $sTimeUnit )) {
switch (strtoupper($sTimeUnit)) {
case 'DAYS':
$hoursToProcess = $iDuration * 8;
break; //In Hours
@@ -85,75 +85,75 @@ class dates
$hoursToProcess = $iDuration;
break; //In Hours
}
$dateArray = explode( " ", $sInitDate );
$dateArray = explode(" ", $sInitDate);
$currentDate = $dateArray[0];
$currentTime = isset( $dateArray[1] ) ? $dateArray[1] : "00:00:00";
$currentTime = isset($dateArray[1]) ? $dateArray[1] : "00:00:00";
$startTime = (float) array_sum( explode( ' ', microtime() ) );
$startTime = (float) array_sum(explode(' ', microtime()));
$calendarObj->addCalendarLog( "* Starting at: $startTime" );
$calendarObj->addCalendarLog( ">>>>> Hours to Process: $hoursToProcess" );
$calendarObj->addCalendarLog( ">>>>> Current Date: $currentDate" );
$calendarObj->addCalendarLog( ">>>>> Current Time: $currentTime" );
$array_hours = explode( ":", $currentTime );
$calendarObj->addCalendarLog("* Starting at: $startTime");
$calendarObj->addCalendarLog(">>>>> Hours to Process: $hoursToProcess");
$calendarObj->addCalendarLog(">>>>> Current Date: $currentDate");
$calendarObj->addCalendarLog(">>>>> Current Time: $currentTime");
$array_hours = explode(":", $currentTime);
$seconds2 = $array_hours[2];
$minutes2 = 0;
while ($hoursToProcess > 0) {
$validBusinessHour = $calendarObj->getNextValidBusinessHoursRange( $currentDate, $currentTime );
$validBusinessHour = $calendarObj->getNextValidBusinessHoursRange($currentDate, $currentTime);
//For Date/Time operations
$currentDateA = explode( "-", $validBusinessHour['DATE'] );
$currentTimeA = explode( ":", $validBusinessHour['TIME'] );
$currentDateA = explode("-", $validBusinessHour['DATE']);
$currentTimeA = explode(":", $validBusinessHour['TIME']);
$hour = $currentTimeA[0];
$minute = $currentTimeA[1];
$second = isset( $currentTimeA[2] ) ? $currentTimeA[2] : 0;
$second = isset($currentTimeA[2]) ? $currentTimeA[2] : 0;
$month = $currentDateA[1];
$day = $currentDateA[2];
$year = $currentDateA[0];
$normalizedDate = date( "Y-m-d H:i:s", mktime( $hour, $minute, $second, $month, $day, $year ) );
$normalizedDateInt = mktime( $hour, $minute, $second, $month, $day, $year );
$normalizedDate = date("Y-m-d H:i:s", mktime($hour, $minute, $second, $month, $day, $year));
$normalizedDateInt = mktime($hour, $minute, $second, $month, $day, $year);
$normalizedDateSeconds = ($hour * 60 * 60) + ($minute * 60);
$arrayHour = explode( ".", $hoursToProcess );
if (isset( $arrayHour[1] )) {
$arrayHour = explode(".", $hoursToProcess);
if (isset($arrayHour[1])) {
$minutes1 = $arrayHour[1];
$cadm = strlen( $minutes1 );
$minutes2 = (($minutes1 / pow( 10, $cadm )) * 60);
$cadm = strlen($minutes1);
$minutes2 = (($minutes1 / pow(10, $cadm)) * 60);
}
$possibleTime = date( "Y-m-d H:i:s", mktime( $hour + $hoursToProcess, $minute + $minutes2, $second + $seconds2, $month, $day, $year ) );
$possibleTimeInt = mktime( $hour + $hoursToProcess, $minute + $minutes2, $second + $seconds2, $month, $day, $year );
$possibleTime = date("Y-m-d H:i:s", mktime($hour + $hoursToProcess, $minute + $minutes2, $second + $seconds2, $month, $day, $year));
$possibleTimeInt = mktime($hour + $hoursToProcess, $minute + $minutes2, $second + $seconds2, $month, $day, $year);
$offsetPermitedMinutes = "0";
$calendarBusinessEndA = explode( ":", $validBusinessHour['BUSINESS_HOURS']['CALENDAR_BUSINESS_END'] );
$calendarBusinessEndNormalized = date( "Y-m-d H:i:s", mktime( $calendarBusinessEndA[0], $calendarBusinessEndA[1] + $offsetPermitedMinutes, 0, $month, $day, $year ) );
$calendarBusinessEndInt = mktime( $calendarBusinessEndA[0], $calendarBusinessEndA[1] + $offsetPermitedMinutes, 0, $month, $day, $year );
$calendarBusinessEndA = explode(":", $validBusinessHour['BUSINESS_HOURS']['CALENDAR_BUSINESS_END']);
$calendarBusinessEndNormalized = date("Y-m-d H:i:s", mktime($calendarBusinessEndA[0], $calendarBusinessEndA[1] + $offsetPermitedMinutes, 0, $month, $day, $year));
$calendarBusinessEndInt = mktime($calendarBusinessEndA[0], $calendarBusinessEndA[1] + $offsetPermitedMinutes, 0, $month, $day, $year);
$calendarBusinessEndSeconds = ($calendarBusinessEndA[0] * 60 * 60) + ($calendarBusinessEndA[1] * 60);
$calendarObj->addCalendarLog( "Possible time: $possibleTime" );
$calendarObj->addCalendarLog( "Current Start Date/Time: $normalizedDate" );
$calendarObj->addCalendarLog( "Calendar Business End: $calendarBusinessEndNormalized" );
$calendarObj->addCalendarLog("Possible time: $possibleTime");
$calendarObj->addCalendarLog("Current Start Date/Time: $normalizedDate");
$calendarObj->addCalendarLog("Calendar Business End: $calendarBusinessEndNormalized");
if ($possibleTimeInt > $calendarBusinessEndInt) {
$currentDateTimeB = explode( " ", $calendarBusinessEndNormalized );
$currentDateTimeB = explode(" ", $calendarBusinessEndNormalized);
$currentDate = $currentDateTimeB[0];
$currentTime = $currentDateTimeB[1];
$diff = abs( $normalizedDateSeconds - $calendarBusinessEndSeconds );
$diff = abs($normalizedDateSeconds - $calendarBusinessEndSeconds);
$diffHours = $diff / 3600;
$hoursToProcess = $hoursToProcess - $diffHours;
} else {
$currentDateTimeA = explode( " ", $possibleTime );
$currentDateTimeA = explode(" ", $possibleTime);
$currentDate = $currentDateTimeA[0];
$currentTime = $currentDateTimeA[1];
$hoursToProcess = 0;
}
$calendarObj->addCalendarLog( "** Hours to Process: $hoursToProcess" );
$calendarObj->addCalendarLog("** Hours to Process: $hoursToProcess");
}
$calendarObj->addCalendarLog( "+++++++++++ Calculated Due Date $currentDate $currentTime" );
$calendarObj->addCalendarLog("+++++++++++ Calculated Due Date $currentDate $currentTime");
$result['DUE_DATE'] = $currentDate . " " . $currentTime;
$result['DUE_DATE_SECONDS'] = strtotime( $currentDate . " " . $currentTime );
$result['DUE_DATE_SECONDS'] = strtotime($currentDate . " " . $currentTime);
//$result['OLD_DUE_DATE'] = date("Y-m-d H:i:s",$oldDate);
//$result['OLD_DUE_DATE_SECONDS']= $oldDate;
$endTime = (float) array_sum( explode( ' ', microtime() ) );
$calendarObj->addCalendarLog( "* Ending at: $endTime" );
$calcTime = round( $endTime - $startTime, 3 );
$calendarObj->addCalendarLog( "** Processing time: " . sprintf( "%.4f", ($endTime - $startTime) ) . " seconds" );
$endTime = (float) array_sum(explode(' ', microtime()));
$calendarObj->addCalendarLog("* Ending at: $endTime");
$calcTime = round($endTime - $startTime, 3);
$calendarObj->addCalendarLog("** Processing time: " . sprintf("%.4f", ($endTime - $startTime)) . " seconds");
$result['DUE_DATE_LOG'] = $calendarObj->calendarLog;
return $result;
}
@@ -175,34 +175,35 @@ class dates
* @return integer timestamp of the result
* @deprecated renamed by Hugo Loza (see calculateDate new function)
*/
function calculateDate_noCalendar ($sInitDate, $iDuration, $sTimeUnit, $iTypeDay, $UsrUid = NULL, $ProUid = NULL, $TasUid = NULL)
public function calculateDate_noCalendar($sInitDate, $iDuration, $sTimeUnit, $iTypeDay, $UsrUid = null, $ProUid = null, $TasUid = null)
{
//load in class variables the config of working days, holidays etc..
$this->prepareInformation( $UsrUid, $ProUid, $TasUid );
$this->prepareInformation($UsrUid, $ProUid, $TasUid);
$iHours = 0;
$iDays = 0;
//convert the $iDuration and $sTimeUnit in hours and days, take in mind 8 hours = 1 day. and then we will have similar for 5 days = 1 weekends
if (strtolower( $sTimeUnit ) == 'hours') {
$iAux = intval( abs( $iDuration ) );
if (strtolower($sTimeUnit) == 'hours') {
$iAux = intval(abs($iDuration));
$iHours = $iAux % $this->hoursPerDay;
$iDays = intval( $iAux / $this->hoursPerDay );
$iDays = intval($iAux / $this->hoursPerDay);
}
if (strtolower( $sTimeUnit ) == 'days') {
$iAux = intval( abs( $iDuration * $this->hoursPerDay ) );
if (strtolower($sTimeUnit) == 'days') {
$iAux = intval(abs($iDuration * $this->hoursPerDay));
$iHours = $iAux % 8;
$iDays = intval( $iAux / 8 );
$iDays = intval($iAux / 8);
}
$addSign = ($iDuration >= 0) ? '+' : '-';
$iInitDate = strtotime( $sInitDate );
if ($iTypeDay == 1) { // working days
$iInitDate = strtotime($sInitDate);
if ($iTypeDay == 1) {
// working days
// if there are days calculate the days,
$iEndDate = $this->addDays( $iInitDate, $iDays, $addSign );
$iEndDate = $this->addDays($iInitDate, $iDays, $addSign);
// if there are hours calculate the hours, and probably add a day if the quantity of hours for last day > 8 hours
$iEndDate = $this->addHours( $iEndDate, $iHours, $addSign );
} else { // $task->getTasTypeDay() == 2 // calendar days
$iEndDate = strtotime( $addSign . $iDays . ' days ', $iInitDate );
$iEndDate = strtotime( $addSign . $iHours . ' hours ', $iEndDate );
$iEndDate = $this->addHours($iEndDate, $iHours, $addSign);
} else {
// $task->getTasTypeDay() == 2 // calendar days
$iEndDate = strtotime($addSign . $iDays . ' days ', $iInitDate);
$iEndDate = strtotime($addSign . $iHours . ' hours ', $iEndDate);
}
return $iEndDate;
}
@@ -218,59 +219,57 @@ class dates
* @return int
*
*/
function calculateDuration ($sInitDate, $sEndDate = '', $UsrUid = NULL, $ProUid = NULL, $TasUid = NULL)
public function calculateDuration($sInitDate, $sEndDate = '', $UsrUid = null, $ProUid = null, $TasUid = null)
{
$this->prepareInformation( $UsrUid, $ProUid, $TasUid );
$this->prepareInformation($UsrUid, $ProUid, $TasUid);
if ((string) $sEndDate == '') {
$sEndDate = date( 'Y-m-d H:i:s' );
$sEndDate = date('Y-m-d H:i:s');
}
if (strtotime( $sInitDate ) > strtotime( $sEndDate )) {
if (strtotime($sInitDate) > strtotime($sEndDate)) {
$sAux = $sInitDate;
$sInitDate = $sEndDate;
$sEndDate = $sAux;
}
$aAux1 = explode( ' ', $sInitDate );
$aAux2 = explode( ' ', $sEndDate );
$aInitDate = explode( '-', $aAux1[0] );
$aEndDate = explode( '-', $aAux2[0] );
$aAux1 = explode(' ', $sInitDate);
$aAux2 = explode(' ', $sEndDate);
$aInitDate = explode('-', $aAux1[0]);
$aEndDate = explode('-', $aAux2[0]);
$i = 1;
$iWorkedDays = 0;
$bFinished = false;
$fHours1 = 0.0;
$fHours2 = 0.0;
if (count( $aInitDate ) != 3) {
$aInitDate = array (0,0,0
);
if (count($aInitDate) != 3) {
$aInitDate = array(0, 0, 0);
}
if (count( $aEndDate ) != 3) {
$aEndDate = array (0,0,0
);
if (count($aEndDate) != 3) {
$aEndDate = array(0, 0, 0);
}
if ($aInitDate !== $aEndDate) {
while (! $bFinished && ($i < 10000)) {
$sAux = date( 'Y-m-d', mktime( 0, 0, 0, $aInitDate[1], $aInitDate[2] + $i, $aInitDate[0] ) );
if ($sAux != implode( '-', $aEndDate )) {
if (! in_array( $sAux, $this->holidays )) {
if (! in_array( date( 'w', mktime( 0, 0, 0, $aInitDate[1], $aInitDate[2] + $i, $aInitDate[0] ) ), $this->weekends )) {
$iWorkedDays ++;
while (!$bFinished && ($i < 10000)) {
$sAux = date('Y-m-d', mktime(0, 0, 0, $aInitDate[1], $aInitDate[2] + $i, $aInitDate[0]));
if ($sAux != implode('-', $aEndDate)) {
if (!in_array($sAux, $this->holidays)) {
if (!in_array(date('w', mktime(0, 0, 0, $aInitDate[1], $aInitDate[2] + $i, $aInitDate[0])), $this->weekends)) {
$iWorkedDays++;
}
}
$i ++;
$i++;
} else {
$bFinished = true;
}
}
if (isset( $aAux1[1] )) {
$aAux1[1] = explode( ':', $aAux1[1] );
if (isset($aAux1[1])) {
$aAux1[1] = explode(':', $aAux1[1]);
$fHours1 = 24 - ($aAux1[1][0] + ($aAux1[1][1] / 60) + ($aAux1[1][2] / 3600));
}
if (isset( $aAux2[1] )) {
$aAux2[1] = explode( ':', $aAux2[1] );
if (isset($aAux2[1])) {
$aAux2[1] = explode(':', $aAux2[1]);
$fHours2 = $aAux2[1][0] + ($aAux2[1][1] / 60) + ($aAux2[1][2] / 3600);
}
$fDuration = ($iWorkedDays * 24) + $fHours1 + $fHours2;
} else {
$fDuration = (strtotime( $sEndDate ) - strtotime( $sInitDate )) / 3600;
$fDuration = (strtotime($sEndDate) - strtotime($sInitDate)) / 3600;
}
return $fDuration;
}
@@ -283,25 +282,25 @@ class dates
* @param string $TasUid
* @return void
*/
function prepareInformation ($UsrUid = NULL, $ProUid = NULL, $TasUid = NULL)
public function prepareInformation($UsrUid = null, $ProUid = null, $TasUid = null)
{
// setup calendarDays according the task
if (isset( $TasUid )) {
$task = TaskPeer::retrieveByPK( $TasUid );
if (! is_null( $task )) {
if (isset($TasUid)) {
$task = TaskPeer::retrieveByPK($TasUid);
if (!is_null($task)) {
$this->calendarDays = ($task->getTasTypeDay() == 2);
}
}
//get an array with all holidays.
$aoHolidays = HolidayPeer::doSelect( new Criteria() );
$holidays = array ();
foreach ($aoHolidays as $holiday)
$holidays[] = strtotime( $holiday->getHldDate() );
$aoHolidays = HolidayPeer::doSelect(new Criteria());
$holidays = array();
foreach ($aoHolidays as $holiday) {
$holidays[] = strtotime($holiday->getHldDate());
}
// by default the weekdays are from monday to friday
$this->weekends = array (0,6
);
// by default the weekdays are from monday to friday
$this->weekends = array(0, 6);
$this->holidays = $holidays;
return;
}
@@ -312,7 +311,7 @@ class dates
* @param $bSkipEveryYear
* @return void
*/
function setSkipEveryYear ($bSkipEveryYear)
public function setSkipEveryYear($bSkipEveryYear)
{
$this->skipEveryYear = $bSkipEveryYear === true;
}
@@ -323,12 +322,13 @@ class dates
* @param data $sDate
* @return void
*/
function addHoliday ($sDate)
public function addHoliday($sDate)
{
if ($date = strtotime( $sDate ))
$this->holidays[] = self::truncateTime( $date );
else
throw new Exception( "Invalid date: $sDate." );
if ($date = strtotime($sDate)) {
$this->holidays[] = self::truncateTime($date);
} else {
throw new Exception("Invalid date: $sDate.");
}
}
/**
@@ -337,10 +337,11 @@ class dates
* @param date/array $aDate must be an array of (strtotime type) dates
* @return void
*/
function setHolidays ($aDates)
public function setHolidays($aDates)
{
foreach ($aDates as $sDate)
foreach ($aDates as $sDate) {
$this->holidays = $aDates;
}
}
/**
@@ -351,7 +352,7 @@ class dates
* 7=Saturday
* @return void
*/
function setWeekends ($aWeekends)
public function setWeekends($aWeekends)
{
$this->weekends = $aWeekends;
}
@@ -364,10 +365,11 @@ class dates
* 7=Saturday
* @return void
*/
function skipDayOfWeek ($iDayNumber)
public function skipDayOfWeek($iDayNumber)
{
if ($iDayNumber < 1 || $iDayNumber > 7)
throw new Exception( "The day of week must be a number from 1 to 7." );
if ($iDayNumber < 1 || $iDayNumber > 7) {
throw new Exception("The day of week must be a number from 1 to 7.");
}
$this->weekends[] = $iDayNumber;
}
@@ -378,24 +380,24 @@ class dates
* @param date $sDateB must be a (strtotime type) dates
* @return void
*/
function addNonWorkingRange ($sDateA, $sDateB)
public function addNonWorkingRange($sDateA, $sDateB)
{
if ($date = strtotime( $sDateA ))
$iDateA = self::truncateTime( $date );
else
throw new Exception( "Invalid date: $sDateA." );
if ($date = strtotime( $sDateB ))
$iDateB = self::truncateTime( $date );
else
throw new Exception( "Invalid date: $sDateB." );
if ($date = strtotime($sDateA)) {
$iDateA = self::truncateTime($date);
} else {
throw new Exception("Invalid date: $sDateA.");
}
if ($date = strtotime($sDateB)) {
$iDateB = self::truncateTime($date);
} else {
throw new Exception("Invalid date: $sDateB.");
}
if ($iDateA > $iDateB) {
$s = $iDateA;
$iDateA = $iDateB;
$iDateB = $s;
}
;
$this->range[] = array ($iDateA,$iDateB
);
$this->range[] = array($iDateA, $iDateB);
}
/**
@@ -407,15 +409,16 @@ class dates
* @param string $addSign
* @return date $iEndDate
*/
private function addDays ($iInitDate, $iDaysCount, $addSign = '+')
private function addDays($iInitDate, $iDaysCount, $addSign = '+')
{
$iEndDate = $iInitDate;
$aList = $this->holidays;
for ($r = 1; $r <= $iDaysCount; $r ++) {
$iEndDate = strtotime( $addSign . "1 day", $iEndDate );
$dayOfWeek = idate( 'w', $iEndDate ); //now sunday=0
if (array_search( $dayOfWeek, $this->weekends ) !== false)
$r --; //continue loop, but we are adding one more day.
for ($r = 1; $r <= $iDaysCount; $r++) {
$iEndDate = strtotime($addSign . "1 day", $iEndDate);
$dayOfWeek = idate('w', $iEndDate); //now sunday=0
if (array_search($dayOfWeek, $this->weekends) !== false) {
$r--; //continue loop, but we are adding one more day.
}
}
return $iEndDate;
}
@@ -428,10 +431,9 @@ class dates
* @param string $addSign
* @return $iEndDate
*/
private function addHours ($sInitDate, $iHoursCount, $addSign = '+')
private function addHours($sInitDate, $iHoursCount, $addSign = '+')
{
$iEndDate = strtotime( $addSign . $iHoursCount . " hours", $sInitDate );
$iEndDate = strtotime($addSign . $iHoursCount . " hours", $sInitDate);
return $iEndDate;
}
@@ -441,18 +443,19 @@ class dates
* @param $iDate = valid timestamp
* @return true if it is within any of the ranges defined.
*/
private function inRange ($iDate)
private function inRange($iDate)
{
$aRange = $this->range;
$iYear = idate( 'Y', $iDate );
$iYear = idate('Y', $iDate);
foreach ($aRange as $key => $rang) {
if ($this->skipEveryYear) {
$deltaYears = idate( 'Y', $rang[1] ) - idate( 'Y', $rang[0] );
$rang[0] = self::changeYear( $rang[0], $iYear );
$rang[1] = self::changeYear( $rang[1], $iYear + $deltaYears );
$deltaYears = idate('Y', $rang[1]) - idate('Y', $rang[0]);
$rang[0] = self::changeYear($rang[0], $iYear);
$rang[1] = self::changeYear($rang[1], $iYear + $deltaYears);
}
if (($iDate >= $rang[0]) && ($iDate <= $rang[1]))
if (($iDate >= $rang[0]) && ($iDate <= $rang[1])) {
return true;
}
}
return false;
}
@@ -463,9 +466,9 @@ class dates
* @param $iDate = valid timestamp
* @return date
*/
private function truncateTime ($iDate)
private function truncateTime($iDate)
{
return mktime( 0, 0, 0, idate( 'm', $iDate ), idate( 'd', $iDate ), idate( 'Y', $iDate ) );
return mktime(0, 0, 0, idate('m', $iDate), idate('d', $iDate), idate('Y', $iDate));
}
/**
@@ -474,10 +477,9 @@ class dates
* @param timestamp $iDate
* @return date
*/
private function getTime ($iDate)
private function getTime($iDate)
{
return array (idate( 'H', $iDate ),idate( 'm', $iDate ),idate( 's', $iDate )
);
return array(idate('H', $iDate), idate('m', $iDate), idate('s', $iDate));
}
/**
@@ -487,9 +489,9 @@ class dates
* @param timestamp $aTime
* @return date
*/
private function setTime ($iDate, $aTime)
private function setTime($iDate, $aTime)
{
return mktime( $aTime[0], $aTime[1], $aTime[2], idate( 'm', $iDate ), idate( 'd', $iDate ), idate( 'Y', $iDate ) );
return mktime($aTime[0], $aTime[1], $aTime[2], idate('m', $iDate), idate('d', $iDate), idate('Y', $iDate));
}
/**
@@ -501,11 +503,11 @@ class dates
* @param List $iYear
* @return array
*/
private function listForYear ($iYear)
private function listForYear($iYear)
{
$aList = $this->holidays;
foreach ($aList as $k => $v) {
$aList[$k] = self::changeYear( $v, $iYear );
$aList[$k] = self::changeYear($v, $iYear);
}
return $aList;
}
@@ -520,12 +522,12 @@ class dates
* @param date $iDate
* @return array
*/
private function changeYear ($iDate, $iYear)
private function changeYear($iDate, $iYear)
{
if ($delta = ($iYear - idate( 'Y', $iDate ))) {
$iDate = strtotime( "$delta year", $iDate );
if ($delta = ($iYear - idate('Y', $iDate))) {
$iDate = strtotime("$delta year", $iDate);
}
return $iDate;
}
}
?>