Modified the javascript so it doesn't use escape anymore. This was

messing up the output of non-English characters because they were encoded
but not decoded by Javascript. The fix was to urlencode after addslashes
and then do the reverse in event.php.

1 files changed, 3 insertions, 2 deletions

diff --git a/week.php b/week.php
index ed2cf5e..10eca96 100644
--- a/week.php
+++ b/week.php
@@ -255,16 +255,17 @@ for ($i=0;$i<7;$i++) {
 														$event_length[$thisday][$i]["state"] = "started";
 														$event_text 	= $master_array[($thisday)]["$cal_time"][($event_length[$thisday][$i]["key"])]["event_text"];
 														$event_text2 	= addslashes($master_array[($thisday)]["$cal_time"][($event_length[$thisday][$i]["key"])]["event_text"]);
-														$event_text2 	= str_replace("\"", "&quot;", $event_text2);
+														$event_text2 	= urlencode($event_text2);
 														$event_start 	= $master_array[($thisday)]["$cal_time"][($event_length[$thisday][$i]["key"])]["event_start"];
 														$event_end		= $master_array[($thisday)]["$cal_time"][($event_length[$thisday][$i]["key"])]["event_end"];
 														$description 	= addslashes($master_array[($thisday)]["$cal_time"][($event_length[$thisday][$i]["key"])]["description"]);
-														$description 	= str_replace("\"", "&quot;", $description);
+														$description	= urlencode($description);
 														$event_start 	= strtotime ("$event_start");
 														$event_start 	= date ($timeFormat, $event_start);
 														$event_end 		= strtotime ("$event_end");
 														$event_end 		= date ($timeFormat, $event_end);
 														$calendar_name2	= addslashes($calendar_name);
+														$calendar_name2 = urlencode($calendar_name2);
 														echo "<td rowspan=\"" . $event_length[$thisday][$i]["length"] . "\" colspan=\"" . $drawWidth . "\" align=\"left\" valign=\"top\" class=\"eventbg2week\">\n";
 														echo "<table width=\"100%\" border=\"0\" cellspacing=\"0\" cellpadding=\"2\">\n";
 														echo "<tr>\n";