Updated README, reverted ical_parser's WEEKLY parsing to 2.0b, added charset to event popup, and added two small patches.

1 files changed, 9 insertions, 11 deletions

diff --git a/functions/ical_parser.php b/functions/ical_parser.php
index 67a1b1f..db57458 100644
--- a/functions/ical_parser.php
+++ b/functions/ical_parser.php
@@ -517,20 +517,15 @@ foreach ($cal_filelist as $filename) {
 													$recur_data[] = $next_date_time;
 													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)) {
+														$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_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);
-															}
+															$next_date = dateOfWeek(date('Ymd', $next_range_time),$day);
+															$next_date_time = strtotime($next_date);
 															$recur_data[] = $next_date_time;
 														}
 													}
@@ -1045,6 +1040,7 @@ foreach ($cal_filelist as $filename) {
 						
 					case 'SUMMARY':
 						$data = str_replace("\\n", "<br />", $data);
+						$data = str_replace("\\t", "&nbsp;", $data);
 						$data = str_replace("\\r", "<br />", $data);
 						$data = str_replace('$', '&#36;', $data);
 						$data = htmlentities(urlencode($data));
@@ -1057,6 +1053,7 @@ foreach ($cal_filelist as $filename) {
 						
 					case 'DESCRIPTION':
 						$data = str_replace("\\n", "<br />", $data);
+						$data = str_replace("\\t", "&nbsp;", $data);
 						$data = str_replace("\\r", "<br />", $data);
 						$data = str_replace('$', '&#36;', $data);
 						$data = htmlentities(urlencode($data));
@@ -1154,6 +1151,7 @@ foreach ($cal_filelist as $filename) {
 						break;
 					case 'LOCATION':
 						$data = str_replace("\\n", "<br />", $data);
+						$data = str_replace("\\t", "&nbsp;", $data);
 						$data = str_replace("\\r", "<br />", $data);
 						$location = $data;
 						break;