From 05d312eb4148ea05727c6f1aac8583e46dc56781 Mon Sep 17 00:00:00 2001 From: Chad Little Date: Sat, 15 May 2004 02:42:13 +0000 Subject: Moving files to valid XHTML. --- README | 2 +- functions/ical_parser.php | 12 ++++++------ functions/list_functions.php | 2 +- functions/template.php | 22 ++++++++++++---------- includes/login.php | 2 +- rss/index.php | 8 ++++---- search.php | 6 +++--- templates/default/admin.tpl | 2 +- templates/default/calendar_nav.tpl | 18 +++++++++--------- templates/default/error.tpl | 14 +++++++------- templates/default/event.tpl | 8 ++++---- templates/default/footer.tpl | 4 ++-- templates/default/header.tpl | 30 +++++++++++++++--------------- templates/default/month.tpl | 12 ++++++------ templates/default/month_small.tpl | 2 +- templates/default/rss_index.tpl | 2 +- templates/default/search.tpl | 8 ++++---- templates/default/sidebar.tpl | 32 ++++++++++++++++---------------- templates/default/todo.tpl | 8 ++++---- templates/default/year.tpl | 2 +- 20 files changed, 99 insertions(+), 97 deletions(-) diff --git a/README b/README index aada6d8..5f71129 100644 --- a/README +++ b/README @@ -135,7 +135,7 @@ Changes: 0.9.3 -Multiple calendar support (up to 8). - -Fixed pesky
tags in event popup. + -Fixed pesky
tags in event popup. -Added Esperanto language. -Major bug fixes. -Last to support Netscape 4.x diff --git a/functions/ical_parser.php b/functions/ical_parser.php index b96fc46..519b6f8 100644 --- a/functions/ical_parser.php +++ b/functions/ical_parser.php @@ -934,8 +934,8 @@ foreach ($cal_filelist as $filename) { break; case 'SUMMARY': - $data = str_replace("\\n", "
", $data); - $data = str_replace("\\r", "
", $data); + $data = str_replace("\\n", "
", $data); + $data = str_replace("\\r", "
", $data); $data = htmlentities(urlencode($data)); if ($valarm_set == FALSE) { $summary = $data; @@ -945,8 +945,8 @@ foreach ($cal_filelist as $filename) { break; case 'DESCRIPTION': - $data = str_replace("\\n", "
", $data); - $data = str_replace("\\r", "
", $data); + $data = str_replace("\\n", "
", $data); + $data = str_replace("\\r", "
", $data); $data = htmlentities(urlencode($data)); if ($valarm_set == FALSE) { $description = $data; @@ -1041,8 +1041,8 @@ foreach ($cal_filelist as $filename) { $organizer[] = array ('name' => $field, 'email' => $data); break; case 'LOCATION': - $data = str_replace("\\n", "
", $data); - $data = str_replace("\\r", "
", $data); + $data = str_replace("\\n", "
", $data); + $data = str_replace("\\r", "
", $data); $location = $data; break; case 'URL': diff --git a/functions/list_functions.php b/functions/list_functions.php index 170daa5..b2dcf04 100644 --- a/functions/list_functions.php +++ b/functions/list_functions.php @@ -14,7 +14,7 @@ function list_jumps() { function list_calcolors() { global $template, $master_array; foreach ($master_array[-3] as $key => $val) { - $return .= ' '.$val.'
'; + $return .= ' '.$val.'
'; } return $return; diff --git a/functions/template.php b/functions/template.php index f0e2352..e5c631b 100644 --- a/functions/template.php +++ b/functions/template.php @@ -246,7 +246,7 @@ class Page { if ($event_calno < 1) $event_calno = 1; if ($event_calno > 7) $event_calno = 7; if ($event_status != '') { - $confirmed = ' '; + $confirmed = ' '; } $weekdisplay .= ''."\n"; @@ -261,9 +261,10 @@ class Page { $event = openevent($event_calna, $event_start, $event_end, $this_time_arr[($event_length[$thisday][$i]["key"])], $week_events_lines, 25, '', '', 'ps', $event_url); $event_temp = str_replace('{EVENT}', $event, $event_temp); $event_temp = str_replace('{EVENT_START}', $event_start, $event_temp); -\ $event_temp = str_replace('{CONFIRMED}', $confirmed, $event_temp); + $event_temp = str_replace('{CONFIRMED}', $confirmed, $event_temp); $event_temp = str_replace('{EVENT_CALNO}', $event_calno, $event_temp); $weekdisplay .= $event_temp; + $weekdisplay .= ''; // End event drawing break; @@ -462,9 +463,9 @@ class Page { if ($event_calno < 1) $event_calno = 1; if ($event_calno > 7) $event_calno = 7; if ($event_status != '') { - $confirmed = ' '; + $confirmed = ' '; } elseif (is_array($event_recur)) { - $confirmed = ' '; + $confirmed = ' '; } $colspan_width = round((460 / $nbrGridCols) * $drawWidth); $daydisplay .= ''."\n"; @@ -480,6 +481,7 @@ class Page { $event_temp = str_replace('{CONFIRMED}', $confirmed, $event_temp); $event_temp = str_replace('{EVENT_CALNO}', $event_calno, $event_temp); $daydisplay .= $event_temp; + $daydisplay .= ''; // End event drawing break; @@ -594,7 +596,7 @@ class Page { '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_text = word_wrap(strip_tags(str_replace('
',' ',$vtodo_text), ''), 21, $tomorrows_events_lines); $data = array ('{VTODO_TEXT}', '{VTODO_ARRAY}'); $rep = array ($vtodo_text, $vtodo_array); @@ -707,11 +709,11 @@ class Page { $event_url = $val['url']; if (!isset($val['event_start'])) { if ($type == 'large') { - $switch['ALLDAY'] .= '
'; + $switch['ALLDAY'] .= '
'; $switch['ALLDAY'] .= openevent($event_calna, '', '', $val, $month_event_lines, 15, '', '', 'psf', $event_url); $switch['ALLDAY'] .= '
'; } else { - $switch['ALLDAY'] .= ' '; + $switch['ALLDAY'] .= ' '; } } else { $event_start = $val['start_unixtime']; @@ -720,11 +722,11 @@ class Page { $start2 = date($timeFormat_small, $val['start_unixtime']); $event_end = date($timeFormat, @strtotime ($event_end)); if ($type == 'large') { - $switch['EVENT'] .= '
'; - $switch['EVENT'] .= openevent($event_calna, $event_start, $event_end, $val, $month_event_lines, 10, "$start2 ", '', 'ps3', $event_url).'
'; + $switch['EVENT'] .= '
'; + $switch['EVENT'] .= openevent($event_calna, $event_start, $event_end, $val, $month_event_lines, 10, "$start2 ", '', 'ps3', $event_url).'
'; $switch['EVENT'] .= '
'; } else { - $switch['EVENT'] = ' '; + $switch['EVENT'] = ' '; } } } diff --git a/includes/login.php b/includes/login.php index c331aa3..38bbd5b 100644 --- a/includes/login.php +++ b/includes/login.php @@ -49,7 +49,7 @@ echo << -
+
END; diff --git a/rss/index.php b/rss/index.php index 4724909..99674be 100644 --- a/rss/index.php +++ b/rss/index.php @@ -17,10 +17,10 @@ foreach ($filelist as $file) { $cal_filename_tmp = substr($file,0,-4); $cal_tmp = urlencode($cal_filename_tmp); $cal_displayname_tmp = str_replace("32", " ", $cal_filename_tmp); - $rss_list = ''.$cal_displayname_tmp.' '. $calendar_lang.'
'; - $rss_list .= $default_path.'/rss/rss.php?cal='.$cal_tmp.'&rssview=day
'; - $rss_list .= $default_path.'/rss/rss.php?cal='.$cal_tmp.'&rssview=week
'; - $rss_list .= $default_path.'/rss/rss.php?cal='.$cal_tmp.'&rssview=month
'; + $rss_list = ''.$cal_displayname_tmp.' '. $calendar_lang.'
'; + $rss_list .= $default_path.'/rss/rss.php?cal='.$cal_tmp.'&rssview=day
'; + $rss_list .= $default_path.'/rss/rss.php?cal='.$cal_tmp.'&rssview=week
'; + $rss_list .= $default_path.'/rss/rss.php?cal='.$cal_tmp.'&rssview=month
'; $footer_check = $default_path.'/rss/rss.php?cal='.$default_cal.'&rssview='.$default_view; } diff --git a/search.php b/search.php index 69dbf58..4512f04 100644 --- a/search.php +++ b/search.php @@ -231,7 +231,7 @@ function format_recur($arr) { if ($key == $last) $list .= $monthsofyear_lang[($month-1)]; else $list .= $monthsofyear_lang[($month-1)].$d; } - $print .= '
'."\n"; + $print .= '
'."\n"; $print .= str_replace('%list%', $list, $format_recur_lang['bymonth']); } @@ -246,7 +246,7 @@ function format_recur($arr) { if ($key == $last) $list .= $day; else $list .= $day.$d; } - $print .= '
'."\n"; + $print .= '
'."\n"; $print .= str_replace('%list%', $list, $format_recur_lang['bymonthday']); } @@ -262,7 +262,7 @@ function format_recur($arr) { if ($key == $last) $list .= $daysofweek_lang[$num]; else $list .= $daysofweek_lang[$num].$d; } - $print .= '
'."\n"; + $print .= '
'."\n"; $print .= str_replace('%list%', $list, $format_recur_lang['byday']); } diff --git a/templates/default/admin.tpl b/templates/default/admin.tpl index acf3169..06106e0 100644 --- a/templates/default/admin.tpl +++ b/templates/default/admin.tpl @@ -69,7 +69,7 @@ - {L_CAL_FILE} {FILENUMBER}: {ACTION_MSG}
+ {L_CAL_FILE} {FILENUMBER}: {ACTION_MSG}
{L_ADDUPDATE_CAL}

{L_ADDUPDATE_DESC}

diff --git a/templates/default/calendar_nav.tpl b/templates/default/calendar_nav.tpl index 8de9641..85b9bfa 100644 --- a/templates/default/calendar_nav.tpl +++ b/templates/default/calendar_nav.tpl @@ -22,11 +22,11 @@
-
-
-
-
-
+
+
+
+
+
{SEARCH_BOX} @@ -61,14 +61,14 @@
- {L_LEGEND}:
+ {L_LEGEND}:
{LEGEND} - {L_GOPRINT}
+ {L_GOPRINT}
- {L_PREFERENCES}
+ {L_PREFERENCES}
- {L_SUBSCRIBE} | {L_DOWNLOAD}
+ {L_SUBSCRIBE} | {L_DOWNLOAD}
Logout {USERNAME} diff --git a/templates/default/error.tpl b/templates/default/error.tpl index 7cd193a..b4eaa9c 100644 --- a/templates/default/error.tpl +++ b/templates/default/error.tpl @@ -20,16 +20,16 @@
-
+
{ERROR_MSG} -
-
+
+
{ERROR_CALENDAR} -
-
+
+
{L_ERROR_BACK} -
-
+
+
diff --git a/templates/default/event.tpl b/templates/default/event.tpl index 7b16003..5f6431f 100644 --- a/templates/default/event.tpl +++ b/templates/default/event.tpl @@ -21,16 +21,16 @@

- {L_ORGANIZER}: {ORGANIZER}
+ {L_ORGANIZER}: {ORGANIZER}
- {L_ATTENDEE}: {ATTENDEE}
+ {L_ATTENDEE}: {ATTENDEE}
- {L_STATUS}: {STATUS}
+ {L_STATUS}: {STATUS}
- {L_LOCATION}: {LOCATION}
+ {L_LOCATION}: {LOCATION}

diff --git a/templates/default/footer.tpl b/templates/default/footer.tpl index 87e6e28..da62efc 100644 --- a/templates/default/footer.tpl +++ b/templates/default/footer.tpl @@ -1,4 +1,4 @@ -

{L_POWERED_BY} PHP iCalendar 2.0
+

{L_POWERED_BY} PHP iCalendar 2.0

@@ -6,7 +6,7 @@

-{L_THIS_SITE_IS} RSS-Enabled
+{L_THIS_SITE_IS} RSS-Enabled
Page generated in {GENERATED} seconds.
diff --git a/templates/default/header.tpl b/templates/default/header.tpl index fefa494..891760f 100644 --- a/templates/default/header.tpl +++ b/templates/default/header.tpl @@ -1,10 +1,10 @@ - - + + - + {CALENDAR_NAME} - {DISPLAY_DATE} - + @@ -13,14 +13,14 @@ \ No newline at end of file diff --git a/templates/default/month.tpl b/templates/default/month.tpl index 6fd628a..5d457d6 100644 --- a/templates/default/month.tpl +++ b/templates/default/month.tpl @@ -31,10 +31,10 @@ -
+
{CALENDAR_NAV} -
+
diff --git a/templates/default/month_small.tpl b/templates/default/month_small.tpl index 27606f7..d1cb890 100644 --- a/templates/default/month_small.tpl +++ b/templates/default/month_small.tpl @@ -32,7 +32,7 @@
@@ -53,22 +53,22 @@
- {START_DATE}
+ {START_DATE}
{START_TIME} 		- {EVENT_TEXT}
{CALNAME} + {EVENT_TEXT}
{CALNAME}
- {START_DATE}
+ {START_DATE}
{START_TIME} 		- {EVENT_TEXT}
{CALNAME} + {EVENT_TEXT}
{CALNAME}
-
+
\ No newline at end of file diff --git a/templates/default/rss_index.tpl b/templates/default/rss_index.tpl index 25df995..23bceb6 100644 --- a/templates/default/rss_index.tpl +++ b/templates/default/rss_index.tpl @@ -35,7 +35,7 @@
- {L_THIS_SITE_IS} RSS 0.91 enabled.
+ {L_THIS_SITE_IS} RSS 0.91 enabled.

{RSS_LIST}
diff --git a/templates/default/search.tpl b/templates/default/search.tpl index 40f39ce..b6204fe 100644 --- a/templates/default/search.tpl +++ b/templates/default/search.tpl @@ -30,7 +30,7 @@

{L_QUERY}: {FORMATTED_SEARCH}

- {DAYOFMONTH}
+ {DAYOFMONTH}
@@ -56,7 +56,7 @@
- {L_EXCEPTION}: {DAYOFMONTH}
+ {L_EXCEPTION}: {DAYOFMONTH}
@@ -82,7 +82,7 @@
-
+
@@ -94,7 +94,7 @@
{SEARCH_BOX}
-
+
diff --git a/templates/default/sidebar.tpl b/templates/default/sidebar.tpl index 7df2dff..961a7e0 100644 --- a/templates/default/sidebar.tpl +++ b/templates/default/sidebar.tpl @@ -35,21 +35,21 @@ - + - +
{L_PREV}{L_PREV} {SIDEBAR_DATE}{L_NEXT}{L_NEXT}
- {L_LEGEND}:
+ {L_LEGEND}:
{LEGEND} - {L_GOPRINT}
+ {L_GOPRINT}
- {L_PREFERENCES}
+ {L_PREFERENCES}
- {L_SUBSCRIBE} | {L_DOWNLOAD}
+ {L_SUBSCRIBE} | {L_DOWNLOAD}
{L_LOGOUT} {USERNAME} @@ -75,11 +75,11 @@
-
-
-
-
-
+
+
+
+
+
{SEARCH_BOX} @@ -146,21 +146,21 @@ - + - + - + @@ -190,7 +190,7 @@
{VTODO_TEXT}
{VTODO_TEXT}
{VTODO_TEXT}
-
+
{MONTH_SMALL|+0} @@ -200,7 +200,7 @@
-
+
{MONTH_SMALL|+1} diff --git a/templates/default/todo.tpl b/templates/default/todo.tpl index 5527a1e..297fcdb 100644 --- a/templates/default/todo.tpl +++ b/templates/default/todo.tpl @@ -21,16 +21,16 @@

- {L_STATUS}: {STATUS}
+ {L_STATUS}: {STATUS}
- {L_PRIORITY}: {PRIORITY}
+ {L_PRIORITY}: {PRIORITY}
- {L_CREATED}: {START_DATE}
+ {L_CREATED}: {START_DATE}
- {L_DUE}: {DUE_DATE}
+ {L_DUE}: {DUE_DATE}

diff --git a/templates/default/year.tpl b/templates/default/year.tpl index 7b564f0..2534826 100644 --- a/templates/default/year.tpl +++ b/templates/default/year.tpl @@ -38,7 +38,7 @@
-
+
-- cgit v1.2.3