From f5f3fe507385fa6616c90aef92eb95857ff6c7a0 Mon Sep 17 00:00:00 2001 From: Chad Little Date: Sun, 21 Sep 2003 05:59:31 +0000 Subject: Fixed extra forms on sidebar. Fixed missing s. --- includes/calendar_nav.php | 4 +- includes/sidebar.php | 725 +++++++++++++++++++++++----------------------- 2 files changed, 364 insertions(+), 365 deletions(-) (limited to 'includes') diff --git a/includes/calendar_nav.php b/includes/calendar_nav.php index f51cf2d..b299c6d 100644 --- a/includes/calendar_nav.php +++ b/includes/calendar_nav.php @@ -50,6 +50,7 @@ echo ''.$day.''; $start_day = strtotime("+1 day", $start_day); } + echo ''; $minical_time = strtotime("-1 month", $fake_getdate_time); $minical_month = date("m", $minical_time); $minical_year = date("Y", $minical_time); @@ -103,7 +104,7 @@ echo ''.$jump_lang.'
'; echo '
'; - echo "
"; include('./functions/list_icals.php'); include('./functions/list_years.php'); include('./functions/list_months.php'); @@ -171,6 +172,7 @@ echo ''.$day.''; $start_day = strtotime("+1 day", $start_day); } + echo ''; $minical_time = strtotime("+1 month", $fake_getdate_time); $minical_month = date("m", $minical_time); $minical_year = date("Y", $minical_time); diff --git a/includes/sidebar.php b/includes/sidebar.php index 1a954ba..cba4e46 100644 --- a/includes/sidebar.php +++ b/includes/sidebar.php @@ -1,383 +1,380 @@ - 24) { - $cal_displayname2 = substr("$cal_displayname2", 0, 21); - $cal_displayname2 = $cal_displayname2 . "..."; - } - - $search_box = '
'; + 24) { + $cal_displayname2 = substr("$cal_displayname2", 0, 21); + $cal_displayname2 = $cal_displayname2 . "..."; +} - ?> -
- - - - - - - - - -
\"[$prev_lang]\""; ?>\"[$next_lang]\""; ?>
- '; - echo ''.$cal_displayname2.'
'; - echo ''; - echo "$goday_lang
\n"; - echo "$goweek_lang
\n"; - echo "$gomonth_lang
\n"; - echo "$goyear_lang
\n"; - echo "$goprint_lang
\n"; - if ($allow_preferences != 'no') echo "$preferences_lang
\n"; - if ($cal != $ALL_CALENDARS_COMBINED) echo "$subscribe_lang | $download_lang\n"; - echo ''; - ?> -
-
-
- - - - - - + +
- '; + +?> + + + + + + + + - -
\"[$prev_lang]\""; ?>\"[$next_lang]\""; ?>
+ '; - echo "'; - echo ''; - echo ''; - echo ''; - } - echo ''; - ?> -
- + echo ''.$cal_displayname2.'
'; + echo ''; + echo "$goday_lang
\n"; + echo "$goweek_lang
\n"; + echo "$gomonth_lang
\n"; + echo "$goyear_lang
\n"; + echo "$goprint_lang
\n"; + if ($allow_preferences != 'no') echo "$preferences_lang
\n"; + if ($cal != $ALL_CALENDARS_COMBINED) echo "$subscribe_lang | $download_lang\n"; + echo ''; + ?> +
+
+ + + + + + + +
+ '; + echo '
'; + echo "'; + echo ''; + echo ''; + echo '
'; + } + echo ''; + ?> +
+
- 0) { ?> -
- - - - - - \n"; + echo "\n"; + ?> +
- - - - - - \n"; - echo ""; - echo "
\"\n"; - foreach ($master_array[("$tomorrows_date")] as $event_times) { - foreach ($event_times as $val) { - $event_text = stripslashes(urldecode($val["event_text"])); - $event_text = strip_tags($event_text, ''); - if ($event_text != "") { - $event_text2 = rawurlencode(addslashes($val["event_text"])); - $description = addslashes(urlencode($val["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); - $event_text = word_wrap($event_text, 21, $tomorrows_events_lines); - - if (!isset($val["event_start"])) { - $event_start = $all_day_lang; - $event_end = ''; - openevent($calendar_name2, $event_start, - $event_end, $val, $tomorrows_events_lines, 21, '', '', 'psf'); - echo "
\n"; - } else { - openevent($calendar_name2, $event_start, - $event_end, $val, $tomorrows_events_lines, 21, '• ', '', 'psf'); - echo "
\n"; - } + 0) { ?> + + + + + + - - - - -
+ + + + + + \n"; + echo ""; + echo "\n"; - echo "\n"; - ?> -
\"\n"; + foreach ($master_array[("$tomorrows_date")] as $event_times) { + foreach ($event_times as $val) { + $event_text = stripslashes(urldecode($val["event_text"])); + $event_text = strip_tags($event_text, ''); + if ($event_text != "") { + $event_text2 = rawurlencode(addslashes($val["event_text"])); + $description = addslashes(urlencode($val["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); + $event_text = word_wrap($event_text, 21, $tomorrows_events_lines); + + if (!isset($val["event_start"])) { + $event_start = $all_day_lang; + $event_end = ''; + openevent($calendar_name2, $event_start, + $event_end, $val, $tomorrows_events_lines, 21, '', '', 'psf'); + echo "
\n"; + } else { + openevent($calendar_name2, $event_start, + $event_end, $val, $tomorrows_events_lines, 21, '• ', '', 'psf'); + echo "
\n"; + } - - } + } } - echo "
-
- - -
- - - - - - \n"; - echo "\n"; - } - } elseif (isset($val['priority']) && ($val['priority'] != 0) && ($val['priority'] <= 5)) { - echo "\n"; - echo "\n"; - } else { - echo "\n"; + +
- - - - - - \n"; - echo ""; - echo " + + + + +
\"\n"; - echo "\n"; - foreach ($master_array['-2'] as $vtodo_times) { - foreach ($vtodo_times as $val) { - $vtodo_text = stripslashes(urldecode($val["vtodo_text"])); - if ($vtodo_text != "") { - if (isset($val["description"])) { - $description = urldecode($val["description"]); - } else { - $description = ""; - } - $completed_date = $val['completed_date']; - $status = $val["status"]; - $priority = $val['priority']; - $start_date = $val["start_date"]; - $due_date = $val['due_date']; - $vtodo_array = array( - 'cal' => $calendar_name, - 'completed_date'=> $completed_date, - 'description' => $description, - 'due_date' => $due_date, - 'priority' => $priority, - 'start_date' => $start_date, - 'status' => $status, - 'vtodo_text' => $vtodo_text); + } + echo "\n"; + echo "\n"; + ?> +
+
+
- $vtodo_array = base64_encode(serialize($vtodo_array)); - - $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_link\"$vtodo_link $vtodo_text
$vtodo_link\"$vtodo_link $vtodo_text
$vtodo_link\"
+ + + + + - - - - -
+ + + + + + \n"; + echo ""; + echo "\n"; - echo "\n"; - ?> -
\"\n"; + echo "\n"; + foreach ($master_array['-2'] as $vtodo_times) { + foreach ($vtodo_times as $val) { + $vtodo_text = stripslashes(urldecode($val["vtodo_text"])); + if ($vtodo_text != "") { + if (isset($val["description"])) { + $description = urldecode($val["description"]); + } else { + $description = ""; + } + $completed_date = $val['completed_date']; + $status = $val["status"]; + $priority = $val['priority']; + $start_date = $val["start_date"]; + $due_date = $val['due_date']; + $vtodo_array = array( + 'cal' => $calendar_name, + 'completed_date'=> $completed_date, + 'description' => $description, + 'due_date' => $due_date, + 'priority' => $priority, + 'start_date' => $start_date, + 'status' => $status, + 'vtodo_text' => $vtodo_text); + + $vtodo_array = base64_encode(serialize($vtodo_array)); + + $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 "\n"; echo "\n"; } + } elseif (isset($val['priority']) && ($val['priority'] != 0) && ($val['priority'] <= 5)) { + echo "\n"; + echo "\n"; + } else { + 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 "
-
-
+ } + echo "
\n"; + echo "
+ + + + + + +
-
- - - - - - '; + $i = 0; + $checkagain = date ("m", $start_day); + if ($checkagain != $minical_month) $whole_month = FALSE; + } + } while ($whole_month == TRUE); + ?> +
- - '; - for ($i=0; $i<7; $i++) { - $day_num = date("w", $start_day); - $day = $daysofweekreallyshort_lang[$day_num]; - echo ''; - $start_day = strtotime("+1 day", $start_day); +
'.$day.'
+ + + + + - -
+ + '; + for ($i=0; $i<7; $i++) { + $day_num = date("w", $start_day); + $day = $daysofweekreallyshort_lang[$day_num]; + echo ''; + $start_day = strtotime("+1 day", $start_day); + } + echo ''; + $minical_time = strtotime("-1 month", $fake_getdate_time); + $minical_month = date("m", $minical_time); + $minical_year = date("Y", $minical_time); + $first_of_month = $minical_year.$minical_month."01"; + $start_day = strtotime(dateOfWeek($first_of_month, $week_start_day)); + $i = 0; + $whole_month = TRUE; + $num_of_events = 0; + do { + $day = date ("j", $start_day); + $daylink = date ("Ymd", $start_day); + $check_month = date ("m", $start_day); + if ($check_month != $minical_month) $day = ''.$day.''; + if ($i == 0) echo "\n"; + if (isset($master_array[("$daylink")]) && ($check_month == $minical_month)) { + echo ''; + } else { + echo ''; } - $minical_time = strtotime("-1 month", $fake_getdate_time); - $minical_month = date("m", $minical_time); - $minical_year = date("Y", $minical_time); - $first_of_month = $minical_year.$minical_month."01"; - $start_day = strtotime(dateOfWeek($first_of_month, $week_start_day)); - $i = 0; - $whole_month = TRUE; - $num_of_events = 0; - do { - $day = date ("j", $start_day); - $daylink = date ("Ymd", $start_day); - $check_month = date ("m", $start_day); - if ($check_month != $minical_month) $day = ''.$day.''; - if ($i == 0) echo "\n"; - if (isset($master_array[("$daylink")]) && ($check_month == $minical_month)) { - echo ''; - } else { - echo ''; - } - $start_day = strtotime("+1 day", $start_day); - $i++; - if ($i == 7) { - echo ''; - $i = 0; - $checkagain = date ("m", $start_day); - if ($checkagain != $minical_month) $whole_month = FALSE; - } - } while ($whole_month == TRUE); - ?> -
'.$day.'
'; + echo ''.$day.''; + echo ''; + echo ''.$day.''; + echo '
'; - echo ''.$day.''; - echo ''; - echo ''.$day.''; - echo '
-
-
- -
- - - - - - - -
- - '; - for ($i=0; $i<7; $i++) { - $day_num = date("w", $start_day); - $day = $daysofweekreallyshort_lang[$day_num]; - echo ''; - $start_day = strtotime("+1 day", $start_day); + $start_day = strtotime("+1 day", $start_day); + $i++; + if ($i == 7) { + echo ''; + $i = 0; + $checkagain = date ("m", $start_day); + if ($checkagain != $minical_month) $whole_month = FALSE; } - $minical_time = $fake_getdate_time; - $minical_month = date("m", $minical_time); - $minical_year = date("Y", $minical_time); - $first_of_month = $minical_year.$minical_month."01"; - $start_day = strtotime(dateOfWeek($first_of_month, $week_start_day)); - $i = 0; - $whole_month = TRUE; - $num_of_events = 0; - do { - $day = date ("j", $start_day); - $daylink = date ("Ymd", $start_day); - $check_month = date ("m", $start_day); - if ($check_month != $minical_month) $day = ''.$day.''; - if ($i == 0) echo "\n"; - if (isset($master_array[("$daylink")]) && ($check_month == $minical_month)) { - echo ''; - } else { - echo ''; - } - $start_day = strtotime("+1 day", $start_day); - $i++; - if ($i == 7) { - echo ''; - $i = 0; - $checkagain = date ("m", $start_day); - if ($checkagain != $minical_month) $whole_month = FALSE; - } - } while ($whole_month == TRUE); - ?> -
'.$day.'
'; - echo ''.$day.''; - echo ''; - echo ''.$day.''; - echo '
-
-
-
- - - - - - - + +
- - '; - for ($i=0; $i<7; $i++) { - $day_num = date("w", $start_day); - $day = $daysofweekreallyshort_lang[$day_num]; - echo ''; - $start_day = strtotime("+1 day", $start_day); + } while ($whole_month == TRUE); + ?> +
'.$day.'
+
+
+
+ + + + + + - -
+ + '; + for ($i=0; $i<7; $i++) { + $day_num = date("w", $start_day); + $day = $daysofweekreallyshort_lang[$day_num]; + echo ''; + $start_day = strtotime("+1 day", $start_day); + } + echo ''; + $minical_time = $fake_getdate_time; + $minical_month = date("m", $minical_time); + $minical_year = date("Y", $minical_time); + $first_of_month = $minical_year.$minical_month."01"; + $start_day = strtotime(dateOfWeek($first_of_month, $week_start_day)); + $i = 0; + $whole_month = TRUE; + $num_of_events = 0; + do { + $day = date ("j", $start_day); + $daylink = date ("Ymd", $start_day); + $check_month = date ("m", $start_day); + if ($check_month != $minical_month) $day = ''.$day.''; + if ($i == 0) echo "\n"; + if (isset($master_array[("$daylink")]) && ($check_month == $minical_month)) { + echo ''; + } else { + echo ''; } - $minical_time = strtotime("+1 month", $fake_getdate_time); - $minical_month = date("m", $minical_time); - $minical_year = date("Y", $minical_time); - $first_of_month = $minical_year.$minical_month."01"; - $start_day = strtotime(dateOfWeek($first_of_month, $week_start_day)); - $i = 0; - $whole_month = TRUE; - $num_of_events = 0; - do { - $day = date ("j", $start_day); - $daylink = date ("Ymd", $start_day); - $check_month = date ("m", $start_day); - if ($check_month != $minical_month) $day = ''.$day.''; - if ($i == 0) echo "\n"; - if (isset($master_array[("$daylink")]) && ($check_month == $minical_month)) { - echo ''; - } else { - echo ''; - } - $start_day = strtotime("+1 day", $start_day); - $i++; - if ($i == 7) { - echo ''; - $i = 0; - $checkagain = date ("m", $start_day); - if ($checkagain != $minical_month) $whole_month = FALSE; - } - } while ($whole_month == TRUE); - ?> -
'.$day.'
'; + echo ''.$day.''; + echo ''; + echo ''.$day.''; + echo '
'; - echo ''.$day.''; - echo ''; - echo ''.$day.''; - echo '
-
-
+ $start_day = strtotime("+1 day", $start_day); + $i++; + if ($i == 7) { + echo '
+
+ + + +
+ + + + + + + +
+ + '; + for ($i=0; $i<7; $i++) { + $day_num = date("w", $start_day); + $day = $daysofweekreallyshort_lang[$day_num]; + echo ''; + $start_day = strtotime("+1 day", $start_day); + } + echo ''; + $minical_time = strtotime("+1 month", $fake_getdate_time); + $minical_month = date("m", $minical_time); + $minical_year = date("Y", $minical_time); + $first_of_month = $minical_year.$minical_month."01"; + $start_day = strtotime(dateOfWeek($first_of_month, $week_start_day)); + $i = 0; + $whole_month = TRUE; + $num_of_events = 0; + do { + $day = date ("j", $start_day); + $daylink = date ("Ymd", $start_day); + $check_month = date ("m", $start_day); + if ($check_month != $minical_month) $day = ''.$day.''; + if ($i == 0) echo "\n"; + if (isset($master_array[("$daylink")]) && ($check_month == $minical_month)) { + echo ''; + } else { + echo ''; + } + $start_day = strtotime("+1 day", $start_day); + $i++; + if ($i == 7) { + echo ''; + $i = 0; + $checkagain = date ("m", $start_day); + if ($checkagain != $minical_month) $whole_month = FALSE; + } + } while ($whole_month == TRUE); + ?> +
'.$day.'
'; + echo ''.$day.''; + echo ''; + echo ''.$day.''; + echo '
+
+
-- cgit v1.2.3