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, 6 insertions, 4 deletions

diff --git a/month.php b/month.php
index 52e8e09..a4fc2a2 100644
--- a/month.php
+++ b/month.php
@@ -128,13 +128,15 @@
 										$event_text = strip_tags($event_text, '<b><i><u>');
 										if ($event_text != "") {	
 											$event_text2 	= addslashes($val["event_text"]);
-											$event_text2 	= str_replace("\"", "&quot;", $event_text2);
+											$event_text2 	= urlencode($event_text2);
 											$description 	= addslashes($val["description"]);
-											$description 	= str_replace("\"", "&quot;", $description);
+											$description	= urlencode($description);
 											$event_start 	= $val["event_start"];
 											$event_end 		= $val["event_end"];
 											$event_start 	= date ($timeFormat, strtotime ("$event_start"));
 											$event_end 		= date ($timeFormat, strtotime ("$event_end"));
+											$calendar_name2	= addslashes($calendar_name);
+											$calendar_name2 = urlencode($calendar_name2);
 											if (strlen($event_text) > 12) {
 												$event_text = substr("$event_text", 0, 10);
 												$event_text = $event_text . "...";
@@ -145,9 +147,9 @@
 											echo "<tr>\n";
 											echo "<td>\n";
 											if (!$event_start == $val["event_start"]) {
-												echo "<center><a class=\"psf\" href=\"javascript:openEventInfo('$event_text2', '$calendar_name', '$event_start', '$event_end', '$description')\"><i>$event_text</i></a></center>\n";
+												echo "<center><a class=\"psf\" href=\"javascript:openEventInfo('$event_text2', '$calendar_name2', '$event_start', '$event_end', '$description')\"><i>$event_text</i></a></center>\n";
 											} else {	
-												echo "<a class=\"psf\" href=\"javascript:openEventInfo('$event_text2', '$calendar_name', '$event_start', '$event_end', '$description')\"><font class=\"G10B\">&#149; $event_text</a>\n";
+												echo "<a class=\"psf\" href=\"javascript:openEventInfo('$event_text2', '$calendar_name2', '$event_start', '$event_end', '$description')\"><font class=\"G10B\">&#149; $event_text</a>\n";
 											}
 											echo "</td>\n";
 											echo "</tr>\n";