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.
author: jwangen <jwangen> 2002-10-02 09:12:50 +0000
committer: jwangen <jwangen> 2002-10-02 09:12:50 +0000
commit: 9c0fa2361097c68f21a8bb4665a535fb2dbe95c1 (patch)
tree: ddce1e46ba55c5f76154798e2f821d5f46002eb7
parent: aa8a68042db789233107cd27f1f5b2da29834ecb (diff)
download: phpicalendar-9c0fa2361097c68f21a8bb4665a535fb2dbe95c1.tar.gz
phpicalendar-9c0fa2361097c68f21a8bb4665a535fb2dbe95c1.tar.bz2
phpicalendar-9c0fa2361097c68f21a8bb4665a535fb2dbe95c1.zip
6 files changed, 36 insertions, 21 deletions
diff --git a/day.php b/day.php
index e312bc2..db477eb 100644
--- a/day.php
+++ b/day.php
@@ -174,15 +174,17 @@ if ($master_array[($getdate)]) {
 													$event_length[$i]["state"] = "started";
 													$event_text 	= $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 	= str_replace("\"", "&quot;", $event_text2);
+													$event_text2 	= urlencode($event_text2);
 													$event_start 	= $master_array[($getdate)]["$cal_time"][($event_length[$i]["key"])]["event_start"];
 													$event_end		= $master_array[($getdate)]["$cal_time"][($event_length[$i]["key"])]["event_end"];
 													$description 	= addslashes($master_array[($getdate)]["$cal_time"][($event_length[$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[$i]["length"] . "\" colspan=\"" . $drawWidth . "\" align=\"left\" valign=\"top\" class=\"eventbg2\">\n";
 													echo "<table width=\"100%\" border=\"0\" cellspacing=\"0\" cellpadding=\"2\">\n";
 													echo "<tr>\n";
@@ -191,7 +193,7 @@ if ($master_array[($getdate)]) {
 													echo "<tr>\n";
 													echo "<td>\n";
 													echo "<table width=\"100%\" border=\"0\" cellpadding=\"1\" cellspacing=\"0\">\n";
-													echo "<td class=\"eventbg\"><a class=\"psf\" href=\"javascript:openEventInfo('$event_text2', '$calendar_name', '$event_start', '$event_end', '$description')\"><font class=\"eventfont\">$event_text</font></a></td>\n";
+													echo "<td class=\"eventbg\"><a class=\"psf\" href=\"javascript:openEventInfo('$event_text2', '$calendar_name2', '$event_start', '$event_end', '$description')\"><font class=\"eventfont\">$event_text</font></a></td>\n";
 													echo "</tr>\n";
 													echo "</table>\n";
 													echo "</td>\n";           
diff --git a/event.php b/event.php
index 14be937..b0bd2de 100644
--- a/event.php
+++ b/event.php
@@ -1,25 +1,32 @@
 <?php 
 
 include "init.inc.php"; 
+$event = urldecode($event);
 $event = stripslashes($event);
 $event = str_replace("\\", "", $event);
+$event = htmlspecialchars($event);
+$description = urldecode($description);
 $description = stripslashes($description);
 $description = str_replace("\\", "", $description);
-
+$description = htmlspecialchars($description);
+$calendar_name2 = urldecode($calendar_name);
+$calendar_name2 = stripslashes($calendar_name2);
+$calendar_name2 = str_replace("\\", "", $calendar_name2);
+$calendar_name2 = htmlspecialchars($calendar_name2);
 ?>
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
         "http://www.w3.org/TR/1999/REC-html401-19991224/loose.dtd">
 <html>
 <head>
   <meta http-equiv="content-type" content="text/html;charset=UTF-8">
-  <title><?php echo "$calendar_name"; ?></title>
+  <title><?php echo "$calendar_name2"; ?></title>
 	<link rel="stylesheet" type="text/css" href="styles/<?php echo "$style_sheet"; ?>">
 </head>
 <body bgcolor="#eeeeee"><center>
 <table border="0" width="430" cellspacing="0" cellpadding="0" class="calborder">
 	<tr>
 		<td align="left" valign="top" bgcolor="#DDDDDD" width="1%" background="images/side_bg.gif"><img src="images/spacer.gif" width="1" height="20"></td>
-		<td bgcolor="#DDDDDD" align="center" class="G10B" width="98%" background="images/side_bg.gif"><b><?php echo "$calendar_name $calendar_lang"; ?></b></td>
+		<td bgcolor="#DDDDDD" align="center" class="G10B" width="98%" background="images/side_bg.gif"><b><?php echo "$calendar_name2 $calendar_lang"; ?></b></td>
 		<td align="right" valign="top" bgcolor="#DDDDDD" width="1%" background="images/side_bg.gif"></td>
 	</tr>
 	<tr>
diff --git a/functions/event.js b/functions/event.js
index 2b78312..00ee211 100644
--- a/functions/event.js
+++ b/functions/event.js
@@ -5,11 +5,11 @@
 		var windowW = 450;
 		var windowH = 275;
 	
-		var url = "event.php?event="+escape(event)+
-			"&calendar_name="+escape(calendarname)+
-			"&start="+escape(start)+
-			"&end="+escape(end)+
-			"&description="+escape(description);
+		var url = "event.php?event="+event+
+			"&calendar_name="+calendarname+
+			"&start="+start+
+			"&end="+end+
+			"&description="+description;
 				
 		options = "scrollbars=no"+",width="+windowW+",height="+windowH;
 	
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";
diff --git a/sidebar.php b/sidebar.php
index 5be5f33..6433f0b 100644
--- a/sidebar.php
+++ b/sidebar.php
@@ -158,13 +158,16 @@
 										$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 	= $val["description"];
 											$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) > 21) {
 												$event_text = substr("$event_text", 0, 18);
 												$event_text = $event_text . "...";
@@ -173,9 +176,9 @@
 											echo "<td width=\"1%\"><img src=\"images/spacer.gif\" width=\"4\" height=\"1\"></td>";
 											echo "<td colspan=\"6\" class=\"G10B\">\n";
 											if (!$event_start == $val["event_start"]) {
-												echo "<a class=\"psf\" href=\"javascript:openEventInfo('$event_text2', '$calendar_name', '$event_start', '$event_end', '$description')\"><i>$event_text</i></a>\n";
+												echo "<a class=\"psf\" href=\"javascript:openEventInfo('$event_text2', '$calendar_name2', '$event_start', '$event_end', '$description')\"><i>$event_text</i></a>\n";
 											} else {	
-												echo "<a class=\"psf\" href=\"javascript:openEventInfo('$event_text2', '$calendar_name', '$event_start', '$event_end', '$description')\"><font class=\"G10B\">&#149; $event_text</font></a>\n";
+												echo "<a class=\"psf\" href=\"javascript:openEventInfo('$event_text2', '$calendar_name2', '$event_start', '$event_end', '$description')\"><font class=\"G10B\">&#149; $event_text</font></a>\n";
 											}
 											echo "</td>\n";
 											echo "</tr>\n";
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";
author	jwangen <jwangen>	2002-10-02 09:12:50 +0000
committer	jwangen <jwangen>	2002-10-02 09:12:50 +0000
commit	9c0fa2361097c68f21a8bb4665a535fb2dbe95c1 (patch)
tree	ddce1e46ba55c5f76154798e2f821d5f46002eb7
parent	aa8a68042db789233107cd27f1f5b2da29834ecb (diff)
download	phpicalendar-9c0fa2361097c68f21a8bb4665a535fb2dbe95c1.tar.gz phpicalendar-9c0fa2361097c68f21a8bb4665a535fb2dbe95c1.tar.bz2 phpicalendar-9c0fa2361097c68f21a8bb4665a535fb2dbe95c1.zip