Changeset 7660 for trunk/prototype/modules
- Timestamp:
- 12/17/12 14:22:24 (12 years ago)
- Location:
- trunk/prototype/modules/calendar/interceptors
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/prototype/modules/calendar/interceptors/DAViCalAdapter.php
r6962 r7660 233 233 } 234 234 if(isset($params['calendar'])) 235 { 236 require_once ROOTPATH.'/plugins/icalcreator/iCalUtilityFunctions.class.php'; 235 { 237 236 require_once ROOTPATH.'/plugins/icalcreator/iCalcreator.class.php'; 238 237 239 $vcalendar = new icalCreator( );238 $vcalendar = new vcalendar( ); 240 239 $vcalendar->parse($data); 241 240 $vcalendar->sort(); -
trunk/prototype/modules/calendar/interceptors/DBMapping.php
r7655 r7660 835 835 foreach ($result as $i => $v) { 836 836 837 $currentTimezone = isset($original['criteria']['timezones'][$v['calendar']]) ? $original['criteria']['timezones'][$v['calendar']] : $v['timezone'];837 $currentTimezone = (isset($v['calendar']) && isset($original['criteria']['timezones'][$v['calendar']])) ? $original['criteria']['timezones'][$v['calendar']] : $v['timezone']; 838 838 839 839 $date->setTimestamp((int) ($v['startTime'] / 1000)); … … 863 863 $result[$i]['historic'] = Controller::find(array('concept' => 'calendarHistoric'), false, array('filter' => array('=', 'schedulable', $v['id']) , 'deepness' => 2)); 864 864 865 } 866 867 868 if(isset( $v['occurrences'] ) && count( $v['occurrences'] ) > 0){ 869 870 foreach( $result[$i]['occurrences'] as &$o){ 871 872 $date->setTimestamp((int) ($o / 1000)); 873 $o = ($date->getTimestamp() + $date->getOffset()).'000'; 874 875 } 865 876 } 866 877 … … 1107 1118 "THEN rep.id = occ.repeat_id AND occ.occurrence - al.alarm_offset >= '$target' AND occ.occurrence - al.alarm_offset <= '".( $target + 86400000)."' ". 1108 1119 "ELSE (co.range_start - al.alarm_offset) >= '$target' AND (co.range_start - al.alarm_offset) <= '".( $target + 86400000)."' END"); 1109 1120 1110 1121 if(is_array($al)) 1111 1122 foreach( $al as $v ) 1112 1123 $params[] = array('schedulable' => $v); 1113 1124 1114 1125 else 1115 1126 $params = false; 1116 1127 1117 1128 return false; 1118 1129 }
Note: See TracChangeset
for help on using the changeset viewer.