Language adds more text, localization of date and time.

13 files changed, 74 insertions, 235 deletions

diff --git a/day.php b/day.php
index 651471c..270d81c 100644
--- a/day.php
+++ b/day.php
@@ -3,21 +3,12 @@
 $current_view = "day";
 include("./ical_parser.php");
 
-//might not need this, depending on implimentation, doesn't work correctly in current form anyway
-//setcookie("last_view", "day");
-
-// drei 20020921: added formats for localization
-// something that will have to go to the user's preferences
-$timeFormat = "H:i";
-$dateFormat = "%a, %d. %B %Y";
-setlocale (LC_TIME, 'de_CH');
 $starttime = "0700";
 $weekstart = 1;
 $gridLength = 30;
 
 if ($getdate == (date("Ymd"))) {
-//	$display_date = date ("l, F d");
-	$display_date = strftime ($dateFormat);
+	$display_date = strftime ($dateFormat_day);
 	$tomorrows_date = date( "Ymd", (time() + (24 * 3600)));
 	$yesterdays_date = date( "Ymd", (time() - (24 * 3600)));
 } else {
@@ -26,8 +17,7 @@ if ($getdate == (date("Ymd"))) {
 	$this_month = $day_array2[2];
 	$this_year = $day_array2[1];
 	$unix_time = mktime(0,0,0,"$this_month","$this_day","$this_year");
-//	$display_date = date ("l, F d", $unix_time);
-	$display_date = strftime($dateFormat, $unix_time);
+	$display_date = strftime($dateFormat_day, $unix_time);
 	$tomorrow = $unix_time + (24 * 3600);
 	$yesterday = $unix_time - (24 * 3600);
 	$tomorrows_date = date( "Ymd", ($tomorrow));
@@ -182,10 +172,8 @@ if ($getdate == (date("Ymd"))) {
 													$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"];
 													$event_start = strtotime ("$event_start");
-			// drei 20020921							$event_start = date ("g:i a", $event_start);
 													$event_start = date ($timeFormat, $event_start);
 													$event_end = strtotime ("$event_end");
-			// drei 20020921							$event_end = date ("g:i a", $event_end);
 													$event_end = date ($timeFormat, $event_end);
 													echo "<td rowspan=\"" . $event_length[$i]["length"] . "\" colspan=\"" . $drawWidth . "\" align=\"left\" valign=\"top\" class=\"eventbg\">\n";
 													echo "<table width=\"100%\" border=\"0\" cellspacing=\"0\" cellpadding=\"2\">\n";
diff --git a/event.php b/event.php
index dd6fdc8..61f47a3 100644
--- a/event.php
+++ b/event.php
@@ -18,17 +18,17 @@ $event = stripslashes($event);
 		<td>  
    <table width="100%" border="0" cellspacing="0" cellpadding="0" class="calborder">
     <tr height="18">
-     <td align="right" valign="top" width="80" class="V12">&nbsp;<b>Event:</b></td>
+     <td align="right" valign="top" width="80" class="V12">&nbsp;<b><? echo "$event_lang"; ?>:</b></td>
      <td nowrap width="7" height="18"></td>
      <td align="left" valign="top" height="18" class="V12"><? echo "$event"; ?></td>
     </tr>
     <tr height="18">
-     <td align="right" valign="top" width="80" class="V12">&nbsp;<b>Start Time:</b></td>
+     <td align="right" valign="top" width="80" class="V12">&nbsp;<b><? echo "$event_start_lang"; ?>:</b></td>
      <td width="7" height="18"></td>
      <td align="left" valign="top" height="18" class="V12"><? echo "$start"; ?></td>
     </tr>
     <tr height="18">
-     <td align="right" valign="top" width="80" class="V12">&nbsp;<b>End Time:</b></td>
+     <td align="right" valign="top" width="80" class="V12">&nbsp;<b><? echo "$event_end_lang"; ?>:</b></td>
      <td width="7" height="18"></td>
      <td align="left" valign="top" height="18" class="V12"><? echo "$end"; ?></td>
     </tr>
diff --git a/ical_parser.php b/ical_parser.php
index aa3218f..2bd3da3 100644
--- a/ical_parser.php
+++ b/ical_parser.php
@@ -9,158 +9,8 @@
 include("./init.inc.php");
 include("./functions/date_add.php");
 include("./functions/date_functions.php");
+include("./functions/overlapping_events.php");
 
-// function to determine the colspan for overlapping events
-// takes 2 parameters: index of event (in regards of column output) and number of overlapping events
-function eventWidth($ind, $overlaps) {
-	switch ($overlaps) {
-	// case 1 means 1 overlap -> two concurrent events etc.
-		case 0:
-			return 12;
-			break;
-		case 1:
-			return 6;
-			break;
-		case 2:
-			return 4;
-			break;
-		case 3:
-			return 3;
-			break;
-		case 4:
-			switch ($ind) {
-				case 0:
-					return 3;
-					break;
-				case 2:
-					return 3;
-					break;
-				default:
-					return 2;
-			}
-			break;
-		case 5:
-			return 2;
-			break;
-		case 6:
-			switch ($ind) {
-				case 0:
-					return 1;
-					break;
-				case 3:
-					return 1;
-					break;
-				default:
-					return 2;
-			}
-			break;
-		case 7:
-			switch ($ind) {
-				case 0:
-					return 2;
-					break;
-				case 2:
-					return 2;
-					break;
-				case 4:
-					return 2;
-					break;
-				case 6:
-					return 2;
-					break;
-				default:
-					return 1;
-			}
-			break;
-		case 8:
-			switch ($ind) {
-				case 0:
-					return 2;
-					break;
-				case 3:
-					return 2;
-					break;
-				case 6:
-					return 2;
-					break;
-				default:
-					return 1;
-			}
-			break;
-		case 9:
-			switch ($ind) {
-				case 0:
-					return 2;
-					break;
-				case 7:
-					return 2;
-					break;
-				default:
-					return 1;
-			}
-			break;
-		case 10:
-			switch ($ind) {
-				case 5:
-					return 2;
-					break;
-				default:
-					return 1;
-			}
-			break;
-		case 11:
-			return 1;
-			break;
-	}
-} 
-
-// drei 20020921: function for checking and counting overlapping events
-function checkOverlap() {
-	global $master_array, $overlap_array, $start_date, $start_time, $end_time;
-
-		$maxOverlaps = 0;
-		if (sizeof($master_array[($start_date)]) > 0) {
-			foreach ($master_array[($start_date)] as $keyTime => $eventTime) {
-				foreach ($eventTime as $keyEvent => $event) {
-					if (($event["event_start"] < $end_time) and ($event["event_end"] > $start_time)) {
-
-						if ($event["event_start"] < $start_time) $overlap_start = $start_time;
-						else $overlap_start = $event["event_start"];
-						if ($event["event_end"] < $end_time) $overlap_end = $event["event_end"];
-						else $overlap_end = $end_time;
-						
-						if (sizeof($overlap_array[($start_date)][($keyTime)][($keyEvent)]) > 0) {
-							$newOverlapEntry = TRUE;
-							foreach ($overlap_array[($start_date)][($keyTime)][($keyEvent)] as $keyOverlap => $overlapEntry) {
-								if (($overlapEntry["start"] < $overlap_end) and ($overlapEntry["end"] > $overlap_start)) {
-									$overlap_array[($start_date)][($keyTime)][($keyEvent)][($keyOverlap)]["count"]++;
-									if ($overlapEntry["start"] < $overlap_start) {
-										$overlap_array[($start_date)][($keyTime)][($keyEvent)][($keyOverlap)]["start"] = $overlap_start;
-									}
-									if ($overlapEntry["end"] > $overlap_end) {
-										$overlap_array[($start_date)][($keyTime)][($keyEvent)][($keyOverlap)]["end"] = $overlap_end;
-									}
-									$newOverlapEntry = FALSE;
-									break;
-								}
-							}
-							if ($newOverlapEntry) {
-								array_push($overlap_array[($start_date)][($keyTime)][($keyEvent)], array ("count" => 1,"start" => $overlap_start, "end" => $overlap_end));
-							}
-						} else {
-							$overlap_array[($start_date)][($keyTime)][($keyEvent)][] = array ("count" => 1,"start" => $overlap_start, "end" => $overlap_end);
-						}
-						foreach ($overlap_array[($start_date)][($keyTime)][($keyEvent)] as $keyOverlap => $overlapEntry) {
-							if ($overlapEntry["count"] > $maxOverlaps) $maxOverlaps = $overlapEntry["count"];
-						}
-						$master_array[($start_date)][($keyTime)][($keyEvent)]["event_overlap"] = $maxOverlaps;
-					}
-				}
-			}
-		}	
-
-	return $maxOverlaps;
-}
 
 
 $day_array = array ("0700", "0730", "0800", "0830", "0900", "0930", "1000", "1030", "1100", "1130", "1200", "1230", "1300", "1330", "1400", "1430", "1500", "1530", "1600", "1630", "1700", "1730", "1800", "1830", "1900", "1930", "2000", "2030", "2100", "2130", "2200", "2230", "2300", "2330");
diff --git a/languages/danish.inc.php b/languages/danish.inc.php
index b3d300f..69e2bad 100644
--- a/languages/danish.inc.php
+++ b/languages/danish.inc.php
@@ -1 +1 @@
-<?

// Danish language include
// For version 0.4 PHP iCalendar
//
// Translation by Jakob PeterhŠnsel (jakob@hjemme.dk)
//
// Submit new translations to chad@chadsdomain.com



$day_lang			= "Dag";
$week_lang			= "Uge";
$month_lang			= "M&aring;ned";
$year_lang			= "&Aring;r";
$calendar_lang		= "Kalender";
$next_day_lang		= "N&aelig;ste Dag";
$next_month_lang	= "N&aelig;ste M&aring;ned";
$next_week_lang		= "N&aelig;ste Uge";
$next_year_lang		= "N&aelig;ste &Aring;r";
$last_day_lang		= "Forrige Dag";
$last_month_lang	= "Forrige M&aring;ned";
$last_week_lang		= "Forrige Uge";
$last_year_lang		= "Forrige &Aring;r";
$subscribe_lang		= "Abonn&eacute;r";
$download_lang		= "Hent";
$powered_by_lang 	= "Drevet af";
$version_lang		= "0.4";


?>
\ No newline at end of file
+<?

// Danish language include
// For version 0.5 PHP iCalendar
//
// Translation by Jakob PeterhŠnsel (jakob@hjemme.dk)
//
// Submit new translations to chad@chadsdomain.com



$day_lang			= "Dag";
$week_lang			= "Uge";
$month_lang			= "M&aring;ned";
$year_lang			= "&Aring;r";
$calendar_lang		= "Kalender";
$next_day_lang		= "N&aelig;ste Dag";
$next_month_lang	= "N&aelig;ste M&aring;ned";
$next_week_lang		= "N&aelig;ste Uge";
$next_year_lang		= "N&aelig;ste &Aring;r";
$last_day_lang		= "Forrige Dag";
$last_month_lang	= "Forrige M&aring;ned";
$last_week_lang		= "Forrige Uge";
$last_year_lang		= "Forrige &Aring;r";
$subscribe_lang		= "Abonn&eacute;r";
$download_lang		= "Hent";
$powered_by_lang 	= "Drevet af";
$version_lang		= "0.5";
$event_lang			= "Event";
$event_start_lang	= "Start Time";
$event_end_lang		= "End Time";
$this_months_lang	= "This Month's Events";
$date_lang			= "Date";
$summary_lang		= "Summary";

// Set Location for date formatting, check out: http://www.php.net/manual/en/function.setlocale.php
setlocale (LC_TIME, 'en_EN');

// For time formatting, check out: http://www.php.net/manual/en/function.date.php
$timeFormat = "g:i A";

// For date formatting, cehck out: http://www.php.net/manual/en/function.strftime.php
$dateFormat_day = "%A, %B %e";
$dateFormat_week = "%B %e";
$dateFormat_week_list = "%a, %b %e";
$dateFormat_month = "%B %Y";
$dateFormat_month_list = "%A, %B %e";

?>
\ No newline at end of file
diff --git a/languages/dutch.inc.php b/languages/dutch.inc.php
index 05f480f..087c86e 100644
--- a/languages/dutch.inc.php
+++ b/languages/dutch.inc.php
@@ -1 +1 @@
-<?

// Dutch language include
// For version 0.5 PHP iCalendar
//
// Translation by Lieven Gekiere (Lieven@gekiere.com)
//
// Submit new translations to chad@chadsdomain.com



$day_lang			= "Dag";
$week_lang			= "Week";
$month_lang			= "Maand";
$year_lang			= "Jaar";
$calendar_lang		= "Kalender";
$next_day_lang		= "Volgende Dag";
$next_month_lang	= "Volgende Maand";
$next_week_lang		= "Volgende Week";
$next_year_lang		= "Volgend Jaar";
$last_day_lang		= "Vorige Dag";
$last_month_lang	= "Vorige Maand";
$last_week_lang		= "Vorige Week";
$last_year_lang		= "Vorig Jaar";
$subscribe_lang		= "Abonneer";
$download_lang		= "Download";
$powered_by_lang 	= "Gemaakt met";
$version_lang		= "0.5";


?>
\ No newline at end of file
+<?

// Dutch language include
// For version 0.5 PHP iCalendar
//
// Translation by Lieven Gekiere (Lieven@gekiere.com)
//
// Submit new translations to chad@chadsdomain.com



$day_lang			= "Dag";
$week_lang			= "Week";
$month_lang			= "Maand";
$year_lang			= "Jaar";
$calendar_lang		= "Kalender";
$next_day_lang		= "Volgende Dag";
$next_month_lang	= "Volgende Maand";
$next_week_lang		= "Volgende Week";
$next_year_lang		= "Volgend Jaar";
$last_day_lang		= "Vorige Dag";
$last_month_lang	= "Vorige Maand";
$last_week_lang		= "Vorige Week";
$last_year_lang		= "Vorig Jaar";
$subscribe_lang		= "Abonneer";
$download_lang		= "Download";
$powered_by_lang 	= "Gemaakt met";
$version_lang		= "0.5";
$event_lang			= "Event";
$event_start_lang	= "Start Time";
$event_end_lang		= "End Time";
$this_months_lang	= "This Month's Events";
$date_lang			= "Date";
$summary_lang		= "Summary";

// Set Location for date formatting, check out: http://www.php.net/manual/en/function.setlocale.php
setlocale (LC_TIME, 'en_EN');

// For time formatting, check out: http://www.php.net/manual/en/function.date.php
$timeFormat = "g:i A";

// For date formatting, cehck out: http://www.php.net/manual/en/function.strftime.php
$dateFormat_day = "%A, %B %e";
$dateFormat_week = "%B %e";
$dateFormat_week_list = "%a, %b %e";
$dateFormat_month = "%B %Y";
$dateFormat_month_list = "%A, %B %e";


?>
\ No newline at end of file
diff --git a/languages/english.inc.php b/languages/english.inc.php
index f4fd773..4da5f6e 100644
--- a/languages/english.inc.php
+++ b/languages/english.inc.php
@@ -1 +1 @@
-<?

// English language include
// For version 0.4 PHP iCalendar
//
// Translation by Chad Little (chad@chadsdomain.com)
//
// Submit new translations to chad@chadsdomain.com



$day_lang			= "Day";
$week_lang			= "Week";
$month_lang			= "Month";
$year_lang			= "Year";
$calendar_lang		= "Calendar";
$next_day_lang		= "Next Day";
$next_month_lang	= "Next Month";
$next_week_lang		= "Next Week";
$next_year_lang		= "Next Year";
$last_day_lang		= "Previous Day";
$last_month_lang	= "Previous Month";
$last_week_lang		= "Previous Week";
$last_year_lang		= "Previous Year";
$subscribe_lang		= "Subscribe";
$download_lang		= "Download";
$powered_by_lang 	= "Powered by";
$version_lang		= "0.4";


?>
\ No newline at end of file
+<?

// English language include
// For version 0.5 PHP iCalendar
//
// Translation by Chad Little (chad@chadsdomain.com)
//
// Submit new translations to chad@chadsdomain.com



$day_lang			= "Day";
$week_lang			= "Week";
$month_lang			= "Month";
$year_lang			= "Year";
$calendar_lang		= "Calendar";
$next_day_lang		= "Next Day";
$next_month_lang	= "Next Month";
$next_week_lang		= "Next Week";
$next_year_lang		= "Next Year";
$last_day_lang		= "Previous Day";
$last_month_lang	= "Previous Month";
$last_week_lang		= "Previous Week";
$last_year_lang		= "Previous Year";
$subscribe_lang		= "Subscribe";
$download_lang		= "Download";
$powered_by_lang 	= "Powered by";
$version_lang		= "0.5";
$event_lang			= "Event";
$event_start_lang	= "Start Time";
$event_end_lang		= "End Time";
$this_months_lang	= "This Month's Events";
$date_lang			= "Date";
$summary_lang		= "Summary";

// Set Location for date formatting, check out: http://www.php.net/manual/en/function.setlocale.php
setlocale (LC_TIME, 'en_EN');

// For time formatting, check out: http://www.php.net/manual/en/function.date.php
$timeFormat = "g:i A";

// For date formatting, cehck out: http://www.php.net/manual/en/function.strftime.php
$dateFormat_day = "%A, %B %e";
$dateFormat_week = "%B %e";
$dateFormat_week_list = "%a, %b %e";
$dateFormat_month = "%B %Y";
$dateFormat_month_list = "%A, %B %e";

?>
\ No newline at end of file
diff --git a/languages/french.inc.php b/languages/french.inc.php
index 72435fb..f197be5 100644
--- a/languages/french.inc.php
+++ b/languages/french.inc.php
@@ -1,7 +1,7 @@
 <?
 
 // French language include
-// For version 0.4 PHP iCalendar
+// For version 0.5 PHP iCalendar
 //
 // Translation by La Shampouineuse (info@lashampoo.com)
 //
@@ -25,7 +25,25 @@ $last_year_lang		= "Ann&eacute;e pr&eacute;c&eacute;dente";
 $subscribe_lang		= "Souscrire";
 $download_lang		= "T&eacute;l&eacute;charger";
 $powered_by_lang 	= "Produit avec";
-$version_lang		= "0.4";
+$version_lang		= "0.5";
+$event_lang			= "Event";
+$event_start_lang	= "Start Time";
+$event_end_lang		= "End Time";
+$this_months_lang	= "This Month's Events";
+$date_lang			= "Date";
+$summary_lang		= "Summary";
 
+// Set Location for date formatting, check out: http://www.php.net/manual/en/function.setlocale.php
+setlocale (LC_TIME, 'en_EN');
+
+// For time formatting, check out: http://www.php.net/manual/en/function.date.php
+$timeFormat = "g:i A";
+
+// For date formatting, cehck out: http://www.php.net/manual/en/function.strftime.php
+$dateFormat_day = "%A, %B %e";
+$dateFormat_week = "%B %e";
+$dateFormat_week_list = "%a, %b %e";
+$dateFormat_month = "%B %Y";
+$dateFormat_month_list = "%A, %B %e";
 
 ?>
diff --git a/languages/german.inc.php b/languages/german.inc.php
index c51e2e9..6cf323d 100644
--- a/languages/german.inc.php
+++ b/languages/german.inc.php
@@ -1 +1 @@
-<?

// German language include
// For version 0.4 PHP iCalendar
//
// Translation by David Reindl (dre@andare.ch)
//
// Submit new translations to chad@chadsdomain.com



$day_lang			= "Tag";
$week_lang			= "Woche";
$month_lang			= "Monat";
$year_lang			= "Jahr";
$calendar_lang		= "Kalender";
$next_day_lang		= "Folgender Tag";
$next_month_lang	= "Folgender Monat";
$next_week_lang		= "Folgende Woche";
$next_year_lang		= "Folgendes Jahr";
$last_day_lang		= "Vorhergehender Tag";
$last_month_lang	= "Vorhergehender Monat";
$last_week_lang		= "Vorhergehende Woche";
$last_year_lang		= "Vorhergehendes Jahr";
$subscribe_lang		= "Abonnieren";
$download_lang		= "Herunterladen";
$powered_by_lang 	= "Powered by";
$version_lang		= "0.4";


?>
\ No newline at end of file
+<?

// German language include
// For version 0.5 PHP iCalendar
//
// Translation by David Reindl (dre@andare.ch)
//
// Submit new translations to chad@chadsdomain.com



$day_lang			= "Tag";
$week_lang			= "Woche";
$month_lang			= "Monat";
$year_lang			= "Jahr";
$calendar_lang		= "Kalender";
$next_day_lang		= "Folgender Tag";
$next_month_lang	= "Folgender Monat";
$next_week_lang		= "Folgende Woche";
$next_year_lang		= "Folgendes Jahr";
$last_day_lang		= "Vorhergehender Tag";
$last_month_lang	= "Vorhergehender Monat";
$last_week_lang		= "Vorhergehende Woche";
$last_year_lang		= "Vorhergehendes Jahr";
$subscribe_lang		= "Abonnieren";
$download_lang		= "Herunterladen";
$powered_by_lang 	= "Powered by";
$version_lang		= "0.5";
$event_lang			= "Event";
$event_start_lang	= "Start Time";
$event_end_lang		= "End Time";
$this_months_lang	= "This Month's Events";
$date_lang			= "Date";
$summary_lang		= "Summary";

// Set Location for date formatting, check out: http://www.php.net/manual/en/function.setlocale.php
setlocale (LC_TIME, 'en_EN');

// For time formatting, check out: http://www.php.net/manual/en/function.date.php
$timeFormat = "g:i A";

// For date formatting, cehck out: http://www.php.net/manual/en/function.strftime.php
$dateFormat_day = "%A, %B %e";
$dateFormat_week = "%B %e";
$dateFormat_week_list = "%a, %b %e";
$dateFormat_month = "%B %Y";
$dateFormat_month_list = "%A, %B %e";


?>
\ No newline at end of file
diff --git a/languages/italian.inc.php b/languages/italian.inc.php
index 82d6939..c1cd283 100644
--- a/languages/italian.inc.php
+++ b/languages/italian.inc.php
@@ -1 +1 @@
-<?

// Italian language include
// For version 0.4 PHP iCalendar
//
// Translation by Luca Cacciagrano (clooka@clac.it)
//
// Submit new translations to chad@chadsdomain.com



$day_lang			= "Giorno";
$week_lang			= "Settimana";
$month_lang			= "Mese";
$year_lang			= "Anno";
$calendar_lang		= "Calendario";
$next_day_lang		= "Giorno Successivo";
$next_month_lang	= "Mese Successivo";
$next_week_lang		= "Settimana Successiva";
$next_year_lang		= "Anno Successivo";
$last_day_lang		= "Giorno Precedente";
$last_month_lang	= "Mese Precedente";
$last_week_lang		= "Settimana Precedente";
$last_year_lang		= "Anno Precedente";
$subscribe_lang		= "Sottoscrivi";
$download_lang		= "Scarica";
$powered_by_lang 	= "Powered by";
$version_lang		= "0.4";


?>
\ No newline at end of file
+<?

// Italian language include
// For version 0.4 PHP iCalendar
//
// Translation by Luca Cacciagrano (clooka@clac.it)
//
// Submit new translations to chad@chadsdomain.com



$day_lang			= "Giorno";
$week_lang			= "Settimana";
$month_lang			= "Mese";
$year_lang			= "Anno";
$calendar_lang		= "Calendario";
$next_day_lang		= "Giorno Successivo";
$next_month_lang	= "Mese Successivo";
$next_week_lang		= "Settimana Successiva";
$next_year_lang		= "Anno Successivo";
$last_day_lang		= "Giorno Precedente";
$last_month_lang	= "Mese Precedente";
$last_week_lang		= "Settimana Precedente";
$last_year_lang		= "Anno Precedente";
$subscribe_lang		= "Sottoscrivi";
$download_lang		= "Scarica";
$powered_by_lang 	= "Powered by";
$version_lang		= "0.5";
$event_lang			= "Event";
$event_start_lang	= "Start Time";
$event_end_lang		= "End Time";
$this_months_lang	= "This Month's Events";
$date_lang			= "Date";
$summary_lang		= "Summary";

// Set Location for date formatting, check out: http://www.php.net/manual/en/function.setlocale.php
setlocale (LC_TIME, 'en_EN');

// For time formatting, check out: http://www.php.net/manual/en/function.date.php
$timeFormat = "g:i A";

// For date formatting, cehck out: http://www.php.net/manual/en/function.strftime.php
$dateFormat_day = "%A, %B %e";
$dateFormat_week = "%B %e";
$dateFormat_week_list = "%a, %b %e";
$dateFormat_month = "%B %Y";
$dateFormat_month_list = "%A, %B %e";

?>
\ No newline at end of file
diff --git a/languages/japanese.inc.php b/languages/japanese.inc.php
index 38b7a62..54d2756 100644
--- a/languages/japanese.inc.php
+++ b/languages/japanese.inc.php
@@ -25,7 +25,6 @@ $last_year_lang		= "去年";
 $subscribe_lang		= "追加";
 $download_lang		= "ダウンロド";
 $powered_by_lang 	= "Powered by";
-$version_lang		= "0.4";
 
 $month_jan_lang		= "1月";
 $month_feb_lang		= "2月";
@@ -57,4 +56,25 @@ $day_thu_lang		= "木曜日";
 $day_fri_lang		= "金曜日";
 $day_sat_lang		= "土曜日";
 
+$version_lang		= "0.5";
+$event_lang			= "Event";
+$event_start_lang	= "Start Time";
+$event_end_lang		= "End Time";
+$this_months_lang	= "This Month's Events";
+$date_lang			= "Date";
+$summary_lang		= "Summary";
+
+// Set Location for date formatting, check out: http://www.php.net/manual/en/function.setlocale.php
+setlocale (LC_TIME, 'en_EN');
+
+// For time formatting, check out: http://www.php.net/manual/en/function.date.php
+$timeFormat = "g:i A";
+
+// For date formatting, cehck out: http://www.php.net/manual/en/function.strftime.php
+$dateFormat_day = "%A, %B %e";
+$dateFormat_week = "%B %e";
+$dateFormat_week_list = "%a, %b %e";
+$dateFormat_month = "%B %Y";
+$dateFormat_month_list = "%A, %B %e";
+
 ?>
\ No newline at end of file
diff --git a/languages/polish.inc.php b/languages/polish.inc.php
index 98c8b44..dc88a37 100644
--- a/languages/polish.inc.php
+++ b/languages/polish.inc.php
@@ -1 +1 @@
-<?

// Polish language include
// For version 0.4 PHP iCalendar
//
// Translation by Stanislaw Cieslicki (stahoo@poczta.onet.pl)
//
// Submit new translations to chad@chadsdomain.com



$day_lang			= "Dzień";
$week_lang			= "Tydzień";
$month_lang			= "MiesiÄ…c";
$year_lang			= "Rok";
$calendar_lang		= "Kalendarz";
$next_day_lang		= "Następny dzień";
$next_month_lang	= "Przyszły miesiąc";
$next_week_lang		= "Przyszły tydzień";
$next_year_lang		= "Przyszły rok";
$last_day_lang		= "Poprzedni dzień";
$last_month_lang	= "Zeszły Miesiąc";
$last_week_lang		= "Zeszły tydzień";
$last_year_lang		= "Zeszły rok";
$subscribe_lang		= "Subskrybuj";
$download_lang		= "Pobież";
$powered_by_lang 	= "Powered by";
$version_lang		= "0.4";


?>
\ No newline at end of file
+<?

// Polish language include
// For version 0.5 PHP iCalendar
//
// Translation by Stanislaw Cieslicki (stahoo@poczta.onet.pl)
//
// Submit new translations to chad@chadsdomain.com



$day_lang			= "Dzień";
$week_lang			= "Tydzień";
$month_lang			= "MiesiÄ…c";
$year_lang			= "Rok";
$calendar_lang		= "Kalendarz";
$next_day_lang		= "Następny dzień";
$next_month_lang	= "Przyszły miesiąc";
$next_week_lang		= "Przyszły tydzień";
$next_year_lang		= "Przyszły rok";
$last_day_lang		= "Poprzedni dzień";
$last_month_lang	= "Zeszły Miesiąc";
$last_week_lang		= "Zeszły tydzień";
$last_year_lang		= "Zeszły rok";
$subscribe_lang		= "Subskrybuj";
$download_lang		= "Pobież";
$powered_by_lang 	= "Powered by";
$version_lang		= "0.5";
$event_lang			= "Event";
$event_start_lang	= "Start Time";
$event_end_lang		= "End Time";
$this_months_lang	= "This Month's Events";
$date_lang			= "Date";
$summary_lang		= "Summary";

// Set Location for date formatting, check out: http://www.php.net/manual/en/function.setlocale.php
setlocale (LC_TIME, 'en_EN');

// For time formatting, check out: http://www.php.net/manual/en/function.date.php
$timeFormat = "g:i A";

// For date formatting, cehck out: http://www.php.net/manual/en/function.strftime.php
$dateFormat_day = "%A, %B %e";
$dateFormat_week = "%B %e";
$dateFormat_week_list = "%a, %b %e";
$dateFormat_month = "%B %Y";
$dateFormat_month_list = "%A, %B %e";

?>
\ No newline at end of file
diff --git a/month.php b/month.php
index 2e7c6af..df68a3d 100644
--- a/month.php
+++ b/month.php
@@ -15,7 +15,7 @@
 	$prev_date = DateAdd ("m", "-1", $date);
 	$next_month = date( "Ym01", $next_date);
 	$prev_month = date( "Ym01", $prev_date);
-	$display_month = date ("F Y", $date);
+	$display_month = strftime ($dateFormat_month, $date);
 	$parse_month = date ("Ym", $date);
 	$first_sunday = sundayOfWeek($this_year, $this_month, "1");
 
@@ -122,21 +122,6 @@
 											echo "</td>\n";
 											echo "</tr>\n";
 											if ($master_array[("$daylink")]) {
-												if ($master_array[("$daylink")]["0001"]["event_text"]) {
-													foreach ($master_array[("$daylink")]["0001"]["event_text"] as $event_text) {
-														$event_text2 = addslashes($event_text);
-														if (strlen($event_text) > 15) {
-															$event_text = substr("$event_text", 0, 12);
-															$event_text = $event_text . "...";
-														}
-														echo "<tr height=\"15\">\n";
-														echo "<td height=\"15\" valign=\"middle\" align=\"center\" bgcolor=\"#ffffff\">\n";
-														//echo "<a class=\"psf\" href=\"day.php?cal=$cal&getdate=$daylink\"><i>$event_text</i></a>\n";
-														echo "<a class=\"psf\" href=\"javascript:openEventInfo('$event_text2', '$calendar_name', '$event_start', '$event_end')\"><i>$event_text</i></a>\n";
-														echo "</td>\n";
-														echo "</tr>\n";
-													}
-												}
 												foreach ($master_array[("$daylink")] as $event_times) {
 													foreach ($event_times as $val) {
 														$event_text = $val["event_text"];
@@ -146,13 +131,8 @@
 															$event_end = $val["event_end"];
 															$event_start = strtotime ("$event_start");
 															$event_end = strtotime ("$event_end");
-															if ($time_format == "24") {
-																$event_start = date ("G:i", $event_start);
-																$event_end = date ("G:i", $event_end);
-															} else {
-																$event_start = date ("g:i a", $event_start);
-																$event_end = date ("g:i a", $event_end);
-															}
+															$event_end = date ($timeFormat, $event_end);
+															$event_start = date ($timeFormat, $event_start);
 															if (strlen($event_text) > 12) {
 																$event_text = substr("$event_text", 0, 10);
 																$event_text = $event_text . "...";
@@ -162,7 +142,11 @@
 															echo "<table width=\"100%\" border=\"0\" cellspacing=\"0\" cellpadding=\"0\">\n";
 															echo "<tr>\n";
 															echo "<td>\n";
-															echo "<a class=\"psf\" href=\"javascript:openEventInfo('$event_text2', '$calendar_name', '$event_start', '$event_end')\"><font class=\"G10B\">&#149; $event_text</font></a>\n";
+															if (!$event_start = $val["event_start"]) {
+																echo "<center><a class=\"psf\" href=\"javascript:openEventInfo('$event_text2', '$calendar_name', '$event_start', '$event_end')\"><i>$event_text</i></a></center>\n";
+															} else {	
+																echo "<a class=\"psf\" href=\"javascript:openEventInfo('$event_text2', '$calendar_name', '$event_start', '$event_end')\"><font class=\"G10B\">&#149; $event_text</font></a>\n";
+															}
 															echo "</td>\n";
 															echo "</tr>\n";
 															echo "</table>\n";
@@ -243,17 +227,17 @@
 							<table width="100%" border="0" cellspacing="0" cellpadding="0">
 								<tr height="25">
 									<td colspan="3" align="center" valign="middle" class="eventborder" width="740" height="25">
-										<font class="eventfont" color="#FFFFFF"><b>This Month's Events</b></font>
+										<font class="eventfont" color="#FFFFFF"><b><? echo "$this_months_lang"; ?></b></font>
 									</td>
 								</tr>
 								<tr height="11">
 									<td valign="middle" width="150" height="11" class="eventbg">
-										<font class="eventfont"><b>&nbsp;Date</b></font>
+										<font class="eventfont"><b>&nbsp;<? echo "$date_lang"; ?></b></font>
 									</td>
 									<td width="1" height="11" class="eventbg"><img src="images/spacer.gif" height="15" width="1">
 									</td>
 									<td valign="middle" width="551" height="11" class="eventbg">
-										<font class="eventfont"><b>&nbsp;Summary</b></font>
+										<font class="eventfont"><b>&nbsp;<? echo "$summary_lang"; ?></b></font>
 									</td>
 								</tr>
 								<tr height="1">
@@ -268,7 +252,7 @@
 										ereg ("([0-9]{6})([0-9]{2})", $key, $regs);
 										if ($regs[1] == $parse_month) {
 											$dayofmonth = strtotime ($key);
-											$dayofmonth = date ("l, F jS", $dayofmonth);
+											$dayofmonth = strftime ($dateFormat_month_list, $dayofmonth);
 											$i = 0;
 											
 											// Pull out each day
@@ -276,40 +260,15 @@
 												
 												// Pull out each time
 												foreach ($new_val as $new_key2 => $new_val2) {
-												if (!$new_val2["event_text"]) {
-													foreach ($new_val2 as $all_day) {
-														$event_text = $all_day;
-														$event_text2 = addslashes($all_day);
-														$event_text = str_replace ("<br>", "", $event_text);
-														if (strlen($event_text) > 70) {
-															$event_text = substr("$event_text", 0, 65);
-															$event_text = $event_text . "...";
-														}
-														echo "<tr height=\"20\">\n";
-														echo "<td valign=\"middle\" bgcolor=\"white\" width=\"200\" height=\"20\">\n";
-														echo "<font class=\"G10B\">&nbsp;<a class=\"psf\" href=\"day.php?getdate=$key\">$dayofmonth</font></a>\n";
-														echo "</td>\n";
-														echo "<td width=\"1\" height=\"20\">\n";
-														echo "</td>\n";
-														echo "<td valign=\"middle\" bgcolor=\"white\" width=\"540\" height=\"20\">\n";
-														echo "<font class=\"G10B\">&nbsp;<a class=\"psf\" href=\"javascript:openEventInfo('$event_text2', '$calendar_name', '$event_start', '$event_end')\">$event_text</font></a> <font class=\"V9\">(All day event)</font>\n";
-														echo "</td>\n";
-														echo "</tr>\n";
-													}
-												} elseif ($new_val2["event_text"]) {	
+												if ($new_val2["event_text"]) {	
 													$event_text = $new_val2["event_text"];
 													$event_text2 = addslashes($new_val2["event_text"]);
 													$event_start = $new_val2["event_start"];
 													$event_end = $new_val2["event_end"];
 													$event_start = strtotime ("$event_start");
 													$event_end = strtotime ("$event_end");
-													if ($time_format == "24") {
-														$event_start = date ("G:i", $event_start);
-														$event_end = date ("G:i", $event_end);
-													} else {
-														$event_start = date ("g:i a", $event_start);
-														$event_end = date ("g:i a", $event_end);
-													}
+													$event_end = date ($timeFormat, $event_end);
+													$event_start = date ($timeFormat, $event_start);
 													$event_text = str_replace ("<br>", "", $event_text);
 													if (strlen($event_text) > 70) {
 														$event_text = substr("$event_text", 0, 65);
@@ -322,7 +281,11 @@
 													echo "<td width=\"1\" height=\"20\">\n";
 													echo "</td>\n";
 													echo "<td valign=\"middle\" bgcolor=\"white\" width=\"540\" height=\"20\">\n";
-													echo "<font class=\"G10B\">&nbsp;<a class=\"psf\" href=\"javascript:openEventInfo('$event_text2', '$calendar_name', '$event_start', '$event_end')\">$event_text</a></font> <font class=\"V9\">($event_start - $event_end)</font>\n";
+													if (!$new_val2["event_start"]) {
+														echo "<font class=\"G10B\">&nbsp;<a class=\"psf\" href=\"javascript:openEventInfo('$event_text2', '$calendar_name', '$event_start', '$event_end')\">$event_text</font></a> <font class=\"V9\">(All day event)</font>\n";
+													} else {	
+														echo "<font class=\"G10B\">&nbsp;<a class=\"psf\" href=\"javascript:openEventInfo('$event_text2', '$calendar_name', '$event_start', '$event_end')\">$event_text</a></font> <font class=\"V9\">($event_start - $event_end)</font>\n";
+													}
 													echo "</td>\n";
 													echo "</tr>\n";
 												}
diff --git a/week.php b/week.php
index 2c80846..3452068 100644
--- a/week.php
+++ b/week.php
@@ -1 +1 @@
-<? 
$current_view = "week";
include("ical_parser.php"); 

//might not need this, depending on implimentation, doesn't work correctly in current form anyway
//setcookie("last_view", "week");


ereg ("([0-9]{4})([0-9]{2})([0-9]{2})", $getdate, $day_array2);
$this_day = $day_array2[3];
$this_week = $day_array2[2];
$this_year = $day_array2[1];
$sunday = sundayOfWeek($this_year, $this_month, $this_day);
$sunday_date = strtotime("$sunday");
$saturday = ($sunday_date + (6 * 25 * 60 * 60));
$start_week = date ("F jS", strtotime("$sunday"));
$end_week =  date ("F jS", $saturday);

$date = strtotime ("$getdate");
$next_week2 = ($date + (7 * 24.4 * 60 * 60));
$prev_week2 = ($date - (7 * 24.4 * 60 * 60));
$next_week = date("Ymd", $next_week2);
$prev_week = date("Ymd", $prev_week2);

?>

<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
        "http://www.w3.org/TR/1999/REC-html401-19991224/loose.dtd">
<html>
<head>
	<meta http-equiv="content-type" content="text/html;charset=UTF-8">
	<title><? echo "$calendar_name"; ?></title> 
	<link rel="stylesheet" type="text/css" href="styles/default.css">
	<? include "functions/event.js"; ?>
</head>
<body bgcolor="#FFFFFF">
<center>
	<table width="700" border="0" cellspacing="0" cellpadding="0" class="V12">
	<tr>
		<td align="left" width="5%"><!--[[a class="psf" href="day.php"]]Today[[/a]]--></td>
		<td align="center" width="90%"><? echo "<a class=\"psf\" href=\"day.php?cal=$cal&getdate=$getdate\">$day_lang</a> | <a class=\"psf\" href=\"week.php?cal=$cal&getdate=$getdate\">$week_lang</a> | <a class=\"psf\" href=\"month.php?cal=$cal&getdate=$getdate\">$month_lang</a>"; ?></td>
		<td align="right" width="5%"><!--[[a class="psf" href="preferences.php"]]Preferences[[/a]]--></td>
	</tr>
	<tr>
		<td colspan="3"><img src="images/spacer.gif" height="10" width="1"></td>
	</tr>
</table>
	<table width="700" border="0" cellspacing="1" cellpadding="2" class="calborder">
<tr>
<td>
	<table width="700" border="0" cellspacing="0" cellpadding="0">
    <tr>
     	<td align="center" valign="middle">
      		<table border="0" cellspacing="0" cellpadding="0" bgcolor="#a1a5a9" class="G10B">
      			<tr>
					<td align="center" valign="top">
						<table border="0" cellspacing="1" cellpadding="0">
							<tr>
								<td colspan="3" bgcolor="white" nowrap>
									<table width="100%" border="0" cellspacing="4" cellpadding="0">
										<tr>
											<td colspan="3">
												<table width="100%" border="0" cellspacing="0" cellpadding="0">
													<tr>
														<td class="G10B" align="left" valign="top" width="5%" nowrap><? echo "<a class=\"psf\" href=\"week.php?cal=$cal&getdate=$prev_week\">$last_week_lang</a>"; ?></td>
														<td class="H20" align="center" valign="middle" width="90%" nowrap><? echo "$start_week - $end_week"; ?></td>
														<td class="G10B" align="right" valign="top" width="5%" nowrap><? echo "<a class=\"psf\" href=\"week.php?cal=$cal&getdate=$next_week\">$next_week_lang</a>"; ?></td>
													</tr>
												</table>
											</td>
										</tr>	
										<tr>
											<td align="left" valign="middle"><? include('./list_icals.php'); ?></td>
											<td align="right" valign="middle" class="G10B"><? echo "<a class=\"psf\" href=\"$fullpath\">$subscribe_lang</a>&nbsp;|&nbsp;<a class=\"psf\" href=\"$filename\">$download_lang</a>"; ?></td>
										</tr>
									</table>
								</td>
							</tr>

					<tr>
						<td align="center" valign="top">
							<table border="0" cellspacing="1" cellpadding="0" class="G10B">
								<tr height="12">
									<td colspan="2" height="11" width="60" nowrap bgcolor="#f5f5f5">
										&nbsp; 
									</td>
									<?	
										$thisdate = strtotime ("$sunday");
										$i = 0;
										do {
											$thisday = date("Ymd", $thisdate);
											$thisday2 = date("D, M j", $thisdate);
											echo "<td height=\"12\" width=\"101\" colspan=\"2\" valign=\"top\" align=\"center\" bgcolor=\"#f5f5f5\" class=\"V9\">\n";
											echo "<a class=\"psf\" href=\"day.php?cal=$cal&getdate=$thisday\">$thisday2</a>\n";
											echo "</td>\n";
											$thisdate = ($thisdate + (25 * 60 * 60));
											$i++;
										
										} while ($i != 7);
										
										
									
									?>

								</tr>
								<tr>
									<td colspan="2" width="60" valign="top" align="center" bgcolor="#f5f5f5">
										<img src="images/spacer.gif" width="1" height="1"> 
									</td>
									
									
								<?
										$thisdate = strtotime ("$sunday");
										$i = 0;
										do {
											$thisday = date("Ymd", $thisdate);
											if ($master_array[("$thisday")]["-1"]) {
												echo "<td colspan=\"2\" valign=\"top\" align=\"center\" bgcolor=\"#ffffff\">\n";
												foreach ($master_array[("$thisday")]["-1"] as $allDay_event) {
													$event_text2 = addslashes($allDay_event["event_text"]);
													if (strlen($allDay_event["event_text"]) > 14) {
														$event_text = substr($allDay_event["event_text"], 0, 11);
														$event_text = $event_text . "...";
													} else {
														$event_text = $allDay_event["event_text"];
													}
													echo "<table width=\"100%\" border=\"0\" cellspacing=\"0\" cellpadding=\"0\">\n";
													echo "<tr height=\"20\">\n";
													echo "<td height=\"20\" valign=\"middle\" align=\"center\" class=\"eventbg\">\n";
													echo "<table width=\"100%\" border=\"0\" cellspacing=\"0\" cellpadding=\"0\">\n";
													echo "<tr>\n";
													echo "<td valign=\"top\" align=\"center\">\n";
													echo "<a class=\"psf\" href=\"javascript:openEventInfo('$event_text2', '$calendar_name', '$event_start', '$event_end')\"><font class=\"eventfont\"><i>$event_text</i></font></a>\n";
													echo "</td>\n";
													echo "</tr>\n";
													echo "</table>\n";
													echo "</td>\n";
													echo "</tr>\n";
													echo "<tr height=\"1\">\n";
													echo "<td height=\"1\">\n";
													echo "<img src=\"images/spacer.gif\" width=\"1\" height=\"1\"> \n";
													echo "</td>\n";
													echo "</tr>\n";
													echo "</table>\n";
												}
												echo "</td>\n";
											} else {
												echo "<td colspan=\"2\" valign=\"top\" align=\"center\" bgcolor=\"#ffffff\">\n";
												echo "<img src=\"images/spacer.gif\" width=\"1\" height=\"1\">\n";
												echo "</td>\n";
											}
											$thisdate = ($thisdate + (25 * 60 * 60));
											$i++;
										
										} while ($i != 7);
								
								?>	
								
								</tr>
								<tr>
									<td width="60" bgcolor="#a1a5a9" nowrap>
										<img src="images/spacer.gif" width="1" height="1"> 
									</td>
									<td width="1" nowrap bgcolor="#a1a5a9">
										<img src="images/spacer.gif" width="1" height="1"> 
									</td>
									<td width="45" nowrap bgcolor="#a1a5a9">
										<img src="images/spacer.gif" width="1" height="1"> 
									</td>
									<td width="45" nowrap bgcolor="#a1a5a9">
										<img src="images/spacer.gif" width="1" height="1"> 
									</td>
									<td width="45" nowrap bgcolor="#a1a5a9">
										<img src="images/spacer.gif" width="1" height="1"> 
									</td>
									<td width="45" nowrap bgcolor="#a1a5a9">
										<img src="images/spacer.gif" width="1" height="1"> 
									</td>
									<td width="45" nowrap bgcolor="#a1a5a9">
										<img src="images/spacer.gif" width="1" height="1"> 
									</td>
									<td width="45" nowrap bgcolor="#a1a5a9">
										<img src="images/spacer.gif" width="1" height="1"> 
									</td>
									<td width="45" nowrap bgcolor="#a1a5a9">
										<img src="images/spacer.gif" width="1" height="1"> 
									</td>
									<td width="45" nowrap bgcolor="#a1a5a9">
										<img src="images/spacer.gif" width="1" height="1"> 
									</td>
									<td width="45" nowrap bgcolor="#a1a5a9">
										<img src="images/spacer.gif" width="1" height="1"> 
									</td>
									<td width="45" nowrap bgcolor="#a1a5a9">
										<img src="images/spacer.gif" width="1" height="1"> 
									</td>
									<td width="45" nowrap bgcolor="#a1a5a9">
										<img src="images/spacer.gif" width="1" height="1"> 
									</td>
									<td width="45" nowrap bgcolor="#a1a5a9">
										<img src="images/spacer.gif" width="1" height="1"> 
									</td>
									<td width="45" nowrap bgcolor="#a1a5a9">
										<img src="images/spacer.gif" width="1" height="1"> 
									</td>
									<td width="45" nowrap bgcolor="#a1a5a9">
										<img src="images/spacer.gif" width="1" height="1"> 
									</td>
								</tr>
								<?
								
								$event_length = 0;
								$k = 0;
								
								foreach ($day_array as $key) {
									$count = 0;
									$k = 0;
									$cal_time = $key;	
									$key = strtotime ("$key");
									if ($time_format == "24") {
										$key = date ("G:i", $key);
									} else {
										$key = date ("g:i A", $key);
									}
									
									// The first <TR> (on the hour)
									if (ereg("^([0-9]{1,2}):00", $key)) {
										echo "<tr height=\"30\">\n";
										echo "<td rowspan=\"2\" align=\"center\" valign=\"top\" bgcolor=\"#f5f5f5\" width=\"60\">$key</td>\n";
										echo "<td height=\"30\" width=\"1\"><img src=\"images/spacer.gif\" width=\"1\" height=\"1\"></td>\n";
										$thisdate = strtotime ("$sunday");
										$thisday = date("Ymd", $thisdate);
										do {
											if ($master_array["$thisday"]["$cal_time"]) {
												$event_text = $master_array["$thisday"]["$cal_time"][$k]["event_text"];
												$event_text2 = addslashes($master_array["$thisday"]["$cal_time"][$k]["event_text"]);
												$event_start = $master_array["$thisday"]["$cal_time"][$k]["event_start"];
												$event_end = $master_array["$thisday"]["$cal_time"][$k]["event_end"];
												$event_start = strtotime ("$event_start");
												$event_end = strtotime ("$event_end");
												if ($time_format == "24") {
													$event_start = date ("G:i", $event_start);
													$event_end = date ("G:i", $event_end);
												} else {
													$event_start = date ("g:i a", $event_start);
													$event_end = date ("g:i a", $event_end);
												}
												if (strlen($event_text) > 14) {
													$event_text = substr("$event_text", 0, 11);
													$event_text = $event_text . "...";
												}
												echo "<td colspan=\"2\" bgcolor=\"#ffffff\">&nbsp;<a class=\"psf\" href=\"javascript:openEventInfo('$event_text2', '$calendar_name', '$event_start', '$event_end')\">$event_text</a></td>\n";
											} else {
												echo "<td colspan=\"2\" bgcolor=\"#ffffff\">&nbsp;</td>\n";
											}
											$thisdate = ($thisdate + (25 * 60 * 60));
											$thisday = date("Ymd", $thisdate);
											$count++;
										} while ($count != 7);
										
										// End Week
										echo "</tr>\n";
										$count = 0;
									}
									
									
									// The second <TR> (on the half hour)
									
									if (ereg("([0-9]{1,2}):30", $key)) {
										echo "<tr height=\"30\">\n";
										echo "<td height=\"30\" width=\"1\"><img src=\"images/spacer.gif\" width=\"1\" height=\"1\"></td>\n";
										$thisdate = strtotime ("$sunday");
										$thisday = date("Ymd", $thisdate);
										do {
											if ($master_array["$thisday"]["$cal_time"]) {
												$event_start = $master_array["$thisday"]["$cal_time"][$k]["event_start"];
												$event_end = $master_array["$thisday"]["$cal_time"][$k]["event_end"];
												$event_start = strtotime ("$event_start");
												$event_end = strtotime ("$event_end");
												if ($time_format == "24") {
													$event_start = date ("G:i", $event_start);
													$event_end = date ("G:i", $event_end);
												} else {
													$event_start = date ("g:i a", $event_start);
													$event_end = date ("g:i a", $event_end);
												}
												$event_text = $master_array["$thisday"]["$cal_time"][$k]["event_text"];
												$event_text2 = addslashes($master_array["$thisday"]["$cal_time"][$k]["event_text"]);
												if (strlen($event_text) > 14) {
													$event_text = substr("$event_text", 0, 11);
													$event_text = $event_text . "...";
												}
												echo "<td colspan=\"2\" bgcolor=\"#ffffff\">&nbsp;<a class=\"psf\" href=\"javascript:openEventInfo('$event_text2', '$calendar_name', '$event_start', '$event_end')\">$event_text</a></td>\n";
											} else {
												echo "<td colspan=\"2\" bgcolor=\"#ffffff\">&nbsp;</td>\n";
											}
											$thisdate = ($thisdate + (25 * 60 * 60));
											$thisday = date("Ymd", $thisdate);
											$count++;
										} while ($count != 7);
										echo "</tr>\n";
									}
									
									
								}
								
								?>

							</table>
						</td>
					</tr>
				</table>
			</td>
		</tr>
	</table>
	</td>
</tr>
</table>
</td>
</tr>
</table>
<br>
<? echo "<font class=\"V9\">$powered_by_lang <a class=\"psf\" href=\"http://sourceforge.net/projects/phpicalendar/\">PHP iCalendar $version_lang</a></font>"; ?>
</center>
</body>
</html>
\ No newline at end of file
+<? 
$current_view = "week";
include("ical_parser.php"); 

ereg ("([0-9]{4})([0-9]{2})([0-9]{2})", $getdate, $day_array2);
$this_day = $day_array2[3];
$this_week = $day_array2[2];
$this_year = $day_array2[1];
$sunday = sundayOfWeek($this_year, $this_month, $this_day);
$sunday_date = strtotime("$sunday");
$saturday = ($sunday_date + (6 * 25 * 60 * 60));
$start_week = strftime($dateFormat_week, strtotime("$sunday"));
$end_week =  strftime($dateFormat_week, $saturday);

$date = strtotime ("$getdate");
$next_week2 = ($date + (7 * 24.4 * 60 * 60));
$prev_week2 = ($date - (7 * 24.4 * 60 * 60));
$next_week = date("Ymd", $next_week2);
$prev_week = date("Ymd", $prev_week2);

?>

<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
        "http://www.w3.org/TR/1999/REC-html401-19991224/loose.dtd">
<html>
<head>
	<meta http-equiv="content-type" content="text/html;charset=UTF-8">
	<title><? echo "$calendar_name"; ?></title> 
	<link rel="stylesheet" type="text/css" href="styles/default.css">
	<? include "functions/event.js"; ?>
</head>
<body bgcolor="#FFFFFF">
<center>
	<table width="700" border="0" cellspacing="0" cellpadding="0" class="V12">
	<tr>
		<td align="left" width="5%"><!--[[a class="psf" href="day.php"]]Today[[/a]]--></td>
		<td align="center" width="90%"><? echo "<a class=\"psf\" href=\"day.php?cal=$cal&getdate=$getdate\">$day_lang</a> | <a class=\"psf\" href=\"week.php?cal=$cal&getdate=$getdate\">$week_lang</a> | <a class=\"psf\" href=\"month.php?cal=$cal&getdate=$getdate\">$month_lang</a>"; ?></td>
		<td align="right" width="5%"><!--[[a class="psf" href="preferences.php"]]Preferences[[/a]]--></td>
	</tr>
	<tr>
		<td colspan="3"><img src="images/spacer.gif" height="10" width="1"></td>
	</tr>
</table>
	<table width="700" border="0" cellspacing="1" cellpadding="2" class="calborder">
<tr>
<td>
	<table width="700" border="0" cellspacing="0" cellpadding="0">
    <tr>
     	<td align="center" valign="middle">
      		<table border="0" cellspacing="0" cellpadding="0" bgcolor="#a1a5a9" class="G10B">
      			<tr>
					<td align="center" valign="top">
						<table border="0" cellspacing="1" cellpadding="0">
							<tr>
								<td colspan="3" bgcolor="white" nowrap>
									<table width="100%" border="0" cellspacing="4" cellpadding="0">
										<tr>
											<td colspan="3">
												<table width="100%" border="0" cellspacing="0" cellpadding="0">
													<tr>
														<td class="G10B" align="left" valign="top" width="5%" nowrap><? echo "<a class=\"psf\" href=\"week.php?cal=$cal&getdate=$prev_week\">$last_week_lang</a>"; ?></td>
														<td class="H20" align="center" valign="middle" width="90%" nowrap><? echo "$start_week - $end_week"; ?></td>
														<td class="G10B" align="right" valign="top" width="5%" nowrap><? echo "<a class=\"psf\" href=\"week.php?cal=$cal&getdate=$next_week\">$next_week_lang</a>"; ?></td>
													</tr>
												</table>
											</td>
										</tr>	
										<tr>
											<td align="left" valign="middle"><? include('./list_icals.php'); ?></td>
											<td align="right" valign="middle" class="G10B"><? echo "<a class=\"psf\" href=\"$fullpath\">$subscribe_lang</a>&nbsp;|&nbsp;<a class=\"psf\" href=\"$filename\">$download_lang</a>"; ?></td>
										</tr>
									</table>
								</td>
							</tr>

					<tr>
						<td align="center" valign="top">
							<table border="0" cellspacing="1" cellpadding="0" class="G10B">
								<tr height="12">
									<td colspan="2" height="11" width="60" nowrap bgcolor="#f5f5f5">
										&nbsp; 
									</td>
									<?	
										$thisdate = strtotime ("$sunday");
										$i = 0;
										do {
											$thisday = date("Ymd", $thisdate);
											$thisday2 = strftime($dateFormat_week_list, $thisdate);
											echo "<td height=\"12\" width=\"101\" colspan=\"2\" valign=\"top\" align=\"center\" bgcolor=\"#f5f5f5\" class=\"V9\">\n";
											echo "<a class=\"psf\" href=\"day.php?cal=$cal&getdate=$thisday\">$thisday2</a>\n";
											echo "</td>\n";
											$thisdate = ($thisdate + (25 * 60 * 60));
											$i++;
										
										} while ($i != 7);
										
										
									
									?>

								</tr>
								<tr>
									<td colspan="2" width="60" valign="top" align="center" bgcolor="#f5f5f5">
										<img src="images/spacer.gif" width="1" height="1"> 
									</td>
									
									
								<?
										$thisdate = strtotime ("$sunday");
										$i = 0;
										do {
											$thisday = date("Ymd", $thisdate);
											if ($master_array[("$thisday")]["-1"]) {
												echo "<td colspan=\"2\" valign=\"top\" align=\"center\" bgcolor=\"#ffffff\">\n";
												foreach ($master_array[("$thisday")]["-1"] as $allDay_event) {
													$event_text2 = addslashes($allDay_event["event_text"]);
													if (strlen($allDay_event["event_text"]) > 14) {
														$event_text = substr($allDay_event["event_text"], 0, 11);
														$event_text = $event_text . "...";
													} else {
														$event_text = $allDay_event["event_text"];
													}
													echo "<table width=\"100%\" border=\"0\" cellspacing=\"0\" cellpadding=\"0\">\n";
													echo "<tr height=\"20\">\n";
													echo "<td height=\"20\" valign=\"middle\" align=\"center\" class=\"eventbg\">\n";
													echo "<table width=\"100%\" border=\"0\" cellspacing=\"0\" cellpadding=\"0\">\n";
													echo "<tr>\n";
													echo "<td valign=\"top\" align=\"center\">\n";
													echo "<a class=\"psf\" href=\"javascript:openEventInfo('$event_text2', '$calendar_name', '$event_start', '$event_end')\"><font class=\"eventfont\"><i>$event_text</i></font></a>\n";
													echo "</td>\n";
													echo "</tr>\n";
													echo "</table>\n";
													echo "</td>\n";
													echo "</tr>\n";
													echo "<tr height=\"1\">\n";
													echo "<td height=\"1\">\n";
													echo "<img src=\"images/spacer.gif\" width=\"1\" height=\"1\"> \n";
													echo "</td>\n";
													echo "</tr>\n";
													echo "</table>\n";
												}
												echo "</td>\n";
											} else {
												echo "<td colspan=\"2\" valign=\"top\" align=\"center\" bgcolor=\"#ffffff\">\n";
												echo "<img src=\"images/spacer.gif\" width=\"1\" height=\"1\">\n";
												echo "</td>\n";
											}
											$thisdate = ($thisdate + (25 * 60 * 60));
											$i++;
										
										} while ($i != 7);
								
								?>	
								
								</tr>
								<tr>
									<td width="60" bgcolor="#a1a5a9" nowrap>
										<img src="images/spacer.gif" width="1" height="1"> 
									</td>
									<td width="1" nowrap bgcolor="#a1a5a9">
										<img src="images/spacer.gif" width="1" height="1"> 
									</td>
									<td width="45" nowrap bgcolor="#a1a5a9">
										<img src="images/spacer.gif" width="1" height="1"> 
									</td>
									<td width="45" nowrap bgcolor="#a1a5a9">
										<img src="images/spacer.gif" width="1" height="1"> 
									</td>
									<td width="45" nowrap bgcolor="#a1a5a9">
										<img src="images/spacer.gif" width="1" height="1"> 
									</td>
									<td width="45" nowrap bgcolor="#a1a5a9">
										<img src="images/spacer.gif" width="1" height="1"> 
									</td>
									<td width="45" nowrap bgcolor="#a1a5a9">
										<img src="images/spacer.gif" width="1" height="1"> 
									</td>
									<td width="45" nowrap bgcolor="#a1a5a9">
										<img src="images/spacer.gif" width="1" height="1"> 
									</td>
									<td width="45" nowrap bgcolor="#a1a5a9">
										<img src="images/spacer.gif" width="1" height="1"> 
									</td>
									<td width="45" nowrap bgcolor="#a1a5a9">
										<img src="images/spacer.gif" width="1" height="1"> 
									</td>
									<td width="45" nowrap bgcolor="#a1a5a9">
										<img src="images/spacer.gif" width="1" height="1"> 
									</td>
									<td width="45" nowrap bgcolor="#a1a5a9">
										<img src="images/spacer.gif" width="1" height="1"> 
									</td>
									<td width="45" nowrap bgcolor="#a1a5a9">
										<img src="images/spacer.gif" width="1" height="1"> 
									</td>
									<td width="45" nowrap bgcolor="#a1a5a9">
										<img src="images/spacer.gif" width="1" height="1"> 
									</td>
									<td width="45" nowrap bgcolor="#a1a5a9">
										<img src="images/spacer.gif" width="1" height="1"> 
									</td>
									<td width="45" nowrap bgcolor="#a1a5a9">
										<img src="images/spacer.gif" width="1" height="1"> 
									</td>
								</tr>
								<?
								
								$event_length = 0;
								$k = 0;
								
								foreach ($day_array as $key) {
									$count = 0;
									$k = 0;
									$cal_time = $key;	
									$key = strtotime ("$key");
									if ($time_format == "24") {
										$key = date ("G:i", $key);
									} else {
										$key = date ("g:i A", $key);
									}
									
									// The first <TR> (on the hour)
									if (ereg("^([0-9]{1,2}):00", $key)) {
										echo "<tr height=\"30\">\n";
										echo "<td rowspan=\"2\" align=\"center\" valign=\"top\" bgcolor=\"#f5f5f5\" width=\"60\">$key</td>\n";
										echo "<td height=\"30\" width=\"1\"><img src=\"images/spacer.gif\" width=\"1\" height=\"1\"></td>\n";
										$thisdate = strtotime ("$sunday");
										$thisday = date("Ymd", $thisdate);
										do {
											if ($master_array["$thisday"]["$cal_time"]) {
												$event_text = $master_array["$thisday"]["$cal_time"][$k]["event_text"];
												$event_text2 = addslashes($master_array["$thisday"]["$cal_time"][$k]["event_text"]);
												$event_start = $master_array["$thisday"]["$cal_time"][$k]["event_start"];
												$event_end = $master_array["$thisday"]["$cal_time"][$k]["event_end"];
												$event_start = strtotime ("$event_start");
												$event_end = strtotime ("$event_end");
												if ($time_format == "24") {
													$event_start = date ("G:i", $event_start);
													$event_end = date ("G:i", $event_end);
												} else {
													$event_start = date ("g:i a", $event_start);
													$event_end = date ("g:i a", $event_end);
												}
												if (strlen($event_text) > 14) {
													$event_text = substr("$event_text", 0, 11);
													$event_text = $event_text . "...";
												}
												echo "<td colspan=\"2\" bgcolor=\"#ffffff\">&nbsp;<a class=\"psf\" href=\"javascript:openEventInfo('$event_text2', '$calendar_name', '$event_start', '$event_end')\">$event_text</a></td>\n";
											} else {
												echo "<td colspan=\"2\" bgcolor=\"#ffffff\">&nbsp;</td>\n";
											}
											$thisdate = ($thisdate + (25 * 60 * 60));
											$thisday = date("Ymd", $thisdate);
											$count++;
										} while ($count != 7);
										
										// End Week
										echo "</tr>\n";
										$count = 0;
									}
									
									
									// The second <TR> (on the half hour)
									
									if (ereg("([0-9]{1,2}):30", $key)) {
										echo "<tr height=\"30\">\n";
										echo "<td height=\"30\" width=\"1\"><img src=\"images/spacer.gif\" width=\"1\" height=\"1\"></td>\n";
										$thisdate = strtotime ("$sunday");
										$thisday = date("Ymd", $thisdate);
										do {
											if ($master_array["$thisday"]["$cal_time"]) {
												$event_start = $master_array["$thisday"]["$cal_time"][$k]["event_start"];
												$event_end = $master_array["$thisday"]["$cal_time"][$k]["event_end"];
												$event_start = strtotime ("$event_start");
												$event_end = strtotime ("$event_end");
												if ($time_format == "24") {
													$event_start = date ("G:i", $event_start);
													$event_end = date ("G:i", $event_end);
												} else {
													$event_start = date ("g:i a", $event_start);
													$event_end = date ("g:i a", $event_end);
												}
												$event_text = $master_array["$thisday"]["$cal_time"][$k]["event_text"];
												$event_text2 = addslashes($master_array["$thisday"]["$cal_time"][$k]["event_text"]);
												if (strlen($event_text) > 14) {
													$event_text = substr("$event_text", 0, 11);
													$event_text = $event_text . "...";
												}
												echo "<td colspan=\"2\" bgcolor=\"#ffffff\">&nbsp;<a class=\"psf\" href=\"javascript:openEventInfo('$event_text2', '$calendar_name', '$event_start', '$event_end')\">$event_text</a></td>\n";
											} else {
												echo "<td colspan=\"2\" bgcolor=\"#ffffff\">&nbsp;</td>\n";
											}
											$thisdate = ($thisdate + (25 * 60 * 60));
											$thisday = date("Ymd", $thisdate);
											$count++;
										} while ($count != 7);
										echo "</tr>\n";
									}
									
									
								}
								
								?>

							</table>
						</td>
					</tr>
				</table>
			</td>
		</tr>
	</table>
	</td>
</tr>
</table>
</td>
</tr>
</table>
<br>
<? echo "<font class=\"V9\">$powered_by_lang <a class=\"psf\" href=\"http://sourceforge.net/projects/phpicalendar/\">PHP iCalendar $version_lang</a></font>"; ?>
</center>
</body>
</html>
\ No newline at end of file