<?php echo "$calendar

From 9c0fa2361097c68f21a8bb4665a535fb2dbe95c1 Mon Sep 17 00:00:00 2001 From: jwangen Date: Wed, 2 Oct 2002 09:12:50 +0000 Subject: 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. --- day.php | 8 +++++--- event.php | 13 ++++++++++--- functions/event.js | 10 +++++----- month.php | 10 ++++++---- sidebar.php | 11 +++++++---- week.php | 5 +++-- 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("\"", """, $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("\"", """, $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 "\n"; echo "\n"; echo "\n"; @@ -191,7 +193,7 @@ if ($master_array[($getdate)]) { echo "\n"; echo "\n"; diff --git a/event.php b/event.php index 14be937..b0bd2de 100644 --- a/event.php +++ b/event.php @@ -1,25 +1,32 @@ - <?php echo "$calendar_name"; ?> + <?php echo "$calendar_name2"; ?>">

\n"; echo "\n"; - echo "\n"; + echo "\n"; echo "\n"; echo "

$event_text

\n"; echo "

- + 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, ''); if ($event_text != "") { $event_text2 = addslashes($val["event_text"]); - $event_text2 = str_replace("\"", """, $event_text2); + $event_text2 = urlencode($event_text2); $description = addslashes($val["description"]); - $description = str_replace("\"", """, $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 "\n"; echo "\n"; echo "\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, ''); if ($event_text != "") { $event_text2 = addslashes($val["event_text"]); - $event_text2 = str_replace("\"", """, $event_text2); + $event_text2 = urlencode($event_text2); + $description = $val["description"]; $description = addslashes($val["description"]); - $description = str_replace("\"", """, $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 ""; echo "\n"; echo "\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("\"", """, $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("\"", """, $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 "

\n"; if (!$event_start == $val["event_start"]) { - echo "$event_text\n"; + echo "$event_text\n"; } else { - echo "• $event_text\n"; + echo "• $event_text\n"; } echo "

\n"; echo "\n"; echo "\n"; -- cgit v1.2.3