|
@@ 471-486 (lines=16) @@
|
| 468 |
|
case _EXTCAL_EVENTS_WEEK: |
| 469 |
|
case _EXTCAL_EVENTS_CALENDAR_WEEK: |
| 470 |
|
case _EXTCAL_EVENTS_AGENDA_WEEK: |
| 471 |
|
case _EXTCAL_EVENTS_UPCOMING: |
| 472 |
|
$start = userTimeToServerTime(mktime(0, 0, 0, $month, $day, $year), $this->_extcalTime->_getUserTimeZone($user)); |
| 473 |
|
$end = userTimeToServerTime(mktime(0, 0, 0, $month, $day + $nbDays + 1, $year), $this->_extcalTime->_getUserTimeZone($user)); |
| 474 |
|
//$end = $start + (($nbDays + 1 )* _EXTCAL_TS_DAY); |
| 475 |
|
//$end = userTimeToServerTime(mktime(0, 0, 0, $month, $day+(($nbJours)+1 * _EXTCAL_TS_DAY), $year), $this->_extcalTime->_getUserTimeZone($user));; |
| 476 |
|
break; |
| 477 |
|
|
| 478 |
|
case _EXTCAL_EVENTS_MONTH: |
| 479 |
|
case _EXTCAL_EVENTS_CALENDAR_MONTH: |
| 480 |
|
$start = userTimeToServerTime(mktime(0, 0, 0, $month, 1, $year), $this->_extcalTime->_getUserTimeZone($user)); |
| 481 |
|
$end = userTimeToServerTime(mktime(23, 59, 59, $month + 1, 1, $year) - _EXTCAL_TS_DAY, $this->_extcalTime->_getUserTimeZone($user)); |
| 482 |
|
|
| 483 |
|
$criteriaCompo->add( new \Criteria('event_start', $end, '<=')); |
| 484 |
|
//$criteriaCompo->add( new \Criteria('event_end', $start, '>=')); |
| 485 |
|
|
| 486 |
|
break; |
| 487 |
|
|
| 488 |
|
case _EXTCAL_EVENTS_DAY: |
| 489 |
|
$start = userTimeToServerTime(mktime(0, 0, 0, $month, $day, $year), $this->_extcalTime->_getUserTimeZone($user)); |
|
@@ 488-503 (lines=16) @@
|
| 485 |
|
|
| 486 |
|
break; |
| 487 |
|
|
| 488 |
|
case _EXTCAL_EVENTS_DAY: |
| 489 |
|
$start = userTimeToServerTime(mktime(0, 0, 0, $month, $day, $year), $this->_extcalTime->_getUserTimeZone($user)); |
| 490 |
|
$end = userTimeToServerTime(mktime(0, 0, 0, $month, $day + 1, $year), $this->_extcalTime->_getUserTimeZone($user)); |
| 491 |
|
//$criteriaCompo->add( new \Criteria('event_start', $end, '<=')); |
| 492 |
|
|
| 493 |
|
break; |
| 494 |
|
|
| 495 |
|
case _EXTCAL_EVENTS_YEAR: |
| 496 |
|
$start = userTimeToServerTime(mktime(0, 0, 0, 1, 1, $year), $this->_extcalTime->_getUserTimeZone($user)); |
| 497 |
|
$end = userTimeToServerTime(mktime(0, 0, 0, 12, 31, $year), $this->_extcalTime->_getUserTimeZone($user)); |
| 498 |
|
break; |
| 499 |
|
|
| 500 |
|
} |
| 501 |
|
$formatDate = $extcalConfig['event_date_week']; |
| 502 |
|
//-------------------------------------------------------------------------- |
| 503 |
|
$criteriaCompo->add( new \Criteria('event_isrecur', 1, '=')); |
| 504 |
|
$criteriaCompo->setOrder($sens); |
| 505 |
|
|
| 506 |
|
$result = $this->getObjects($criteriaCompo); |