aboutsummaryrefslogtreecommitdiffstats
path: root/day.php
diff options
context:
space:
mode:
authorjwangen <jwangen>2002-10-02 09:12:50 +0000
committerjwangen <jwangen>2002-10-02 09:12:50 +0000
commit9c0fa2361097c68f21a8bb4665a535fb2dbe95c1 (patch)
treeddce1e46ba55c5f76154798e2f821d5f46002eb7 /day.php
parentaa8a68042db789233107cd27f1f5b2da29834ecb (diff)
downloadphpicalendar-9c0fa2361097c68f21a8bb4665a535fb2dbe95c1.tar.gz
phpicalendar-9c0fa2361097c68f21a8bb4665a535fb2dbe95c1.tar.bz2
phpicalendar-9c0fa2361097c68f21a8bb4665a535fb2dbe95c1.zip
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.
Diffstat (limited to 'day.php')
-rw-r--r--day.php8
1 files changed, 5 insertions, 3 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";

© 2014-2024 Faster IT GmbH | imprint | privacy policy