Menu
▾
▴
phpicalendar-commits — Mailing list ONLY for CVS commits. This is a listen-only list.
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(5) |
Feb
(25) |
Mar
(18) |
Apr
|
May
(26) |
Jun
(14) |
Jul
(1) |
Aug
(5) |
Sep
(82) |
Oct
(3) |
Nov
(130) |
Dec
(9) |
| 2004 |
Jan
(4) |
Feb
(62) |
Mar
|
Apr
(3) |
May
(100) |
Jun
|
Jul
(6) |
Aug
(49) |
Sep
(33) |
Oct
(47) |
Nov
(2) |
Dec
(1) |
| 2005 |
Jan
|
Feb
(4) |
Mar
(1) |
Apr
(8) |
May
(17) |
Jun
|
Jul
(1) |
Aug
(2) |
Sep
(26) |
Oct
(18) |
Nov
(37) |
Dec
(14) |
| 2006 |
Jan
(2) |
Feb
(18) |
Mar
(34) |
Apr
(52) |
May
(7) |
Jun
(3) |
Jul
(2) |
Aug
(10) |
Sep
|
Oct
|
Nov
(18) |
Dec
(4) |
| 2007 |
Jan
|
Feb
(7) |
Mar
(7) |
Apr
(6) |
May
(52) |
Jun
|
Jul
(1) |
Aug
|
Sep
|
Oct
(15) |
Nov
|
Dec
(1) |
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(250) |
| 2009 |
Jan
(35) |
Feb
(45) |
Mar
|
Apr
(4) |
May
(35) |
Jun
(13) |
Jul
(49) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(11) |
| 2010 |
Jan
(3) |
Feb
(30) |
Mar
|
Apr
(35) |
May
(12) |
Jun
(2) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(4) |
|
From: <ji...@us...> - 2008-12-26 17:07:56
|
Update of /cvsroot/phpicalendar/phpicalendar/includes In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv19611/includes Modified Files: event.php Log Message: squelch warnings in event.php Index: event.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/includes/event.php,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** event.php 26 Dec 2008 16:59:10 -0000 1.45 --- event.php 26 Dec 2008 17:07:53 -0000 1.46 *************** *** 29,32 **** --- 29,33 ---- $i=0; $display .= $lang['l_organizer'] . ' - '; + $organizers = array(); foreach ($organizer as $val) { $organizers[] = $organizer[$i]["name"]; *************** *** 38,41 **** --- 39,43 ---- $i=0; $display .= $lang['l_attendee'] . ' - '; + $attendees = array(); foreach ($attendee as $val) { $attendees[] .= $attendee[$i]["name"]; |
|
From: <ji...@us...> - 2008-12-26 16:59:21
|
Update of /cvsroot/phpicalendar/phpicalendar/languages In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv18788/languages Modified Files: english.inc.php Log Message: eliminate negative event lengths and adjust display lengths for short events Index: english.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/languages/english.inc.php,v retrieving revision 1.66 retrieving revision 1.67 diff -C2 -d -r1.66 -r1.67 *** english.inc.php 26 Dec 2008 08:26:31 -0000 1.66 --- english.inc.php 26 Dec 2008 16:59:10 -0000 1.67 *************** *** 95,98 **** --- 95,99 ---- $lang['l_attendee'] = 'Attendee'; $lang['l_location'] = 'Location'; + $lang['l_url'] = 'URL'; $lang['l_admin_header'] = 'PHP iCalendar Administration'; $lang['l_username'] = 'Username'; |
|
From: <ji...@us...> - 2008-12-26 16:59:16
|
Update of /cvsroot/phpicalendar/phpicalendar/calendars In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv18788/calendars Modified Files: test.ics Log Message: eliminate negative event lengths and adjust display lengths for short events Index: test.ics =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/calendars/test.ics,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** test.ics 26 Dec 2008 09:05:15 -0000 1.6 --- test.ics 26 Dec 2008 16:59:10 -0000 1.7 *************** *** 25,28 **** --- 25,67 ---- END:VTIMEZONE + BEGIN:VEVENT + UID:20081128T075152Z-3660-100-1-5@sietchtabr + DTSTAMP:20081128T075151Z + LAST-MODIFIED:20081128T075152 + SUMMARY:Witchcraft Paris + CATEGORIES:jdr + DTSTART;TZID=/softwarestudio.org/Tzfile/Europe/Paris:20081213T210000 + DTEND;TZID=/softwarestudio.org/Tzfile/Europe/Paris:20081213T230000 + CLASS:PUBLIC + SEQUENCE:1 + CREATED:20081128T075152 + END:VEVENT + + BEGIN:VEVENT + UID:20081128T075152Z-3660-100-1-6@sietchtabr2 + DTSTAMP:20081128T075151Z + LAST-MODIFIED:20081128T075152 + SUMMARY:Witchcraft PST + CATEGORIES:jdr + DTSTART;TZID=US/Pacific:20081213T210000 + DTEND;TZID=US/Pacific:20081213T230000 + CLASS:PUBLIC + SEQUENCE:1 + CREATED:20081128T075152 + END:VEVENT + + BEGIN:VEVENT + UID:20081128T075152Z-3660-100-1-7@sietchtabr2 + DTSTAMP:20081128T075151Z + LAST-MODIFIED:20081128T075152 + SUMMARY:daylight test PST + CATEGORIES:jdr + DTSTART;TZID=US/Pacific:20060331T010000 + DTEND;TZID=US/Pacific:20060331T020000 + RRULE:FREQ=DAILY; + CLASS:PUBLIC + SEQUENCE:1 + CREATED:20081128T075152 + END:VEVENT BEGIN:VEVENT *************** *** 48,51 **** --- 87,91 ---- DTSTART;TZID=US/Eastern:20100902T090000 RRULE:FREQ=DAILY;COUNT=10 + URL:http://google.com END:VEVENT |
|
From: <ji...@us...> - 2008-12-26 16:59:15
|
Update of /cvsroot/phpicalendar/phpicalendar/functions/parse In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv18788/functions/parse Modified Files: end_vevent.php Log Message: eliminate negative event lengths and adjust display lengths for short events Index: end_vevent.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/parse/end_vevent.php,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** end_vevent.php 26 Dec 2008 08:26:31 -0000 1.15 --- end_vevent.php 26 Dec 2008 16:59:10 -0000 1.16 *************** *** 49,53 **** } } ! # look for events that span more than one day if (isset($start_unixtime,$end_unixtime) && date('Ymd',$start_unixtime) != date('Ymd',$end_unixtime)) { --- 49,58 ---- } } ! # disallow events with negative length ! if ($end_unixtime < $start_unixtime){ ! $end_date = $start_date; ! $end_time = $start_time; ! $end_unixtime = $start_unixtime; ! } # look for events that span more than one day if (isset($start_unixtime,$end_unixtime) && date('Ymd',$start_unixtime) != date('Ymd',$end_unixtime)) { *************** *** 64,70 **** preg_match ('/([0-9]{2})([0-9]{2})/', $end_time, $time2); if (isset($start_unixtime) && isset($end_unixtime)) { ! $length = $end_unixtime - $start_unixtime; } else { ! $length = ($time2[1]*60+$time2[2]) - ($time[1]*60+$time[2]); } --- 69,75 ---- preg_match ('/([0-9]{2})([0-9]{2})/', $end_time, $time2); if (isset($start_unixtime) && isset($end_unixtime)) { ! $length = $end_unixtime - $start_unixtime; } else { ! $length = ($time2[1]*60+$time2[2]) - ($time[1]*60+$time[2]); } |
|
From: <ji...@us...> - 2008-12-26 16:59:15
|
Update of /cvsroot/phpicalendar/phpicalendar In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv18788 Modified Files: config.inc.php Log Message: eliminate negative event lengths and adjust display lengths for short events Index: config.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/config.inc.php,v retrieving revision 1.185 retrieving revision 1.186 diff -C2 -d -r1.185 -r1.186 *** config.inc.php 26 Dec 2008 08:26:31 -0000 1.185 --- config.inc.php 26 Dec 2008 16:59:10 -0000 1.186 *************** *** 16,20 **** 'show_completed' => 'no', # 'timezone' => 'US/Central', ! 'timezone' => 'America/Bogota', # 'second_offset' => $secs, # 'cookie_uri' => '' --- 16,21 ---- 'show_completed' => 'no', # 'timezone' => 'US/Central', ! # 'timezone' => 'America/Bogota', ! 'timezone' => 'Europe/Paris', # 'second_offset' => $secs, # 'cookie_uri' => '' |
|
From: <ji...@us...> - 2008-12-26 16:59:14
|
Update of /cvsroot/phpicalendar/phpicalendar/includes In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv18788/includes Modified Files: event.php Log Message: eliminate negative event lengths and adjust display lengths for short events Index: event.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/includes/event.php,v retrieving revision 1.44 retrieving revision 1.45 diff -C2 -d -r1.44 -r1.45 *** event.php 20 Dec 2008 09:35:44 -0000 1.44 --- event.php 26 Dec 2008 16:59:10 -0000 1.45 *************** *** 44,61 **** $attendee = implode(', ',$attendees); } ! ! if (isset($event['location'])) { ! if ($event['url'] != '') $event['location'] = '<a href="'.$event['url'].'" target="_blank">'.stripslashes($event['location']).'</a>'; ! }else{ ! $event['location'] = stripslashes($event['location']); ! } ! ! if (!isset($event['location']) && isset($event['url'])) { ! $event['location'] = '<a href="'.$event['url'].'" target="_blank">'.$event['url'].'</a>'; ! $lang['l_location'] = 'URL'; ! } ! if (sizeof($attendee) == 0) $attendee = ''; if (sizeof($organizer) == 0) $organizer = ''; switch ($event['status']){ --- 44,51 ---- $attendee = implode(', ',$attendees); } ! if (isset($event['location'])) $event['location'] = stripslashes($event['location']); if (sizeof($attendee) == 0) $attendee = ''; if (sizeof($organizer) == 0) $organizer = ''; + if ($event['url'] != '') $event['url'] = '<a href="'.$event['url'].'" target="_blank">'.$event['url'].'</a>'; switch ($event['status']){ *************** *** 84,88 **** 'attendee' => $attendee, 'status' => $event['status'], ! 'location' => stripslashes($event['location']), 'cal_title_full' => $event['calname'].' '.$lang['l_calendar'], 'template' => $phpiCal_config->template, --- 74,79 ---- 'attendee' => $attendee, 'status' => $event['status'], ! 'location' => $event['location'], ! 'url' => $event['url'], 'cal_title_full' => $event['calname'].' '.$lang['l_calendar'], 'template' => $phpiCal_config->template, *************** *** 92,96 **** 'l_attendee' => $lang['l_attendee'], 'l_status' => $lang['l_status'], ! 'l_location' => $lang['l_location'] )); --- 83,88 ---- 'l_attendee' => $lang['l_attendee'], 'l_status' => $lang['l_status'], ! 'l_location' => $lang['l_location'], ! 'l_url' => $lang['l_url'] )); |
|
From: <ji...@us...> - 2008-12-26 16:59:14
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv18788/functions Modified Files: template.php Log Message: eliminate negative event lengths and adjust display lengths for short events Index: template.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/template.php,v retrieving revision 1.101 retrieving revision 1.102 diff -C2 -d -r1.101 -r1.102 *** template.php 26 Dec 2008 08:26:31 -0000 1.101 --- template.php 26 Dec 2008 16:59:10 -0000 1.102 *************** *** 360,364 **** $key = date ($timeFormat, $key); - if (ereg("([0-9]{1,2}):00", $key)) { $weekdisplay .= '<tr>'; --- 360,363 ---- *************** *** 467,475 **** } $colspan_width = round((80 / $nbrGridCols[$thisday]) * $drawWidth); $weekdisplay .= '<td width="'.$colspan_width.'" rowspan="' . $event_length[$thisday][$i]['length'] . '" colspan="' . $drawWidth . '" align="left" valign="top" class="eventbg2_'.$event_calno.'">'."\n"; // Start drawing the event - $event_temp = $loop_event; - $event = openevent($thisday, $cal_time, $uid, $this_time_arr[$uid], $phpiCal_config->week_events_lines, 25, 'ps'); $event_temp = str_replace('{EVENT}', $event, $event_temp); $event_temp = str_replace('{EVENT_START}', $event_start, $event_temp); --- 466,477 ---- } $colspan_width = round((80 / $nbrGridCols[$thisday]) * $drawWidth); + $event_temp = $loop_event; + $event = openevent($thisday, $cal_time, $uid, $this_time_arr[$uid], $phpiCal_config->week_events_lines, 25, 'ps'); + # adjust length by rough guess to word wrapping + $event_text_lines = ceil((strlen(strip_tags(trim($event))) * 8)/$colspan_width) + 1; + if ($event_length[$thisday][$i]['length'] < $event_text_lines) $event_length[$thisday][$i]['length'] = $event_text_lines; $weekdisplay .= '<td width="'.$colspan_width.'" rowspan="' . $event_length[$thisday][$i]['length'] . '" colspan="' . $drawWidth . '" align="left" valign="top" class="eventbg2_'.$event_calno.'">'."\n"; // Start drawing the event $event_temp = str_replace('{EVENT}', $event, $event_temp); $event_temp = str_replace('{EVENT_START}', $event_start, $event_temp); |
|
From: <ji...@us...> - 2008-12-26 16:59:14
|
Update of /cvsroot/phpicalendar/phpicalendar/templates/default In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv18788/templates/default Modified Files: event.tpl Log Message: eliminate negative event lengths and adjust display lengths for short events Index: event.tpl =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/event.tpl,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** event.tpl 20 Dec 2008 09:35:44 -0000 1.10 --- event.tpl 26 Dec 2008 16:59:10 -0000 1.11 *************** *** 33,36 **** --- 33,39 ---- <b>{L_LOCATION}</b>: {LOCATION}<br /> <!-- switch location off --> + <!-- switch url on --> + <b>{L_URL}</b>: {URL}<br /> + <!-- switch url off --> </p> </div> |
|
From: <ji...@us...> - 2008-12-26 09:11:55
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv12623/functions Modified Files: ical_parser.php Log Message: fix bug 1190302 with provided patch Index: ical_parser.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v retrieving revision 1.230 retrieving revision 1.231 diff -C2 -d -r1.230 -r1.231 *** ical_parser.php 26 Dec 2008 05:54:46 -0000 1.230 --- ical_parser.php 26 Dec 2008 09:11:52 -0000 1.231 *************** *** 413,419 **** break; case 'ATTENDEE': ! $field = str_replace("ATTENDEE;CN=", "", $field); ! $data = str_replace ("mailto:", "", $data); ! $attendee[] = array ('name' => stripslashes($field), 'email' => stripslashes($data)); break; case 'ORGANIZER': --- 413,421 ---- break; case 'ATTENDEE': ! $attendee[] = array ('name' => ereg_replace ("ATTENDEE;CN=([^;]*).*", "\\1", $field), ! 'email' => ereg_replace (".*mailto:(.*).*", "\\1", $field), ! 'RSVP' => ereg_replace (".*RSVP=([^;]*).*", "\\1", $field), ! 'PARSTAT' => ereg_replace (".*PARTSTAT=([^;]*).*", "\\1", $field), ! 'ROLE' => ereg_replace (".*ROLE=([^;]*).*", "\\1", $field)); break; case 'ORGANIZER': |
|
From: <ji...@us...> - 2008-12-26 09:05:19
|
Update of /cvsroot/phpicalendar/phpicalendar In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv11896 Modified Files: search.php Log Message: fix bug 961091 with provided patch Index: search.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/search.php,v retrieving revision 1.43 retrieving revision 1.44 diff -C2 -d -r1.43 -r1.44 *** search.php 26 Dec 2008 08:26:31 -0000 1.43 --- search.php 26 Dec 2008 09:05:15 -0000 1.44 *************** *** 110,119 **** while ($and_arr[$i] == 'or') { $or_arr[$j][] = $and_arr[$i-1]; ! unset($and_arr[$i], $and_arr[$i-1]); ! $i += 2; } ! if (isset($and_arr[$i-1])) { ! $or_arr[$j][] = $and_arr[$i-1]; ! unset($and_arr[$i-1]); } $or_str_arr[$j] = implode('</b> OR <b>', $or_arr[$j]); --- 110,119 ---- while ($and_arr[$i] == 'or') { $or_arr[$j][] = $and_arr[$i-1]; ! array_splice($and_arr,$i-1,2); ! $i--; } ! if (isset($and_arr[$i])) { ! $or_arr[$j][] = $and_arr[$i]; ! array_splice($and_arr,$i,1); } $or_str_arr[$j] = implode('</b> OR <b>', $or_arr[$j]); *************** *** 126,133 **** if (substr($val,0,1) == '-') { $not_arr[] = substr($val,1); ! unset($and_arr[$key]); } elseif(substr($val,0,1) == '+') { $and_arr[] = substr($val,1); ! unset($and_arr[$key]); } } --- 126,133 ---- if (substr($val,0,1) == '-') { $not_arr[] = substr($val,1); ! array_splice($and_arr,$key,1); } elseif(substr($val,0,1) == '+') { $and_arr[] = substr($val,1); ! array_splice($and_arr,$key,1); } } |
|
From: <ji...@us...> - 2008-12-26 09:05:19
|
Update of /cvsroot/phpicalendar/phpicalendar/calendars In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv11896/calendars Modified Files: test.ics Log Message: fix bug 961091 with provided patch Index: test.ics =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/calendars/test.ics,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** test.ics 26 Dec 2008 08:26:31 -0000 1.5 --- test.ics 26 Dec 2008 09:05:15 -0000 1.6 *************** *** 50,53 **** --- 50,68 ---- END:VEVENT + BEGIN:VEVENT + DTSTAMP:20070306T130934Z + ORGANIZER;CN=xxx:MAILTO:xxx localhost localdomain + CREATED:20070212T152028Z + UID:KOrganizer-1162820691.683 + SEQUENCE:2 + LAST-MODIFIED:20070306T130835Z + SUMMARY:Knitting Class + CLASS:PUBLIC + PRIORITY:5 + RRULE:FREQ=WEEKLY;UNTIL=20070326T190000Z;BYDAY=MO + DTSTART:20070219T190000Z + DTEND:20070219T210000Z + TRANSP:OPAQUE + END:VEVENT END:VCALENDAR |
|
From: <ji...@us...> - 2008-12-26 08:26:36
|
Update of /cvsroot/phpicalendar/phpicalendar/templates/default In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv6403/templates/default Modified Files: search.tpl Log Message: expand search range;fix todo display Index: search.tpl =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/search.tpl,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** search.tpl 13 Sep 2005 21:57:28 -0000 1.6 --- search.tpl 26 Dec 2008 08:26:31 -0000 1.7 *************** *** 31,35 **** <div><p class="V12">{L_QUERY}: {FORMATTED_SEARCH}</p></div> <!-- switch results on --> ! <font class="V12"><b><a class="ps3" href="day.php?cal={CAL}&getdate={KEY}">{DAYOFMONTH}</a></b></font><br /> <div style="margin-left: 10px; margin-bottom: 10px;"> <table width="100%" border="0" cellspacing="1" cellpadding="1"> --- 31,35 ---- <div><p class="V12">{L_QUERY}: {FORMATTED_SEARCH}</p></div> <!-- switch results on --> ! <font class="V12"><b><a class="ps3" href="day.php?cal={CAL}&getdate={KEY}">{L_STARTING_ON} {DAYOFMONTH}</a></b></font><br /> <div style="margin-left: 10px; margin-bottom: 10px;"> <table width="100%" border="0" cellspacing="1" cellpadding="1"> |
|
From: <ji...@us...> - 2008-12-26 08:26:36
|
Update of /cvsroot/phpicalendar/phpicalendar In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv6403 Modified Files: config.inc.php search.php Log Message: expand search range;fix todo display Index: config.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/config.inc.php,v retrieving revision 1.184 retrieving revision 1.185 diff -C2 -d -r1.184 -r1.185 *** config.inc.php 26 Dec 2008 05:54:46 -0000 1.184 --- config.inc.php 26 Dec 2008 08:26:31 -0000 1.185 *************** *** 12,17 **** # 'allow_login' => 'yes', 'allow_preferences' => 'yes', ! # 'show_search' => 'yes', # 'show_todos' => 'no', # 'timezone' => 'US/Central', 'timezone' => 'America/Bogota', --- 12,18 ---- # 'allow_login' => 'yes', 'allow_preferences' => 'yes', ! 'show_search' => 'yes', # 'show_todos' => 'no', + 'show_completed' => 'no', # 'timezone' => 'US/Central', 'timezone' => 'America/Bogota', Index: search.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/search.php,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** search.php 20 Dec 2008 05:05:25 -0000 1.42 --- search.php 26 Dec 2008 08:26:31 -0000 1.43 *************** *** 297,300 **** --- 297,301 ---- 'l_results' => $lang['l_results'], 'l_query' => $lang['l_query'], + 'l_starting_on' => $lang['l_starting_on'], 'l_time' => $lang['l_time'], 'l_summary' => $lang['l_summary'], |
|
From: <ji...@us...> - 2008-12-26 08:26:36
|
Update of /cvsroot/phpicalendar/phpicalendar/languages In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv6403/languages Modified Files: english.inc.php Log Message: expand search range;fix todo display Index: english.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/languages/english.inc.php,v retrieving revision 1.65 retrieving revision 1.66 diff -C2 -d -r1.65 -r1.66 *** english.inc.php 24 Dec 2008 21:09:31 -0000 1.65 --- english.inc.php 26 Dec 2008 08:26:31 -0000 1.66 *************** *** 60,63 **** --- 60,64 ---- $lang['l_rss_language'] = 'en-us'; $lang['l_search_took'] = 'Search took %s seconds'; + $lang['l_starting_on'] = 'Starting on '; $lang['l_recurring_event'] = 'Recurring event'; $lang['l_exception'] = 'Exception'; *************** *** 69,73 **** $lang['l_select_view'] = 'Select your default view'; $lang['l_select_time'] = 'Select your default start time'; ! $lang['l_select_endtime'] = 'Select your default end time'; $lang['l_select_day'] = 'Select your default start day of week'; $lang['l_select_style'] = 'Select your default style'; --- 70,74 ---- $lang['l_select_view'] = 'Select your default view'; $lang['l_select_time'] = 'Select your default start time'; ! $lang['l_select_endtime'] = 'Select your default end time'; $lang['l_select_day'] = 'Select your default start day of week'; $lang['l_select_style'] = 'Select your default style'; |
|
From: <ji...@us...> - 2008-12-26 08:26:36
|
Update of /cvsroot/phpicalendar/phpicalendar/calendars In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv6403/calendars Modified Files: Home.ics test.ics Log Message: expand search range;fix todo display Index: Home.ics =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/calendars/Home.ics,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** Home.ics 17 Dec 2008 06:58:52 -0000 1.14 --- Home.ics 26 Dec 2008 08:26:31 -0000 1.15 *************** *** 89,92 **** --- 89,93 ---- DTSTART;TZID=US/Pacific:20021015T103220 END:VTODO + BEGIN:VTODO SEQUENCE:2 *************** *** 98,101 **** --- 99,103 ---- DTSTART;TZID=US/Pacific:20021015T103220 END:VTODO + BEGIN:VTODO SEQUENCE:2 *************** *** 104,110 **** COMPLETED;TZID=US/Pacific:20021016T104842 UID:99731AB0-92C7-11D7-A4A2-000A95690022 - STATUS:COMPLETED DTSTART;TZID=US/Pacific:20021015T103220 END:VTODO BEGIN:VEVENT SEQUENCE:9 --- 106,112 ---- COMPLETED;TZID=US/Pacific:20021016T104842 UID:99731AB0-92C7-11D7-A4A2-000A95690022 DTSTART;TZID=US/Pacific:20021015T103220 END:VTODO + BEGIN:VEVENT SEQUENCE:9 Index: test.ics =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/calendars/test.ics,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** test.ics 26 Dec 2008 05:54:46 -0000 1.4 --- test.ics 26 Dec 2008 08:26:31 -0000 1.5 *************** *** 29,33 **** DTSTAMP:20070616T185152Z UID:{e5d8825e-4189-5341-80c7-4ec2c9f54404} ! SUMMARY:Futsal LOCATION:Jockvale E S\, 101 Malvern Dr\, Nepean\, K2J 2S8 DESCRIPTION: (613) 825-1224\, (613) 825-1219\nhttp://maps.google.com/maps?f=q&hl=en&q=101+Malvern+Dr\,+Nepean\,+K2J+2S8+canada&sll=45.460733\,-75.610657&sspn=0.062007\,0.144196&ie=UTF8&ll=45.285969\,-75.763178&spn=0.01555\,0.036049&z=15&om=1 --- 29,33 ---- DTSTAMP:20070616T185152Z UID:{e5d8825e-4189-5341-80c7-4ec2c9f54404} ! SUMMARY:Futsal geändert geääääääääääääääääääändert geändert geändert LOCATION:Jockvale E S\, 101 Malvern Dr\, Nepean\, K2J 2S8 DESCRIPTION: (613) 825-1224\, (613) 825-1219\nhttp://maps.google.com/maps?f=q&hl=en&q=101+Malvern+Dr\,+Nepean\,+K2J+2S8+canada&sll=45.460733\,-75.610657&sspn=0.062007\,0.144196&ie=UTF8&ll=45.285969\,-75.763178&spn=0.01555\,0.036049&z=15&om=1 *************** *** 40,42 **** --- 40,53 ---- END:VEVENT + BEGIN:VEVENT + SEQUENCE:7 + DTSTAMP:20020918T224617Z + SUMMARY:Daily for 10 occurrences + STATUS:CONFIRMED + DURATION:PT1H30M + DTSTART;TZID=US/Eastern:20100902T090000 + RRULE:FREQ=DAILY;COUNT=10 + END:VEVENT + + END:VCALENDAR |
|
From: <ji...@us...> - 2008-12-26 08:26:36
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv6403/functions Modified Files: template.php Log Message: expand search range;fix todo display Index: template.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/template.php,v retrieving revision 1.100 retrieving revision 1.101 diff -C2 -d -r1.100 -r1.101 *** template.php 23 Dec 2008 22:02:44 -0000 1.100 --- template.php 26 Dec 2008 08:26:31 -0000 1.101 *************** *** 147,241 **** if (isset($the_arr)){ - // Pull out each event - foreach($the_arr as $key => $val) { - - $events_found++; - $dayofmonth = strtotime($val['date']); - $dayofmonth = localizeDate ('%A, %B %e %Y', $dayofmonth); - $events_tmp = $loop_event; - $recur_tmp = $loop_recur; - - if ($val['event_text']) { - $event_text = stripslashes(urldecode($val['event_text'])); - $description = stripslashes(urldecode($val['description'])); - $location = stripslashes(urldecode($val['location'])); - $event_start = $val['event_start']; - $event_end = $val['event_end']; - if (isset($val['display_end'])) $event_end = $val['display_end']; - if (!$val['event_start']) { - $event_start = $lang['l_all_day']; - $event_start2 = ''; - $event_end = ''; - } else { - $event_start = date ($timeFormat, strtotime ($event_start)); - $event_end = date ($timeFormat, strtotime ($event_end)); - $event_start = $event_start .' - '.$event_end; - } - } - - if ($description == '') { - $events_tmp = preg_replace('!<\!-- switch description_events on -->(.*)<\!-- switch description_events off -->!Uis', '', $events_tmp); - } - if (!isset($val['exceptions'])) { - $events_tmp = preg_replace('!<\!-- switch exceptions on -->(.*)<\!-- switch exceptions off -->!Uis', '', $events_tmp); - }else{ - $some_exceptions = ""; - foreach ($val['exceptions'] as $except_val){ - $except_tmp = $loop_except; - - $except_date = strtotime($except_val['date']); - $except_date = localizeDate ('%A, %B %e %Y', $except_date); - $except_tmp = str_replace('{DAYOFMONTH}', $except_date, $except_tmp); - - $except_event_start = date ($timeFormat, strtotime ($except_val['event_start'])); - $except_event_end = date ($timeFormat, strtotime ($except_val['event_end'])); - $except_event_start = $except_event_start .' - '.$except_event_end; - - $except_tmp = str_replace('{EVENT_START}', $except_event_start, $except_tmp); - - $except_event_text = stripslashes(urldecode($except_val['event_text'])); - $except_tmp = str_replace('{EVENT_TEXT}', $except_event_text, $except_tmp); - - #is there a recur in the exception? - if (!$except_val['recur']) { - $except_tmp = preg_replace('!<\!-- switch except_recur on -->(.*)<\!-- switch except_recur off -->!Uis', '', $except_tmp); - }else{ - $except_tmp = str_replace('{EXCEPT_RECUR}', $except_val['recur'], $except_tmp); - } - #is there a description in the exception? - if (!$except_val['description']) { - $except_tmp = preg_replace('!<\!-- switch except_description on -->(.*)<\!-- switch except_description off -->!Uis', '', $except_tmp); - }else{ - $except_description = stripslashes(urldecode($except_val['description'])); - $except_tmp = str_replace('{EXCEPT_DESCRIPTION}', $except_description, $except_tmp); } ! $some_exceptions .= $except_tmp; ! ! } ! $events_tmp = preg_replace('!<\!-- switch exceptions on -->(.*)<\!-- switch exceptions off -->!Uis', $some_exceptions,$events_tmp ); ! ! } ! ! if (!$val['recur']) { ! $events_tmp = preg_replace('!<\!-- switch recur on -->(.*)<\!-- switch recur off -->!Uis', '', $events_tmp); ! }else{ ! $events_tmp = str_replace('{RECUR}', $val['recur'], $events_tmp); ! } ! $search = array('{EVENT_START}', '{EVENT_TEXT}', '{DESCRIPTION}','{LOCATION}'); $replace = array($event_start, $event_text, $description, $location); ! $events_tmp = str_replace($search, $replace, $events_tmp); ! $some_events .= $events_tmp; ! $events_tmp = $loop_event; ! ! $some_events = str_replace('{KEY}', $val['date'], $some_events); ! $some_events = str_replace('{DAYOFMONTH}', $dayofmonth, $some_events); ! $final .= $day_tmp.$some_events; ! unset ($day_tmp, $some_events); ! ! } } if ($events_found < 1) { --- 147,239 ---- if (isset($the_arr)){ + // Pull out each event + foreach($the_arr as $key => $val) { + $events_found++; + $dayofmonth = strtotime($val['date']); + $dayofmonth = localizeDate ('%A, %B %e %Y', $dayofmonth); + $events_tmp = $loop_event; + $recur_tmp = $loop_recur; + if ($val['event_text']) { + $event_text = stripslashes(urldecode($val['event_text'])); + $description = stripslashes(urldecode($val['description'])); + $location = stripslashes(urldecode($val['location'])); + $event_start = $val['event_start']; + $event_end = $val['event_end']; + if (isset($val['display_end'])) $event_end = $val['display_end']; + if (!$val['event_start']) { + $event_start = $lang['l_all_day']; + $event_start2 = ''; + $event_end = ''; + } else { + $event_start = date ($timeFormat, strtotime ($event_start)); + $event_end = date ($timeFormat, strtotime ($event_end)); + $event_start = $event_start .' - '.$event_end; + } + } + + if ($description == '') { + $events_tmp = preg_replace('!<\!-- switch description_events on -->(.*)<\!-- switch description_events off -->!Uis', '', $events_tmp); + } + if (!isset($val['exceptions'])) { + $events_tmp = preg_replace('!<\!-- switch exceptions on -->(.*)<\!-- switch exceptions off -->!Uis', '', $events_tmp); + }else{ + $some_exceptions = ""; + foreach ($val['exceptions'] as $except_val){ + $except_tmp = $loop_except; + + $except_date = strtotime($except_val['date']); + $except_date = localizeDate ('%A, %B %e %Y', $except_date); + $except_tmp = str_replace('{DAYOFMONTH}', $except_date, $except_tmp); + + $except_event_start = date ($timeFormat, strtotime ($except_val['event_start'])); + $except_event_end = date ($timeFormat, strtotime ($except_val['event_end'])); + $except_event_start = $except_event_start .' - '.$except_event_end; + + $except_tmp = str_replace('{EVENT_START}', $except_event_start, $except_tmp); + + $except_event_text = stripslashes(urldecode($except_val['event_text'])); + $except_tmp = str_replace('{EVENT_TEXT}', $except_event_text, $except_tmp); + + #is there a recur in the exception? + if (!$except_val['recur']) { + $except_tmp = preg_replace('!<\!-- switch except_recur on -->(.*)<\!-- switch except_recur off -->!Uis', '', $except_tmp); + }else{ + $except_tmp = str_replace('{EXCEPT_RECUR}', $except_val['recur'], $except_tmp); + } + #is there a description in the exception? + if (!$except_val['description']) { + $except_tmp = preg_replace('!<\!-- switch except_description on -->(.*)<\!-- switch except_description off -->!Uis', '', $except_tmp); + }else{ + $except_description = stripslashes(urldecode($except_val['description'])); + $except_tmp = str_replace('{EXCEPT_DESCRIPTION}', $except_description, $except_tmp); + } + $some_exceptions .= $except_tmp; } ! $events_tmp = preg_replace('!<\!-- switch exceptions on -->(.*)<\!-- switch exceptions off -->!Uis', $some_exceptions,$events_tmp ); ! ! } ! ! if (!$val['recur']) { ! $events_tmp = preg_replace('!<\!-- switch recur on -->(.*)<\!-- switch recur off -->!Uis', '', $events_tmp); ! $events_tmp = str_replace('{L_STARTING_ON}', '', $events_tmp); ! }else{ ! $events_tmp = str_replace('{RECUR}', $val['recur'], $events_tmp); ! } ! $search = array('{EVENT_START}', '{EVENT_TEXT}', '{DESCRIPTION}','{LOCATION}'); $replace = array($event_start, $event_text, $description, $location); ! $events_tmp = str_replace($search, $replace, $events_tmp); ! $some_events .= $events_tmp; ! $events_tmp = $loop_event; ! ! $some_events = str_replace('{KEY}', $val['date'], $some_events); ! $some_events = str_replace('{DAYOFMONTH}', $dayofmonth, $some_events); ! $final .= $day_tmp.$some_events; ! unset ($day_tmp, $some_events); ! ! } } if ($events_found < 1) { *************** *** 825,835 **** $vtodo_array = $todo; ! $vtodo_text = word_wrap(strip_tags(str_replace('<br />',' ',$vtodo_text), '<b><i><u>'), 21, $tomorrows_events_lines); $data = array ('{VTODO_TEXT}', '{VTODO_ARRAY}'); $rep = array ($vtodo_text, $vtodo_array); // Reset this TODO's category. $temp = ''; ! if ($status == 'COMPLETED' || (isset($val['completed_date']) && isset($val['completed_time']))) { if ($phpiCal_config->show_completed == 'yes') { $temp = $completed; --- 823,835 ---- $vtodo_array = $todo; ! $vtodo_text = word_wrap(strip_tags(str_replace('<br />',' ',$vtodo_text), '<b><i><u>'), 21, $phpiCal_config->tomorrows_events_lines); $data = array ('{VTODO_TEXT}', '{VTODO_ARRAY}'); $rep = array ($vtodo_text, $vtodo_array); // Reset this TODO's category. + + $temp = ''; ! if ($status == 'COMPLETED' || ($val['completed_date'] !='' && $val['completed_time'] !='')) { if ($phpiCal_config->show_completed == 'yes') { $temp = $completed; |
|
From: <ji...@us...> - 2008-12-26 08:26:36
|
Update of /cvsroot/phpicalendar/phpicalendar/functions/parse In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv6403/functions/parse Modified Files: end_vevent.php recur_functions.php Log Message: expand search range;fix todo display Index: end_vevent.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/parse/end_vevent.php,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** end_vevent.php 26 Dec 2008 05:54:46 -0000 1.14 --- end_vevent.php 26 Dec 2008 08:26:31 -0000 1.15 *************** *** 254,257 **** --- 254,258 ---- #echo "<pre>$summary\n\tstart mArray time:".date("Ymd his",$mArray_begin)."\n\tnext_range_unixtime:".date("Ymd his",$next_range_unixtime)."\n\tend range time ".date("Ymd his",$end_range_unixtime)."\n"; $recur_data = array(); + if($current_view == 'search') $freq_type = 'none'; while ($next_range_unixtime <= $end_range_unixtime && $count > 0) { $year = date("Y", $next_range_unixtime); Index: recur_functions.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/parse/recur_functions.php,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** recur_functions.php 26 Dec 2008 05:54:46 -0000 1.12 --- recur_functions.php 26 Dec 2008 08:26:31 -0000 1.13 *************** *** 11,27 **** function add_recur($times,$freq=''){ global $recur_data; ! global $count, $mArray_begin, $mArray_end, $except_dates, $start_date, $start_date_unixtime,$end_range_unixtime, $day_offset; if (!is_array($times)) $times = array($times); /* BYMONTH, BYWEEKNO, BYYEARDAY, BYMONTHDAY, BYDAY, BYHOUR, BYMINUTE, BYSECOND and BYSETPOS */ #dump_times($times); ! $times = restrict_bymonth($times,$freq); ! # $times = restrict_byweekno($times,$freq); ! $times = restrict_byyearday($times,$freq); ! $times = restrict_bymonthday($times,$freq); ! $times = restrict_byday($times,$freq); ! if($start_date_unixtime > $mArray_begin) $times[] = $start_date_unixtime; ! $times = restrict_bysetpos($times,$freq);#echo "restrict_bysetpos"; ! $times = array_unique($times); ! sort($times); $until_date = date("Ymd",$end_range_unixtime); foreach ($times as $time){ --- 11,29 ---- function add_recur($times,$freq=''){ global $recur_data; ! global $count, $mArray_begin, $mArray_end, $except_dates, $start_date, $start_date_unixtime,$end_range_unixtime, $day_offset, $current_view; if (!is_array($times)) $times = array($times); /* BYMONTH, BYWEEKNO, BYYEARDAY, BYMONTHDAY, BYDAY, BYHOUR, BYMINUTE, BYSECOND and BYSETPOS */ #dump_times($times); ! if ($current_view != 'search'){ ! $times = restrict_bymonth($times,$freq); ! # $times = restrict_byweekno($times,$freq); ! $times = restrict_byyearday($times,$freq); ! $times = restrict_bymonthday($times,$freq); ! $times = restrict_byday($times,$freq); ! if($start_date_unixtime > $mArray_begin) $times[] = $start_date_unixtime; ! $times = restrict_bysetpos($times,$freq);#echo "restrict_bysetpos"; ! $times = array_unique($times); ! sort($times); ! } $until_date = date("Ymd",$end_range_unixtime); foreach ($times as $time){ |
|
From: <ji...@us...> - 2008-12-26 08:26:36
|
Update of /cvsroot/phpicalendar/phpicalendar/functions/init In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv6403/functions/init Modified Files: date_range.php Log Message: expand search range;fix todo display Index: date_range.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/init/date_range.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** date_range.php 24 Dec 2008 21:09:31 -0000 1.6 --- date_range.php 26 Dec 2008 08:26:31 -0000 1.7 *************** *** 38,41 **** --- 38,45 ---- $mArray_end = time(); break; + case 'search': + $mArray_begin = mktime (0,0,0,1,1,1970); + $mArray_end = mktime (0,0,0,1,31,2030); + break; default: $mArray_begin = mktime (0,0,0,12,21,($this_year - 1)); |
|
From: <ji...@us...> - 2008-12-26 05:54:51
|
Update of /cvsroot/phpicalendar/phpicalendar/calendars In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv24761/calendars Modified Files: US Holidays.ics test.ics Log Message: fix US holidays; fix 1743686 where byday set and timezone pushes event to different day Index: US Holidays.ics =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/calendars/US Holidays.ics,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** US Holidays.ics 23 Dec 2008 20:24:54 -0000 1.6 --- US Holidays.ics 26 Dec 2008 05:54:46 -0000 1.7 *************** *** 603,607 **** TRANSP:OPAQUE UID:6ED833DC-879C-41C0-9E1D-4C83FD7DDB72 ! DTSTART;VALUE=DATE:1970901 DTSTAMP:20050930T224817Z SUMMARY:Labor Day --- 603,607 ---- TRANSP:OPAQUE UID:6ED833DC-879C-41C0-9E1D-4C83FD7DDB72 ! DTSTART;VALUE=DATE:19970901 DTSTAMP:20050930T224817Z SUMMARY:Labor Day Index: test.ics =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/calendars/test.ics,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** test.ics 25 Dec 2008 18:45:26 -0000 1.3 --- test.ics 26 Dec 2008 05:54:46 -0000 1.4 *************** *** 25,66 **** END:VTIMEZONE - BEGIN:VEVENT - UID:20081128T075152Z-3660-100-1-5@sietchtabr - DTSTAMP:20081128T075151Z - LAST-MODIFIED:20081128T075152 - SUMMARY:Witchcraft Paris - CATEGORIES:jdr - DTSTART;TZID=/softwarestudio.org/Tzfile/Europe/Paris:20081213T210000 - DTEND;TZID=/softwarestudio.org/Tzfile/Europe/Paris:20081213T230000 - CLASS:PUBLIC - SEQUENCE:1 - CREATED:20081128T075152 - END:VEVENT BEGIN:VEVENT ! UID:20081128T075152Z-3660-100-1-6@sietchtabr2 ! DTSTAMP:20081128T075151Z ! LAST-MODIFIED:20081128T075152 ! SUMMARY:Witchcraft PST ! CATEGORIES:jdr ! DTSTART;TZID=US/Pacific:20081213T210000 ! DTEND;TZID=US/Pacific:20081213T230000 ! CLASS:PUBLIC ! SEQUENCE:1 ! CREATED:20081128T075152 ! END:VEVENT ! ! BEGIN:VEVENT ! UID:20081128T075152Z-3660-100-1-7@sietchtabr2 ! DTSTAMP:20081128T075151Z ! LAST-MODIFIED:20081128T075152 ! SUMMARY:daylight test PST ! CATEGORIES:jdr ! DTSTART;TZID=US/Pacific:20060331T010000 ! DTEND;TZID=US/Pacific:20060331T020000 ! RRULE:FREQ=DAILY; CLASS:PUBLIC ! SEQUENCE:1 ! CREATED:20081128T075152 END:VEVENT --- 25,41 ---- END:VTIMEZONE BEGIN:VEVENT ! DTSTAMP:20070616T185152Z ! UID:{e5d8825e-4189-5341-80c7-4ec2c9f54404} ! SUMMARY:Futsal ! LOCATION:Jockvale E S\, 101 Malvern Dr\, Nepean\, K2J 2S8 ! DESCRIPTION: (613) 825-1224\, (613) 825-1219\nhttp://maps.google.com/maps?f=q&hl=en&q=101+Malvern+Dr\,+Nepean\,+K2J+2S8+canada&sll=45.460733\,-75.610657&sspn=0.062007\,0.144196&ie=UTF8&ll=45.285969\,-75.763178&spn=0.01555\,0.036049&z=15&om=1 ! CATEGORIES:Competition CLASS:PUBLIC ! LAST-MODIFIED:20070626T152159Z ! RRULE:FREQ=WEEKLY;COUNT=4;BYDAY=TH ! DTSTART:20070621T003000Z ! DTEND:20070621T013000Z END:VEVENT |
|
From: <ji...@us...> - 2008-12-26 05:54:51
|
Update of /cvsroot/phpicalendar/phpicalendar/functions/parse In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv24761/functions/parse Modified Files: end_vevent.php parse_tzs.php recur_functions.php Log Message: fix US holidays; fix 1743686 where byday set and timezone pushes event to different day Index: end_vevent.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/parse/end_vevent.php,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** end_vevent.php 25 Dec 2008 18:45:26 -0000 1.13 --- end_vevent.php 26 Dec 2008 05:54:46 -0000 1.14 *************** *** 293,296 **** --- 293,300 ---- $recur_data_hour = @substr($start_time,0,2); $recur_data_minute = @substr($start_time,2,2); + if (isset($allday_start) && $allday_start != ''){ + $recur_data_hour = '00'; + $recur_data_minute = '00'; + } foreach($recur_data as $recur_data_unixtime) { $recur_data_year = date('Y', $recur_data_unixtime); *************** *** 299,302 **** --- 303,308 ---- $recur_data_date = $recur_data_year.$recur_data_month.$recur_data_day; + /* at this point the recur data year, month, day, hour, and minute are in the default timezone for the phpicalendar installation, if that is set. We need to compare whether both the event timezone and the the phpicaledar timezone are in the same state wrt std vs daylight time. */ + if (isset($allday_start) && $allday_start != '') { $start_time2 = $recur_data_unixtime; Index: parse_tzs.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/parse/parse_tzs.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** parse_tzs.php 20 Dec 2008 00:33:14 -0000 1.4 --- parse_tzs.php 26 Dec 2008 05:54:46 -0000 1.5 *************** *** 7,10 **** --- 7,13 ---- // read file in line by line // XXX end line is skipped because of the 1-line readahead + $is_daylight = false; + $is_std = false; + while (!feof($ifile)) { $line = $nextline; *************** *** 17,24 **** $nextline = ereg_replace("[\r\n]", "", $nextline); } ! $line = trim($line); ! $is_daylight = false; ! $is_std = false; ! switch ($line) { case 'BEGIN:VTIMEZONE': --- 20,24 ---- $nextline = ereg_replace("[\r\n]", "", $nextline); } ! $line = trim($line); switch ($line) { case 'BEGIN:VTIMEZONE': *************** *** 56,66 **** default: unset ( $data, $prop_pos, $property); ! if (ereg ("([^:]+):(.*)", $line, $line)){ ! $property = $line[1]; ! $data = $line[2]; $prop_pos = strpos($property,';'); if ($prop_pos !== false) $property = substr($property,0,$prop_pos); $property = strtoupper($property); - switch ($property) { case 'TZID': --- 56,65 ---- default: unset ( $data, $prop_pos, $property); ! if (ereg ("([^:]+):(.*)", $line, $arr)){ ! $property = $arr[1]; ! $data = $arr[2]; $prop_pos = strpos($property,';'); if ($prop_pos !== false) $property = substr($property,0,$prop_pos); $property = strtoupper($property); switch ($property) { case 'TZID': *************** *** 74,79 **** break; case 'DTSTART': ! if($is_std) $begin_std = $data; ! if($is_daylight) $begin_daylight = $data; break; case 'TZNAME': --- 73,84 ---- break; case 'DTSTART': ! if($is_std || $is_daylight){ ! $datetime = extractDateTime($data, $property, $field); ! $start_unixtime = $datetime[0]; ! $start_date = $datetime[1]; ! $year = substr($start_date,0,4); ! if($is_std) $begin_std[$year] = $data; ! if($is_daylight) $begin_daylight[$year] = $data; ! } break; case 'TZNAME': Index: recur_functions.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/parse/recur_functions.php,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** recur_functions.php 25 Dec 2008 18:45:26 -0000 1.11 --- recur_functions.php 26 Dec 2008 05:54:46 -0000 1.12 *************** *** 2,32 **** /* from the std ! BYxxx rule parts modify the recurrence in some manner. BYxxx rule ! parts for a period of time which is the same or greater than the ! frequency generally reduce or limit the number of occurrences of the ! recurrence generated. For example, "FREQ=DAILY;BYMONTH=1" reduces the ! number of recurrence instances from all days (if BYMONTH tag is not ! present) to all days in January. BYxxx rule parts for a period of ! time less than the frequency generally increase or expand the number ! of occurrences of the recurrence. For example, ! "FREQ=YEARLY;BYMONTH=1,2" increases the number of days within the ! yearly recurrence set from 1 (if BYMONTH tag is not present) to 2. ! ! If multiple BYxxx rule parts are specified, then after evaluating the ! specified FREQ and INTERVAL rule parts, the BYxxx rule parts are ! applied to the current set of evaluated occurrences in the following ! order: BYMONTH, BYWEEKNO, BYYEARDAY, BYMONTHDAY, BYDAY, BYHOUR, ! BYMINUTE, BYSECOND and BYSETPOS; then COUNT and UNTIL are evaluated. ! We will use two kinds of functions - those that restrict the date to allowed values and those that expand allowed values */ function add_recur($times,$freq=''){ global $recur_data; ! global $count, $mArray_begin, $mArray_end, $except_dates, $start_date_unixtime,$end_range_unixtime; if (!is_array($times)) $times = array($times); ! /*BYMONTH, BYWEEKNO, BYYEARDAY, BYMONTHDAY, BYDAY, BYHOUR, ! BYMINUTE, BYSECOND and BYSETPOS*/ #dump_times($times); $times = restrict_bymonth($times,$freq); --- 2,17 ---- /* from the std ! "BYxxx rule parts modify the recurrence in some manner. BYxxx rule parts for a period of time which is the same or greater than the frequency generally reduce or limit the number of occurrences of the recurrence generated. For example, "FREQ=DAILY;BYMONTH=1" reduces the number of recurrence instances from all days (if BYMONTH tag is not present) to all days in January. BYxxx rule parts for a period of time less than the frequency generally increase or expand the number of occurrences of the recurrence. For example, "FREQ=YEARLY;BYMONTH=1,2" increases the number of days within the yearly recurrence set from 1 (if BYMONTH tag is not present) to 2. ! If multiple BYxxx rule parts are specified, then after evaluating the specified FREQ and INTERVAL rule parts, the BYxxx rule parts are applied to the current set of evaluated occurrences in the following order: BYMONTH, BYWEEKNO, BYYEARDAY, BYMONTHDAY, BYDAY, BYHOUR, BYMINUTE, BYSECOND and BYSETPOS; then COUNT and UNTIL are evaluated." + We will use two kinds of functions - those that restrict the date to allowed values and those that expand allowed values */ function add_recur($times,$freq=''){ global $recur_data; ! global $count, $mArray_begin, $mArray_end, $except_dates, $start_date, $start_date_unixtime,$end_range_unixtime, $day_offset; if (!is_array($times)) $times = array($times); ! /* BYMONTH, BYWEEKNO, BYYEARDAY, BYMONTHDAY, BYDAY, BYHOUR, BYMINUTE, BYSECOND and BYSETPOS */ #dump_times($times); $times = restrict_bymonth($times,$freq); *************** *** 44,53 **** $date = date("Ymd",$time); $time = strtotime("$date 12:00:00"); ! if(isset($time) && !in_array($time, $recur_data) && ! !in_array($date, $except_dates) && $time >= $start_date_unixtime && $date <= $until_date){ $count--; #echo "\n.$count\n"; ! if($time >= $mArray_begin && ! $time <= $mArray_end ! && $count >= 0 ) $recur_data[] = $time; } --- 29,45 ---- $date = date("Ymd",$time); $time = strtotime("$date 12:00:00"); ! # day offset fixes shifts across day boundaries due to time diffs. ! # These are already fixed for the initial instance, but need to be fixed for recurrences ! if (date("Ymd", $time) != $start_date) $time = $time + $day_offset * (24*60*60); ! if(isset($time) ! && !in_array($time, $recur_data) ! && !in_array($date, $except_dates) ! && $time >= $start_date_unixtime ! && $date <= $until_date ! ){ $count--; #echo "\n.$count\n"; ! if($time >= $mArray_begin ! && $time <= $mArray_end ! && $count >= 0 ) $recur_data[] = $time; } |
|
From: <ji...@us...> - 2008-12-26 05:54:51
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv24761/functions Modified Files: date_functions.php ical_parser.php is_daylight.php Log Message: fix US holidays; fix 1743686 where byday set and timezone pushes event to different day Index: date_functions.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/date_functions.php,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** date_functions.php 25 Dec 2008 18:45:26 -0000 1.41 --- date_functions.php 26 Dec 2008 05:54:46 -0000 1.42 *************** *** 210,214 **** /* Returns an array of the date and time extracted from the data ! passed in. This array contains (unixtime, date, time, allday). $data = A string representing a date-time per RFC2445. --- 210,214 ---- /* Returns an array of the date and time extracted from the data ! passed in. This array contains (unixtime, date, time, allday, tzid). $data = A string representing a date-time per RFC2445. *************** *** 220,224 **** function extractDateTime($data, $property, $field) { global $tz_array, $phpiCal_config, $calendar_tz; - $allday =''; #suppress error on returning undef. // Check for zulu time. --- 220,223 ---- *************** *** 259,265 **** $offset_tmp = chooseOffset($unixtime, $tz_dt); } elseif (isset($calendar_tz)) { ! $offset_tmp = chooseOffset($unixtime, $calendar_tz); } else { $offset_tmp = $server_offset_tmp; } // Set the values. --- 258,266 ---- $offset_tmp = chooseOffset($unixtime, $tz_dt); } elseif (isset($calendar_tz)) { ! $offset_tmp = chooseOffset($unixtime, $calendar_tz); ! $tz_dt = $calendar_tz; } else { $offset_tmp = $server_offset_tmp; + $tz_dt = $phpiCal_config->timezone; } // Set the values. *************** *** 270,274 **** // Return the results. ! return array($unixtime, $date, $time, $allday); } --- 271,275 ---- // Return the results. ! return array($unixtime, $date, $time, $allday, $tz_dt); } Index: ical_parser.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v retrieving revision 1.229 retrieving revision 1.230 diff -C2 -d -r1.229 -r1.230 *** ical_parser.php 20 Dec 2008 05:05:25 -0000 1.229 --- ical_parser.php 26 Dec 2008 05:54:46 -0000 1.230 *************** *** 280,283 **** --- 280,288 ---- $start_time = $datetime[2]; $allday_start = $datetime[3]; + $start_tz = $datetime[4]; + preg_match ('/([0-9]{4})([0-9]{2})([0-9]{2})([0-9]{0,2})([0-9]{0,2})/', $data, $regs); + $vevent_start_date = $regs[1] . $regs[2] . $regs[3]; + $day_offset = dayCompare($start_date, $vevent_start_date); + #echo date("Ymd Hi", $start_unixtime)." $start_date $start_time $vevent_start_date $day_offset<br>"; break; Index: is_daylight.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/is_daylight.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** is_daylight.php 25 Dec 2008 18:45:26 -0000 1.1 --- is_daylight.php 26 Dec 2008 05:54:46 -0000 1.2 *************** *** 13,289 **** $day = date("d",$time); $hour = date("H",$time); ! switch ($timezone){ ! case 'US/Samoa': # array('-1100', '-1100'); ! case 'America/Adak': # array('-1000', '-0900'); ! case 'America/Atka': ! case 'US/Aleutian': ! case 'America/Anchorage': # array('-0900', '-0800'); ! case 'America/Nome': ! case 'US/Alaska': ! case 'America/Juneau': ! case 'America/Yakutat': ! case 'America/Dawson': # array('-0800', '-0700'); ! case 'America/Los_Angeles': ! case 'America/Vancouver': ! case 'America/Whitehorse': ! case 'Canada/Pacific': ! case 'Canada/Yukon': ! case 'PST8PDT': ! case 'US/Pacific': ! case 'America/Boise': # array('-0700', '-0600'); ! case 'America/Cambridge_Bay': ! case 'America/Denver': ! case 'America/Edmonton': ! case 'America/Inuvik': ! case 'America/Shiprock': ! case 'America/Yellowknife': ! case 'Canada/Mountain': ! case 'MST7MDT': ! case 'Navajo': ! case 'US/Mountain': ! case 'America/Chicago': # array('-0600', '-0500'); ! case 'America/Menominee': ! case 'America/Merida': ! case 'America/Rainy_River': ! case 'America/Rankin_Inlet': ! case 'America/Winnipeg': ! case 'Canada/Central': ! case 'CST6CDT': ! case 'US/Central': ! case 'America/Detroit': # array('-0500', '-0400'); ! case 'America/Grand_Turk': ! case 'America/Iqaluit': ! case 'America/Kentucky/Louisville': ! case 'America/Kentucky/Monticello': ! case 'America/Louisville': ! case 'America/Montreal': ! case 'America/Nassau': ! case 'America/New_York': ! case 'America/Nipigon': ! case 'America/Pangnirtung': ! case 'America/Thunder_Bay': ! case 'Canada/Eastern': ! case 'EST5EDT': ! case 'US/Eastern': ! case 'US/Michigan': ! case 'America/Glace_Bay': # array('-0400', '-0300'); ! case 'America/Goose_Bay': ! case 'America/Halifax': ! case 'America/Thule': ! case 'Canada/Atlantic': ! case 'America/St_Johns': # array('-0330', '-0230'); ! case 'Canada/Newfoundland': ! case 'America/Godthab': # array('-0300', '-0200'); ! case 'America/Miquelon': ! if ($year < 2007){ $start = strtotime("+1 Sun",strtotime($year."0331")); $end = strtotime("-1 Sun",strtotime($year."1101")); ! }else{ ! $start = strtotime("+2 Sun",strtotime($year."0300")); ! $end = strtotime("+1 Sun",strtotime($year."1031")); ! } ! break; ! case 'America/Havana': ! case 'Cuba': ! $start = strtotime("+3 Sun",strtotime($year."0300")); ! $end = strtotime("-1 Sun",strtotime($year."1101")); ! break; ! case 'America/Cancun': ! case 'America/Chihuahua': ! case 'America/Ensenada': ! case 'America/Tijuana': ! case 'America/Mexico_City': ! case 'America/Monterrey': ! case 'Atlantic/Bermuda': ! case 'Mexico/BajaSur': ! case 'Mexico/BajaNorte': ! case 'Mexico/General': ! case 'America/Mazatlan': ! $start = strtotime("+1 Sun",strtotime($year."0331")); ! $end = strtotime("-1 Sun",strtotime($year."1101")); ! break; ! case 'Chile/EasterIsland': # array('-0500', '-0600'); ! case 'Pacific/Easter': ! ! break; ! case 'America/Asuncion': # array('-0300', '-0400'); ! case 'America/Cuiaba': ! case 'America/Santiago': ! case 'Antarctica/Palmer': ! case 'Atlantic/Stanley': ! case 'Chile/Continental': ! ! break; ! case 'America/Araguaina': # array('-0200', '-0300'); ! case 'America/Sao_Paulo': ! case 'Brazil/East': ! ! break; ! case 'America/Scoresbysund': # array('-0100', '+0000'); ! case 'Atlantic/Azores': ! ! break; ! case 'Atlantic/Canary': # array('+0000', '+0100'); ! case 'Atlantic/Faeroe': ! case 'Atlantic/Madeira': ! case 'Eire': ! case 'Europe/Belfast': ! case 'Europe/Dublin': ! case 'Europe/Lisbon': ! case 'Europe/London': ! case 'GB-Eire': ! case 'GB': ! case 'Portugal': ! case 'WET': ! ! break; ! case 'Africa/Ceuta': # array('+0100', '+0200'); ! case 'Arctic/Longyearbyen': ! case 'CET': ! case 'Europe/Amsterdam': ! case 'Europe/Andorra': ! case 'Europe/Belgrade': ! case 'Europe/Berlin': ! case 'Europe/Bratislava': ! case 'Europe/Brussels': ! case 'Europe/Budapest': ! case 'Europe/Copenhagen': ! case 'Europe/Gibraltar': ! case 'Europe/Ljubljana': ! case 'Europe/Luxembourg': ! case 'Europe/Madrid': ! case 'Europe/Malta': ! case 'Europe/Monaco': ! case 'Europe/Oslo': ! case 'Europe/Paris': ! case 'Europe/Prague': ! case 'Europe/Rome': ! case 'Europe/San_Marino': ! case 'Europe/Sarajevo': ! case 'Europe/Skopje': ! case 'Europe/Stockholm': ! case 'Europe/Tirane': ! case 'Europe/Vaduz': ! case 'Europe/Vatican': ! case 'Europe/Vienna': ! case 'Europe/Warsaw': ! case 'Europe/Zagreb': ! case 'Europe/Zurich': ! case 'MET': ! case 'Poland': ! $start = strtotime("-1 Sun",strtotime($year."0401")); ! $end = strtotime("-1 Sun",strtotime($year."1101")); ! break; ! case 'Africa/Windhoek': # array('+0200', '+0100'); ! ! break; ! case 'Asia/Amman': # array('+0200', '+0300'); ! case 'Asia/Beirut': ! case 'Asia/Damascus': ! case 'Asia/Gaza': ! case 'Asia/Istanbul': ! case 'Asia/Jerusalem': ! case 'Asia/Nicosia': ! case 'Asia/Tel_Aviv': ! case 'EET': ! case 'Egypt': ! case 'Europe/Athens': ! case 'Europe/Bucharest': ! case 'Europe/Chisinau': ! case 'Europe/Helsinki': ! case 'Europe/Istanbul': ! case 'Europe/Kaliningrad': ! case 'Europe/Kiev': ! case 'Europe/Minsk': ! case 'Europe/Nicosia': ! case 'Europe/Riga': ! case 'Europe/Simferopol': ! case 'Europe/Sofia': ! case 'Europe/Tiraspol': ! case 'Europe/Uzhgorod': ! case 'Europe/Zaporozhye': ! case 'Israel': ! case 'Turkey': ! ! break; ! case 'Asia/Baghdad': # array('+0300', '+0400'); ! case 'Europe/Moscow': ! case 'W-SU': ! ! break; ! case 'Asia/Tehran': # array('+0330', '+0430'); ! case 'Iran': ! ! break; ! case 'Asia/Aqtau': # array('+0400', '+0500'); ! case 'Asia/Baku': ! case 'Asia/Tbilisi': ! case 'Asia/Yerevan': ! case 'Europe/Samara': ! ! break; ! case 'Asia/Aqtobe': # array('+0500', '+0600'); ! case 'Asia/Bishkek': ! case 'Asia/Yekaterinburg': ! ! break; ! case 'Asia/Almaty': # array('+0600', '+0700'); ! case 'Asia/Novosibirsk': ! case 'Asia/Omsk': ! ! break; ! case 'Asia/Krasnoyarsk': # array('+0700', '+0800'); ! ! break; ! case 'Asia/Irkutsk': # array('+0800', '+0900'); ! ! break; ! case 'Asia/Yakutsk': # array('+0900', '+1000'); ! break; ! case 'Asia/Vladivostok': # array('+1000', '+1100'); ! case 'Australia/ACT': ! case 'Australia/Melbourne': ! case 'Australia/NSW': ! case 'Australia/Sydney': ! case 'Australia/Tasmania': ! case 'Australia/Victoria': ! ! break; ! case 'Australia/Adelaide': # array('+1030', '+0930'); ! case 'Australia/Broken_Hill': ! case 'Australia/South': ! case 'Australia/Yancowinna': ! ! break; ! case 'Asia/Magadan': # array('+1100', '+1200'); ! ! break; ! case 'Australia/LHI': # array('+1100', '+1030'); ! case 'Australia/Lord_Howe': ! ! break; ! case 'Australia/Canberra': # array('+1100', '+1000'); ! case 'Australia/Hobart': ! ! break; ! case 'Asia/Anadyr': # array('+1200', '+1300'); ! case 'Asia/Kamchatka': ! ! break; ! case 'Antarctica/McMurdo': ! case 'Antarctica/South_Pole': ! case 'NZ': # array('+1300', '+1200'); ! case 'Pacific/Auckland': ! break; ! case 'NZ-CHAT': ! case 'Pacific/Chatham': # array('+1345', '+1245'); ! break; ! default: ! $dlst = date('I', $time); } if (isset($start,$end) && $time >= $start && $time < $end) $dlst = 1; ! echo "$summary $dlst <br>"; return $dlst; --- 13,293 ---- $day = date("d",$time); $hour = date("H",$time); ! ! if(isset($tz_array[$timezone]['dt_start'][$year]) && isset($tz_array[$timezone]['st_start'][$year])){ ! $start = $tz_array[$timezone]['dt_start'][$year]; ! $end = $tz_array[$timezone]['st_start'][$year]; ! }else{ ! switch ($timezone){ ! case 'US/Samoa': # array('-1100', '-1100'); ! case 'America/Adak': # array('-1000', '-0900'); ! case 'America/Atka': ! case 'US/Aleutian': ! case 'America/Anchorage': # array('-0900', '-0800'); ! case 'America/Nome': ! case 'US/Alaska': ! case 'America/Juneau': ! case 'America/Yakutat': ! case 'America/Dawson': # array('-0800', '-0700'); ! case 'America/Los_Angeles': ! case 'America/Vancouver': ! case 'America/Whitehorse': ! case 'Canada/Pacific': ! case 'Canada/Yukon': ! case 'PST8PDT': ! case 'US/Pacific': ! case 'America/Boise': # array('-0700', '-0600'); ! case 'America/Cambridge_Bay': ! case 'America/Denver': ! case 'America/Edmonton': ! case 'America/Inuvik': ! case 'America/Shiprock': ! case 'America/Yellowknife': ! case 'Canada/Mountain': ! case 'MST7MDT': ! case 'Navajo': ! case 'US/Mountain': ! case 'America/Chicago': # array('-0600', '-0500'); ! case 'America/Menominee': ! case 'America/Merida': ! case 'America/Rainy_River': ! case 'America/Rankin_Inlet': ! case 'America/Winnipeg': ! case 'Canada/Central': ! case 'CST6CDT': ! case 'US/Central': ! case 'America/Detroit': # array('-0500', '-0400'); ! case 'America/Grand_Turk': ! case 'America/Iqaluit': ! case 'America/Kentucky/Louisville': ! case 'America/Kentucky/Monticello': ! case 'America/Louisville': ! case 'America/Montreal': ! case 'America/Nassau': ! case 'America/New_York': ! case 'America/Nipigon': ! case 'America/Pangnirtung': ! case 'America/Thunder_Bay': ! case 'Canada/Eastern': ! case 'EST5EDT': ! case 'US/Eastern': ! case 'US/Michigan': ! case 'America/Glace_Bay': # array('-0400', '-0300'); ! case 'America/Goose_Bay': ! case 'America/Halifax': ! case 'America/Thule': ! case 'Canada/Atlantic': ! case 'America/St_Johns': # array('-0330', '-0230'); ! case 'Canada/Newfoundland': ! case 'America/Godthab': # array('-0300', '-0200'); ! case 'America/Miquelon': ! if ($year < 2007){ ! $start = strtotime("+1 Sun",strtotime($year."0331")); ! $end = strtotime("-1 Sun",strtotime($year."1101")); ! }else{ ! $start = strtotime("+2 Sun",strtotime($year."0300")); ! $end = strtotime("+1 Sun",strtotime($year."1031")); ! } ! break; ! case 'America/Havana': ! case 'Cuba': ! $start = strtotime("+3 Sun",strtotime($year."0300")); ! $end = strtotime("-1 Sun",strtotime($year."1101")); ! break; ! case 'America/Cancun': ! case 'America/Chihuahua': ! case 'America/Ensenada': ! case 'America/Tijuana': ! case 'America/Mexico_City': ! case 'America/Monterrey': ! case 'Atlantic/Bermuda': ! case 'Mexico/BajaSur': ! case 'Mexico/BajaNorte': ! case 'Mexico/General': ! case 'America/Mazatlan': $start = strtotime("+1 Sun",strtotime($year."0331")); $end = strtotime("-1 Sun",strtotime($year."1101")); ! break; ! case 'Chile/EasterIsland': # array('-0500', '-0600'); ! case 'Pacific/Easter': + break; + case 'America/Asuncion': # array('-0300', '-0400'); + case 'America/Cuiaba': + case 'America/Santiago': + case 'Antarctica/Palmer': + case 'Atlantic/Stanley': + case 'Chile/Continental': ! break; ! case 'America/Araguaina': # array('-0200', '-0300'); ! case 'America/Sao_Paulo': ! case 'Brazil/East': ! ! break; ! case 'America/Scoresbysund': # array('-0100', '+0000'); ! case 'Atlantic/Azores': ! ! break; ! case 'Atlantic/Canary': # array('+0000', '+0100'); ! case 'Atlantic/Faeroe': ! case 'Atlantic/Madeira': ! case 'Eire': ! case 'Europe/Belfast': ! case 'Europe/Dublin': ! case 'Europe/Lisbon': ! case 'Europe/London': ! case 'GB-Eire': ! case 'GB': ! case 'Portugal': ! case 'WET': ! case 'Africa/Ceuta': # array('+0100', '+0200'); ! case 'Arctic/Longyearbyen': ! case 'CET': ! case 'Europe/Amsterdam': ! case 'Europe/Andorra': ! case 'Europe/Belgrade': ! case 'Europe/Berlin': ! case 'Europe/Bratislava': ! case 'Europe/Brussels': ! case 'Europe/Budapest': ! case 'Europe/Copenhagen': ! case 'Europe/Gibraltar': ! case 'Europe/Ljubljana': ! case 'Europe/Luxembourg': ! case 'Europe/Madrid': ! case 'Europe/Malta': ! case 'Europe/Monaco': ! case 'Europe/Oslo': ! case 'Europe/Paris': ! case 'Europe/Prague': ! case 'Europe/Rome': ! case 'Europe/San_Marino': ! case 'Europe/Sarajevo': ! case 'Europe/Skopje': ! case 'Europe/Stockholm': ! case 'Europe/Tirane': ! case 'Europe/Vaduz': ! case 'Europe/Vatican': ! case 'Europe/Vienna': ! case 'Europe/Warsaw': ! case 'Europe/Zagreb': ! case 'Europe/Zurich': ! case 'MET': ! case 'Poland': ! case 'Europe/Athens': ! case 'Europe/Bucharest': ! case 'Europe/Chisinau': ! case 'Europe/Helsinki': ! case 'Europe/Istanbul': ! case 'Europe/Kaliningrad': ! case 'Europe/Kiev': ! case 'Europe/Minsk': ! case 'Europe/Nicosia': ! case 'Europe/Riga': ! case 'Europe/Simferopol': ! case 'Europe/Sofia': ! case 'Europe/Tiraspol': ! case 'Europe/Uzhgorod': ! case 'Europe/Zaporozhye': ! case 'EET': ! $start = strtotime("-1 Sun",strtotime($year."0401")); ! $end = strtotime("-1 Sun",strtotime($year."1101")); ! break; ! case 'Africa/Windhoek': # array('+0200', '+0100'); ! ! break; ! case 'Asia/Amman': # array('+0200', '+0300'); ! case 'Asia/Beirut': ! case 'Asia/Damascus': ! case 'Asia/Gaza': ! case 'Asia/Istanbul': ! case 'Asia/Jerusalem': ! case 'Asia/Nicosia': ! case 'Asia/Tel_Aviv': ! case 'Egypt': ! case 'Israel': ! case 'Turkey': ! ! break; ! case 'Asia/Baghdad': # array('+0300', '+0400'); ! case 'Europe/Moscow': ! case 'W-SU': ! ! break; ! case 'Asia/Tehran': # array('+0330', '+0430'); ! case 'Iran': ! ! break; ! case 'Asia/Aqtau': # array('+0400', '+0500'); ! case 'Asia/Baku': ! case 'Asia/Tbilisi': ! case 'Asia/Yerevan': ! case 'Europe/Samara': ! ! break; ! case 'Asia/Aqtobe': # array('+0500', '+0600'); ! case 'Asia/Bishkek': ! case 'Asia/Yekaterinburg': ! ! break; ! case 'Asia/Almaty': # array('+0600', '+0700'); ! case 'Asia/Novosibirsk': ! case 'Asia/Omsk': ! ! break; ! case 'Asia/Krasnoyarsk': # array('+0700', '+0800'); ! ! break; ! case 'Asia/Irkutsk': # array('+0800', '+0900'); ! ! break; ! case 'Asia/Yakutsk': # array('+0900', '+1000'); ! ! ! break; ! case 'Asia/Vladivostok': # array('+1000', '+1100'); ! case 'Australia/ACT': ! case 'Australia/Melbourne': ! case 'Australia/NSW': ! case 'Australia/Sydney': ! case 'Australia/Tasmania': ! case 'Australia/Victoria': ! ! break; ! case 'Australia/Adelaide': # array('+1030', '+0930'); ! case 'Australia/Broken_Hill': ! case 'Australia/South': ! case 'Australia/Yancowinna': ! ! break; ! case 'Asia/Magadan': # array('+1100', '+1200'); ! ! break; ! case 'Australia/LHI': # array('+1100', '+1030'); ! case 'Australia/Lord_Howe': ! ! break; ! case 'Australia/Canberra': # array('+1100', '+1000'); ! case 'Australia/Hobart': ! ! break; ! case 'Asia/Anadyr': # array('+1200', '+1300'); ! case 'Asia/Kamchatka': ! ! break; ! case 'Antarctica/McMurdo': ! case 'Antarctica/South_Pole': ! case 'NZ': # array('+1300', '+1200'); ! case 'Pacific/Auckland': ! break; ! case 'NZ-CHAT': ! case 'Pacific/Chatham': # array('+1345', '+1245'); ! break; ! default: ! $dlst = date('I', $time); ! } } if (isset($start,$end) && $time >= $start && $time < $end) $dlst = 1; ! #echo "$summary $dlst <br>"; return $dlst; |
|
From: <ji...@us...> - 2008-12-26 05:54:51
|
Update of /cvsroot/phpicalendar/phpicalendar In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv24761 Modified Files: config.inc.php Log Message: fix US holidays; fix 1743686 where byday set and timezone pushes event to different day Index: config.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/config.inc.php,v retrieving revision 1.183 retrieving revision 1.184 diff -C2 -d -r1.183 -r1.184 *** config.inc.php 25 Dec 2008 18:45:26 -0000 1.183 --- config.inc.php 26 Dec 2008 05:54:46 -0000 1.184 *************** *** 14,18 **** # 'show_search' => 'yes', # 'show_todos' => 'no', ! 'timezone' => 'US/Central', # 'second_offset' => $secs, # 'cookie_uri' => '' --- 14,19 ---- # 'show_search' => 'yes', # 'show_todos' => 'no', ! # 'timezone' => 'US/Central', ! 'timezone' => 'America/Bogota', # 'second_offset' => $secs, # 'cookie_uri' => '' |
|
From: <ji...@us...> - 2008-12-25 18:45:32
|
Update of /cvsroot/phpicalendar/phpicalendar In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv28460 Modified Files: config.inc.php Log Message: progress on timezones and daylight time Index: config.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/config.inc.php,v retrieving revision 1.182 retrieving revision 1.183 diff -C2 -d -r1.182 -r1.183 *** config.inc.php 24 Dec 2008 21:09:31 -0000 1.182 --- config.inc.php 25 Dec 2008 18:45:26 -0000 1.183 *************** *** 5,9 **** In version 2.3, there has been a change in the way configuration works in order to reduce the number of confusing global variables. Unfortunately, this means that config.inc.php files from older installations will have to be translated to the new format. The conversion is simple: use the old variable names as array keys for the $configs array below: */ ! $configs = array( # 'calendar_path' => '/Library/WebServer/Documents/phpicalendar/calendars', --- 5,9 ---- In version 2.3, there has been a change in the way configuration works in order to reduce the number of confusing global variables. Unfortunately, this means that config.inc.php files from older installations will have to be translated to the new format. The conversion is simple: use the old variable names as array keys for the $configs array below: */ ! $secs = 6*60*60; $configs = array( # 'calendar_path' => '/Library/WebServer/Documents/phpicalendar/calendars', *************** *** 14,17 **** --- 14,19 ---- # 'show_search' => 'yes', # 'show_todos' => 'no', + 'timezone' => 'US/Central', + # 'second_offset' => $secs, # 'cookie_uri' => '' ); |
|
From: <ji...@us...> - 2008-12-25 18:45:32
|
Update of /cvsroot/phpicalendar/phpicalendar/calendars In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv28460/calendars Modified Files: test.ics Log Message: progress on timezones and daylight time Index: test.ics =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/calendars/test.ics,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** test.ics 24 Dec 2008 21:26:31 -0000 1.2 --- test.ics 25 Dec 2008 18:45:26 -0000 1.3 *************** *** 29,33 **** DTSTAMP:20081128T075151Z LAST-MODIFIED:20081128T075152 ! SUMMARY:Witchcraft CATEGORIES:jdr DTSTART;TZID=/softwarestudio.org/Tzfile/Europe/Paris:20081213T210000 --- 29,33 ---- DTSTAMP:20081128T075151Z LAST-MODIFIED:20081128T075152 ! SUMMARY:Witchcraft Paris CATEGORIES:jdr DTSTART;TZID=/softwarestudio.org/Tzfile/Europe/Paris:20081213T210000 *************** *** 38,40 **** --- 38,67 ---- END:VEVENT + BEGIN:VEVENT + UID:20081128T075152Z-3660-100-1-6@sietchtabr2 + DTSTAMP:20081128T075151Z + LAST-MODIFIED:20081128T075152 + SUMMARY:Witchcraft PST + CATEGORIES:jdr + DTSTART;TZID=US/Pacific:20081213T210000 + DTEND;TZID=US/Pacific:20081213T230000 + CLASS:PUBLIC + SEQUENCE:1 + CREATED:20081128T075152 + END:VEVENT + + BEGIN:VEVENT + UID:20081128T075152Z-3660-100-1-7@sietchtabr2 + DTSTAMP:20081128T075151Z + LAST-MODIFIED:20081128T075152 + SUMMARY:daylight test PST + CATEGORIES:jdr + DTSTART;TZID=US/Pacific:20060331T010000 + DTEND;TZID=US/Pacific:20060331T020000 + RRULE:FREQ=DAILY; + CLASS:PUBLIC + SEQUENCE:1 + CREATED:20081128T075152 + END:VEVENT + END:VCALENDAR |
|
From: <ji...@us...> - 2008-12-25 18:45:31
|
Update of /cvsroot/phpicalendar/phpicalendar/calendars/recur_tests In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv28460/calendars/recur_tests Modified Files: ex_set2.ics ex_set3.ics ex_set4.ics Log Message: progress on timezones and daylight time Index: ex_set2.ics =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/calendars/recur_tests/ex_set2.ics,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ex_set2.ics 18 Dec 2008 09:22:23 -0000 1.1 --- ex_set2.ics 25 Dec 2008 18:45:26 -0000 1.2 *************** *** 64,68 **** SEQUENCE:7 DTSTAMP:20020918T224617Z ! SUMMARY:Weekly on Tuesday and Thursday for 5 weeks - goes 1 extra? STATUS:CONFIRMED DURATION:PT1H30M --- 64,68 ---- SEQUENCE:7 DTSTAMP:20020918T224617Z ! SUMMARY:Weekly on Tuesday and Thursday for 5 weeks STATUS:CONFIRMED DURATION:PT1H30M Index: ex_set3.ics =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/calendars/recur_tests/ex_set3.ics,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ex_set3.ics 18 Dec 2008 09:22:23 -0000 1.1 --- ex_set3.ics 25 Dec 2008 18:45:26 -0000 1.2 *************** *** 70,74 **** RRULE:FREQ=MONTHLY;INTERVAL=2;COUNT=10;BYDAY=1SU,-1SU END:VEVENT - END:VCALENDAR BEGIN:VEVENT SEQUENCE:7 --- 70,73 ---- Index: ex_set4.ics =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/calendars/recur_tests/ex_set4.ics,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ex_set4.ics 18 Dec 2008 09:22:23 -0000 1.1 --- ex_set4.ics 25 Dec 2008 18:45:26 -0000 1.2 *************** *** 52,56 **** RRULE:FREQ=MONTHLY;INTERVAL=18;COUNT=10;BYMONTHDAY=10,11,12,13,14,15 END:VEVENT - END:VCALENDAR BEGIN:VEVENT SEQUENCE:7 --- 52,55 ---- *************** *** 62,66 **** RRULE:FREQ=MONTHLY;INTERVAL=2;BYDAY=TU END:VEVENT - END:VCALENDAR BEGIN:VEVENT SEQUENCE:7 --- 61,64 ---- |
