Added support for #'s and &'s in javascript.

7 files changed, 12 insertions, 20 deletions

diff --git a/calendars/Home.ics b/calendars/Home.ics
index bd1f97a..7a08379 100644
--- a/calendars/Home.ics
+++ b/calendars/Home.ics
@@ -7,21 +7,21 @@ X-WR-RELCALID;VALUE=TEXT:BB9B43C2-C373-11D6-BB9D-003065C59510
 VERSION:2.0
 BEGIN:VEVENT
 DTSTAMP:20020816T035857Z
-SUMMARY:Moby Area2 all day concert
+SUMMARY:Moby Area2 all day concert & shoreline
 DTEND;TZID=US/Pacific:20020814T233000
 UID:BB9ADBD4-C373-11D6-BB9D-003065C59510
 DTSTART;TZID=US/Pacific:20020814T153000
 END:VEVENT
 BEGIN:VEVENT
 DTSTAMP:20020816T035941Z
-SUMMARY:Motorcycle service
+SUMMARY:Motorcycle service #147
 DTEND;TZID=US/Pacific:20020814T093000
 UID:BB9AE200-C373-11D6-BB9D-003065C59510
 DTSTART;TZID=US/Pacific:20020814T090000
 END:VEVENT
 BEGIN:VEVENT
 DTSTAMP:20020908T213204Z
-SUMMARY:Pick up Stef
+SUMMARY:Pick up Stef @ airport
 DTEND;TZID=US/Pacific:20020822T202500
 UID:BB9AE6EB-C373-11D6-BB9D-003065C59510
 DTSTART;TZID=US/Pacific:20020822T192000
diff --git a/day.php b/day.php
index a6ecf6b..caf6baf 100644
--- a/day.php
+++ b/day.php
@@ -11,18 +11,8 @@ $current_view = 'day';
 include('./functions/ical_parser.php');
 if ($minical_view == "current") $minical_view = "day";
 
-
-
-//if ($use_sessions == 'yes') {
-//	session_start();
-//	if (is_array($aArray)) $master_array = $aArray;
-//	echo 'using sessions';
-//}
-
 $starttime = '0500';
 $weekstart = 1;
-// dpr 20020926: moved variable gridLength to config.inc.php
-//$gridLength = 30;
 $unix_time = strtotime($getdate);
 $today_today = date ('Ymd');
 $tomorrows_date = date( 'Ymd', strtotime('+1 day',  $unix_time));
@@ -184,7 +174,7 @@ if (is_array($master_array[($getdate)])) {
 											switch ($event_length[$i]['state']) {
 												case 'begin':
 													$event_length[$i]['state'] = 'started';
-													$event_text 	= $master_array[($getdate)][$cal_time][($event_length[$i]['key'])]['event_text'];
+													$event_text 	= urldecode($master_array[($getdate)][$cal_time][($event_length[$i]['key'])]['event_text']);
 													$event_text2 	= addslashes($master_array[($getdate)][$cal_time][($event_length[$i]['key'])]['event_text']);
 													$event_text2 	= rawurlencode($event_text2);
 													$event_start 	= $master_array[($getdate)][$cal_time][($event_length[$i]['key'])]['event_start'];
diff --git a/functions/ical_parser.php b/functions/ical_parser.php
index 9501d08..c41178d 100644
--- a/functions/ical_parser.php
+++ b/functions/ical_parser.php
@@ -461,9 +461,11 @@ if ($parse_file) {
 				$except_times[] = $regs[4] . $regs[5];
 				
 			} elseif (stristr($field, 'SUMMARY')) {
+				$data = htmlentities(urlencode($data));
 				$summary = $data;
 				
 			} elseif (stristr($field, 'DESCRIPTION')) {
+				$data = htmlentities(urlencode($data));
 				if ($valarm_set = FALSE) { 
 					$description = $data;
 				} else {
@@ -502,7 +504,6 @@ if ($parse_file) {
 				}	
 				
 			} elseif (stristr($field, 'RRULE')) {
-				// $data = 'RRULE:FREQ=YEARLY;INTERVAL=2;BYMONTH=1;BYDAY=SU;BYHOUR=8,9;BYMINUTE=30';
 				$data = ereg_replace ('RRULE:', '', $data);
 				$rrule = split (';', $data);
 				foreach ($rrule as $recur) {
diff --git a/month.php b/month.php
index eb2501a..7a771b7 100644
--- a/month.php
+++ b/month.php
@@ -133,7 +133,7 @@
 								foreach ($master_array[("$daylink")] as $event_times) {
 									foreach ($event_times as $val) {
 										$num_of_events++;
-										$event_text = $val["event_text"];
+										$event_text = urldecode($val["event_text"]);
 										$event_text = strip_tags($event_text, '<b><i><u>');
 										if ($event_text != "") {	
 											$event_text2 	= addslashes($val["event_text"]);
diff --git a/month_bottom.php b/month_bottom.php
index 392f815..efbd30f 100644
--- a/month_bottom.php
+++ b/month_bottom.php
@@ -360,9 +360,10 @@
 												// Pull out each time
 												foreach ($new_val as $new_key2 => $new_val2) {
 												if ($new_val2["event_text"]) {	
-													$event_text 	= $new_val2["event_text"];
+													$event_text 	= urldecode($new_val2["event_text"]);
 													$event_text2 	= addslashes($new_val2["event_text"]);
 													$event_text2 	= str_replace("\"", "&quot;", $event_text2);
+													$event_text2 	= urlencode($event_text2);
 													$description 	= addslashes($new_val2["description"]);
 													$description 	= str_replace("\"", "&quot;", $description);
 													$event_start 	= $new_val2["event_start"];
diff --git a/sidebar.php b/sidebar.php
index 8fc8af4..cc9bf03 100644
--- a/sidebar.php
+++ b/sidebar.php
@@ -168,7 +168,7 @@
 								<?php
 								foreach ($master_array[("$tomorrows_date")] as $event_times) {
 									foreach ($event_times as $val) {
-										$event_text = $val["event_text"];
+										$event_text = urldecode($val["event_text"]);
 										$event_text = strip_tags($event_text, '<b><i><u>');
 										if ($event_text != "") {	
 											$event_text2 	= addslashes($val["event_text"]);
diff --git a/week.php b/week.php
index 0ce5f21..15ddd44 100644
--- a/week.php
+++ b/week.php
@@ -173,7 +173,7 @@ for ($i=0;$i<7;$i++) {
 									if (isset($master_array[($thisday)]["-1"])) {
 										echo "<table width=\"100%\" border=\"0\" cellspacing=\"1\" cellpadding=\"4\" class=\"V9\">\n";
 										foreach($master_array[($thisday)]["-1"] as $allday) {
-											$all_day_text 	= $allday["event_text"];
+											$all_day_text 	= urldecode($allday["event_text"]);
 											$all_day_text 	= word_wrap($all_day_text, 12, $allday_week_lines);
 											$event_text2 	= urlencode(addslashes($all_day_text));
 											$description 	= $allday["description"];
@@ -263,7 +263,7 @@ for ($i=0;$i<7;$i++) {
 													case "begin":
 													
 														$event_length[$thisday][$i]["state"] = "started";
-														$event_text 	= $master_array[($thisday)]["$cal_time"][($event_length[$thisday][$i]["key"])]["event_text"];
+														$event_text 	= urldecode($master_array[($thisday)]["$cal_time"][($event_length[$thisday][$i]["key"])]["event_text"]);
 														$event_text 	= word_wrap($event_text, 25, $week_events_lines);
 														$event_text2 	= addslashes($master_array[($thisday)]["$cal_time"][($event_length[$thisday][$i]["key"])]["event_text"]);
 														$event_text2 	= urlencode($event_text2);