mambax7 /
extcal
| @@ 1606-1621 (lines=16) @@ | ||
| 1603 | $occurEventStart = $eventDayOccurStart + $eventHourOccurStart; |
|
| 1604 | $occurEventEnd = $occurEventStart + $eventHourOccurEnd; |
|
| 1605 | ||
| 1606 | if // Event start falls within search period |
|
| 1607 | ($occurEventStart <= $periodEnd |
|
| 1608 | && // Event end falls within search period |
|
| 1609 | $occurEventEnd >= $periodStart |
|
| 1610 | && // This occur is after start reccur date |
|
| 1611 | $occurEventStart >= $event['event_recur_start']) { |
|
| 1612 | $event['event_start'] = $occurEventStart; |
|
| 1613 | $event['event_end'] = $occurEventEnd; |
|
| 1614 | ||
| 1615 | $recuEvents[] = $event; |
|
| 1616 | } elseif ($occurEventStart > $periodEnd) { |
|
| 1617 | break; |
|
| 1618 | } |
|
| 1619 | ||
| 1620 | if (13 == ++$month) { |
|
| 1621 | $month = 1; |
|
| 1622 | ++$year; |
|
| 1623 | } |
|
| 1624 | ||
| @@ 1664-1678 (lines=15) @@ | ||
| 1661 | $occurEventStart = $eventDayOccurStart + $eventHourOccurStart; |
|
| 1662 | $occurEventEnd = $eventDayOccurStart + $eventHourOccurEnd; |
|
| 1663 | ||
| 1664 | if // Event start falls within search period |
|
| 1665 | (($occurEventStart <= $periodEnd) |
|
| 1666 | && // Event end falls within search period |
|
| 1667 | ($occurEventEnd >= $periodStart) |
|
| 1668 | && // This week day is selected |
|
| 1669 | in_array($month, $eventOptions)) { |
|
| 1670 | $event['event_start'] = $occurEventStart; |
|
| 1671 | $event['event_end'] = $occurEventEnd; |
|
| 1672 | ||
| 1673 | $recuEvents[] = $event; |
|
| 1674 | } elseif ($occurEventStart > $periodEnd) { |
|
| 1675 | break; |
|
| 1676 | } |
|
| 1677 | ||
| 1678 | if (13 == ++$month) { |
|
| 1679 | $month = 1; |
|
| 1680 | ++$year; |
|
| 1681 | ++$nbOccur; |
|
