Updated files for 1.0.

23 files changed, 201 insertions, 426 deletions

diff --git a/config.inc.php b/config.inc.php
index 5319547..b739dc4 100644
--- a/config.inc.php
+++ b/config.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-// Configuration file for PHP iCalendar 0.9.5
+// Configuration file for PHP iCalendar 1.0
 //
 // To set values, change the text between the single quotes
 // Follow instructions to the right for detailed information
@@ -41,7 +41,8 @@ $this_months_events 	= 'yes';			// Display "This month's events" at the bottom o
 $use_color_cals 		= 'yes';			// Display each calendar in the pop-up as a different color.
 $daysofweek_dayview 	= 'no';				// Display the days of the week in day.php view.
 $enable_rss				= 'yes';			// Enable RSS access to your calendars (good thing).
-$show_search			= 'no';				// Show the search box in the sidebar.
+$enable_publishing		= 'no';				// Enable webdav style publishing to your calendar's folder. READ calendars/publish.php before using!
+$show_search			= 'yes';				// Show the search box in the sidebar.
 $allow_preferences		= 'yes';			// Allow visitors to change various preferences via cookies.
 $printview_default		= 'no';				// Set print view as the default view. day, week, and month only supported views for $default_view (listed well above).
 $show_todos				= 'yes';			// Show your todo list on the side of day and week view.
diff --git a/includes/event.php b/includes/event.php
index 7fd47ed..96e2e93 100644
--- a/includes/event.php
+++ b/includes/event.php
@@ -8,17 +8,17 @@ function decode_popup ($item) {
 	return $item;
 }
 
-$event			= (isset($_REQUEST['event'])) ? decode_popup($_REQUEST['event']) : ('unset');
-$description	= (isset($_REQUEST['description'])) ? decode_popup($_REQUEST['description']) : ('unset');
-$cal			= (isset($_REQUEST['cal'])) ? decode_popup($_REQUEST['cal']) : ('unset');
-$start			= (isset($_REQUEST['start'])) ? decode_popup($_REQUEST['start']) : ('unset');
-$end			= (isset($_REQUEST['end'])) ? decode_popup($_REQUEST['end']) : ('unset');
-$status			= (isset($_REQUEST['status'])) ? decode_popup($_REQUEST['status']) : ('unset');
-$location		= (isset($_REQUEST['location'])) ? decode_popup($_REQUEST['location']) : ('unset');
-$url			= (isset($_REQUEST['url'])) ? decode_popup($_REQUEST['url']) : ('unset');
-$organizer		= (isset($_REQUEST['organizer'])) ? ($_REQUEST['organizer']) : ('unset');
+$event			= (isset($HTTP_POST_VARS['event'])) ? decode_popup($HTTP_POST_VARS['event']) : ('unset');
+$description	= (isset($HTTP_POST_VARS['description'])) ? decode_popup($HTTP_POST_VARS['description']) : ('unset');
+$cal			= (isset($HTTP_POST_VARS['cal'])) ? decode_popup($HTTP_POST_VARS['cal']) : ('unset');
+$start			= (isset($HTTP_POST_VARS['start'])) ? decode_popup($HTTP_POST_VARS['start']) : ('unset');
+$end			= (isset($HTTP_POST_VARS['end'])) ? decode_popup($HTTP_POST_VARS['end']) : ('unset');
+$status			= (isset($HTTP_POST_VARS['status'])) ? decode_popup($HTTP_POST_VARS['status']) : ('unset');
+$location		= (isset($HTTP_POST_VARS['location'])) ? decode_popup($HTTP_POST_VARS['location']) : ('unset');
+$url			= (isset($HTTP_POST_VARS['url'])) ? decode_popup($HTTP_POST_VARS['url']) : ('unset');
+$organizer		= (isset($HTTP_POST_VARS['organizer'])) ? ($HTTP_POST_VARS['organizer']) : ('unset');
 $organizer 		= unserialize (decode_popup ($organizer));
-$attendee		= (isset($_REQUEST['attendee'])) ? ($_REQUEST['attendee']) : ('unset');
+$attendee		= (isset($HTTP_POST_VARS['attendee'])) ? ($HTTP_POST_VARS['attendee']) : ('unset');
 $attendee 		= unserialize (decode_popup ($attendee));
 $cal_title_full	= $cal.' '.$calendar_lang;
 
diff --git a/includes/footer.inc.php b/includes/footer.inc.php
index be2b953..52a9878 100644
--- a/includes/footer.inc.php
+++ b/includes/footer.inc.php
@@ -1,6 +1,6 @@
 <?php 
 
-echo "<center class=\"V9\"><br>$powered_by_lang <a class=\"psf\" href=\"http://phpicalendar.sourceforge.net/nuke/\">PHP iCalendar 0.9.5</a>";
+echo "<center class=\"V9\"><br>$powered_by_lang <a class=\"psf\" href=\"http://phpicalendar.sourceforge.net/nuke/\">PHP iCalendar 1.0</a>";
 if ($enable_rss == 'yes') {
 	echo "<br>\n";
 	if ((isset($current_view)) && ($current_view == 'rssindex')) {
diff --git a/languages/brazilian.inc.php b/languages/brazilian.inc.php
index 56892d0..55fb191 100644
--- a/languages/brazilian.inc.php
+++ b/languages/brazilian.inc.php
@@ -1,7 +1,7 @@
 <?php

 

 // Brazilian Portuguese language include

-// For version 0.9.5 PHP iCalendar

+// For version 1.0 PHP iCalendar

 //

 // Translation by Wilton, Bennet (suporte@bennetworks.com.br) 

 // 01-nov-2002 02:42 PM

@@ -114,7 +114,7 @@ $action_success_lang	= 'Your action was successful.';
 $submit_lang			= 'Submit';

 $delete_lang			= 'Delete';

 

-// ----- New for 0.9.5

+// ----- New for 1.0

 $all_cal_comb_lang		= 'All calendars combined';

 

 // - navigation

diff --git a/languages/catalan.inc.php b/languages/catalan.inc.php
index 09af746..6b9d929 100644
--- a/languages/catalan.inc.php
+++ b/languages/catalan.inc.php
@@ -1,7 +1,7 @@
 <?php
 
 // Catalan language include
-// For version 0.9.5 PHP iCalendar
+// For version 1.0 PHP iCalendar
 //
 // Translation by Oriol Ferrer Mesia; (tm05788@salleurl.edu)
 
@@ -113,7 +113,7 @@ $action_success_lang	= 'L\'acci&oacute; ha acabat satisfact&ograve;riament.';
 $submit_lang			= 'Envia';
 $delete_lang			= 'Esborra';
 
-// ----- New for 0.9.5
+// ----- New for 1.0
 $all_cal_comb_lang		= 'All calendars combined';
 
 // - navigation
diff --git a/languages/czech.inc.php b/languages/czech.inc.php
index 3a6b31d..d43e63e 100644
--- a/languages/czech.inc.php
+++ b/languages/czech.inc.php
@@ -1,7 +1,7 @@
 <?php

 

 // Czech language include

-// For version 0.9.5 PHP iCalendar

+// For version 1.0 PHP iCalendar

 //

 // Translation by Whit, studio jižák (whit@studio.jizak.cz)

 //

diff --git a/languages/danish.inc.php b/languages/danish.inc.php
index 4ff5692..10e02e1 100644
--- a/languages/danish.inc.php
+++ b/languages/danish.inc.php
@@ -1,7 +1,7 @@
 <?php
 
 // Danish language include
-// For version 0.9.5 PHP iCalendar
+// For version 1.0 PHP iCalendar
 //
 // Translation by Henrik H�jmark (styxx@worldonline.dk)
 //            and Jakob Peterh�nsel (marook@creepers.org)
@@ -114,7 +114,7 @@ $action_success_lang	= 'Your action was successful.';
 $submit_lang			= 'Submit';
 $delete_lang			= 'Delete';
 
-// ----- New for 0.9.5
+// ----- New for 1.0
 $all_cal_comb_lang		= 'All calendars combined';
 
 // - navigation
diff --git a/languages/dutch.inc.php b/languages/dutch.inc.php
index d06347a..2ab1b4f 100644
--- a/languages/dutch.inc.php
+++ b/languages/dutch.inc.php
@@ -1,7 +1,7 @@
 <?php
 
 // Dutch language include
-// For version 0.9.5 PHP iCalendar
+// For version 1.0 PHP iCalendar
 //
 // Translation by Lieven Gekiere (Lieven@gekiere.com)
 //
@@ -42,7 +42,7 @@ $goweek_lang		= 'Ga Naar Deze Week';
 $gomonth_lang		= 'Ga Naar Deze Maand';
 $goyear_lang		= 'Ga Naar Dit Jaar';
 $search_lang		= 'Zoeken'; // the verb
-$results_lang		= 'Zoek Resultaten';
+$results_lang		= 'Zoekresultaten';
 $query_lang			= 'Zoekopdracht: '; // will be followed by the search query
 $no_results_lang	= 'Geen activiteiten gevonden';
 $goprint_lang		= 'Makkelijk Printbaar';
@@ -115,16 +115,16 @@ $submit_lang			= 'Verzenden';
 $delete_lang			= 'Verwijder';
 
 // ----- New for 0.9.5
-$all_cal_comb_lang		= 'All calendars combined';
+$all_cal_comb_lang		= 'Alle Kalenders samen';
 
 // - navigation
 $back_lang = 'Terug';
 $next_lang = 'Volgende';
 $prev_lang = 'Vorige';
-$day_view_lang = 'Dag overzicht';
-$week_view_lang = 'Week overzicht';
-$month_view_lang = 'Maand overzicht';
-$year_view_lang = 'Jaar overzicht';
+$day_view_lang = 'Dagoverzicht';
+$week_view_lang = 'Weekoverzicht';
+$month_view_lang = 'Maandoverzicht';
+$year_view_lang = 'Jaaroverzicht';
 
 // ---------------------------------
 
diff --git a/languages/english.inc.php b/languages/english.inc.php
index 2688029..974b19a 100644
--- a/languages/english.inc.php
+++ b/languages/english.inc.php
@@ -1,7 +1,7 @@
 <?php
 
 // English language include
-// For version 0.9.5 PHP iCalendar
+// For version 1.0 PHP iCalendar
 //
 // Translation by Chad Little (chad@chadsdomain.com)
 //
@@ -114,7 +114,7 @@ $action_success_lang	= 'Your action was successful.';
 $submit_lang			= 'Submit';
 $delete_lang			= 'Delete';
 
-// ----- New for 0.9.5
+// ----- New for 1.0
 $all_cal_comb_lang		= 'All calendars combined';
 
 // - navigation
diff --git a/languages/esperanto.inc.php b/languages/esperanto.inc.php
index bf8e4e2..68ccb49 100644
--- a/languages/esperanto.inc.php
+++ b/languages/esperanto.inc.php
@@ -1,7 +1,7 @@
 <?php
 
 // Esperanto language include
-// For version 0.9.5 PHP iCalendar
+// For version 1.0 PHP iCalendar
 //
 // Translation by Sjoerd Bosga (sjoerd@esperanto.se)
 //
@@ -114,7 +114,7 @@ $action_success_lang	= 'Via peto plenumi&#285;is.';
 $submit_lang			= 'En&#349;uti';
 $delete_lang			= 'Forigi';
 
-// ----- New after 0.9.5
+// ----- New after 1.0
 $all_cal_comb_lang		= '&#264;iuj kalendaroj kune';
 
 
diff --git a/languages/finnish.inc.php b/languages/finnish.inc.php
index e16dbaa..f789f06 100644
--- a/languages/finnish.inc.php
+++ b/languages/finnish.inc.php
@@ -1,7 +1,7 @@
 <?php
 
 // Finnish language include
-// For version 0.9.5 PHP iCalendar
+// For version 1.0 PHP iCalendar
 //
 // Translation by Kari Somby (kari.somby@ramk.fi)
 //
@@ -114,7 +114,7 @@ $action_success_lang	= 'Toiminta onnistui.';
 $submit_lang			= 'L&aumlhet&auml';
 $delete_lang			= 'Tuhoa';
 
-// ----- New for 0.9.5
+// ----- New for 1.0
 $all_cal_comb_lang		= 'All calendars combined';
 
 // - navigation
diff --git a/languages/french.inc.php b/languages/french.inc.php
index 104baa3..3bc5a2e 100644
--- a/languages/french.inc.php
+++ b/languages/french.inc.php
@@ -1,7 +1,7 @@
 <?php
 
 // French language include
-// For version 0.9.5 PHP iCalendar
+// For version 1.0 PHP iCalendar
 //
 // Translation by La Shampouineuse (info@lashampoo.com)
 //
diff --git a/languages/german.inc.php b/languages/german.inc.php
index 4ced298..ba1dcbd 100644
--- a/languages/german.inc.php
+++ b/languages/german.inc.php
@@ -1,199 +1 @@
-<?php

-

-// German language include

-// For version 0.9.5 PHP iCalendar

-//

-// Translation by David Reindl (dre@andare.ch)

-// Corrected by whippersnapper slomo (mail@slomo.de)

-//

-// 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';

-$event_lang			= 'Eintrag';

-$event_start_lang	= 'Beginn';

-$event_end_lang		= 'Ende';

-$this_months_lang	= 'Alle Eintr&auml;ge in diesem Monat';

-$date_lang			= 'Datum';

-$summary_lang		= 'Beschreibung';

-$all_day_lang		= 'Tagesereignis';

-$notes_lang			= 'Notiz';

-$this_years_lang	= 'Eintr&auml;ge in diesem Jahr';

-$today_lang			= 'Heute';

-$this_week_lang		= 'Diese Woche';

-$this_month_lang	= 'Diesen Monat';

-$jump_lang			= 'Gehe zu';

-$tomorrows_lang		= 'Morgige Eintr&auml;ge';

-$goday_lang			= 'Gehe zum heutigen Tag';

-$goweek_lang		= 'Gehe zur aktuellen Woche';

-$gomonth_lang		= 'Gehe zum aktuellen Monat';

-$goyear_lang		= 'Gehe zum aktuellen Jahr';

-$search_lang		= 'Suchen'; // the verb

-$results_lang		= 'Suchresultate';

-$query_lang			= 'Suche: '; // will be followed by the search query

-$no_results_lang	= 'Keine Eintr&auml;ge gefunden';

-$goprint_lang		= 'Druckversion';

-$time_lang			= 'Zeit';

-$summary_lang		= 'Zusammenfassung';

-$description_lang	= 'Beschreibung';

-$this_site_is_lang		= 'Diese Site ist';

-$no_events_day_lang		= 'Keine Eintr&auml;ge f&uuml;r heute.';

-$no_events_week_lang	= 'Keine Eintr&auml;ge in dieser Woche.';

-$no_events_month_lang	= 'Keine Eintr&auml;ge in diesem Monat.';

-$rss_day_date			= 'H:i';  // Lists just the time

-$rss_week_date			= '%e. %b';  // Lists just the day

-$rss_month_date			= '%e. %b';  // Lists just the day

-$rss_language			= 'en-us';

-$search_took_lang		= 'Suche dauerte %s Sekunden';

-$recurring_event_lang	= 'Wiederkehrender Eintrag';

-$exception_lang			= 'Ausnahme';

-$no_query_lang			= 'Kein Suchbegriff';

-$preferences_lang		= 'Einstellungen';

-$printer_lang			= 'Drucker';

-$select_lang_lang		= 'Standardsprache w&auml;hlen:';

-$select_cal_lang		= 'Standardkalender w&auml;hlen:';

-$select_view_lang		= 'Standardansicht  w&auml;hlen:';

-$select_time_lang		= 'Tag beginnt um:';

-$select_day_lang		= 'Woche beginnt mit:';

-$select_style_lang		= 'Standardstil w&auml;hlen:';

-$set_prefs_lang			= 'Einstellungen speichern';

-$completed_date_lang	= 'Erledigt am';

-$completed_lang			= 'Erledigt';

-$created_lang			= 'Erstellt:';

-$due_lang				= 'F&auml;llig:';

-$priority_lang			= 'Priorit&auml;t:';

-$priority_high_lang		= 'hoch';

-$priority_low_lang		= 'tief';

-$priority_medium_lang	= 'mittel';

-$priority_none_lang		= 'keine';

-$status_lang			= 'Status:';

-$todo_lang				= 'Aufgaben';

-$unfinished_lang		= 'Pendent';

-$prefs_set_lang 		= 'Your preferences have been set.';

-$prefs_unset_lang 		= 'Preferences unset. Changes will take place next page load.';

-$unset_prefs_lang 		= 'Unset preferences:';

-$organizer_lang			= 'Organizer';

-$attendee_lang			= 'Attendee';

-$status_lang			= 'Status';

-$location_lang			= 'Location';

-$admin_header_lang		= 'PHP iCalendar Administration';

-$username_lang			= 'Username';

-$password_lang			= 'Password';

-$login_lang				= 'Login';

-$invalid_login_lang		= 'Wrong username or password.';

-$addupdate_cal_lang		= 'Add or Update a Calendar';

-$addupdate_desc_lang	= 'Add a calendar by uploading a new file. Update a calendar by uploading a file of the same name.';

-$delete_cal_lang		= 'Delete a Calendar';

-$logout_lang			= 'Logout';

-$cal_file_lang			= 'Calendar File';

-$php_error_lang			= 'PHP Error';

-$upload_error_gen_lang	= 'There was a problem with your upload.';

-$upload_error_lang[0]	= 'There was a problem with your upload.';

-$upload_error_lang[1]	= 'The file you are trying to upload is too big.';

-$upload_error_lang[2]	= 'The file you are trying to upload is too big.';

-$upload_error_lang[3]	= 'The file you are trying upload was only partially uploaded.';

-$upload_error_lang[4]	= 'You must select a file for upload.';

-$upload_error_type_lang = 'Only .ics files may be uploaded.';

-$copy_error_lang		= 'Failed to copy file';

-$delete_error_lang		= 'Failed to delete file';

-$delete_success_lang	= 'was deleted successfully.';

-$action_success_lang	= 'Your action was successful.';

-$submit_lang			= 'Submit';

-$delete_lang			= 'Delete';

-

-// ----- New for 0.9.5

-$all_cal_comb_lang		= 'All calendars combined';

-

-// - navigation

-$back_lang = 'Back';

-$next_lang = 'Next';

-$prev_lang = 'Prev';

-$day_view_lang = 'Day View';

-$week_view_lang = 'Week View';

-$month_view_lang = 'Month View';

-$year_view_lang = 'Year View';

-

-// ---------------------------------

-

-// $format_recur, items enclosed in % will be substituted with variables

-$format_recur_lang['delimiter']	= ', ';								// ie, 'one, two, three'

-

-$format_recur_lang['yearly']		= array('Jahr','Jahre');		// for these, put singular

-$format_recur_lang['monthly']		= array('Monat','Monate');		// and plural forms

-$format_recur_lang['weekly']		= array('Woche','Wochen');		// these will be %freq%

-$format_recur_lang['daily']			= array('Tag','Tage');			// in the replacement below

-$format_recur_lang['hourly']		= array('Stunde','Stunden');

-$format_recur_lang['minutely']		= array('Minute','Minuten');

-$format_recur_lang['secondly']		= array('Sekunde','Sekunden');

-

-$format_recur_lang['start']			= 'Jeden %int% %freq% %for%';	// ie, 'Every 1 day until January 4' or 'Every 1 day for a count of 5'

-$format_recur_lang['until']			= 'bis %date%';				// ie, 'until January 4'

-$format_recur_lang['count']			= 'f&uuml;r %int% Mal';		// ie, 'for 5 times'

-

-$format_recur_lang['bymonth']		= 'In den Monaten: %list%';			// ie, 'In months: January, February, March'

-$format_recur_lang['bymonthday']	= 'An den Daten: %list%';			// ie, 'On dates: 1, 2, 3, 4'

-$format_recur_lang['byday']			= 'An den Tagen: %list%';			// ie, 'On days: Mon, Tues, Wed, Thurs'

-

-// ---------------------------------

-

-$daysofweek_lang			= array ('Sonntag','Montag','Dienstag','Mittwoch','Donnerstag','Freitag','Samstag');

-$daysofweekshort_lang		= array ('Son','Mon','Die','Mit','Don','Fre','Sam');

-$daysofweekreallyshort_lang	= array ('S','M','D','M','D','F','S');

-$monthsofyear_lang			= array ('Januar','Februar','M&auml;rz','April','Mai','Juni','Juli','August','September','Oktober','November','Dezember');

-$monthsofyearshort_lang		= array ('Jan','Feb','M&auml;r','Apr','Mai','Jun','Jul','Aug','Sep','Okt','Nov','Dez');

-

-// For time formatting, check out: http://www.php.net/manual/en/function.date.php

-$timeFormat = 'H:i';

-$timeFormat_small = 'H:i';

-

-// For date formatting, see note below

-$dateFormat_day = '%A, %e. %B';

-$dateFormat_week = '%B %e';

-$dateFormat_week_list = '%a, %e. %b';

-$dateFormat_week_jump = ' %e. %b';

-$dateFormat_month = '%B %Y';

-$dateFormat_month_list = '%A, %e. %B';

-

-/*

-Notes about dateFormat_*

-	The pieces are similar to that of the PHP function strftime(), 

-	however only the following is supported at this time:

-	

-	%A - the full week day name as specified in $daysofweek_lang

-	%a - the shortened week day name as specified in $daysofweekshort_lang

-	%B - the full month name as specified in $monthsofyear_lang

-	%b - the shortened month name as specified in $monthsofyearshort_lang

-	%e - the day of the month as a decimal number (1 to 31)

-	%Y - the 4-digit year

-

-	If this causes problems with representing your language accurately, let

-	us know. We will be happy to modify this if needed.

-*/

-

-// Error messages - %s will be replaced with a variable

-$error_title_lang = 'Fehler!';

-$error_window_lang = 'Es ist ein Fehler aufgetreten!';

-$error_calendar_lang = 'Der Kalender "%s" wurde bearbeitet, als dieser Fehler auftrat.';

-$error_path_lang = 'Der Pfad "%s" kann nicht ge&ouml;ffnet werden.';

-$error_back_lang = 'Bitte klicken Sie die "Zur&uuml;ck" Schaltfl&auml;che des Browsers um zur&uuml;ckzuspringen.';

-$error_remotecal_lang = 'Dieser Server blockiert entfernte Kalender, welche nicht freigegeben wurden.';

-$error_restrictedcal_lang = 'Sie haben versucht einen Kalender mit eingeschr&auml;nktem Zugriff auf diesem Server aufzurufen.';

-$error_invalidcal_lang = 'Dieser Kalender enth&auml;lt Fehler. Bitte w&auml;hlen Sie einen anderen aus.';

-

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

// German language include
// For version 1.0 PHP iCalendar
//
// Translation by David Reindl (dre@andare.ch)
// Corrected by whippersnapper slomo (mail@slomo.de)
//
// 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';
$event_lang		= 'Eintrag';
$event_start_lang	= 'Beginn';
$event_end_lang		= 'Ende';

$this_months_lang	= 'Alle Eintr&auml;ge in diesem Monat';
$date_lang		= 'Datum';
$summary_lang		= 'Beschreibung';
$all_day_lang		= 'Tagesereignis';
$notes_lang		= 'Notiz';

$this_years_lang	= 'Eintr&auml;ge in diesem Jahr';
$today_lang		= 'Heute';
$this_week_lang		= 'Diese Woche';
$this_month_lang	= 'Diesen Monat';
$jump_lang		= 'Gehe zu';
$tomorrows_lang		= 'Morgige Eintr&auml;ge';

$goday_lang		= 'Gehe zum heutigen Tag';
$goweek_lang		= 'Gehe zur aktuellen Woche';
$gomonth_lang		= 'Gehe zum aktuellen Monat';
$goyear_lang		= 'Gehe zum aktuellen Jahr';

$search_lang		= 'Suchen'; // the verb
$results_lang		= 'Suchresultate';
$query_lang		= 'Suche: '; // will be followed by the search query
$no_results_lang	= 'Keine Eintr&auml;ge gefunden';
$goprint_lang		= 'Druckversion';
$time_lang		= 'Zeit';
$summary_lang		= 'Zusammenfassung';
$description_lang	= 'Beschreibung';
$this_site_is_lang	= 'Diese Site ist';

$no_events_day_lang	= 'Keine Eintr&auml;ge f&uuml;r heute.';
$no_events_week_lang	= 'Keine Eintr&auml;ge in dieser Woche.';
$no_events_month_lang	= 'Keine Eintr&auml;ge in diesem Monat.';

$rss_day_date		= 'H:i';  // Lists just the time
$rss_week_date		= '%e. %b';  // Lists just the day
$rss_month_date		= '%e. %b';  // Lists just the day
$rss_language		= 'de-de';

$search_took_lang	= 'Suche dauerte %s Sekunden';
$recurring_event_lang	= 'Wiederkehrender Eintrag';
$exception_lang		= 'Ausnahme';
$no_query_lang		= 'Kein Suchbegriff';
$preferences_lang	= 'Einstellungen';
$printer_lang		= 'Drucker';

$select_lang_lang	= 'Standardsprache w&auml;hlen:';
$select_cal_lang	= 'Standardkalender w&auml;hlen:';
$select_view_lang	= 'Standardansicht  w&auml;hlen:';
$select_time_lang	= 'Tag beginnt um:';
$select_day_lang	= 'Woche beginnt mit:';
$select_style_lang	= 'Standardstil w&auml;hlen:';

$set_prefs_lang		= 'Einstellungen speichern';

$completed_date_lang	= 'Erledigt am';
$completed_lang		= 'Erledigt';

$created_lang		= 'Erstellt:';
$due_lang		= 'F&auml;llig:';

$priority_lang		= 'Priorit&auml;t:';
$priority_high_lang	= 'hoch';
$priority_low_lang	= 'tief';
$priority_medium_lang	= 'mittel';
$priority_none_lang	= 'keine';

$status_lang		= 'Status:';
$todo_lang		= 'Aufgaben';
$unfinished_lang	= 'Pendent';

$prefs_set_lang 	= 'Einstellungen wurden gespeichert.';
$prefs_unset_lang 	= 'Einstellungen gel&ouml;scht. &Auml;nderungen werden beim Aufruf der n&auml;chsten Seite aktiv.';
$unset_prefs_lang 	= 'Einstellungen l&ouml;schen:';

$organizer_lang		= 'Organisator';
$attendee_lang		= 'Teilnehmer';
$status_lang		= 'Status';
$location_lang		= 'Ort';

$admin_header_lang	= 'PHP iCalendar Administration';
$username_lang		= 'Benutzername';
$password_lang		= 'Passwort';
$login_lang		= 'Anmelden';
$invalid_login_lang	= 'Falscher Benutzername oder Passwort.';
$addupdate_cal_lang	= 'Kalender aktualisieren oder hochladen';
$addupdate_desc_lang	= 'Um einen Kalendar hinzuzuf&uuml;gen, laden Sie ein neues Kalender Dokument hoch. Um einen Kalender zu aktualisieren, laden Sie ein Kalender Dokument mit dem selben Namen hoch.';
$delete_cal_lang	= 'Einen Kalender l&ouml;schen';
$logout_lang		= 'Abmelden';
$cal_file_lang		= 'Kalender Dokument';
$php_error_lang		= 'PHP Fehler';

$upload_error_gen_lang	= 'Es ist ein Problem beim Hochladen aufgetreten.';
$upload_error_lang[0]	= 'Fehler beim Hochladen des Dokuments.';
$upload_error_lang[1]	= 'Das hochzuladende Dokument ist zu gross.';
$upload_error_lang[2]	= 'Das Dokument, welches Sie versuchen hochzuladen, ist zu gross.';
$upload_error_lang[3]	= 'The file you are trying upload was only partially uploaded.';
$upload_error_lang[4]	= 'Sie m&uuml;ssen ein Dokument zum Hochladen ausw&auml;hlen.';
$upload_error_type_lang = 'Nur Dokumente mit der Suffix .ics d&uuml;rfen hochgeladen werden.';

$copy_error_lang	= 'Kopieren des Dokuments nicht erfolgreich';
$delete_error_lang	= 'L&ouml;schen des Dokuments nicht erfolgreich';
$delete_success_lang	= 'wurde gel&ouml;scht.';
$action_success_lang	= 'Die Aktion war erfolgreich.';

$submit_lang		= 'Absenden';
$delete_lang		= 'L&ouml;schen';


// ----- New for 0.9.5

$all_cal_comb_lang	= 'Alle Kalender zusammen';

// - navigation

$back_lang              = 'Zur&uuml;ck';
$next_lang              = 'N&auml;chste';
$prev_lang              = 'Vorherige';

$day_view_lang          = 'Tagesansicht';
$week_view_lang         = 'Wochenansicht';
$month_view_lang        = 'Monatsansicht';
$year_view_lang         = 'Jahresansicht';


// ---------------------------------

// $format_recur, items enclosed in % will be substituted with variables

$format_recur_lang['delimiter'] = ', ';                     // ie, 'one, two, three'

$format_recur_lang['yearly']    = array('Jahr','Jahre');    // for these, put singular
$format_recur_lang['monthly']   = array('Monat','Monate');  // and plural forms
$format_recur_lang['weekly']	= array('Woche','Wochen');  // these will be %freq%
$format_recur_lang['daily']	= array('Tag','Tage');      // in the replacement below
$format_recur_lang['hourly']	= array('Stunde','Stunden');
$format_recur_lang['minutely']	= array('Minute','Minuten');
$format_recur_lang['secondly']	= array('Sekunde','Sekunden');

$format_recur_lang['start']	= 'Jeden %int% %freq% %for%';   // ie, 'Every 1 day until January 4' or 'Every 1 day for a count of 5'
$format_recur_lang['until']	= 'bis %date%';             // ie, 'until January 4'
$format_recur_lang['count']	= 'f&uuml;r %int% Mal';     // ie, 'for 5 times'

$format_recur_lang['bymonth']	= 'In den Monaten: %list%'; // ie, 'In months: January, February, March'
$format_recur_lang['bymonthday']    = 'An den Daten: %list%';   // ie, 'On dates: 1, 2, 3, 4'
$format_recur_lang['byday']	= 'An den Tagen: %list%';   // ie, 'On days: Mon, Tues, Wed, Thurs'

// ---------------------------------

$daysofweek_lang		= array ('Sonntag','Montag','Dienstag','Mittwoch','Donnerstag','Freitag','Samstag');
$daysofweekshort_lang		= array ('Son','Mon','Die','Mit','Don','Fre','Sam');
$daysofweekreallyshort_lang	= array ('S','M','D','M','D','F','S');

$monthsofyear_lang		= array ('Januar','Februar','M&auml;rz','April','Mai','Juni','Juli','August','September','Oktober','November','Dezember');
$monthsofyearshort_lang		= array ('Jan','Feb','M&auml;r','Apr','Mai','Jun','Jul','Aug','Sep','Okt','Nov','Dez');


// For time formatting, check out: http://www.php.net/manual/en/function.date.php

$timeFormat             = 'H:i';
$timeFormat_small       = 'H:i';


// For date formatting, see note below

$dateFormat_day         = '%A, %e. %B';
$dateFormat_week        = '%B %e';
$dateFormat_week_list   = '%a, %e. %b';
$dateFormat_week_jump   = ' %e. %b';
$dateFormat_month       = '%B %Y';
$dateFormat_month_list  = '%A, %e. %B';

/*

Notes about dateFormat_*

	The pieces are similar to that of the PHP function strftime(), 
	however only the following is supported at this time:

	%A - the full week day name as specified in $daysofweek_lang
	%a - the shortened week day name as specified in $daysofweekshort_lang
	%B - the full month name as specified in $monthsofyear_lang
	%b - the shortened month name as specified in $monthsofyearshort_lang
	%e - the day of the month as a decimal number (1 to 31)
	%Y - the 4-digit year

	If this causes problems with representing your language accurately, let
	us know. We will be happy to modify this if needed.

*/


// Error messages - %s will be replaced with a variable

$error_title_lang       = 'Fehler!';
$error_window_lang      = 'Es ist ein Fehler aufgetreten!';
$error_calendar_lang    = 'Der Kalender "%s" wurde bearbeitet, als dieser Fehler auftrat.';
$error_path_lang        = 'Der Pfad "%s" kann nicht ge&ouml;ffnet werden.';
$error_back_lang        = 'Bitte klicken Sie die "Zur&uuml;ck" Schaltfl&auml;che des Browsers um zur&uuml;ckzuspringen.';
$error_remotecal_lang   = 'Dieser Server blockiert entfernte Kalender, welche nicht freigegeben wurden.';
$error_restrictedcal_lang   = 'Sie haben versucht einen Kalender mit eingeschr&auml;nktem Zugriff auf diesem Server aufzurufen.';
$error_invalidcal_lang  = 'Dieser Kalender enth&auml;lt Fehler. Bitte w&auml;hlen Sie einen anderen aus.';

?>
\ No newline at end of file
diff --git a/languages/italian.inc.php b/languages/italian.inc.php
index 8679e12..8712dab 100644
--- a/languages/italian.inc.php
+++ b/languages/italian.inc.php
@@ -1,7 +1,7 @@
 <?php
 
 // Italian language include
-// For version 0.9.5 PHP iCalendar
+// For version 1.0 PHP iCalendar
 //
 // First translation by Luca Cacciagrano (clooka@clac.it)
 // Updated translation by Daniele Nicolucci (jollino@discussioni.org)
@@ -115,7 +115,7 @@ $action_success_lang	= 'Your action was successful.';
 $submit_lang			= 'Submit';
 $delete_lang			= 'Delete';
 
-// ----- New for 0.9.5
+// ----- New for 1.0
 $all_cal_comb_lang		= 'All calendars combined';
 
 // - navigation
diff --git a/languages/japanese.inc.php b/languages/japanese.inc.php
index 66c10cc..6c782c0 100644
--- a/languages/japanese.inc.php
+++ b/languages/japanese.inc.php
@@ -119,7 +119,7 @@ $action_success_lang	= 'Your action was successful.';
 $submit_lang			= 'Submit';
 $delete_lang			= 'Delete';
 
-// ----- New for 0.9.5
+// ----- New for 1.0
 $all_cal_comb_lang		= 'All calendars combined';
 
 // - navigation
diff --git a/languages/korean.inc.php b/languages/korean.inc.php
index 0e30e9d..a9cc390 100644
--- a/languages/korean.inc.php
+++ b/languages/korean.inc.php
@@ -1,7 +1,7 @@
 <?php
 
 // Korean language include
-// For version 0.9.5 PHP iCalendar
+// For version 1.0 PHP iCalendar
 //
 // Translation by TaeYoung Oh (spier@hybird.net)
 //
diff --git a/languages/norwegian.inc.php b/languages/norwegian.inc.php
index 68966dc..26545c5 100644
--- a/languages/norwegian.inc.php
+++ b/languages/norwegian.inc.php
@@ -1,7 +1,7 @@
 <?php
 
 // Norwegian language include
-// For version 0.9.5 PHP iCalendar
+// For version 1.0 PHP iCalendar
 //
 // Translation by Geir Kielland (kielland@mac.com)
 //
@@ -113,7 +113,7 @@ $action_success_lang	= 'Din handling ble utf&oslash;rt.';
 $submit_lang			= 'Legg inn';
 $delete_lang			= 'Slett';
 
-// ----- New for 0.9.5
+// ----- New for 1.0
 $all_cal_comb_lang		= 'Alle kalenderne samlet';
 
 // - navigation
diff --git a/languages/polish.inc.php b/languages/polish.inc.php
index bbf56bd..4c43750 100644
--- a/languages/polish.inc.php
+++ b/languages/polish.inc.php
@@ -1,7 +1,7 @@
 <?php

 

 // Polish language include

-// For version 0.9.5 PHP iCalendar

+// For version 1.0 PHP iCalendar

 //

 // Translation by Stanisław Cieślicki (stahoo@poczta.onet.pl)

 //

@@ -114,7 +114,7 @@ $action_success_lang	= 'Zakończono sukcesem.';
 $submit_lang			= 'Wyślij';

 $delete_lang			= 'Wymaż';

 

-// ----- New for 0.9.5

+// ----- New for 1.0

 $all_cal_comb_lang		= 'All calendars combined';

 

 // - navigation

diff --git a/languages/portuguese.inc.php b/languages/portuguese.inc.php
index f75403a..34be7f6 100644
--- a/languages/portuguese.inc.php
+++ b/languages/portuguese.inc.php
@@ -1,7 +1,7 @@
 <?php
 
 // Portuguese language include
-// For version 0.9.5 PHP iCalendar
+// For version 1.0 PHP iCalendar
 //
 // Translation by Rui Costa (ruicosta@ubi.pt)
 //
@@ -113,7 +113,7 @@ $action_success_lang	= 'Your action was successful.';
 $submit_lang			= 'Submit';
 $delete_lang			= 'Delete';
 
-// ----- New for 0.9.5
+// ----- New for 1.0
 $all_cal_comb_lang		= 'All calendars combined';
 
 // - navigation
diff --git a/languages/spanish.inc.php b/languages/spanish.inc.php
index b7bc151..0bed6f4 100644
--- a/languages/spanish.inc.php
+++ b/languages/spanish.inc.php
@@ -1,7 +1,7 @@
 <?php
 
 // Spanish language include
-// For version 0.9.5 PHP iCalendar
+// For version 1.0 PHP iCalendar
 //
 // Translation by Javier Navarro from XIPS (jnavarro@xips.es)
 
@@ -55,7 +55,7 @@ $no_events_month_lang	= 'No hay eventos para este mes.';
 $rss_day_date			= 'g:i A';  // Lists just the time
 $rss_week_date			= '%e de %b';  // Lists just the day
 $rss_month_date			= '%e de %b';  // Lists just the day
-$rss_language			= 'en-us';
+$rss_language			= 'es-es';
 $search_took_lang		= 'La busqeda tard&oacute; %s segundos';
 $recurring_event_lang	= 'Evento peri&ocaute;dico';
 $exception_lang			= 'Excepci&oacute;n';
@@ -69,7 +69,7 @@ $select_time_lang		= 'Elija su hora de inicio por defecto:';
 $select_day_lang		= 'Escoja su dia de la semana de inicio:';
 $select_style_lang		= 'Seleccione su estilo por defecto:';
 $set_prefs_lang			= 'Guardar preferencias';
-$completed_date_lang	= 'Finalizado a';
+$completed_date_lang	= 'Finalizado el';
 $completed_lang			= 'Finalizado';
 $created_lang			= 'Creado:';
 $due_lang				= 'Hasta:';
@@ -81,40 +81,40 @@ $priority_none_lang		= 'Ninguna';
 $status_lang			= 'Estado:';
 $todo_lang				= 'Por hacer';
 $unfinished_lang		= 'Sin terminar';
-$prefs_set_lang 		= 'Sus preferencias han sido activadas.';
+$prefs_set_lang 		= 'Sus preferencias han sido guardadas.';
 $prefs_unset_lang 		= 'Preferencias no activas. Los cambios se activaran al recargar la p&aacute;gina.';
 $unset_prefs_lang 		= 'Preferencias sin activar:';
-$organizer_lang			= 'Organizer';
-$attendee_lang			= 'Attendee';
-$status_lang			= 'Status';
-$location_lang			= 'Location';
-$admin_header_lang		= 'PHP iCalendar Administration';
-$username_lang			= 'Username';
-$password_lang			= 'Password';
-$login_lang				= 'Login';
-$invalid_login_lang		= 'Wrong username or password.';
-$addupdate_cal_lang		= 'Add or Update a Calendar';
-$addupdate_desc_lang	= 'Add a calendar by uploading a new file. Update a calendar by uploading a file of the same name.';
-$delete_cal_lang		= 'Delete a Calendar';
-$logout_lang			= 'Logout';
-$cal_file_lang			= 'Calendar File';
-$php_error_lang			= 'PHP Error';
-$upload_error_gen_lang	= 'There was a problem with your upload.';
-$upload_error_lang[0]	= 'There was a problem with your upload.';
-$upload_error_lang[1]	= 'The file you are trying to upload is too big.';
-$upload_error_lang[2]	= 'The file you are trying to upload is too big.';
-$upload_error_lang[3]	= 'The file you are trying upload was only partially uploaded.';
-$upload_error_lang[4]	= 'You must select a file for upload.';
-$upload_error_type_lang = 'Only .ics files may be uploaded.';
-$copy_error_lang		= 'Failed to copy file';
-$delete_error_lang		= 'Failed to delete file';
-$delete_success_lang	= 'was deleted successfully.';
-$action_success_lang	= 'Your action was successful.';
-$submit_lang			= 'Submit';
-$delete_lang			= 'Delete';
+$organizer_lang			= 'Organizador';
+$attendee_lang			= 'Invitado';
+$status_lang			= 'Estado';
+$location_lang			= 'Lugar';
+$admin_header_lang		= 'Administraci&oacute;n de PHP iCalendar';
+$username_lang			= 'Usuario';
+$password_lang			= 'Contrase&ntilde;a';
+$login_lang				= 'Registro';
+$invalid_login_lang		= 'Usuario o contrase&ntilde;a incorrectos.';
+$addupdate_cal_lang		= 'A&ntilde;adir o actualizar un calendario';
+$addupdate_desc_lang	= 'A&ntilde;ade un calendario enviando un nuevo fichero. Actualiza un calendario enviando un fichero existente.';
+$delete_cal_lang		= 'Borra un calendario';
+$logout_lang			= 'Salir';
+$cal_file_lang			= 'Fichero de Calendario';
+$php_error_lang			= 'Error PHP';
+$upload_error_gen_lang	= 'Hubo un problema con su env&iacute;o.';
+$upload_error_lang[0]	= 'Hubo un problema con su env&iacute;o.';
+$upload_error_lang[1]	= 'El fichero que intenta enviar es demasiado grande.';
+$upload_error_lang[2]	= 'El fichero que intenta enviar es demasiado grande.';
+$upload_error_lang[3]	= 'Solo se ha recibido una parte del fichero que intentaba enviar.';
+$upload_error_lang[4]	= 'Debe elegir un fichero para enviar.';
+$upload_error_type_lang = 'Solo se aceptan ficheros de calendario (.ics).';
+$copy_error_lang		= 'Fall&oacute; la copia del fichero';
+$delete_error_lang		= 'Fall&oacute; el borrado del fichero';
+$delete_success_lang	= 'se borr&oacute; correctamente.';
+$action_success_lang	= 'Su acci&oacute;n fu&eacute; correcta.';
+$submit_lang			= 'Enviar';
+$delete_lang			= 'Borrar';
 
 // ----- New for 0.9.5
-$all_cal_comb_lang		= 'All calendars combined';
+$all_cal_comb_lang		= 'Todos los calendarios combinados';
 
 // - navigation
 $back_lang = 'Atr&aacute;s';
diff --git a/languages/swedish.inc.php b/languages/swedish.inc.php
index 08090f1..b861f7d 100644
--- a/languages/swedish.inc.php
+++ b/languages/swedish.inc.php
diff --git a/languages/traditional_chinese.inc.php b/languages/traditional_chinese.inc.php
index b8c5159..f53229c 100644
--- a/languages/traditional_chinese.inc.php
+++ b/languages/traditional_chinese.inc.php
@@ -1,7 +1,7 @@
 <?php
 
 // Trad. Chinese language include
-// For version 0.9.5 PHP iCalendar
+// For version 1.0 PHP iCalendar
 //
 // Translation by Kevin Fyure (digdog@mac.com)
 //
@@ -116,7 +116,7 @@ $action_success_lang	= 'Your action was successful.';
 $submit_lang			= 'Submit';
 $delete_lang			= 'Delete';
 
-// ----- New for 0.9.5
+// ----- New for 1.0
 $all_cal_comb_lang		= 'All calendars combined';
 
 // - navigation
diff --git a/search.php b/search.php
index b3f1321..083cc6d 100644
--- a/search.php
+++ b/search.php
@@ -105,158 +105,130 @@ include (BASE.'includes/header.inc.php');
       	</td>
     </tr>
 	<tr>
-		<td colspan="3"  class="dayborder"><img src="images/spacer.gif" width="1" height="5" alt=" "></td>
+		<td class="dayborder"><img src="images/spacer.gif" width="1" height="5" alt=" "></td>
 	</tr>
 	<tr>
-		<td colspan="3">
-				<table border="0" cellspacing="0" cellpadding="0" width="100%">
-					<tr>
-						<td align="center" valign="top">
-							<table width="100%" border="0" cellspacing="0" cellpadding="0">
-								<tr>
-									<td colspan="3" height="1"></td>
-								</tr>							
-								<tr>
-									<td colspan="3" class="G10B" align="center"><?php echo $query_lang.': '.$formatted_search; ?></td>
-								</tr>
-								<tr>
-									<td colspan="3" class="G10B">&nbsp;</td>
-								</tr>								
-								<?php	
-									if (isset($the_arr) && is_array($the_arr)) {
-										foreach($the_arr as $val) {
-											$key = $val['date'];
-											$dayofmonth = strtotime ($key);
-											$dayofmonth = localizeDate ($dateFormat_day, $dayofmonth);
-											echo "<tr><td width=\"10\"><img src=\"images/spacer.gif\" width=\"10\" height=\"1\" alt=\" \"></td>\n";
-											echo "<td align=\"left\" colspan=\"2\"><font class=\"V12\"><b><a class=\"ps3\" href=\"day.php?cal=$cal&amp;getdate=$key\">$dayofmonth</a></b></font></td></tr>";
-											echo "<tr><td colspan=\"3\"><img src=\"images/spacer.gif\" width=\"1\" height=\"5\" alt=\" \"></td></tr>\n";
-											
-											if ($val["event_text"]) {	
-												$event_text 	= stripslashes(urldecode($val["event_text"]));
-												$description 	= stripslashes(urldecode($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"));
-												$event_start 	= "$event_start - $event_end";
-												if (!$val["event_start"]) { 
-													$event_start = "$all_day_lang";
-													$event_start2 = '';
-													$event_end = '';
-												}
-												echo "<tr>\n";
-												echo "<td width=\"10\"><img src=\"images/spacer.gif\" width=\"10\" height=\"1\" alt=\" \"></td>\n";
-												echo "<td width=\"10\"><img src=\"images/spacer.gif\" width=\"10\" height=\"1\" alt=\" \"></td>\n";
-												echo "<td align=\"left\">\n";
-												echo "<table width=\"100%\" border=\"0\" cellspacing=\"1\" cellpadding=\"1\">\n";
-												echo "<tr>\n";
-												echo "<td width=\"120\" class=\"G10BOLD\">$time_lang:</td>\n";
-												echo "<td align=\"left\" class=\"G10B\">$event_start</td>\n";
-												echo "</tr>\n";
-												echo "<tr>\n";
-												echo "<td valign=\"top\" width=\"100\" class=\"G10BOLD\">$summary_lang:</td>\n";
-												echo "<td valign=\"top\" align=\"left\" class=\"G10B\">$event_text</td>\n";
-												echo "</tr>\n";
-												if (isset($val['recur'])) {
-													$recur = $val['recur'];
-													echo "<tr>\n";
-													echo "<td valign=\"top\" width=\"100\" class=\"G10BOLD\">Recurring event:</td>\n";
-													echo "<td valign=\"top\" align=\"left\" class=\"G10B\">$recur</td>\n";
-													echo "</tr>\n";
-												}
-												if ($val["description"]) {
-													echo "<tr>\n";
-													echo "<td valign=\"top\" width=\"100\" class=\"G10BOLD\">$description_lang:</td>\n";
-													echo "<td valign=\"top\" align=\"left\" class=\"G10B\">$description</td>\n";
-													echo "</tr>\n";
-												}
-												echo "</table>\n";
-												echo "</td>\n";
-												echo "</tr>\n";			
-												echo "<tr><td colspan=\"3\"><img src=\"images/spacer.gif\" width=\"1\" height=\"10\" alt=\" \"></td></tr>\n";
-												if (isset($val['exceptions'])) {
-													echo "<tr><td colspan=\"3\"><table width=\"100%\" border=\"0\" cellspacing=\"0\" cellpadding=\"0\">\n";
-													foreach($val['exceptions'] as $val2) {
-														$key = $val2['date'];
-														$dayofmonth = strtotime ($key);
-														$dayofmonth = localizeDate ($dateFormat_day, $dayofmonth);
-														echo "<tr><td width=\"20\"><img src=\"images/spacer.gif\" width=\"20\" height=\"1\" alt=\" \"></td>\n";
-														echo "<td align=\"left\" colspan=\"2\"><font class=\"V10\"><i>$exception_lang</i>: <a class=\"ps3\" href=\"day.php?cal=$cal&amp;getdate=$key\">$dayofmonth</a></font></td></tr>";
-														echo "<tr><td colspan=\"3\"><img src=\"images/spacer.gif\" width=\"1\" height=\"5\" alt=\" \"></td></tr>\n";
-														
-														if ($val2["event_text"]) {	
-															$event_text 	= stripslashes(urldecode($val2["event_text"]));
-															$description 	= stripslashes(urldecode($val2["description"]));
-															$event_start 	= $val2["event_start"];
-															$event_end 		= $val2["event_end"];
-															$event_start 	= date ($timeFormat, strtotime ("$event_start"));
-															$event_end 		= date ($timeFormat, strtotime ("$event_end"));
-															$event_start 	= "$event_start - $event_end";
-															if (!$val2["event_start"]) { 
-																$event_start = "$all_day_lang";
-																$event_start2 = '';
-																$event_end = '';
-															}
-															echo "<tr>\n";
-															echo "<td width=\"10\"><img src=\"images/spacer.gif\" width=\"10\" height=\"1\" alt=\" \"></td>\n";
-															echo "<td width=\"10\"><img src=\"images/spacer.gif\" width=\"10\" height=\"1\" alt=\" \"></td>\n";
-															echo "<td align=\"left\">\n";
-															echo "<table width=\"100%\" border=\"0\" cellspacing=\"1\" cellpadding=\"1\">\n";
-															echo "<tr>\n";
-															echo "<td width=\"100\" class=\"V10\">$time_lang:</td>\n";
-															echo "<td align=\"left\" class=\"V10\">$event_start</td>\n";
-															echo "</tr>\n";
-															echo "<tr>\n";
-															echo "<td valign=\"top\" width=\"100\" class=\"V10\">$summary_lang:</td>\n";
-															echo "<td valign=\"top\" align=\"left\" class=\"V10\">$event_text</td>\n";
-															echo "</tr>\n";
-															if (isset($val2['recur'])) {
-																$recur = $val2['recur'];
-																echo "<tr>\n";
-																echo "<td valign=\"top\" width=\"100\" class=\"V10\">$recurring_event_lang:</td>\n";
-																echo "<td valign=\"top\" align=\"left\" class=\"V10\">$recur</td>\n";
-																echo "</tr>\n";
-															}
-															if ($val2["description"]) {
-																echo "<tr>\n";
-																echo "<td valign=\"top\" width=\"100\" class=\"V10\">$description_lang:</td>\n";
-																echo "<td valign=\"top\" align=\"left\" class=\"V10\">$description</td>\n";
-																echo "</tr>\n";
-															}
-															echo "</table>\n";
-															echo "</td>\n";
-															echo "</tr>\n";			
-															echo "<tr><td colspan=\"3\"><img src=\"images/spacer.gif\" width=\"1\" height=\"10\" alt=\" \"></td></tr>\n";
-														}
-													}
-													echo "</table></td><tr>\n";
-												}
-											}
+		<td align="left">
+			<div style="padding: 10px;">
+				<?php 
+				
+				echo '<div align="center"><p class="V12">'.$query_lang.': '.$formatted_search.'</p></div>';
+				
+				if (isset($the_arr) && is_array($the_arr)) {
+					foreach($the_arr as $val) {
+						$key = $val['date'];
+						$dayofmonth = strtotime ($key);
+						$dayofmonth = localizeDate ($dateFormat_day, $dayofmonth);
+						echo '<font class="V12"><b><a class="ps3" href="day.php?cal='.$cal.'&amp;getdate='.$key.'">'.$dayofmonth.'</a></b></font><br>';
+						
+						if ($val["event_text"]) {	
+							$event_text 	= stripslashes(urldecode($val["event_text"]));
+							$description 	= stripslashes(urldecode($val["description"]));
+							$event_start 	= $val["event_start"];
+							$event_end 		= $val["event_end"];
+							$event_calna 	= $val["calname"];
+							$event_start 	= date ($timeFormat, strtotime ("$event_start"));
+							$event_end 		= date ($timeFormat, strtotime ("$event_end"));
+							$event_start 	= "$event_start - $event_end";
+							if (!$val["event_start"]) { 
+								$event_start = "$all_day_lang";
+								$event_start2 = '';
+								$event_end = '';
+							}
+							echo '<div style="margin-left: 10px;">';
+							echo "<table width=\"100%\" border=\"0\" cellspacing=\"1\" cellpadding=\"1\">\n";
+							echo "<tr>\n";
+							echo "<td width=\"120\" class=\"G10BOLD\">$time_lang:</td>\n";
+							echo "<td align=\"left\" class=\"G10B\">$event_start</td>\n";
+							echo "</tr>\n";
+							echo "<tr>\n";
+							echo "<td valign=\"top\" width=\"100\" class=\"G10BOLD\">$summary_lang:</td>\n";
+							echo "<td valign=\"top\" align=\"left\" class=\"G10B\">$event_text</td>\n";
+							echo "</tr>\n";
+							if (isset($val['recur'])) {
+								$recur = $val['recur'];
+								echo "<tr>\n";
+								echo "<td valign=\"top\" width=\"100\" class=\"G10BOLD\">Recurring event:</td>\n";
+								echo "<td valign=\"top\" align=\"left\" class=\"G10B\">$recur</td>\n";
+								echo "</tr>\n";
+							}
+							if ($val["description"]) {
+								echo "<tr>\n";
+								echo "<td valign=\"top\" width=\"100\" class=\"G10BOLD\">$description_lang:</td>\n";
+								echo "<td valign=\"top\" align=\"left\" class=\"G10B\">$description</td>\n";
+								echo "</tr>\n";
+							}
+							echo "</table>\n";
+							echo '</div>';
+							if (isset($val['exceptions'])) {
+								echo "<table width=\"100%\" border=\"0\" cellspacing=\"0\" cellpadding=\"0\">\n";
+								foreach($val['exceptions'] as $val2) {
+									$key = $val2['date'];
+									$dayofmonth = strtotime ($key);
+									$dayofmonth = localizeDate ($dateFormat_day, $dayofmonth);
+									echo "<td align=\"left\" colspan=\"2\"><font class=\"V10\"><i>$exception_lang</i>: <a class=\"ps3\" href=\"day.php?cal=$cal&amp;getdate=$key\">$dayofmonth</a></font></td></tr>";
+									
+									if ($val2["event_text"]) {	
+										$event_text 	= stripslashes(urldecode($val2["event_text"]));
+										$description 	= stripslashes(urldecode($val2["description"]));
+										$event_start 	= $val2["event_start"];
+										$event_end 		= $val2["event_end"];
+										$event_start 	= date ($timeFormat, strtotime ("$event_start"));
+										$event_end 		= date ($timeFormat, strtotime ("$event_end"));
+										$event_start 	= "$event_start - $event_end";
+										if (!$val2["event_start"]) { 
+											$event_start = "$all_day_lang";
+											$event_start2 = '';
+											$event_end = '';
 										}
-									} else {
-										echo '<tr><td colspan="3" class="G10B" align="center">';
-										echo $no_results_lang;
-										echo '</td></tr><tr><td class="G10B">&nbsp;</td></tr>';
+										echo "<tr>\n";
+										echo "<td align=\"left\">\n";
+										echo '<div style="margin-left: 10px;">';
+										echo "<table width=\"100%\" border=\"0\" cellspacing=\"1\" cellpadding=\"1\">\n";
+										echo "<tr>\n";
+										echo "<td width=\"100\" class=\"V10\">$time_lang:</td>\n";
+										echo "<td align=\"left\" class=\"V10\">$event_start</td>\n";
+										echo "</tr>\n";
+										echo "<tr>\n";
+										echo "<td valign=\"top\" width=\"100\" class=\"V10\">$summary_lang:</td>\n";
+										echo "<td valign=\"top\" align=\"left\" class=\"V10\">$event_text</td>\n";
+										echo "</tr>\n";
+										if (isset($val2['recur'])) {
+											$recur = $val2['recur'];
+											echo "<tr>\n";
+											echo "<td valign=\"top\" width=\"100\" class=\"V10\">$recurring_event_lang:</td>\n";
+											echo "<td valign=\"top\" align=\"left\" class=\"V10\">$recur</td>\n";
+											echo "</tr>\n";
+										}
+										if ($val2["description"]) {
+											echo "<tr>\n";
+											echo "<td valign=\"top\" width=\"100\" class=\"V10\">$description_lang:</td>\n";
+											echo "<td valign=\"top\" align=\"left\" class=\"V10\">$description</td>\n";
+											echo "</tr>\n";
+										}
+										echo "</table>";
+										echo '</div><br>';
+		
 									}
-										
-									
-								
-								?>
-								<tr>
-									<td colspan="3" class="G10B" align="center"><?php echo $search_box; ?></td>
-								</tr>	
-								<tr>
-									<td colspan="3" class="G10B" align="center">
-									<?php 
-										echo '<font class="V9G">'.sprintf($search_took_lang,$search_took).'</font><br><br>';
-									?>
-									</td>
-								</tr>
-							</table>
-						</td>
-					</tr>
-				</table>		
+								}
+							}
+						}
+					}
+				} else {
+					echo '<div align="center">';
+					echo '<p class="V12">'.$no_results_lang.'</p>';
+					echo '</div>';
+				}
+					
+					echo '<div align="center">';
+					echo $search_box;
+					echo '<p class="V9G">'.sprintf($search_took_lang,$search_took).'</p></div>';
+					echo '</div>';
+				?>
+
+					</td>
+				</tr>
+			</table>		
 		</td>
 	</tr>
 </table>