From 1abdce2be8b964f28768e663e84359eb321a369c Mon Sep 17 00:00:00 2001 From: Greg Westin Date: Sat, 8 Feb 2003 04:47:57 +0000 Subject: -Changes to functions/todo.js and functions/event.js fix bug 654486. -Other miscellaneous changes to event and todo popups. -Changed a variable name to avoid confusion with other similarly-named var --- includes/event.php | 6 +++--- includes/sidebar.php | 17 +++++++++++------ includes/todo.php | 4 ++-- 3 files changed, 16 insertions(+), 11 deletions(-) (limited to 'includes') diff --git a/includes/event.php b/includes/event.php index d7ac996..3d95c0a 100644 --- a/includes/event.php +++ b/includes/event.php @@ -12,8 +12,8 @@ if (isset($HTTP_GET_VARS['description']) && ($HTTP_GET_VARS['description'] !== ' } else { $description = ''; } -if (isset($HTTP_GET_VARS['calendar_name']) && ($HTTP_GET_VARS['calendar_name'] !== '') ) { - $calendar_name = $HTTP_GET_VARS['calendar_name']; +if (isset($HTTP_GET_VARS['cal']) && ($HTTP_GET_VARS['cal'] !== '') ) { + $calendar_name = $HTTP_GET_VARS['cal']; } else { $calendar_name = ''; } @@ -62,7 +62,7 @@ $calendar_name2 = str_replace('\\', '', $calendar_name2); - +
('.$start.' - '.$end.')'; if ($start == '' && $end == '' && isset($start, $end)) $event_times = ' - ('.$all_day_lang.')'; diff --git a/includes/sidebar.php b/includes/sidebar.php index a2e7cf4..4fa48cc 100644 --- a/includes/sidebar.php +++ b/includes/sidebar.php @@ -213,10 +213,10 @@ if ((isset($master_array['-2'])) && ($show_todos == 'yes')) { ?> echo "\n"; echo ""; echo "\n"; echo "\n"; ?> diff --git a/includes/todo.php b/includes/todo.php index 5bcf20b..3c39515 100644 --- a/includes/todo.php +++ b/includes/todo.php @@ -35,8 +35,8 @@ if ((!isset($status) || $status == "COMPLETED") && isset($completed_date)) { $status = $unfinished_lang; } -if (isset($vtodo_array['calendar_name']) && ($vtodo_array['calendar_name'] !== '') ) { - $calendar_name = $vtodo_array['calendar_name']; +if (isset($vtodo_array['cal']) && ($vtodo_array['cal'] !== '') ) { + $calendar_name = $vtodo_array['cal']; } else { $calendar_name = ''; } -- cgit v1.2.3
\"\n"; + echo "\n"; foreach ($master_array['-2'] as $vtodo_times) { foreach ($vtodo_times as $val) { $vtodo_text = stripslashes(urldecode($val["vtodo_text"])); - $vtodo_text = strip_tags($vtodo_text, ''); if ($vtodo_text != "") { $description = $val["description"]; $completed_date = $val['completed_date']; @@ -225,7 +225,7 @@ if ((isset($master_array['-2'])) && ($show_todos == 'yes')) { ?> $start_date = $val["start_date"]; $due_date = $val['due_date']; $vtodo_array = array( - 'calendar_name' => $calendar_name, + 'cal' => $calendar_name, 'completed_date'=> $completed_date, 'description' => $description, 'due_date' => $due_date, @@ -236,21 +236,26 @@ if ((isset($master_array['-2'])) && ($show_todos == 'yes')) { ?> $vtodo_array = base64_encode(serialize($vtodo_array)); - $vtodo_text = word_wrap($vtodo_text, 21, $tomorrows_events_lines); + $vtodo_text = word_wrap(strip_tags(str_replace('
',' ',$vtodo_text), ''), 21, $tomorrows_events_lines); + $vtodo_link = ""; if ($status == 'COMPLETED' || (isset($val['completed_date']) && isset($val['completed_time']))) { if ($show_completed == 'yes') { $vtodo_text = "$vtodo_text"; - echo "\" $vtodo_text
\n"; + echo "\n"; + echo "\n"; } } elseif (isset($val['priority']) && ($val['priority'] != 0) && ($val['priority'] <= 5)) { - echo "\" $vtodo_text
\n"; + echo "\n"; + echo "\n"; } else { - echo "\" $vtodo_text
\n"; + echo "\n"; + echo "\n"; } } } } + echo "
$vtodo_link\"$vtodo_link $vtodo_text
$vtodo_link\"$vtodo_link $vtodo_text
$vtodo_link\"$vtodo_link $vtodo_text
\n"; echo "