| @@ 691-701 (lines=11) @@ | ||
| 688 | * |
|
| 689 | * @return CriteriaCompo |
|
| 690 | */ |
|
| 691 | public function _getCalendarCriteriaCompo($start, $end, $cat=0, &$user) |
|
| 692 | { |
|
| 693 | global $extcalConfig; |
|
| 694 | $criteriaCompo = $this->_getCriteriaCompo($start, $end, $cat, $user); |
|
| 695 | //if (!$this->_extcalConfig['diplay_past_event_cal']) { |
|
| 696 | if (!$extcalConfig['diplay_past_event_cal']) { |
|
| 697 | $criteriaCompo->add( new \Criteria('event_end', time(), '>')); |
|
| 698 | } |
|
| 699 | ||
| 700 | return $criteriaCompo; |
|
| 701 | } |
|
| 702 | ||
| 703 | /** |
|
| 704 | * @param $start |
|
| @@ 711-721 (lines=11) @@ | ||
| 708 | * |
|
| 709 | * @return CriteriaCompo |
|
| 710 | */ |
|
| 711 | public function _getListCriteriaCompo($start, $end, $cat=0, &$user) |
|
| 712 | { |
|
| 713 | global $extcalConfig; |
|
| 714 | $criteriaCompo = $this->_getCriteriaCompo($start, $end, $cat, $user); |
|
| 715 | // if (!$this->_extcalConfig['diplay_past_event_list']) { |
|
| 716 | if (!$extcalConfig['diplay_past_event_list']) { |
|
| 717 | $criteriaCompo->add( new \Criteria('event_end', time(), '>')); |
|
| 718 | } |
|
| 719 | ||
| 720 | return $criteriaCompo; |
|
| 721 | } |
|
| 722 | ||
| 723 | // Return upcomming event |
|
| 724 | ||