Menu
▾
▴
[xoops-svn] SF.net SVN: xoops-svn:[10609] XoopsModules/extcal/trunk/modules/extcal
|
From: <be...@us...> - 2012-12-30 09:49:17
|
Revision: 10609
http://sourceforge.net/p/xoops/svn/10609
Author: beckmi
Date: 2012-12-30 09:49:12 +0000 (Sun, 30 Dec 2012)
Log Message:
-----------
- fixed: past events not being visible (mamba)
- fixed: displaying the correct week in Week view, when the first day of the week is Monday
- updated Highslide JS from version 4.1.8 to 4.1.13
Modified Paths:
--------------
XoopsModules/extcal/trunk/modules/extcal/class/event.php
XoopsModules/extcal/trunk/modules/extcal/docs/changelog.txt
XoopsModules/extcal/trunk/modules/extcal/include/constantes.php
XoopsModules/extcal/trunk/modules/extcal/js/graphics/controlbar-white.gif
XoopsModules/extcal/trunk/modules/extcal/js/highslide-full.js
XoopsModules/extcal/trunk/modules/extcal/js/highslide-full.min.js
XoopsModules/extcal/trunk/modules/extcal/js/highslide-full.packed.js
XoopsModules/extcal/trunk/modules/extcal/js/highslide-ie6.css
XoopsModules/extcal/trunk/modules/extcal/js/highslide-with-gallery.js
XoopsModules/extcal/trunk/modules/extcal/js/highslide-with-gallery.min.js
XoopsModules/extcal/trunk/modules/extcal/js/highslide-with-gallery.packed.js
XoopsModules/extcal/trunk/modules/extcal/js/highslide-with-html.js
XoopsModules/extcal/trunk/modules/extcal/js/highslide-with-html.min.js
XoopsModules/extcal/trunk/modules/extcal/js/highslide-with-html.packed.js
XoopsModules/extcal/trunk/modules/extcal/js/highslide.css
XoopsModules/extcal/trunk/modules/extcal/js/highslide.js
XoopsModules/extcal/trunk/modules/extcal/js/highslide.min.js
XoopsModules/extcal/trunk/modules/extcal/js/highslide.packed.js
XoopsModules/extcal/trunk/modules/extcal/language/english/modinfo.php
XoopsModules/extcal/trunk/modules/extcal/view_agenda-week.php
XoopsModules/extcal/trunk/modules/extcal/view_calendar-week.php
XoopsModules/extcal/trunk/modules/extcal/view_week.php
Modified: XoopsModules/extcal/trunk/modules/extcal/class/event.php
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/class/event.php 2012-12-30 05:26:01 UTC (rev 10608)
+++ XoopsModules/extcal/trunk/modules/extcal/class/event.php 2012-12-30 09:49:12 UTC (rev 10609)
@@ -1,2388 +1,2403 @@
-<?php
-
-
-if (!defined("XOOPS_ROOT_PATH")) {
- die("XOOPS root path not defined");
-}
-
-include_once XOOPS_ROOT_PATH . '/modules/extcal/class/ExtcalPersistableObjectHandler.php';
-include_once XOOPS_ROOT_PATH . '/modules/extcal/class/perm.php';
-include_once XOOPS_ROOT_PATH . '/modules/extcal/class/time.php';
-include_once XOOPS_ROOT_PATH . '/modules/extcal/class/config.php';
-include_once XOOPS_ROOT_PATH . '/modules/extcal/class/extDateTime.php';
-
-include_once XOOPS_ROOT_PATH . '/modules/extcal/include/constantes.php';
-
-
-class ExtcalEvent extends XoopsObject
-{
-
- var $externalKey = array();
-
- function __construct()
- {
- $this->initVar('event_id', XOBJ_DTYPE_INT, null, false);
- $this->initVar('cat_id', XOBJ_DTYPE_INT, null, true);
- $this->initVar('event_title', XOBJ_DTYPE_TXTBOX, null, true, 255);
- $this->initVar('event_desc', XOBJ_DTYPE_TXTAREA, '', false);
- $this->initVar('event_organisateur', XOBJ_DTYPE_TXTBOX, '', false);
- $this->initVar('event_contact', XOBJ_DTYPE_TXTBOX, '', false);
- $this->initVar('event_url', XOBJ_DTYPE_URL, '', false);
- $this->initVar('event_email', XOBJ_DTYPE_TXTBOX, '', false);
- $this->initVar('event_address', XOBJ_DTYPE_TXTAREA, '', false);
- $this->initVar('event_approved', XOBJ_DTYPE_INT, 0, false);
- $this->initVar('event_start', XOBJ_DTYPE_INT, null, true);
- $this->initVar('event_end', XOBJ_DTYPE_INT, 0, false);
- $this->initVar('event_submitter', XOBJ_DTYPE_INT, 0, false);
- $this->initVar('event_submitdate', XOBJ_DTYPE_INT, 0, false);
- $this->initVar('event_nbmember', XOBJ_DTYPE_INT, 0, false);
- $this->initVar('event_isrecur', XOBJ_DTYPE_INT, 0, false);
- $this->initVar('event_recur_rules', XOBJ_DTYPE_TXTBOX, null, false);
- $this->initVar('event_recur_start', XOBJ_DTYPE_INT, 0, false);
- $this->initVar('event_recur_end', XOBJ_DTYPE_INT, 0, false);
- $this->initVar('dohtml', XOBJ_DTYPE_INT, 0, false);
- $this->initVar('event_picture1', XOBJ_DTYPE_TXTBOX, null, false);
- $this->initVar('event_picture2', XOBJ_DTYPE_TXTBOX, null, false);
- //$this->initVar("event_price",XOBJ_DTYPE_OTHER,null,false,10);
- $this->initVar('event_price', XOBJ_DTYPE_TXTBOX, '', false);
- $this->initVar('event_etablissement', XOBJ_DTYPE_INT, 5, false);
- $this->initVar('event_icone', XOBJ_DTYPE_TXTBOX, '', false);
-
- $this->externalKey['cat_id'] = array(
- 'className' => 'cat',
- 'getMethodeName' => 'getCat',
- 'keyName' => 'cat',
- 'core' => false
- );
- $this->externalKey['event_submitter'] = array(
- 'className' => 'user',
- 'getMethodeName' => 'get',
- 'keyName' => 'user',
- 'core' => true
- );
- }
-
- function getExternalKey($key)
- {
- return $this->externalKey[$key];
- }
-
-}
-
-class ExtcalEventHandler extends ExtcalPersistableObjectHandler
-{
-
- private $_extcalPerm;
- private $_extcalTime;
- private $_extcalConfig;
-
- function __construct(&$db)
- {
- $this->_extcalPerm = ExtcalPerm::getHandler();
- $this->_extcalTime = ExtcalTime::getHandler();
- // $extcalConfig = ExtcalConfig::getHandler();
- // $this->_extcalConfig = $extcalConfig->getModuleConfig();
- $this->ExtcalPersistableObjectHandler($db, 'extcal_event', _EXTCAL_CLN_EVENT, 'event_id');
- }
-
- function createEvent($data)
- {
- $event = $this->create();
- $this->_checkDate($data);
- $this->_userTimeToServerTime($data);
- $this->_addRecurValue($data);
- $event->setVars($data);
- return $this->insert($event, true);
- }
-
- function createEventForPreview($data)
- {
- $event = $this->create();
- $this->_checkDate($data);
- $this->_addRecurValue($data);
- $event->setVars($data);
-
- return $event;
- }
-
- function modifyEvent($eventId, $data)
- {
- $event = $this->get($eventId);
- $this->_checkDate($data);
- $this->_userTimeToServerTime($data);
- $this->_addRecurValue($data);
- $event->setVars($data);
- return $this->insert($event);
- }
-
- function deleteEvent($eventId)
- {
- /* TODO :
- - Delete who's going
- - Delete who's not going
- - Delete comment
- - Delete notifications
- */
- $this->delete($eventId, true);
- }
-
- function deleteAllEvents($criteria = null, $force = true, $asObject = false)
- {
- /* TODO :
- - Delete who's going
- - Delete who's not going
- - Delete comment
- - Delete notifications
- */
- $this->deleteAll($criteria, $force, $asObject);
- }
-
- function getAllEvents($criteria = null, $asObject = false)
- {
-
-
- $rst = $this->getObjects($criteria, $asObject);
- if ($asObject) {
- return $rst;
- } else {
- return $this->objectToArray($rst);
- }
- }
-
- // Return one approved event selected by his id
- function getEvent($eventId, $skipPerm = false)
- {
-
- $user = $GLOBALS['xoopsUser'];
-
- $criteriaCompo = new CriteriaCompo();
- $criteriaCompo->add(new Criteria('event_id', $eventId));
- $criteriaCompo->add(new Criteria('event_approved', 1));
- if (!$skipPerm) {
- $this->_addCatPermCriteria($criteriaCompo, $user);
- }
- $ret = $this->getObjects($criteriaCompo);
- if (isset($ret[0])) {
- return $ret[0];
- } else {
- return false;
- }
- }
-
-
- // Return one event selected by his id (approve or not)
- function getEventWithNotApprove($eventId, $skipPerm = false)
- {
-
- $user = $GLOBALS['xoopsUser'];
-
- $criteriaCompo = new CriteriaCompo();
- $criteriaCompo->add(new Criteria('event_id', $eventId));
- if (!$skipPerm) {
- $this->_addCatPermCriteria($criteriaCompo, $user);
- }
- $ret = $this->getObjects($criteriaCompo);
- if (isset($ret[0])) {
- return $ret[0];
- } else {
- return false;
- }
- }
-
- function formatEventsDate(&$events, $pattern)
- {
- $max = count($events);
- for (
- $i = 0; $i < $max; $i++
- ) {
- $this->formatEventDate($events[$i], $pattern);
- }
- }
-
-// function getPicture1(&$event) {
-// return $event['event_picture1'];
-// }
-// function getPicture2(&$event) {
-// return $event['event_picture2'];
-// }
-// function getDesc(&$event) {
-// return $event['event_desc'];
-// }
-
- function formatEventDate(&$event, $pattern)
- {
- if (!$event['event_isrecur']) {
- $event['formated_event_start'] = $this->_extcalTime->getFormatedDate($pattern, $event['event_start']);
- $event['formated_event_end'] = $this->_extcalTime->getFormatedDate($pattern, $event['event_end']);
- } else {
- $event['formated_event_start'] = $this->_extcalTime->getFormatedDate($pattern, $event['event_start']);
- $event['formated_event_end'] = $this->_extcalTime->getFormatedDate($pattern, $event['event_end']);
- $event['formated_reccur_rule'] = $this->_extcalTime->getFormatedReccurRule($event['event_recur_rules']);
- }
- $event['formated_event_submitdate'] = $this->_extcalTime->getFormatedDate($pattern, $event['event_submitdate']);
- }
-
-//JJD - to valid modif
-// function _checkDate(&$data)
-// {
-//
-// list($year, $month, $day) = explode("-", $data['event_start']['date']);
-// $data['event_start']
-// =
-// mktime(0, 0, 0, $month, $day, $year) + $data['event_start']['time'];
-// list($year, $month, $day) = explode("-", $data['event_end']['date']);
-// $data['event_end']
-// = mktime(0, 0, 0, $month, $day, $year) + $data['event_end']['time'];
-//
-// if ($data['have_end'] == 0 || $data['event_start'] > $data['event_end']
-// ) {
-// $data['event_end'] = $data['event_start'];
-// }
-//
-// }
-
- function _checkDate(&$data)
- {
-
- $data['event_start'] = strtotime($data['event_start']['date']) + $data['event_start']['time'];
- $data['event_end'] = strtotime($data['event_end']['date']) + $data['event_end']['time'];
-
-
- if ($data['have_end'] == 0 || $data['event_start'] > $data['event_end']
- ) {
- $data['event_end'] = $data['event_start'];
- }
-
- }
-
- function _userTimeToServerTime(&$data)
- {
-
- $user = $GLOBALS['xoopsUser'];
-
- $data['event_start'] = userTimeToServerTime($data['event_start'], $this->_extcalTime->_getUserTimeZone($user));
- $data['event_end'] = userTimeToServerTime($data['event_end'], $this->_extcalTime->_getUserTimeZone($user));
-
- }
-
- function serverTimeToUserTime(&$data)
- {
-
- $user = $GLOBALS['xoopsUser'];
-
- $data['event_start'] = xoops_getUserTimestamp($data['event_start'], $this->_extcalTime->_getUserTimeZone($user));
- $data['event_end'] = xoops_getUserTimestamp($data['event_end'], $this->_extcalTime->_getUserTimeZone($user));
- $data['event_submitdate'] = xoops_getUserTimestamp($data['event_submitdate'], $this->_extcalTime->_getUserTimeZone($user));
-
- }
-
- function serverTimeToUserTimes(&$events)
- {
- $max = count($events);
-
- for (
- $i = 0; $i < $max; $i++
- ) {
- $this->serverTimeToUserTime($events[$i]);
- }
- }
-
- function _addRecurValue(&$data)
- {
- $data['event_isrecur'] = $this->getIsRecur($_POST);
- $data['event_recur_rules'] = $this->getRecurRules($_POST);
- $data['event_recur_start'] = $this->getRecurStart($data, $_POST);
- $data['event_recur_end'] = $this->getRecurEnd($data, $_POST);
- }
-
-
- /***************************************************************
- * Return events on perioe
- ***************************************************************/
- function getEventsOnPeriode($criteres)
- {
- //ext_echoArray($criteres);
- global $extcalConfig;
-
- $eventsU = $this->getEventsUniques($criteres);
- $eventsR = $this->getEventsRecurents($criteres);
- $events = array_merge($eventsU, $eventsR);
-
- // $events = $eventsU;
-
- //ext_echoArray($events);
-
- //Tri des evennement par date ascendante
- $ordre = array();
- $eventArray = array();
-
- while (list($k, $v) = each($events)) {
- $ordre[] = intval($v['event_start']);
- $this->formatEventDate($v, $extcalConfig['event_date_week']);
- //$v['cat']['cat_light_color'] = $v['cat']['cat_color'];
- $v['cat']['cat_light_color'] = eclaircirCouleur($v['cat']['cat_color'], _EXTCAL_INFOBULLE_RGB_MIN, _EXTCAL_INFOBULLE_RGB_MAX);
- if ($v['event_icone'] == '') {
- $v['event_icone'] = $v['cat']['cat_icone'];
- }
- $eventArray[] = $v;
- }
- array_multisort($eventArray, SORT_ASC, SORT_NUMERIC, $ordre, SORT_ASC, SORT_NUMERIC);
-
- return $eventArray;
- }
-
- /*****************************************************************
- *
- *****************************************************************/
- function getEventsUniques($criteres)
- {
- global $extcalConfig;
- while (list($k, $v) = each($criteres)) {
- $$k = $v;
-
- }
- if (!isset($nbDays)) {
- $nbDays = 7;
- }
- if (!isset($sens)) {
- $sens = 'ASC';
- }
- if (!isset($externalKeys)) {
- $externalKeys = array('cat_id');
- }
- //------------------------------------------------------
- switch ($periode) {
- case _EXTCAL_EVENTS_WEEK:
- case _EXTCAL_EVENTS_CALENDAR_WEEK:
- case _EXTCAL_EVENTS_AGENDA_WEEK:
- $criteriaCompo = $this->_getEventWeekCriteria($day, $month, $year, $cat, $nbDays);
- if (!$extcalConfig['diplay_past_event_cal']) {
- $criteriaCompo->add(new Criteria('event_end', time(), '>'));
- }
- break;
-
- case _EXTCAL_EVENTS_MONTH:
- case _EXTCAL_EVENTS_CALENDAR_MONTH:
- $criteriaCompo = $this->_getEventMonthCriteria($month, $year, $cat);
-
- if (!$extcalConfig['diplay_past_event_cal']) {
- $criteriaCompo->add(new Criteria('event_end', time(), '>'));
- }
- break;
-
- case _EXTCAL_EVENTS_DAY:
- $criteriaCompo = $this->_getEventDayCriteria($day, $month, $year, $cat);
- break;
-
- case _EXTCAL_EVENTS_YEAR:
- $criteriaCompo = $this->_getEventYearCriteria($year, $cat);
- break;
- }
- //--------------------------------------------------------------------------
- $criteriaCompo->add(new Criteria('event_isrecur', 0, '='));
- $criteriaCompo->setOrder($sens);
-
- $result = $this->getObjects($criteriaCompo);
- $events = $this->objectToArray($result, $externalKeys);
- $this->serverTimeToUserTimes($events);
- return $events;
-
- }
-
- /*****************************************************************
- * evennement r\xE9curents
- *****************************************************************/
-
- function getEventsRecurents($criteres)
- {
- global $extcalConfig;
-
- while (list($k, $v) = each($criteres)) {
- $$k = $v;
- }
- if (!isset($nbDays)) {
- $nbDays = 7;
- }
- if (!isset($sens)) {
- $sens = 'ASC';
- }
- if (!isset($externalKeys)) {
- $externalKeys = array('cat_id');
- }
- $user = $GLOBALS['xoopsUser'];
- //------------------------------------------------------
-
-
- $criteriaCompo = new CriteriaCompo();
-
-
- switch ($periode) {
- case _EXTCAL_EVENTS_WEEK:
- case _EXTCAL_EVENTS_CALENDAR_WEEK:
- case _EXTCAL_EVENTS_AGENDA_WEEK:
- $start = userTimeToServerTime(mktime(0, 0, 0, $month, $day, $year), $this->_extcalTime->_getUserTimeZone($user));
- $end = userTimeToServerTime(
- mktime(
- 0, 0, 0, $month, $day + $nbDays + 1, $year
- ), $this->_extcalTime->_getUserTimeZone($user)
- );
- //$end = $start + (($nbDays + 1 )* _EXTCAL_TS_DAY);
- //$end = userTimeToServerTime(mktime(0, 0, 0, $month, $day+(($nbJours)+1 * _EXTCAL_TS_DAY), $year), $this->_extcalTime->_getUserTimeZone($user));;
- break;
-
-
- case _EXTCAL_EVENTS_MONTH:
- case _EXTCAL_EVENTS_CALENDAR_MONTH:
- $start = userTimeToServerTime(mktime(0, 0, 0, $month, 1, $year), $this->_extcalTime->_getUserTimeZone($user));
- $end = userTimeToServerTime(
- mktime(23, 59, 59, $month + 1, 1, $year)
- - _EXTCAL_TS_DAY, $this->_extcalTime->_getUserTimeZone($user)
- );
-
- $criteriaCompo->add(new Criteria('event_start', $end, '<='));
- //$criteriaCompo->add(new Criteria('event_end', $start, '>='));
-
-
- break;
-
- case _EXTCAL_EVENTS_DAY:
- $start = userTimeToServerTime(mktime(0, 0, 0, $month, $day, $year), $this->_extcalTime->_getUserTimeZone($user));
- $end = userTimeToServerTime(
- mktime(
- 0, 0, 0, $month, $day + 1, $year
- ), $this->_extcalTime->_getUserTimeZone($user)
- );
- ;
- //$criteriaCompo->add(new Criteria('event_start', $end, '<='));
-
- break;
-
- case _EXTCAL_EVENTS_YEAR:
- $start = userTimeToServerTime(mktime(0, 0, 0, 1, 1, $year), $this->_extcalTime->_getUserTimeZone($user));
- $end = userTimeToServerTime(mktime(0, 0, 0, 12, 31, $year), $this->_extcalTime->_getUserTimeZone($user));
- break;
- }
- $formatDate = $extcalConfig['event_date_week'];
- //--------------------------------------------------------------------------
- $criteriaCompo->add(new Criteria('event_isrecur', 1, '='));
- $criteriaCompo->setOrder($sens);
-
- $result = $this->getObjects($criteriaCompo);
- $events = $this->objectToArray($result, $externalKeys);
- $this->serverTimeToUserTimes($events);
-
- //Balyage de tous les evennements r\xE9currents et creation de toutes le events
- $eventsR = array();
- while (list($k, $event) = each($events)) {
- //$te = $this->GetInterval($event, $start, $end);
- //$eventsR = array_merge($eventsR, $te);
- //echo 'event : ' . $event['event_id'] . '<br>';
- //ext_echoArray($event);
- $recurEvents = $this->getRecurEventToDisplay($event, $start, $end);
- if (count($recurEvents) > 0) {
- $eventsR = array_merge($eventsR, $recurEvents);
- }
-
- // Formating date
- //$eventsR = array_merge($eventsArray, $recurEvents);
-
- }
-
-
- return $eventsR;
-
- }
-
- /*****************************************************************
- *
- *****************************************************************/
- function echoDateArray($period, $caption = '')
- {
- if ($caption != '') {
- echo "<hr>echoDateArray -> {$caption}<br>";
- } else {
- echo "<hr>echoDateArray<br>";
- }
-
- reset($period);
- foreach (
- $period as $dt
- ) {
- echo $dt->format("l d-m-Y H:i:s\n") . '<br>';
- }
-
- }
-
-
- /*****************************************************************
- * Criteria
- *****************************************************************/
- // Return the criteria compo object for a day
- function _getEventDayCriteria($day, $month, $year, $cat = 0)
- {
-
- $user = $GLOBALS['xoopsUser'];
-
- $dayStart = userTimeToServerTime(mktime(0, 0, 0, $month, $day, $year), $this->_extcalTime->_getUserTimeZone($user));
- $dayEnd = userTimeToServerTime(mktime(23, 59, 59, $month, $day, $year), $this->_extcalTime->_getUserTimeZone($user));
- $criteriaCompo = $this->_getListCriteriaCompo($dayStart, $dayEnd, $cat, $user);
-
- return $criteriaCompo;
- }
-
- // Return the criteria compo object for a week
- function _getEventWeekCriteria($day, $month, $year, $cat, $nbDays = 7)
- {
-
- $user = $GLOBALS['xoopsUser'];
-
- $userStartTime = mktime(0, 0, 0, $month, $day, $year);
- $userEndTime = $userStartTime + (_EXTCAL_TS_DAY * $nbDays);
- $weekStart = userTimeToServerTime($userStartTime, $this->_extcalTime->_getUserTimeZone($user));
- $weekEnd = userTimeToServerTime($userEndTime, $this->_extcalTime->_getUserTimeZone($user));
- $criteriaCompo = $this->_getCriteriaCompo($weekStart, $weekEnd, $cat, $user);
- return $criteriaCompo;
- }
-
- // Return the criteria compo object for a month
- function _getEventMonthCriteria($month, $year, $cat)
- {
-
- $user = $GLOBALS['xoopsUser'];
-
- $userStartTime = mktime(0, 0, 0, $month, 1, $year);
- $userEndTime = mktime(23, 59, 59, $month + 1, 0, $year);
- $monthStart = userTimeToServerTime($userStartTime, $this->_extcalTime->_getUserTimeZone($user));
- $monthEnd = userTimeToServerTime($userEndTime, $this->_extcalTime->_getUserTimeZone($user));
- $criteriaCompo = $this->_getCriteriaCompo($monthStart, $monthEnd, $cat, $user);
- return $criteriaCompo;
- }
-
- // Return event occuring on a given year
- function _getEventYearCriteria($year, $cat = 0)
- {
- $user = $GLOBALS['xoopsUser'];
-
- $userStartTime = mktime(0, 0, 0, 1, 1, $year);
- $userEndTime = mktime(23, 59, 59, 12, 31, $year);
- $yearStart = userTimeToServerTime($userStartTime, $this->_extcalTime->_getUserTimeZone($user));
- $yearEnd = userTimeToServerTime($userEndTime, $this->_extcalTime->_getUserTimeZone($user));
- $criteriaCompo = $this->_getListCriteriaCompo($yearStart, $yearEnd, $cat, $user);
-
- return $criteriaCompo;
- }
-
-
- /**********************************************************************
- * Debut de - A virer in fine
- **********************************************************************/
-
- /**********************************************************************
- * FIN de - A virer in fine
- **********************************************************************/
-
-
- /**********************************************************************
- * Construction des criteres en fonction de la p\xE9riode
- **********************************************************************/
-
- function _getCriteriaCompo($start, $end, $cat, &$user)
- {
-
- $criteriaNoRecur = new CriteriaCompo();
- $criteriaNoRecur->add(new Criteria('event_start', $end, '<='));
- $criteriaNoRecur->add(new Criteria('event_end', $start, '>='));
- $criteriaNoRecur->add(new Criteria('event_isrecur', 0));
-
- $criteriaRecur = new CriteriaCompo();
- $criteriaRecur->add(new Criteria('event_recur_start', $end, '<='));
- $criteriaRecur->add(new Criteria('event_recur_end', $start, '>='));
- $criteriaRecur->add(new Criteria('event_isrecur', 1));
-
- $criteriaCompoDate = new CriteriaCompo();
- $criteriaCompoDate->add($criteriaNoRecur, 'OR');
- $criteriaCompoDate->add($criteriaRecur, 'OR');
-
- $criteriaCompo = new CriteriaCompo();
- $criteriaCompo->add($criteriaCompoDate);
-
- $criteriaCompo->add(new Criteria('event_approved', 1));
- $this->_addCatSelectCriteria($criteriaCompo, $cat);
- $this->_addCatPermCriteria($criteriaCompo, $user);
- $criteriaCompo->setSort('event_start');
-
- return $criteriaCompo;
- }
-
- function _getCalendarCriteriaCompo($start, $end, $cat, &$user)
- {
- global $extcalConfig;
- $criteriaCompo = $this->_getCriteriaCompo($start, $end, $cat, $user);
- //if (!$this->_extcalConfig['diplay_past_event_cal']) {
- if (!$extcalConfig['diplay_past_event_cal']) {
- $criteriaCompo->add(new Criteria('event_end', time(), '>'));
- }
- return $criteriaCompo;
- }
-
- function _getListCriteriaCompo($start, $end, $cat, &$user)
- {
- global $extcalConfig;
- $criteriaCompo = $this->_getCriteriaCompo($start, $end, $cat, $user);
- // if (!$this->_extcalConfig['diplay_past_event_list']) {
- if (!$extcalConfig['diplay_past_event_list']) {
- $criteriaCompo->add(new Criteria('event_end', time(), '>'));
- }
- return $criteriaCompo;
- }
-
- // Return upcomming event
- function getUpcommingEvent($nbEvent, $cat = 0)
- {
-
- $now = time();
-
- $criteriaNoRecur = new CriteriaCompo();
- $criteriaNoRecur->add(new Criteria('event_start', $now, '>='));
- $criteriaNoRecur->add(new Criteria('event_isrecur', 0));
-
- $criteriaRecur = new CriteriaCompo();
- $criteriaRecur->add(new Criteria('event_recur_start', $now, '>='));
- $criteriaRecur->add(new Criteria('event_isrecur', 1));
-
- $criteriaCompoDate = new CriteriaCompo();
- $criteriaCompoDate->add($criteriaNoRecur, 'OR');
- $criteriaCompoDate->add($criteriaRecur, 'OR');
-
- $criteriaCompo = new CriteriaCompo();
- $criteriaCompo->add($criteriaCompoDate);
-
- $criteriaCompo->add(new Criteria('event_approved', 1));
- $this->_addCatSelectCriteria($criteriaCompo, $cat);
- $this->_addCatPermCriteria($criteriaCompo, $GLOBALS['xoopsUser']);
-
-
- $criteriaCompo->setSort('event_start');
- $criteriaCompo->setLimit($nbEvent);
- return $this->getObjects($criteriaCompo);
- }
-
-
- // Return event occuring this day
- function getThisDayEvent($nbEvent, $cat = 0)
- {
- $day = date("j");
- $month = date("n");
- $year = date("Y");
-
- $dayStart = mktime(0, 0, 0, $month, $day, $year);
- $dayEnd = mktime(0, 0, 0, $month, $day + 1, $year);
-
- $criteriaCompo = new CriteriaCompo();
- $this->_addCatSelectCriteria($criteriaCompo, $cat);
- $this->_addCatPermCriteria($criteriaCompo, $GLOBALS['xoopsUser']);
- $criteriaCompo->add(new Criteria('event_end', $dayStart, '>='));
- $criteriaCompo->add(new Criteria('event_start', $dayEnd, '<'));
- $criteriaCompo->add(new Criteria('event_approved', 1));
- $criteriaCompo->setSort('event_start');
- $criteriaCompo->setLimit($nbEvent);
- return $this->getObjects($criteriaCompo);
- }
-
- // Return last added event
- function getNewEvent($start, $limit, $cat = 0, $skipPerm = false)
- {
- $criteriaCompo = new CriteriaCompo();
- $this->_addCatSelectCriteria($criteriaCompo, $cat);
- if (!$skipPerm) {
- $this->_addCatPermCriteria($criteriaCompo, $GLOBALS['xoopsUser']);
- }
- $criteriaCompo->add(new Criteria('event_approved', 1));
- $criteriaCompo->setSort('event_id');
- $criteriaCompo->setOrder('DESC');
- $criteriaCompo->setStart($start);
- $criteriaCompo->setLimit($limit);
- return $this->getObjects($criteriaCompo);
- }
-
- function getCountNewEvent()
- {
- $criteriaCompo = new CriteriaCompo();
- $this->_addCatSelectCriteria($criteriaCompo, 0);
- $criteriaCompo->add(new Criteria('event_approved', 1));
- $criteriaCompo->setSort('event_id');
- return $this->getCount($criteriaCompo);
- }
-
- // Return random upcomming event
- function getRandomEvent($nbEvent, $cat = 0)
- {
- $criteriaCompo = new CriteriaCompo();
- $this->_addCatSelectCriteria($criteriaCompo, $cat);
- $this->_addCatPermCriteria($criteriaCompo, $GLOBALS['xoopsUser']);
- $criteriaCompo->add(new Criteria('event_start', time(), '>='));
- $criteriaCompo->add(new Criteria('event_approved', 1));
- $criteriaCompo->setSort('RAND()');
- $criteriaCompo->setLimit($nbEvent);
- return $this->getObjects($criteriaCompo);
- }
-
- function getPendingEvent()
- {
- $criteriaCompo = new CriteriaCompo();
- $criteriaCompo->add(new Criteria('event_approved', 0));
- $criteriaCompo->setSort('event_start');
- return $this->getObjects($criteriaCompo);
- }
-
- function _addCatPermCriteria(&$criteria, &$user)
- {
- $authorizedAccessCats = $this->_extcalPerm->getAuthorizedCat($user, 'extcal_cat_view');
- $count = count($authorizedAccessCats);
- if ($count > 0) {
- $in = '(' . $authorizedAccessCats[0];
- array_shift($authorizedAccessCats);
- foreach (
- $authorizedAccessCats as $authorizedAccessCat
- ) {
- $in .= ',' . $authorizedAccessCat;
- }
- $in .= ')';
- $criteria->add(new Criteria('cat_id', $in, 'IN'));
- } else {
- $criteria->add(new Criteria('cat_id', '(0)', 'IN'));
- }
- }
-
- function _addCatSelectCriteria(&$criteria, $cats)
- {
- if (!is_array($cats) && $cats > 0) {
- $criteria->add(new Criteria('cat_id', $cats));
- }
- if (is_array($cats)) {
- if (array_search(0, $cats) === false) {
- $in = '(' . current($cats);
- array_shift($cats);
- foreach (
- $cats as $cat
- ) {
- $in .= ',' . $cat;
- }
- $in .= ')';
- $criteria->add(new Criteria('cat_id', $in, 'IN'));
- }
- }
- }
-
- /**********************************************************************
- formulaire d'edition des evennements*
- **********************************************************************/
- function getEventForm($siteSide = 'user', $mode = 'new', $data = null)
- {
- $catHandler = xoops_getmodulehandler(_EXTCAL_CLS_CAT, _EXTCAL_MODULE);
- $fileHandler = xoops_getmodulehandler(_EXTCAL_CLS_FILE, _EXTCAL_MODULE);
- /***************************************************/
- include_once XOOPS_ROOT_PATH . "/modules/extcal/class/etablissement.php";
- if ($siteSide == 'admin') {
- $action = 'event.php?op=enreg';
- $cats = $catHandler->getAllCat($GLOBALS['xoopsUser'], 'all');
- } else {
- $action = 'post.php';
- $cats = $catHandler->getAllCat($GLOBALS['xoopsUser']);
- }
- /***************************************************/
- $reccurOptions = array();
-
- if ($mode == 'edit' OR $mode == 'clone') {
- if (!$event = $this->getEventWithNotApprove($data['event_id'])) {
- return false;
- }
- if ($mode == 'clone') {
- $data['event_id'] = 0;
- $event->setVar('event_id', 0);
- $newTitle = $event->getVar('event_title') . ' (' . _AM_EXTCAL_CLONE_OF . $data['event_id'] . ')';
- $event->setVar('event_title', $newTitle);
- }
-
- $formTitle = _MD_EXTCAL_EDIT_EVENT;
- $formName = 'modify_event';
- $title = $event->getVar('event_title', 'e');
- $cat = $event->getVar('cat_id');
- $desc = $event->getVar('event_desc', 'e');
- $nbMember = $event->getVar('event_nbmember', 'e');
- $organisateur = $event->getVar('event_organisateur');
- $contact = $event->getVar('event_contact', 'e');
- $url = $event->getVar('event_url', 'e');
- $email = $event->getVar('event_email', 'e');
- $event_address = $event->getVar('event_address', 'e');
- $startDateValue = xoops_getUserTimestamp($event->getVar('event_start'), $this->_extcalTime->_getUserTimeZone($GLOBALS['xoopsUser']));
- $endDateValue = xoops_getUserTimestamp($event->getVar('event_end'), $this->_extcalTime->_getUserTimeZone($GLOBALS['xoopsUser']));
- $event_picture1 = $event->getVar('event_picture1');
- $event_picture2 = $event->getVar('event_picture2');
- $event_price = $event->getVar('event_price');
- $event_etablissement = $event->getVar('event_etablissement');
- $event_icone = $event->getVar('event_icone');
-
- // Configuring recurring form
- $eventOptions = explode('|', $event->getVar('event_recur_rules'));
- $reccurMode = $eventOptions[0];
- array_shift($eventOptions);
- switch ($reccurMode) {
-
- case 'daily':
-
- $reccurOptions['rrule_freq'] = 'daily';
- $reccurOptions['rrule_daily_interval'] = $eventOptions[0];
-
- break;
-
- case 'weekly':
-
- $reccurOptions['rrule_freq'] = 'weekly';
- $reccurOptions['rrule_weekly_interval'] = $eventOptions[0];
- array_shift($eventOptions);
- $reccurOptions['rrule_weekly_bydays'] = $eventOptions;
-
- break;
-
- case 'monthly':
-
- $reccurOptions['rrule_freq'] = 'monthly';
- $reccurOptions['rrule_monthly_interval'] = $eventOptions[0];
- array_shift($eventOptions);
- if (substr($eventOptions[0], 0, 2) != "MD") {
- $reccurOptions['rrule_monthly_byday'] = $eventOptions[0];
- } else {
- $reccurOptions['rrule_bymonthday'] = substr($eventOptions[0], 2);
- }
-
- break;
-
- case 'yearly':
-
- $reccurOptions['rrule_freq'] = 'yearly';
- $reccurOptions['rrule_yearly_interval'] = $eventOptions[0];
- array_shift($eventOptions);
- $reccurOptions['rrule_yearly_byday'] = $eventOptions[0];
- array_shift($eventOptions);
- $reccurOptions['rrule_yearly_bymonths'] = $eventOptions;
-
- break;
-
- }
-
- $files = $fileHandler->objectToArray($fileHandler->getEventFiles($data['event_id']));
- $fileHandler->formatFilesSize($files);
-
- } elseif ($mode == 'preview') {
-
- $formTitle = _MD_EXTCAL_SUBMIT_EVENT;
- $formName = 'submit_event';
- $title = $data['event_title'];
- $cat = $data['cat_id'];
- $desc = $data['event_desc'];
- $nbMember = $data['event_nbmember'];
- $organisateur = $data['event_organisateur'];
- $contact = $data['event_contact'];
- $url = $data['event_url'];
- $email = $data['event_email'];
- $event_address = $data['event_address'];
- $startDateValue = $data['event_start'];
- $endDateValue = $data['event_end'];
- $eventEndOk = $data['have_end'];
- $event_picture1 = $data['event_picture1'];
- $event_picture2 = $data['event_picture2'];
- $event_price = $data['event_price'];
- $event_etablissement = $data['event_etablissement'];
- $event_icone = $data['event_icone'];
-
- // Configuring recurring form
- $eventOptions = explode('|', $this->getRecurRules($_POST));
- $reccurMode = $eventOptions[0];
- array_shift($eventOptions);
- switch ($reccurMode) {
-
- case 'daily':
-
- $reccurOptions['rrule_freq'] = 'daily';
- $reccurOptions['rrule_daily_interval'] = $eventOptions[0];
-
- break;
-
- case 'weekly':
-
- $reccurOptions['rrule_freq'] = 'weekly';
- $reccurOptions['rrule_weekly_interval'] = $eventOptions[0];
- array_shift($eventOptions);
- $reccurOptions['rrule_weekly_bydays'] = $eventOptions;
-
- break;
-
- case 'monthly':
-
- $reccurOptions['rrule_freq'] = 'monthly';
- $reccurOptions['rrule_monthly_interval'] = $eventOptions[0];
- array_shift($eventOptions);
- if (substr($eventOptions[0], 0, 2) != "MD") {
- $reccurOptions['rrule_monthly_byday'] = $eventOptions[0];
- } else {
- $reccurOptions['rrule_bymonthday'] = substr($eventOptions[0], 2);
- }
-
- break;
-
- case 'yearly':
-
- $reccurOptions['rrule_freq'] = 'yearly';
- $reccurOptions['rrule_yearly_interval'] = $eventOptions[0];
- array_shift($eventOptions);
- $reccurOptions['rrule_yearly_byday'] = $eventOptions[0];
- array_shift($eventOptions);
- $reccurOptions['rrule_yearly_bymonths'] = $eventOptions;
-
- break;
-
- }
-
- $files = $fileHandler->objectToArray($fileHandler->getEventFiles($data['event_id']));
- $fileHandler->formatFilesSize($files);
-
- } else {
- $formTitle = _MD_EXTCAL_SUBMIT_EVENT;
- $formName = 'submit_event';
- $title = '';
- $cat = '';
- $desc = '';
- $nbMember = 0;
- $organisateur = '';
- $contact = '';
- $url = '';
- $email = '';
- $event_address = '';
- $startDateValue = 0;
- $endDateValue = 0;
- $eventEndOk = 0;
- $event_picture1 = '';
- $event_picture2 = '';
- $event_price = '';
- $event_etablissement = '';
- $files = array();
- $event_icone = '';
-
- }
-
- // Create XoopsForm Object
- $form = new ExtcalThemeForm($formTitle, 'event_form', $action, 'post', true);
- // Add this extra to allow file upload
- $form->setExtra('enctype="multipart/form-data"');
-
-
- //-----------------------------------------------
- // Title
- $form->addElement(new XoopsFormText(_MD_EXTCAL_TITLE, 'event_title', 80, 255, $title), true);
- //-----------------------------------------------
- // Category select
- $catSelect = new XoopsFormSelect(_MD_EXTCAL_CATEGORY, 'cat_id', $cat);
- foreach (
- $cats as $cat
- ) {
- $catSelect->addOption($cat->getVar('cat_id'), $cat->getVar('cat_name'));
- }
- $form->addElement($catSelect, true);
- //-----------------------------------------------------------
-
- $file_path = XOOPS_ROOT_PATH . '/modules/extcal/css/images';
- $tf = XoopsLists::getImgListAsArray($file_path);
- array_unshift($tf, _MD_EXTCAL_NONE);
- $xfIcones = new XoopsFormSelect(_MD_EXTCAL_ICONE, "event_icone", $event_icone, '');
- $xfIcones->addOptionArray($tf);
- $form->addElement($xfIcones, false);
- //-----------------------------------------------------------
- //etablissement
- $etablissementHandler = xoops_getmodulehandler(_EXTCAL_CLS_ETABLISSEMENT, _EXTCAL_MODULE);
- $etablissement_select = new XoopsFormSelect(_MD_EXTCAL_ETABLISSEMENT, 'event_etablissement', $event_etablissement);
- $criteria = new CriteriaCompo();
- $criteria->setSort('nom');
- $criteria->setOrder('ASC');
-
-
- //$lstEtablissement = $etablissementHandler->getList($criteria);
- $etablissement_arr = $etablissementHandler->getAll($criteria);
- $tEts = array();
- $tEts[0] = _MD_EXTCAL_NONE;
- foreach (
- array_keys($etablissement_arr) as $i
- ) {
- //$tEts[$etablissement_arr[$i]->getVar('id')] = $etablissement_arr[$i]->getVar('nom');
- $tEts[$etablissement_arr[$i]['id']] = $etablissement_arr[$i]['nom'];
- }
- //array_unshift($tEts, _MD_EXTCAL_NONE);
-
- $etablissement_select->addOptionArray($tEts);
- $form->addElement($etablissement_select, true);
-
- //-----------------------------------------------------------
-
-
- // Start and end
- new ExtcalFormDateTime($form, $startDateValue, $endDateValue); //mb
- // Description
- $form->addElement(new XoopsFormDhtmlTextArea(_MD_EXTCAL_DESCRIPTION, 'event_desc', $desc, 10), false);
- // Max registered member for this event
- $nbMemberElement = new XoopsFormText(_MD_EXTCAL_NBMEMBER, 'event_nbmember', 4, 4, $nbMember);
- $nbMemberElement->setDescription(_MD_EXTCAL_NBMEMBER_DESC);
- $form->addElement($nbMemberElement, false);
-
- //Price and monnaie
- $monnaie_price = new XoopsFormElementTray(_MD_EXTCAL_PRICE, '');
- //price
- $monnaie_price->addElement(new XoopsFormText('', 'event_price', 20, 255, $event_price));
- //monnaie
- $monnaie = new XoopsFormLabel(_MD_EXTCAL_DEVISE2, '');
- $monnaie_price->addElement($monnaie);
- $form->addElement($monnaie_price);
- //----------------------------------------------------------------
- $form->addElement(new XoopsFormText(_MD_EXTCAL_ORGANISATEUR, 'event_organisateur', 80, 255, $organisateur), false);
- // Contact
- $form->addElement(new XoopsFormText(_MD_EXTCAL_CONTACT, 'event_contact', 80, 255, $contact), false);
- // Url
- $form->addElement(new XoopsFormText(_MD_EXTCAL_URL, 'event_url', 80, 255, $url), false);
- // Email
- $form->addElement(new XoopsFormText(_MD_EXTCAL_EMAIL, 'event_email', 80, 255, $email), false);
- // Address
- $form->addElement(new XoopsFormDhtmlTextArea(_MD_EXTCAL_ADDRESS, 'event_address', $event_address), false);
- // Recurence form
- $form->addElement(new ExtcalFormRecurRules($reccurOptions));
- // File attachement
- $fileElmtTray = new XoopsFormElementTray(_MD_EXTCAL_FILE_ATTACHEMENT, "<br />");
-
- // If they are attached file to this event
- if (count($files) > 0) {
- $eventFiles = new ExtcalFormFileCheckBox('', 'filetokeep');
- foreach (
- $files as $file
- ) {
- $name
- =
- $file['file_nicename'] . " (<i>" . $file['file_mimetype'] . "</i>) " . $file['formated_file_size'];
- $eventFiles->addOption($file['file_id'], $name);
- }
- $fileElmtTray->addElement($eventFiles);
- }
- $fileElmtTray->addElement(new XoopsFormFile(_MD_EXTCAL_FILE_ATTACHEMENT, 'event_file', 3145728));
- $form->addElement($fileElmtTray);
-
- if (isset($data['event_id'])) {
- $form->addElement(new XoopsFormHidden('event_id', $data['event_id']), false);
- }
- //Hack Kraven0
- ///////////////////////////////////////////////////////////////////////////////
- //Picture1
- $file_tray = new XoopsFormElementTray(sprintf(_MD_EXTCAL_FORM_IMG, 1), '');
- if (!empty($event_picture1)) {
- $file_tray->addElement(
- new XoopsFormLabel('', "<img src='" . XOOPS_URL . "/uploads/extcal/" . $event_picture1
- . "' name='image' id='image' alt=''/><br /><br />")
- );
- $check_del_img = new XoopsFormCheckBox('', 'delimg_1');
- $check_del_img->addOption(1, _MD_EXTCAL_DEL_IMG);
- $file_tray->addElement($check_del_img);
- $file_img = new XoopsFormFile(_MD_EXTCAL_IMG, 'attachedimage1', 2145728);
- unset($check_del_img);
- } else {
- $file_img = new XoopsFormFile('', 'attachedimage1', 2145728);
- }
- $file_img->setExtra("size ='40'");
- $file_tray->addElement($file_img);
- $msg = sprintf(_MD_EXTCAL_IMG_CONFIG, intval(400728 / 1000), 500, 500);
- $file_label = new XoopsFormLabel('', '<br />' . $msg);
- $file_tray->addElement($file_label);
- $form->addElement($file_tray);
- $form->addElement(new XoopsFormHidden('file1', $event_picture1));
- unset($file_img);
- unset($file_tray);
- //Picture2
- $file_tray = new XoopsFormElementTray(sprintf(_MD_EXTCAL_FORM_IMG, 2), '');
- if (!empty($event_picture2)) {
- $file_tray->addElement(
- new XoopsFormLabel('', "<img src='" . XOOPS_URL . "/uploads/extcal/" . $event_picture2
- . "' name='image' id='image' alt=''/><br /><br />")
- );
- $check_del_img = new XoopsFormCheckBox('', 'delimg_2');
- $check_del_img->addOption(1, _MD_EXTCAL_DEL_IMG);
- $file_tray->addElement($check_del_img);
- $file_img = new XoopsFormFile(_MD_EXTCAL_IMG, 'attachedimage2', 2145728);
- unset($check_del_img);
- } else {
- $file_img = new XoopsFormFile('', 'attachedimage2', 2145728);
- }
- $file_img->setExtra("size ='40'");
- $file_tray->addElement($file_img);
- $msg = sprintf(_MD_EXTCAL_IMG_CONFIG, intval(400728 / 1000), 500, 500);
- $file_label = new XoopsFormLabel('', '<br />' . $msg);
- $file_tray->addElement($file_label);
- $form->addElement($file_tray);
- $form->addElement(new XoopsFormHidden('file2', $event_picture2));
- unset($file_img);
- unset($file_tray);
- ///////////////////////////////////////////////////////////////////////////////
-
- $buttonElmtTray = new XoopsFormElementTray('', " ");
- $buttonElmtTray->addElement(new XoopsFormButton("", "form_submit", _SUBMIT, "submit"), false);
- if ($siteSide == 'user') {
- $buttonElmtTray->addElement(new XoopsFormButton("", "form_preview", _MD_EXTCAL_PREVIEW, "submit"), false);
- }
- $form->addElement($buttonElmtTray);
- return $form;
-
- }
-
- /********************************************************************/
-
- function getIsRecur($parm)
- {
-
- $recurFreq = array('daily', 'weekly', 'monthly', 'yearly');
- return in_array($parm['rrule_freq'], $recurFreq);
-
- }
-
- function getRecurRules($parm)
- {
- //ext_echoArray($parm);exit;
-
- // If this isn't a reccuring event
- if (!$this->getIsRecur($parm)) {
- return '';
- }
-
- $recurRules = '';
-
- $recurFreq = $parm['rrule_freq'];
-
- switch ($recurFreq) {
-
- case 'daily':
-
- if (!isset($parm['rrule_daily_interval'])) {
- $parm['rrule_daily_interval'] = 0;
- }
- $recurRules = 'daily|';
- $recurRules .= $parm['rrule_daily_interval'];
-
- break;
-
- case 'weekly':
- if (!isset($parm['rrule_weekly_interval'])) {
- $parm['rrule_weekly_interval'] = 0;
- }
- $recurRules = 'weekly|';
- $recurRules .= $parm['rrule_weekly_interval'];
- foreach (
- $parm['rrule_weekly_bydays'] as $day
- ) {
- $recurRules .= '|' . $day;
- }
-
- break;
-
- case 'monthly':
-
- if (!isset($parm['rrule_monthly_interval'])) {
- $parm['rrule_monthly_interval'] = 0;
- }
- $recurRules = 'monthly|';
- $recurRules .= $parm['rrule_monthly_interval'] . '|';
- if ($parm['rrule_monthly_byday'] != "") {
- $recurRules .= $parm['rrule_monthly_byday'];
- } else {
- $recurRules .= "MD" . $parm['rrule_bymonthday'];
- }
-
- break;
-
- case 'yearly':
-//JJD - to valid modif
-//
-// if ($parm['rrule_yearly_byday'] == "") {
-// list($year, $month, $day) = explode("-", $parm['event_start']['date']);
-// $parm['rrule_yearly_byday'] = date("j", mktime(0, 0, 0, $month, $day, $year));
-// }
-//
-// $recurRules = 'yearly|';
-// $recurRules .= $parm['rrule_yearly_interval'];
-// $recurRules .= '|' . $parm['rrule_yearly_byday'];
-// foreach (
-// $parm['rrule_yearly_bymonths'] as $month
-// ) {
-// $recurRules .= '|' . $month;
-// }
-//
-// break;
-
- if (!isset($parm['rrule_yearly_interval'])) {
- $parm['rrule_yearly_interval'] = 0;
- }
- if ($parm['rrule_yearly_byday'] == "") {
- $time = strtotime($parm['event_start']['date']);
- $parm['rrule_yearly_byday'] = date("j", mktime(0, 0, 0, date("m", $time), date("d", $time), date("Y", $time)));
- }
-
- $recurRules = 'yearly|';
- $recurRules .= $parm['rrule_yearly_interval'];
- $recurRules .= '|' . $parm['rrule_yearly_byday'];
- foreach (
- $parm['rrule_yearly_bymonths'] as $month
- ) {
- $recurRules .= '|' . $month;
- }
-
- break;
-
- }
-
- return $recurRules;
-
- }
-
- function getRecurStart($data, $parm)
- {
-
- // If this isn't a reccuring event
- if (!$this->getIsRecur($parm)) {
- return 0;
- }
-
- return $data['event_start'];
-
- }
-
- function getRecurEnd($data, $parm)
- {
- if (!$this->getIsRecur($parm)) {
- return 0;
- }
-
- $recurFreq = $parm['rrule_freq'];
-
- $recurStart = $this->getRecurStart($data, $parm);
-
- switch ($recurFreq) {
-
- case 'daily':
-
- $interval = $parm['rrule_daily_interval'];
- $recurEnd = $recurStart + ($interval * _EXTCAL_TS_DAY) - 1;
-
- break;
-
- case 'weekly':
-
- global $extcalConfig;
-
- // Getting the first weekday TS
- $startWeekTS = mktime(0, 0, 0, date('n', $data['event_recur_start']), date('j', $data['event_recur_start']), date('Y', $data['event_recur_start']));
- $offset = date('w', $startWeekTS) - $extcalConfig['week_start_day'];
- $startWeekTS = $startWeekTS - ($offset * _EXTCAL_TS_DAY);
-
- $recurEnd
- = $startWeekTS + ($parm['rrule_weekly_interval'] * _EXTCAL_TS_WEEK) - 1;
-
- break;
-
- case 'monthly':
-
- $recurEnd
- = $recurStart + ($parm['rrule_monthly_interval'] * 2678400) - 1;
-
- break;
-
- case 'yearly':
-
- $recurEnd
- = $recurStart + ($parm['rrule_yearly_interval'] * 32140800) - 1;
-
- break;
-
- }
-
- return $recurEnd;
-
- }
-
- /*******************************************************************
- *
- *******************************************************************/
- function getRecurEventToDisplay(&$event, $periodStart, $periodEnd)
- {
- global $extcalConfig;
-
- $recuEvents = array();
- $eventOptions = explode('|', $event['event_recur_rules']);
-
- switch ($eventOptions[0]) {
-
- case 'daily':
-
- array_shift($eventOptions);
- $rRuleInterval = $eventOptions[0];
- if ($rRuleInterval == '' || $rRuleInterval == 0) {
- $rRuleInterval = 54;
- }
-
- $occurEventStart = $event['event_recur_start'];
- $occurEventEnd = $event['event_recur_start'] + ($event['event_end'] - $event['event_start']);
-
- $nbOccur = 0;
- // This variable is used to stop the loop after we add all occur on the view to keep good performance
- $isOccurOnPeriod = false;
- // Parse all occurence of this event
- while ($nbOccur < $rRuleInterval) {
- // Add this event occurence only if it's on the period view
- if // Event start falls within search period
- ($occurEventStart <= $periodEnd
- && // Event end falls within search period
- $occurEventEnd >= $periodStart
- ) {
-
- $event['event_start'] = $occurEventStart;
- $event['event_end'] = $occurEventEnd;
-
- $recuEvents[] = $event;
- $isOccurOnPeriod = true;
- } elseif ($isOccurOnPeriod) {
- break;
- }
-
- $occurEventStart += _EXTCAL_TS_DAY;
- $occurEventEnd += _EXTCAL_TS_DAY;
-
- $nbOccur++;
- }
-
- break;
-
- case 'weekly':
-
- global $extcalConfig;
-
- array_shift($eventOptions);
- $rRuleInterval = $eventOptions[0];
- if ($rRuleInterval == '' || $rRuleInterval == 0) {
- $rRuleInterval = 54;
- }
- array_shift($eventOptions);
-
- // Getting the first weekday TS
- $startWeekTS = mktime(0, 0, 0, date('n', $event['event_recur_start']), date('j', $event['event_recur_start']), date('Y', $event['event_recur_start']));
- $offset = date('w', $startWeekTS) - $extcalConfig['week_start_day'];
- $startWeekTS = $startWeekTS - ($offset * _EXTCAL_TS_DAY) + _EXTCAL_TS_WEEK;
-
- $occurEventStart = $event['event_recur_start'];
- $occurEventEnd = $event['event_recur_start'] + ($event['event_end'] - $event['event_start']);
-
- $dayArray = array('SU', 'MO', 'TU', 'WE', 'TH', 'FR', 'SA');
-
- $nbOccur = 0;
-
- // Parse all occurence of this event
- while ($nbOccur < $rRuleInterval) {
- // Add this event occurence only if it's on the period view and according to day
- if ($occurEventStart <= $periodEnd // Event start falls within search period
- && $occurEventEnd >= $periodStart // Event end falls within search period
- && in_array($dayArray[date('w', $occurEventStart)], $eventOptions)
- ) // This week day is selected
- {
- $event['event_start'] = $occurEventStart;
- $event['event_end'] = $occurEventEnd;
-
- $recuEvents[] = $event;
- }
-
- $occurEventStart += _EXTCAL_TS_DAY;
- $occurEventEnd += _EXTCAL_TS_DAY;
-
- if ($occurEventStart >= $startWeekTS) {
- $nbOccur++;
- $startWeekTS += _EXTCAL_TS_WEEK;
- }
- }
-
- break;
-
- case 'monthly':
- array_shift($eventOptions);
- $rRuleInterval = $eventOptions[0];
- if ($rRuleInterval == '' || $rRuleInterval == 0) {
- $rRuleInterval = 100;
- }
- array_shift($eventOptions);
-
- $day = date('j', $event['event_recur_start']);
- $month = date('n', $event['event_recur_start']);
- $year = date('Y', $event['event_recur_start']);
-
- $nbOccur = 0;
-
- $eventHourOccurStart = $event['event_recur_start'] - mktime(0, 0, 0, $month, $day, $year);
- $eventHourOccurEnd
- = $event['event_end'] - $event['event_start'];
-
- // Parse all occurence of this event
- while ($nbOccur < $rRuleInterval) {
- $eventDayOccurStart = $this->_getOccurTS($month, $year, $eventOptions[0]);
- if (!$eventDayOccurStart) {
- $eventDayOccurStart = mktime(0, 0, 0, $month, $day, $year);
- }
-
- $occurEventStart
- = $eventDayOccurStart + $eventHourOccurStart;
- $occurEventEnd = $occurEventStart + $eventHourOccurEnd;
-
- if // Event start falls within search period
- ($occurEventStart <= $periodEnd
- && // Event end falls within search period
- $occurEventEnd >= $periodStart
- && // This occur is after start reccur date
- $occurEventStart >= $event['event_recur_start']
- ) {
-
- $event['event_start'] = $occurEventStart;
- $event['event_end'] = $occurEventEnd;
-
- $recuEvents[] = $event;
-
- } elseif ($occurEventStart > $periodEnd) {
- break;
- }
-
- if (++$month == 13) {
- $month = 1;
- $year++;
- }
-
- $nbOccur++;
-
- }
-
- break;
-
-
- case 'yearly':
-
- array_shift($eventOptions);
- $rRuleInterval = $eventOptions[0];
- if ($rRuleInterval == '' || $rRuleInterval == 0) {
- $rRuleInterval = 10;
- }
- array_shift($eventOptions);
- $dayCode = $eventOptions[0];
- array_shift($eventOptions);
-
- $day = date('j', $event['event_recur_start']);
- $month = date('n', $event['event_recur_start']);
- $year = date('Y', $event['event_recur_start']);
-
- $nbOccur = 0;
-
- $eventHourOccurStart = $event['event_recur_start'] - mktime(0, 0, 0, $month, $day, $year);
- $eventHourOccurEnd
- = $event['event_end'] - $even...
[truncated message content] |
