Update of /cvsroot/phpicalendar/phpicalendar/functions
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11768/functions
Modified Files:
ical_parser.php
Log Message:
Updated README, reverted ical_parser's WEEKLY parsing to 2.0b, added charset to event popup, and added two small patches.
Index: ical_parser.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v
retrieving revision 1.193
retrieving revision 1.194
diff -C2 -d -r1.193 -r1.194
*** ical_parser.php 1 Sep 2005 18:35:04 -0000 1.193
--- ical_parser.php 13 Sep 2005 21:36:38 -0000 1.194
***************
*** 518,535 ****
break;
case 'WEEKLY':
- // Populate $byday with the default day if it's not set.
if (!isset($byday)) {
! $byday[] = strtoupper(substr($daysofweekshort_lang[date('w', $next_range_time)], 0, 2));
! }
! if (is_array($byday)) {
foreach($byday as $day) {
$day = two2threeCharDays($day);
! $next_date_time = strtotime($day,$next_range_time) + (12 * 60 * 60);
! // Since this renders events from $next_range_time to $next_range_time + 1 week, I need to handle intervals
! // as well. This checks to see if $next_date_time is after $day_start (i.e., "next week"), and thus
! // if we need to add $interval weeks to $next_date_time.
! if ($next_date_time > strtotime($week_start_day, $next_range_time) && $interval > 1) {
! $next_date_time = strtotime('+'.($interval - 1).' '.$freq_type, $next_date_time);
! }
$recur_data[] = $next_date_time;
}
--- 518,530 ----
break;
case 'WEEKLY':
if (!isset($byday)) {
! $next_date = dateOfWeek(date('Ymd', $next_range_time),$bd);
! $next_date_time = strtotime($next_date);
! $recur_data[] = $next_date_time;
! } elseif (is_array($byday)) {
foreach($byday as $day) {
$day = two2threeCharDays($day);
! $next_date = dateOfWeek(date('Ymd', $next_range_time),$day);
! $next_date_time = strtotime($next_date);
$recur_data[] = $next_date_time;
}
***************
*** 1046,1049 ****
--- 1041,1045 ----
case 'SUMMARY':
$data = str_replace("\\n", "<br />", $data);
+ $data = str_replace("\\t", " ", $data);
$data = str_replace("\\r", "<br />", $data);
$data = str_replace('$', '$', $data);
***************
*** 1058,1061 ****
--- 1054,1058 ----
case 'DESCRIPTION':
$data = str_replace("\\n", "<br />", $data);
+ $data = str_replace("\\t", " ", $data);
$data = str_replace("\\r", "<br />", $data);
$data = str_replace('$', '$', $data);
***************
*** 1155,1158 ****
--- 1152,1156 ----
case 'LOCATION':
$data = str_replace("\\n", "<br />", $data);
+ $data = str_replace("\\t", " ", $data);
$data = str_replace("\\r", "<br />", $data);
$location = $data;
|
